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 2018-08-30 12:00:39.944553088 +0000 +++ ./json/Objects.json 2018-09-06 15:50:38.545708399 +0000 @@ -46825,20 +46825,20 @@ }, { "type": "0x2ac7", "id": "Ninja - Future Seeker Tester Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "playerskins", - "Index": "138" + "Index": "398" }, "SlotType": "10", - "Description": "Testers assemble! Seek the bugs of tomorrow!\\n\\nSprite Credits: Beige", + "Description": "Testers assemble! Seek the bugs of tomorrow!\\n\\nSprite Credits: Piggby", "Activate": { "_": "UnlockSkin", "skinType": "10936" }, "Consumable": "", "Soulbound": "", "BagType": "8" }, @@ -53165,16 +53165,95 @@ "skinType": "29988" }, "Consumable": "", "BagType": "8", "Soulbound": "", "feedPower": "2000" }, { + "type": "0x2605", + "id": "Masked Samurai Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "396" + }, + "SlotType": "10", + "Description": "Always prepared to shred through his enemies.\\n\\nSkin Class: Samurai\\nSprite Credits: Lovens", + "Activate": { + "_": "UnlockSkin", + "skinType": "9732" + }, + "Consumable": "", + "BagType": "8", + "Soulbound": "", + "feedPower": "2000" + }, + { + "type": "0x2607", + "id": "Little Prince Rogue Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "397" + }, + "SlotType": "10", + "Description": "It is only with the heart that one can see rightly. What is essential is invisible to the eye.\\n\\nSkin Class: Rogue\\nSprite Credits: Lovens", + "Activate": { + "_": "UnlockSkin", + "skinType": "9734" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { + "type": "0x2609", + "id": "Samurai - Future Seeker Tester Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "398" + }, + "SlotType": "10", + "Description": "Testers assemble! Seek the bugs of tomorrow!\\n\\nSprite Credits: Piggby", + "Activate": { + "_": "UnlockSkin", + "skinType": "9736" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8" + }, + { + "type": "0x260b", + "id": "Silent Samurai Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "399" + }, + "SlotType": "10", + "Description": "Despite his flashy looks he rarely says anything.\\n\\nSprite Credits: Squzavvvv", + "Activate": { + "_": "UnlockSkin", + "skinType": "9738" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { "type": "0x172e", "id": "Mixcoatl Summoner", "Class": "Character", "Texture": { "File": "invisible", "Index": "0" }, "NoMiniMap": "", @@ -85337,17 +85416,17 @@ "DisplayId": "Mini Leviathan Pet Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "148" }, "SlotType": "10", - "Description": "This cute manatee is ready to shoot your enemies with 10 billion guns!\\n\\nSprite Credits: Lovens\\n\\nUnlocks Mini Leviathan Skin of the Reptile 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!", + "Description": "This cute manatee is ready to shoot your enemies with 10 billion guns!\\n\\nSprite Credits: Lovens\\n\\nUnlocks Baby Leviathan Skin of the Reptile 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": "19521" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" @@ -92597,16 +92676,264 @@ "skinType": "15715" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" }, { + "id": "Little Fox", + "type": "0x260c", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Canine", + "Rarity": "Rare", + "DefaultSkin": "Little Fox Pet Skin", + "Size": "80", + "NoHatchOrFuse": "" + }, + { + "type": "0x260d", + "id": "Little Fox Pet Skin", + "PetSkin": "", + "DisplayId": "Little Fox", + "Class": "PetSkin", + "Family": "Canine", + "Rarity": "Rare", + "AnimatedTexture": { + "File": "chars8x8rPets1", + "Index": "242" + } + }, + { + "type": "0x260e", + "id": "Little Fox Pet Stone", + "DisplayId": "Little Fox Pet Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "chars8x8rPets1", + "Index": "242" + }, + "SlotType": "10", + "Description": "You become responsible, forever, for what you have tamed.\\n\\nSprite Credits: Lovens\\n\\nUnlocks Little Fox Skin of the Canine 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": "9741" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { + "id": "Mini Beer God", + "type": "0x260f", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Humanoid", + "Rarity": "Rare", + "DefaultSkin": "Mini Beer God Pet Skin", + "Size": "80", + "NoHatchOrFuse": "" + }, + { + "type": "0x2610", + "id": "Mini Beer God Pet Skin", + "PetSkin": "", + "DisplayId": "Mini Beer God", + "Class": "PetSkin", + "Family": "Humanoid", + "Rarity": "Rare", + "AnimatedTexture": { + "File": "chars8x8rPets1", + "Index": "243" + } + }, + { + "type": "0x2611", + "id": "Mini Beer God Pet Stone", + "DisplayId": "Mini Beer God Pet Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "chars8x8rPets1", + "Index": "243" + }, + "SlotType": "10", + "Description": "Comes with a free pint of beer!\\n\\nSprite Credits: Lovens\\n\\nUnlocks Mini Beer God Skin of the Humanoid 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": "9744" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { + "id": "Titanium Rex", + "type": "0x2612", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Automaton", + "Rarity": "Divine", + "DefaultSkin": "Titanium Rex", + "Size": "80", + "NoHatchOrFuse": "" + }, + { + "type": "0x2613", + "id": "Titanium Rex Pet Skin", + "PetSkin": "", + "DisplayId": "Titanium Rex", + "Class": "PetSkin", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "88" + }, + "Family": "Automaton", + "Rarity": "Divine" + }, + { + "type": "0x2614", + "id": "Titanium Rex Pet Stone", + "DisplayId": "Titanium Rex Pet Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "88" + }, + "ScaleValue": "10", + "SlotType": "10", + "Description": "A fossil of an extinct race of prehistoric predators, reanimated through means of metal and wires.\\n\\nSprite Credits: Piggby\\n\\nUnlocks Titanium Rex Skin of the Automaton 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": "9747" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { + "id": "Red Panda", + "type": "0x2615", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Exotic", + "Rarity": "Divine", + "DefaultSkin": "Red Panda", + "Size": "80", + "NoHatchOrFuse": "" + }, + { + "type": "0x2616", + "id": "Red Panda Pet Skin", + "PetSkin": "", + "DisplayId": "Red Panda", + "Class": "PetSkin", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "89" + }, + "Family": "Exotic", + "Rarity": "Divine" + }, + { + "type": "0x2617", + "id": "Red Panda Pet Stone", + "DisplayId": "Red Panda Pet Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "89" + }, + "ScaleValue": "10", + "SlotType": "10", + "Description": "The red teddy bear of the east, ready to play with its new chewtoys: the minions of Oryx.\\n\\nSprite Credits: Piggby\\n\\nUnlocks Red Panda Skin of the Exotic 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": "9750" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { + "id": "Gargantua", + "type": "0x2618", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Reptile", + "Rarity": "Divine", + "DefaultSkin": "Gargantua", + "Size": "80", + "NoHatchOrFuse": "" + }, + { + "type": "0x2619", + "id": "Gargantua Pet Skin", + "PetSkin": "", + "DisplayId": "Gargantua", + "Class": "PetSkin", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "90" + }, + "Family": "Reptile", + "Rarity": "Divine" + }, + { + "type": "0x261a", + "id": "Gargantua Pet Stone", + "DisplayId": "Gargantua Pet Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "90" + }, + "ScaleValue": "10", + "SlotType": "10", + "Description": "These primal behemoths of legend are believed to have shaped the mountains of Earth. They are known as harbingers of earthquakes, ancient as the Earth itself.\\n\\nSprite Credits: Piggby\\n\\nUnlocks Gargantua Skin of the Reptile 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": "9753" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { "type": "0x0927", "id": "Dreadstump the Pirate King", "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "chars16x16dEncounters", "Index": "4" }, @@ -108637,17 +108964,17 @@ }, { "type": "0x2ab8", "id": "Ninja - Future Seeker Tester", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", - "Index": "138" + "Index": "398" }, "PlayerClassType": "0x0326", "NoSkinSelect": "" }, { "type": "0x2ab9", "id": "Wizard - Future Seeker Tester", "Skin": "", @@ -111872,16 +112199,64 @@ "AnimatedTexture": { "File": "playerskins", "Index": "395" }, "PlayerClassType": "0x0311", "NoSkinSelect": "" }, { + "type": "0x2604", + "id": "Masked Samurai", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "396" + }, + "PlayerClassType": "0x0311", + "NoSkinSelect": "" + }, + { + "type": "0x2606", + "id": "Little Prince Rogue", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "397" + }, + "PlayerClassType": "0x0300", + "NoSkinSelect": "" + }, + { + "type": "0x2608", + "id": "Samurai - Future Seeker Tester", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "398" + }, + "PlayerClassType": "0x0311", + "NoSkinSelect": "" + }, + { + "type": "0x260a", + "id": "Silent Samurai", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "399" + }, + "PlayerClassType": "0x0311", + "NoSkinSelect": "" + }, + { "type": "0x0144", "id": "mini Paladin skin Placeholder", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "254" }, @@ -156316,17 +156691,17 @@ "id": "Battle Decaract", "DisplayId": "Decaract", "Enemy": "", "Class": "Character", "Texture": { "File": "lofiChar8x8", "Index": "0xb5" }, - "MaxHitPoints": "10000", + "MaxHitPoints": "1000000", "Size": "0", "Hero": "", "Quest": "", "God": "", "Level": "20" }, { "type": "0x537", @@ -185571,17 +185946,17 @@ "HitSound": "monster/eggs_hit", "DeathSound": "monster/eggs_death", "MaxHitPoints": "15000", "Defense": "0", "Exp": "0", "Size": "200", "ShadowSize": "100", "Terrain": "Mountains", - "SpawnProb": "1.0", + "SpawnProb": "0.0", "PerRealmMax": "1", "Quest": "", "God": "", "Level": "20" }, { "type": "0x1fd3", "id": "Megamad Oryx Brute", Binary files ../current/sheets/chars8x8rPets1.png and ./sheets/chars8x8rPets1.png differ Binary files ../current/sheets/lofiChar2.png and ./sheets/lofiChar2.png differ 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