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-02-07 12:41:02.766675296 +0000 +++ ./json/Objects.json 2018-02-14 12:41:09.175809069 +0000 @@ -41636,17 +41636,17 @@ "Class": "Equipment", "Item": "", "DisplayId": "Rusty Cuffs", "Texture": { "File": "lostHallsObjects8x8", "Index": "0xb7" }, "SlotType": "9", - "Description": "Used to bound aggressive golems. Considering it’s no longer attached, it does not appear to have been very effective.", + "Description": "Used to bind aggressive golems. Considering they are no longer attached, they do not appear to have been very effective.", "ActivateOnEquip": [ { "_": "IncrementStat", "stat": "0", "amount": "40" }, { "_": "IncrementStat", @@ -43937,17 +43937,17 @@ "id": "Monkey King Paladin Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "playerskins", "Index": "257" }, "SlotType": "10", - "Description": "Oryx you hairy God, what magic powers do you have to let you talk so big? Clear off, or I’ll give you a taste of my cudgel!\\n\\nSkin Class: Paladin\\nSprite Credits: Dappertron", + "Description": "Oryx you hairy God, what magic powers do you have to let you talk so big? Clear off, or I'll give you a taste of my cudgel!\\n\\nSkin Class: Paladin\\nSprite Credits: Dappertron", "Activate": { "_": "UnlockSkin", "skinType": "6042" }, "Consumable": "", "BagType": "8", "Soulbound": "", "feedPower": "2000" @@ -46001,17 +46001,17 @@ "objectId": "Ice Pail" }, "OldSound": "use_potion", "Soulbound": "", "feedPower": "10" }, { "type": "0x2042", - "id": "Santa’s Sleigh", + "id": "Santa's Sleigh", "Class": "Equipment", "Item": "", "Texture": { "File": "oryxHordeObjects8x8", "Index": "0x36" }, "SlotType": "10", "ExtraTooltipData": { @@ -47346,25 +47346,25 @@ }, "Consumable": "", "BagType": "8", "Soulbound": "", "feedPower": "2000" }, { "type": "0x0770", - "id": "Stolen Heart Prism", + "id": "Heart of Gold Prism", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6d" }, "SlotType": "22", - "Description": "spawns a loyal and trustworthy companion.\\n\\nSprite Credits: Lovens", + "Description": "It's said that love lasts three years... this angel didn't get the memo.\\n\\nSprite Credits: Lovens", "Usable": "", "BagType": "1", "MpCost": "60", "Activate": [ { "_": "Pet", "objectId": "heartDecoy" }, @@ -47382,17 +47382,17 @@ "id": "Cupid's Garments", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x67" }, "SlotType": "6", - "Description": "Who said diapers couldn't be fashionable?", + "Description": "Who said diapers couldn't be fashionable?\\n\\nSprite Credits: WunderWafe", "ActivateOnEquip": [ { "_": "IncrementStat", "stat": "21", "amount": "16" }, { "_": "IncrementStat", @@ -47415,17 +47415,17 @@ "id": "Ring of Unbound Love", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x68" }, "SlotType": "9", - "Description": "My heart couldn't be anymore full!", + "Description": "My heart couldn't be anymore full!\\n\\nSprite Credits: WunderWafe", "ActivateOnEquip": { "_": "IncrementStat", "stat": "0", "amount": "180" }, "BagType": "9", "FameBonus": "7", "feedPower": "325", @@ -47436,17 +47436,17 @@ "id": "Heartstruck Bow", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x65" }, "SlotType": "3", - "Description": "Some people wear their heart on their sleeve, I chose to use mine as ammunition!", + "Description": "Some people wear their heart on their sleeve, I chose to use mine as ammunition!\\n\\nSprite Credits: WunderWafe", "RateOfFire": "1.4", "Sound": "weapon/golden_bow", "Projectile": { "ObjectId": "Love Arrow", "Speed": "120", "MinDamage": "115", "MaxDamage": "170", "LifetimeMS": "600", @@ -47471,17 +47471,17 @@ "id": "Quiver of Dazing Love", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x66" }, "SlotType": "15", - "Description": "It truly is dazzling when you put your heart into the work!", + "Description": "It truly is dazzling when you put your heart into the work!\\n\\nSprite Credits: WunderWafe", "Sound": "spell/fire_spray", "Projectile": { "ObjectId": "Love Bolt", "Speed": "150", "MinDamage": "310", "MaxDamage": "360", "LifetimeMS": "1000", "Size": "150", @@ -81775,17 +81775,17 @@ "Class": "Pet", "Texture": { "File": "lofiObj2", "Index": "0x32" }, "Family": "Farm", "Rarity": "Rare", "DefaultSkin": "Mini Pegasus Skin", - "Size": "60" + "Size": "80" }, { "type": "0x609a", "id": "Mini Pegasus Skin", "PetSkin": "", "DisplayId": "Mini Pegasus", "Class": "PetSkin", "AnimatedTexture": { @@ -81821,17 +81821,17 @@ "Class": "Pet", "Texture": { "File": "lofiObj2", "Index": "0x32" }, "Family": "Aquatic", "Rarity": "Rare", "DefaultSkin": "Prince Frog Skin", - "Size": "60" + "Size": "80" }, { "type": "0x609d", "id": "Prince Frog Skin", "PetSkin": "", "DisplayId": "Prince Frog", "Class": "PetSkin", "AnimatedTexture": { @@ -81913,17 +81913,17 @@ "Class": "Pet", "Texture": { "File": "lofiObj2", "Index": "0x32" }, "Family": "Avian", "Rarity": "Rare", "DefaultSkin": "Lovebird Skin", - "Size": "60" + "Size": "80" }, { "type": "0x6200", "id": "Lovebird Skin", "PetSkin": "", "DisplayId": "Lovebird", "Class": "PetSkin", "AnimatedTexture": { @@ -82019,16 +82019,62 @@ "skinId": "25096" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" }, { + "id": "Zodiac Dog", + "type": "0x620b", + "Pet": "", + "Class": "Pet", + "Texture": { + "File": "lofiObj2", + "Index": "0x32" + }, + "Family": "Canine", + "Rarity": "Divine", + "DefaultSkin": "Zodiac Dog Skin", + "Size": "80" + }, + { + "type": "0x620c", + "id": "Zodiac Dog Skin", + "PetSkin": "", + "DisplayId": "Zodiac Dog", + "Class": "PetSkin", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "58" + } + }, + { + "type": "0x620d", + "id": "Zodiac Dog Pet Stone", + "DisplayId": "Zodiac Dog Pet Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "58" + }, + "SlotType": "10", + "Description": "There has never been a gooder boy in a thousand dynasties.\\n\\nSprite Credits: Dappertron\\n\\nTransform your pet into Zodiac Dog of the Canine 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": "25099" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { "type": "0x0927", "id": "Dreadstump the Pirate King", "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "chars16x16dEncounters", "Index": "4" }, @@ -118910,297 +118956,287 @@ "id": "Heart x 1", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "1", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x641F", "id": "Heart x 2", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "2", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6420", "id": "Heart x 3", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "3", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6421", "id": "Heart x 4", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "4", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6422", "id": "Heart x 5", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "5", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6423", "id": "Heart x 6", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "6", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6424", "id": "Heart x 7", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "7", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6425", "id": "Heart x 8", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "8", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6426", "id": "Heart x 9", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "9", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6427", "id": "Heart x 10", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x6c" }, "SlotType": "10", - "Description": "Collect Hearts and exchange them for love letters!", + "Description": "Collect Hearts and exchange them for Love Letters at the Tinkerer... or share them with others!", "Quantity": "10", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "10" }, { "name": "Event", "description": "Valentine's Day 2018" } ] }, - "Soulbound": "", "BagType": "7", "Treasure": "" }, { "type": "0x6409", "id": "Love Letter x 1", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "1", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119218,17 +119254,17 @@ "id": "Love Letter x 2", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect Love Letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "2", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119246,17 +119282,17 @@ "id": "Love Letter x 3", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "3", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119274,17 +119310,17 @@ "id": "Love Letter x 4", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "4", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119302,17 +119338,17 @@ "id": "Love Letter x 5", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "5", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119330,17 +119366,17 @@ "id": "Love Letter x 6", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "6", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119358,17 +119394,17 @@ "id": "Love Letter x 7", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "7", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119386,17 +119422,17 @@ "id": "Love Letter x 8", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "8", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119414,17 +119450,17 @@ "id": "Love Letter x 9", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "9", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119442,17 +119478,17 @@ "id": "Love Letter x 10", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "10", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119470,17 +119506,17 @@ "id": "Love Letter x 11", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "11", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119498,17 +119534,17 @@ "id": "Love Letter x 12", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "12", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119526,17 +119562,17 @@ "id": "Love Letter x 13", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "13", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119554,17 +119590,17 @@ "id": "Love Letter x 14", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "14", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119582,17 +119618,17 @@ "id": "Love Letter x 15", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "15", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119610,17 +119646,17 @@ "id": "Love Letter x 16", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "16", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119638,17 +119674,17 @@ "id": "Love Letter x 17", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "17", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119666,17 +119702,17 @@ "id": "Love Letter x 18", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "18", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119694,17 +119730,17 @@ "id": "Love Letter x 19", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "19", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { @@ -119722,17 +119758,17 @@ "id": "Love Letter x 20", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x69" }, "SlotType": "10", - "Description": "Collect love letters and exchange them for exclusive rewards!", + "Description": "Bring Love Letters to the Tinkerer and exchange them for exclusive rewards!", "Quantity": "20", "ExtraTooltipData": { "EffectInfo": [ { "name": "Stack limit", "description": "20" }, { Binary files ../current/sheets/petsDivine.png and ./sheets/petsDivine.png differ Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ