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 2016-10-27 23:00:25.772424610 +0000 +++ ./json/Objects.json 2016-11-03 18:00:25.860542069 +0000 @@ -33934,17 +33934,17 @@ "id": "Giant Vampire Bat Pet Stone", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x59b" }, "SlotType": "10", - "Description": "Customize your pet with the Giant Vampire Bat Skin. The appearance change will consume this item and is not reversible.", + "Description": "Transform your pet into Giant Vampire Bat of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "Activate": { "_": "PetSkin", "skinId": "32763" }, "Consumable": "", "Soulbound": "", "BagType": "4", "DisplayId": "Giant Vampire Bat Skin", @@ -33955,17 +33955,17 @@ "id": "Pumpkin Head Pet Stone", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x1f" }, "SlotType": "10", - "Description": "Customize your pet with the Pumpkin Head Skin. The appearance change will consume this item and is not reversible.", + "Description": "Transform your pet into Pumpkin Head of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "Activate": { "_": "PetSkin", "skinId": "32651" }, "Consumable": "", "Soulbound": "", "BagType": "4", "DisplayId": "Pumpkin Head Pet Skin", @@ -60195,16 +60195,72 @@ }, "Family": "Spooky", "Rarity": "Divine", "DefaultSkin": "Reaper Skin", "Size": "80", "DisplayId": "Reaper" }, { + "id": "Jaco", + "type": "0x6109", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x15a" + }, + "Family": "Spooky", + "Rarity": "Divine", + "DefaultSkin": "Jaco Skin", + "Size": "80", + "DisplayId": "Jaco" + }, + { + "id": "Giant Vampire Bat", + "type": "0x7ffb", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x15a" + }, + "Family": "Spooky", + "Rarity": "Divine", + "DefaultSkin": "Giant Vampire Bat Skin", + "WhileMoving": { + "Z": "0.25", + "Flying": "" + }, + "Size": "80", + "DisplayId": "Giant Vampire Bat" + }, + { + "type": "0x7f8b", + "id": "Pumpkin Head", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Spooky", + "Rarity": "Divine", + "DefaultSkin": "Pumpkin Head Skin", + "ShadowSize": "80", + "Size": "60", + "Flying": "", + "Z": "0.56", + "WhileMoving": { + "Flying": "", + "Z": "0.62" + }, + "DisplayId": "Pumpkin Head" + }, + { "id": "Battle God", "type": "0x7f80", "Pet": "", "Class": "Pet", "Texture": { "File": "lofiObjBig", "Index": "0xe0" }, @@ -60245,16 +60301,36 @@ "Z": "0.3", "Flying": "" }, "ShadowSize": "60", "Size": "80", "DisplayId": "Forest Fairy" }, { + "id": "Marid", + "type": "0x6100", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObjBig", + "Index": "0xe0" + }, + "Family": "Humanoid", + "Rarity": "Divine", + "DefaultSkin": "Marid Skin", + "WhileMoving": { + "Z": "0.25", + "Flying": "" + }, + "ShadowSize": "60", + "Size": "80", + "DisplayId": "Marid" + }, + { "id": "Lil' Oryx", "type": "0x7f83", "Pet": "", "Class": "Pet", "Texture": { "File": "lofiObjBig", "Index": "0xe0" }, @@ -60291,16 +60367,47 @@ "Family": "? ? ? ?", "Rarity": "Divine", "DefaultSkin": "Great Jelly Skin", "Size": "80", "ShadowSize": "90", "DisplayId": "Great Jelly" }, { + "id": "Sir Bagston", + "type": "0x6103", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "? ? ? ?", + "Rarity": "Divine", + "DefaultSkin": "Bagston Skin", + "ShadowSize": "40", + "Size": "80", + "DisplayId": "Sir Bagston" + }, + { + "id": "Goldy", + "type": "0x6106", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "? ? ? ?", + "Rarity": "Divine", + "DefaultSkin": "Goldy Skin", + "Size": "80", + "DisplayId": "Goldy" + }, + { "id": "Spiderbot", "type": "0x7f86", "Pet": "", "Class": "Pet", "Texture": { "File": "lofiObjBig", "Index": "0xe0" }, @@ -61812,174 +61919,108 @@ "skinId": "32648" }, "Consumable": "", "Soulbound": "", "BagType": "4", "DisplayId": "Gutsbot Pet Stone" }, { - "id": "Marid", - "type": "0x6100", - "Pet": "", - "Class": "Pet", - "Texture": { - "File": "lofiObjBig", - "Index": "0xe0" - }, - "Family": "Humanoid", - "Rarity": "Divine", - "DefaultSkin": "Marid Skin", - "WhileMoving": { - "Z": "0.25", - "Flying": "" - }, - "ShadowSize": "60", - "Size": "80", - "DisplayId": "Marid" - }, - { "type": "0x89a2", "id": "Marid Skin", "PetSkin": "", "DisplayId": "Marid", "Class": "PetSkin", "AnimatedTexture": { "File": "petsDivine", "Index": "32" } }, { "type": "0xcfb", "id": "Marid Pet Stone", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x15a" + "File": "lofiObj3", + "Index": "0x59f" }, "SlotType": "10", - "Description": "Customize your pet with the Marid Skin. The appearance change will consume this item and is not reversible.", + "Description": "Transform your pet into Marid of the Humanoid family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "Activate": { "_": "PetSkin", "skinId": "24832" }, "Consumable": "", "Soulbound": "", "BagType": "4", "DisplayId": "Marid Pet Skin", "feedPower": "5000" }, { - "id": "Sir Bagston", - "type": "0x6103", - "Pet": "", - "Class": "Pet", - "Texture": { - "File": "lofiObj2", - "Index": "0x32" - }, - "Family": "Unknown", - "Rarity": "Divine", - "DefaultSkin": "Bagston Skin", - "ShadowSize": "40", - "Size": "80", - "DisplayId": "Sir Bagston" - }, - { "type": "0x6104", "id": "Bagston Skin", "PetSkin": "", "DisplayId": "Sir Bagston", "Class": "PetSkin", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "107" } }, { "type": "0x6105", "id": "Bagston Pet Stone", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x15a" + "File": "lofiObj3", + "Index": "0x59e" }, "SlotType": "10", - "Description": "Customize your pet with Custom Skin", + "Description": "Transform your pet into Sir Bagston of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "Activate": { "_": "PetSkin", "skinId": "24835" }, "Consumable": "", "Soulbound": "", "BagType": "4", - "DisplayId": "Bagston Pet Stone" - }, - { - "id": "Goldy", - "type": "0x6106", - "Pet": "", - "Class": "Pet", - "Texture": { - "File": "lofiObj2", - "Index": "0x32" - }, - "Family": "Unknown", - "Rarity": "Divine", - "DefaultSkin": "Goldy Skin", - "Size": "80", - "DisplayId": "Goldy" + "DisplayId": "Bagston Pet Skin" }, { "type": "0x6107", "id": "Goldy Skin", "PetSkin": "", - "DisplayId": "Goddess", + "DisplayId": "Goldy", "Class": "PetSkin", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "108" } }, { "type": "0x6108", "id": "Goldy Pet Stone", "Class": "Equipment", "Item": "", "Texture": { - "File": "lofiObj2", - "Index": "0x15a" + "File": "lofiObj3", + "Index": "0x59d" }, "SlotType": "10", - "Description": "Customize your pet with Custom Skin", + "Description": "Transform your pet into Goldy of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "Activate": { "_": "PetSkin", "skinId": "24838" }, "Consumable": "", "Soulbound": "", "BagType": "4", - "DisplayId": "Goldy Pet Stone" - }, - { - "id": "Jaco", - "type": "0x6109", - "Pet": "", - "Class": "Pet", - "Texture": { - "File": "lofiObj2", - "Index": "0x15a" - }, - "Family": "Unknown", - "Rarity": "Divine", - "DefaultSkin": "Jaco Skin", - "Size": "80", - "DisplayId": "Jaco" + "DisplayId": "Goldy Pet Skin" }, { "type": "0x610a", "id": "Jaco Skin", "PetSkin": "", "DisplayId": "Jaco", "Class": "PetSkin", "AnimatedTexture": { @@ -61992,80 +62033,39 @@ "id": "Jaco Pet Stone", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x599" }, "SlotType": "10", - "Description": "Customize your pet with the Jaco Skin. The appearance change will consume this item and is not reversible.", + "Description": "Transform your pet into Jaco of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "Activate": { "_": "PetSkin", "skinId": "24841" }, "Consumable": "", "Soulbound": "", "BagType": "4", "DisplayId": "Jaco Pet Skin", "feedPower": "5000" }, { - "id": "Giant Vampire Bat", - "type": "0x7ffb", - "Pet": "", - "Class": "Pet", - "Texture": { - "File": "lofiObj2", - "Index": "0x15a" - }, - "Family": "Unknown", - "Rarity": "Divine", - "DefaultSkin": "Giant Vampire Bat Skin", - "WhileMoving": { - "Z": "0.25", - "Flying": "" - }, - "Size": "80", - "DisplayId": "Giant Vampire Bat" - }, - { "type": "0x7ffc", "id": "Giant Vampire Bat Skin", "PetSkin": "", "DisplayId": "Giant Vampire Bat", "Class": "PetSkin", "AnimatedTexture": { "File": "petsDivine", "Index": "34" } }, { - "type": "0x7f8b", - "id": "Pumpkin Head", - "Pet": "", - "Class": "Pet", - "Texture": { - "File": "lofiObj2", - "Index": "0x32" - }, - "Family": "Unknown", - "Rarity": "Divine", - "DefaultSkin": "Pumpkin Head Skin", - "ShadowSize": "80", - "Size": "60", - "Flying": "", - "Z": "0.56", - "WhileMoving": { - "Flying": "", - "Z": "0.62" - }, - "DisplayId": "Pumpkin Head" - }, - { "type": "0x7f8c", "id": "Pumpkin Head Skin", "PetSkin": "", "DisplayId": "Pumpkin Head", "Class": "PetSkin", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "109" Binary files ../current/sheets/lofiObj3.png and ./sheets/lofiObj3.png differ diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/strings.json ./strings.json --- ../current/strings.json 2016-10-27 21:00:20.859517198 +0000 +++ ./strings.json 2016-11-03 18:00:22.100543422 +0000 @@ -424,21 +424,21 @@ "MoneyFrame.gold": "Gold Amount", "MoneyFrame.payment": "Payment Method", "MoneyFrame.rightButton": "Cancel", "MoneyFrame.title": "Support the game and buy Realm", "MustBeNamed.desc": "You must name your character to enter the arena.", "MustBeNamed.title": "Named Character Required", "MyPlayerToolTip.NextClassQuest": "Next Goal: Earn {nextStarFame} Fame\\n with a {character}", "MysteryBoxError.blockedForUser": "Sorry, your account is not eligible for this purchase only accounts created before {date} can purchase this offer", - "MysteryBoxError.maxPurchase": "You have reached the maximum purchase number of this box", + "MysteryBoxError.maxPurchase": "You have reached the maximum number of purchases for this box or it may be sold out. It is possible that buying a single box will work.", "MysteryBoxError.noFame": "Not enough Fame", "MysteryBoxError.noGold": "Not enough Gold", "MysteryBoxError.outdated": "Outdated Mystery Box information", - "MysteryBoxError.soldOut": "Sorry, sold out", + "MysteryBoxError.soldOut": "You have reached the maximum number of purchases for this box or it may be sold out. It is possible that buying a single box will work.", "MysteryBoxInfo.saleEndStringDays": "This sale ends in {amount} days", "MysteryBoxInfo.saleEndStringHours": "This sale ends in {amount} hours", "MysteryBoxInfo.saleEndStringMinutes": "This sale ends in {amount} minutes", "MysteryBoxPanel.checkBackLater": "Check Back Later", "MysteryBoxPanel.mysteryBoxShop": "Mystery Box Shop", "MysteryBoxPanel.open": "Open", "MysteryBoxRollModal.okString": "OK", "MysteryBoxRollModal.playAgainString": "Play Again for {cost}", @@ -2242,18 +2242,16 @@ "equip.Customize_your_Sorcerer_with_the_Slime_Skin.": "Customize your Sorcerer with the Slime Skin.", "equip.Customize_your_Trickster_with_the_Slime_Skin.": "Customize your Trickster with the Slime Skin.", "equip.Customize_your_Warrior_with_the_Ivory_Gladiator_Skin.": "Customize your Warrior with the Ivory Gladiator Skin.", "equip.Customize_your_Warrior_with_the_Olive_Gladiator_Skin.": "Customize your Warrior with the Olive Gladiator Skin.", "equip.Customize_your_Warrior_with_the_Shoveguy_Skin.": "Customize your Warrior with the Shoveguy Skin.", "equip.Customize_your_Warrior_with_the_Slime_Skin.": "Customize your Warrior with the Slime Skin.", "equip.Customize_your_Wizard_with_the_Gentleman_Skin._Rarity:_Rare": "Customize your Wizard with the Gentleman Skin. Rarity: Rare Indeed", "equip.Customize_your_Wizard_with_the_Mini_Twilight_Skin.": "Customize your Wizard with the Mini Twilight Skin.", - "equip.Customize_your_pet_with_the_Giant_Vampire_Bat_Skin._The_app": "Customize your pet with the Giant Vampire Bat Skin. The appearance change will consume this item and is not reversible.", - "equip.Customize_your_pet_with_the_Pumpkin_Head_Skin._The_appearan": "Customize your pet with the Pumpkin Head Skin. The appearance change will consume this item and is not reversible.", "equip.Cut_from_a_fallen_star,_a_deep_purple_emanating_an_unearthl": "Cut from a fallen star, a deep purple emanating an unearthly glow, hinting at the power fused within.", "equip.Dagger_of_Dire_Hatred": "Dagger of Dire Hatred", "equip.Dagger_of_Foul_Malevolence": "Dagger of Foul Malevolence", "equip.Dagger_of_Sinister_Deeds": "Dagger of Sinister Deeds", "equip.Dagger_of_the_Amethyst_Prism": "Dagger of the Amethyst Prism", "equip.Dagger_of_the_Terrible_Talon": "Dagger of the Terrible Talon", "equip.Damages_monsters.": "Damages monsters.", "equip.Damages_monsters_for_longer_while_celebrating_Independence_": "Damages monsters for longer while celebrating Independence Day. Happy 4th of July!", @@ -2986,16 +2984,18 @@ "equip.Tome_of_Holy_Protection": "Tome of Holy Protection", "equip.Tome_of_Purification": "Tome of Purification", "equip.Tome_of_Rejuvenation": "Tome of Rejuvenation", "equip.Tome_of_Renewing": "Tome of Renewing", "equip.Totem_Key": "Totem Key", "equip.Tough,_durable_armor_made_from_wyvern_leather.": "Tough, durable armor made from wyvern leather.", "equip.Toxic_Sewers_Key": "Toxic Sewers Key", "equip.Toy_Knife": "Toy Knife", + "equip.Transform_your_pet_into_Giant_Vampire_Bat_of_the_Spooky_fam": "Transform your pet into Giant Vampire Bat of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", + "equip.Transform_your_pet_into_Pumpkin_Head_of_the_Spooky_family._": "Transform your pet into Pumpkin Head of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "equip.Transformation_Potion": "Transformation Potion", "equip.Treasure": "Treasure", "equip.Tremendously_strong_plate_armor_shrouded_by_an_aura_of_demo": "Tremendously strong plate armor shrouded by an aura of demonic revenge.", "equip.Trick_White_Bag": "Totally a White Bag", "equip.Uncommon_????_Egg": "Uncommon ???? Egg", "equip.Uncommon_Aquatic_Egg": "Uncommon Aquatic Egg", "equip.Uncommon_Automaton_Egg": "Uncommon Automaton Egg", "equip.Uncommon_Avian_Egg": "Uncommon Avian Egg", @@ -4002,17 +4002,17 @@ "pets.AttackMid": "AttackMid", "pets.Attack_Close": "Attack Close", "pets.Attack_Far": "Attack Far", "pets.Attack_Mid": "Attack Mid", "pets.Baby": "Baby", "pets.Baby_Dragon": "Baby Dragon", "pets.Baby_Dragon_Skin": "Baby Dragon", "pets.Baby_Skin": "Baby", - "pets.Bagston_Pet_Stone": "Bagston Pet Stone", + "pets.Bagston_Pet_Stone": "Bagston Pet Skin", "pets.Bagston_Skin": "Sir Bagston", "pets.Bat": "Bat", "pets.Bat_Skin": "Bat", "pets.Battle_God": "Battle God", "pets.Battle_God_Skin": "Battle God", "pets.Battle_Penguin": "Battle Penguin", "pets.Battle_Penguin_Skin": "Battle P.", "pets.Bee": "Bee", @@ -4047,20 +4047,17 @@ "pets.Centaur_Skin": "Centaur", "pets.Chameleon": "Chameleon", "pets.Chameleon_Skin": "Chameleon", "pets.Chick": "Chick", "pets.Chick_Skin": "Chick", "pets.CloseRangeAttack": "CloseRangeAttack", "pets.Crab": "Crab", "pets.Crab_Skin": "Crab", - "pets.Customize_your_pet_with_Custom_Skin": "Customize your pet with Custom Skin", "pets.Customize_your_pet_with_the_Gutsbot_Skin": "Customize your pet with the Gutsbot Skin", - "pets.Customize_your_pet_with_the_Jaco_Skin._The_appearance_change": "Customize your pet with the Jaco Skin. The appearance change will consume this item and is not reversible.", - "pets.Customize_your_pet_with_the_Marid_Skin._The_appearance_chang": "Customize your pet with the Marid Skin. The appearance change will consume this item and is not reversible.", "pets.Cylindron": "Cylindron", "pets.Cylindron_Skin": "Cylindron", "pets.Decoy": "Decoy", "pets.Demon_Frog": "Demon Frog", "pets.Demon_Frog_Skin": "Demon Frog", "pets.Dino": "Dino", "pets.Dino_Skin": "Dino", "pets.Disabled_Pet_Skin": "Disabled Pet", @@ -4100,18 +4097,18 @@ "pets.Golden_Hyena_Skin": "Golden Hyena", "pets.Golden_Pup": "Golden Pup", "pets.Golden_Pup_Skin": "Golden Pup", "pets.Golden_Sheepdog": "Golden Sheepdog", "pets.Golden_Sheepdog_Skin": "G. Sheepdog", "pets.Goldfinch": "Goldfinch", "pets.Goldfinch_Skin": "Goldfinch", "pets.Goldy": "Goldy", - "pets.Goldy_Pet_Stone": "Goldy Pet Stone", - "pets.Goldy_Skin": "Goddess", + "pets.Goldy_Pet_Stone": "Goldy Pet Skin", + "pets.Goldy_Skin": "Goldy", "pets.Grape_Penguin": "Grape Penguin", "pets.Grape_Penguin_Skin": "Grape Penguin", "pets.Grass_Penguin": "Grass Penguin", "pets.Grass_Penguin_Skin": "Grass Penguin", "pets.Great_Jelly": "Great Jelly", "pets.Great_Jelly_Skin": "Great Jelly", "pets.Great_Shark": "Great Shark", "pets.Great_Shark_Skin": "Great Shark", @@ -4283,16 +4280,20 @@ "pets.Tank_Penguin": "Tank Penguin", "pets.Tank_Penguin_Skin": "Tank Penguin", "pets.Tiger": "Tiger", "pets.Tiger_Skin": "Great Tiger", "pets.Tomb_Snake": "Tomb Snake", "pets.Tomb_Snake_Skin": "Tomb Snake", "pets.Toucan": "Toucan", "pets.Toucan_Skin": "Toucan", + "pets.Transform_your_pet_into_Goldy_of_the_?_?_?_?_family._This_is": "Transform your pet into Goldy of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", + "pets.Transform_your_pet_into_Jaco_of_the_Spooky_family._This_is_i": "Transform your pet into Jaco of the Spooky family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", + "pets.Transform_your_pet_into_Marid_of_the_Humanoid_family._This_i": "Transform your pet into Marid of the Humanoid family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", + "pets.Transform_your_pet_into_Sir_Bagston_of_the_?_?_?_?_family._T": "Transform your pet into Sir Bagston of the ? ? ? ? family. This is irreversible and the item is consumed upon use. The rarity and abilities of your pet will be retained. If you fuse your pet to reach a new rarity level it is not guaranteed that your pet will retain the current skin.", "pets.Turkey": "Turkey", "pets.Turkey_Skin": "Turkey", "pets.Turtle": "Turtle", "pets.Turtle_Skin": "Turtle", "pets.USA_Eagle": "USA Eagle", "pets.USA_Eagle_Skin": "USA Eagle", "pets.Ultrawasp": "Ultrawasp", "pets.Ultrawasp_Skin": "Ultrawasp",