diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json
--- ../current/json/Objects.json 2019-09-26 18:50:49.424923285 +0000
+++ ./json/Objects.json 2019-10-01 13:40:49.226361448 +0000
@@ -12774,16 +12774,17 @@
"MultiHit": ""
}
},
{
"type": "0x0d5e",
"id": "Pentaract Tower",
"Enemy": "",
"Class": "Character",
+ "TrackLoot": "",
"Texture": {
"File": "lofiChar216x16",
"Index": "0x38"
},
"Animation": {
"prob": "1.0",
"period": "0.0",
"Frame": [
@@ -13168,16 +13169,17 @@
},
{
"type": "0x0d64",
"id": "Hermit God Tentacle",
"Group": "Hermit God Encounter",
"Enemy": "",
"Class": "Character",
"ShadowSize": "100",
+ "TrackLoot": "",
"AnimatedTexture": {
"File": "chars16x16rEncounters",
"Index": "11"
},
"AltTexture": {
"id": "1",
"AnimatedTexture": {
"File": "chars16x16rEncounters",
@@ -13211,16 +13213,17 @@
},
{
"type": "0x0d65",
"id": "Hermit God Tentacle Spawner",
"Group": "Hermit God Encounter",
"Class": "Character",
"Enemy": "",
"NoMiniMap": "",
+ "TrackLoot": "",
"Texture": {
"File": "invisible",
"Index": "0"
},
"Exp": "0",
"ShadowSize": "0",
"Size": "0",
"Invincible": ""
@@ -46675,17 +46678,17 @@
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x5cd"
},
"Usable": "",
"SlotType": "20",
- "Description": "A crystal trap with a built-in luring mechanism. The perimeter of the trap reflects light toward the center to create an illusionary mimic.",
+ "Description": "A crystal trap with a built-in luring mechanism. The perimeter of the trap reflects light toward the center to create an illusionary mimic.\\n\\nSprite Credits: Aurum",
"ExtraTooltipData": {
"EffectInfo": {
"description": "Creates a centered decoy for 1 second.",
"name": "Trap"
}
},
"MpCost": "80",
"Cooldown": "5",
@@ -46730,17 +46733,17 @@
"id": "Prismimic",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x5cc"
},
"SlotType": "22",
- "Description": "The perfectly cut head of a Prismimic, dastardly agents of the Crystal Entity. Its copying abilities are unprecedented.",
+ "Description": "The perfectly cut head of a Prismimic, dastardly agents of the Crystal Entity. Its copying abilities are unprecedented.\\n\\nSprite Credits: Aurum",
"Usable": "",
"BagType": "6",
"FameBonus": "6",
"MpCost": "85",
"ExtraTooltipData": {
"EffectInfo": {
"description": "Creates an expanding ring of 8 decoys",
"name": ""
@@ -60438,16 +60441,36 @@
"_": "UnlockSkin",
"skinType": "10109"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8"
},
{
+ "type": "0x5eeb",
+ "id": "Haunted Doll Trickster Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "playerskins",
+ "Index": "464"
+ },
+ "SlotType": "10",
+ "Description": "Never take out this horrific doll.\\n\\nSkin Class: Trickster\\nSprite Credits: Nazoado",
+ "Activate": {
+ "_": "UnlockSkin",
+ "skinType": "24298"
+ },
+ "Consumable": "",
+ "BagType": "8",
+ "Soulbound": "",
+ "feedPower": "1000"
+ },
+ {
"type": "0x190",
"id": "Apple",
"DisplayId": "Apple of Extreme Maxening",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj",
"Index": "0x0f"
@@ -103966,16 +103989,166 @@
"skinType": "30163"
},
"Consumable": "",
"Soulbound": "",
"BagType": "8",
"feedPower": "1000"
},
{
+ "id": "Skelephant",
+ "type": "0x75d5",
+ "Pet": "",
+ "Class": "Pet",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x32"
+ },
+ "Family": "Spooky",
+ "Rarity": "Divine",
+ "DefaultSkin": "Skelephant Pet Skin",
+ "Size": "80",
+ "NoHatchOrFuse": ""
+ },
+ {
+ "type": "0x75d6",
+ "id": "Skelephant Pet Skin",
+ "PetSkin": "",
+ "DisplayId": "Skelephant",
+ "Class": "PetSkin",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "115"
+ },
+ "Family": "Spooky",
+ "Rarity": "Divine"
+ },
+ {
+ "type": "0x75d7",
+ "id": "Skelephant Pet Stone",
+ "DisplayId": "Skelephant Pet Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "115"
+ },
+ "ScaleValue": "10",
+ "SlotType": "10",
+ "Description": "All of the muscle of a war elephant, with none of the muscle!\\n\\nSprite Credits: Dappertron\\n\\nUnlocks Skelephant Skin of the Spooky family. The skin will be added to your Pet Wardrobe in the Pet Yard and can be used to change the appearance of your pet!",
+ "Activate": {
+ "_": "UnlockPetSkin",
+ "skinType": "30166"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "8",
+ "feedPower": "1000"
+ },
+ {
+ "id": "Phantom Tea Set",
+ "type": "0x75d8",
+ "Pet": "",
+ "Class": "Pet",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x32"
+ },
+ "Family": "? ? ? ?",
+ "Rarity": "Divine",
+ "DefaultSkin": "Phantom Tea Set Pet Skin",
+ "Size": "80",
+ "NoHatchOrFuse": ""
+ },
+ {
+ "type": "0x75d9",
+ "id": "Phantom Tea Set Pet Skin",
+ "PetSkin": "",
+ "DisplayId": "Phantom Tea Set",
+ "Class": "PetSkin",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "116"
+ },
+ "Family": "? ? ? ?",
+ "Rarity": "Divine"
+ },
+ {
+ "type": "0x75da",
+ "id": "Phantom Tea Set Pet Stone",
+ "DisplayId": "Phantom Tea Set Pet Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "116"
+ },
+ "ScaleValue": "10",
+ "SlotType": "10",
+ "Description": "Care for a spot of something resembling tea?\\n\\nSprite Credits: Dappertron\\n\\nUnlocks Phantom Tea Set Skin of the ? ? ? ? family. The skin will be added to your Pet Wardrobe in the Pet Yard and can be used to change the appearance of your pet!",
+ "Activate": {
+ "_": "UnlockPetSkin",
+ "skinType": "30169"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "8",
+ "feedPower": "1000"
+ },
+ {
+ "id": "Fool's Penguin",
+ "type": "0x75db",
+ "Pet": "",
+ "Class": "Pet",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x32"
+ },
+ "Family": "Penguin",
+ "Rarity": "Divine",
+ "DefaultSkin": "Fool's Penguin Pet Skin",
+ "Size": "80",
+ "NoHatchOrFuse": ""
+ },
+ {
+ "type": "0x75dc",
+ "id": "Fool's Penguin Pet Skin",
+ "PetSkin": "",
+ "DisplayId": "Fool's Penguin",
+ "Class": "PetSkin",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "117"
+ },
+ "Family": "Penguin",
+ "Rarity": "Divine"
+ },
+ {
+ "type": "0x75dd",
+ "id": "Fool's Penguin Pet Stone",
+ "DisplayId": "Fool's Penguin Pet Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "petsDivine",
+ "Index": "117"
+ },
+ "ScaleValue": "10",
+ "SlotType": "10",
+ "Description": "AvERT yOUR atTenTiON TO thIS UNwARY wREtch. stArE deeP into iTS eYES, i beG YOU.\\n\\nSprite Credits: Dappertron\\n\\nUnlocks Fool's Penguin Skin of the Penguin family. The skin will be added to your Pet Wardrobe in the Pet Yard and can be used to change the appearance of your pet!",
+ "Activate": {
+ "_": "UnlockPetSkin",
+ "skinType": "30172"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "8",
+ "feedPower": "1000"
+ },
+ {
"type": "0x0927",
"id": "Dreadstump the Pirate King",
"Enemy": "",
"Class": "Character",
"AnimatedTexture": {
"File": "chars16x16dEncounters",
"Index": "4"
},
@@ -125266,16 +125439,28 @@
"AnimatedTexture": {
"File": "playerskins",
"Index": "459"
},
"PlayerClassType": "0x0311",
"NoSkinSelect": ""
},
{
+ "type": "0x5eea",
+ "id": "Haunted Doll Trickster",
+ "Skin": "",
+ "Class": "Skin",
+ "AnimatedTexture": {
+ "File": "playerskins",
+ "Index": "464"
+ },
+ "PlayerClassType": "0x0324",
+ "NoSkinSelect": ""
+ },
+ {
"type": "0x1731",
"id": "Stheno Summoner",
"Class": "GameObject",
"Texture": {
"File": "invisible",
"Index": "0"
},
"Size": "0"
Binary files ../current/sheets/petsDivine.png and ./sheets/petsDivine.png differ
Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ
Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.png differ