diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/EquipmentSets.json ./json/EquipmentSets.json --- ../current/json/EquipmentSets.json 2018-06-28 17:10:32.283011971 +0000 +++ ./json/EquipmentSets.json 2018-08-23 10:30:33.203029684 +0000 @@ -686,11 +686,66 @@ "amount": "11" }, { "_": "IncrementStat", "stat": "21", "amount": "2" } ] + }, + { + "type": "0xf3d", + "id": "Akuma Slayer Set", + "Setpiece": [ + { + "_": "Equipment", + "slot": "0", + "itemtype": "0x203e" + }, + { + "_": "Equipment", + "slot": "1", + "itemtype": "0xf3c" + }, + { + "_": "Equipment", + "slot": "2", + "itemtype": "0x2040" + }, + { + "_": "Equipment", + "slot": "3", + "itemtype": "0x2041" + } + ], + "ActivateOnEquipAll": [ + { + "_": "ChangeSkin", + "skinType": "0x7568", + "size": "80", + "color": "ffffff", + "bulletType": "Katana Akuma Slash big" + }, + { + "_": "IncrementStat", + "stat": "20", + "amount": "3" + }, + { + "_": "IncrementStat", + "stat": "22", + "amount": "4" + }, + { + "_": "IncrementStat", + "stat": "0", + "amount": "115" + }, + { + "_": "IncrementStat", + "stat": "21", + "amount": "10" + } + ] } ] } \ No newline at end of file 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-16 10:00:40.470080045 +0000 +++ ./json/Objects.json 2018-08-23 10:30:38.323129544 +0000 @@ -41506,16 +41506,185 @@ "Cooldown": "0.5", "Usable": "", "BagType": "6", "FameBonus": "6", "feedPower": "900", "Soulbound": "" }, { + "type": "0x203e", + "id": "SamuraiST0", + "setType": "0xf3d", + "setName": "Akuma Slayer Set", + "DisplayId": "Kazekiri", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0xa9" + }, + "OldSound": "bladeSwing", + "SlotType": "24", + "Description": "A Katana made to harness the energy of the Wind.", + "RateOfFire": "0.8", + "Projectile": { + "ObjectId": "Katana Akuma Slash", + "Speed": "150", + "MinDamage": "100", + "MaxDamage": "120", + "LifetimeMS": "300", + "Amplitude": "0.4", + "Frequency": "0.5", + "MultiHit": "", + "PassesCover": "", + "FaceDir": "" + }, + "NumProjectiles": "2", + "ArcGap": "0", + "BagType": "8", + "FameBonus": "4", + "feedPower": "500", + "Soulbound": "" + }, + { + "type": "0x2040", + "id": "SamuraiST2", + "setType": "0xf3d", + "setName": "Akuma Slayer Set", + "DisplayId": "Kamishimo", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0xab" + }, + "SlotType": "7", + "Description": "While being made of soft fabric, this outfit is mysteriously sturdy.", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "21", + "amount": "14" + }, + { + "_": "IncrementStat", + "stat": "0", + "amount": "60" + }, + { + "_": "IncrementStat", + "stat": "28", + "amount": "4" + } + ], + "BagType": "8", + "FameBonus": "4", + "feedPower": "500", + "Soulbound": "" + }, + { + "type": "0x2041", + "id": "SamuraiST3", + "setType": "0xf3d", + "setName": "Akuma Slayer Set", + "DisplayId": "Akuma's Tear", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0xac" + }, + "SlotType": "9", + "Description": "The first and last teardrop of the ominous fiery demon.", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "0", + "amount": "30" + }, + { + "_": "IncrementStat", + "stat": "3", + "amount": "40" + }, + { + "_": "IncrementStat", + "stat": "28", + "amount": "1" + } + ], + "BagType": "8", + "FameBonus": "4", + "feedPower": "500", + "Soulbound": "" + }, + { + "type": "0xf3c", + "id": "SamuraiST1", + "setType": "0xf3d", + "setName": "Akuma Slayer Set", + "DisplayId": "Ryu's Blade", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d2LofiObjEmbed", + "Index": "0xaa" + }, + "SlotType": "27", + "Description": "Calls upon old energy to unleash a swarm of dragon like energy spirits.", + "Projectile": { + "ObjectId": "Wakizashi Pink", + "Speed": "120", + "MinDamage": "125", + "MaxDamage": "250", + "LifetimeMS": "800", + "ArmorPiercing": "", + "PassesCover": "", + "MultiHit": "", + "ConditionEffect": { + "_": "Exposed", + "duration": "3.5" + }, + "FaceDir": "", + "Wavy": "" + }, + "ActivateOnEquip": { + "_": "IncrementStat", + "stat": "20", + "amount": "2" + }, + "Usable": "", + "MpCost": "85", + "Activate": [ + { + "_": "BulletCreate", + "numShots": "4", + "gapAngle": "270", + "gapTiles": "0.5", + "offsetAngle": "165", + "minDistance": "3", + "maxDistance": "3" + }, + { + "_": "BulletCreate", + "numShots": "4", + "gapAngle": "270", + "gapTiles": "0.5", + "offsetAngle": "195", + "minDistance": "3", + "maxDistance": "3" + } + ], + "BagType": "8", + "FameBonus": "4", + "feedPower": "500", + "Soulbound": "" + }, + { "type": "0xc85", "id": "Common Feline Egg", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj2", "Index": "0x100" }, @@ -52956,16 +53125,56 @@ "skinType": "30054" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" }, { + "type": "0x7569", + "id": "Akuma SamuraiST Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins16", + "Index": "20" + }, + "SlotType": "10", + "Description": "Samurai ST Skin\\n\\nSkin Class: Samurai", + "Activate": { + "_": "UnlockSkin", + "skinType": "30056" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "8", + "feedPower": "2000" + }, + { + "type": "0x7525", + "id": "Mini Akuma Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "395" + }, + "SlotType": "10", + "Description": "Customize your Samurai with the Mini Akuma Skin.\\n\\nSkin Class: Samurai", + "Activate": { + "_": "UnlockSkin", + "skinType": "29988" + }, + "Consumable": "", + "BagType": "8", + "Soulbound": "", + "feedPower": "2000" + }, + { "type": "0x172e", "id": "Mixcoatl Summoner", "Class": "Character", "Texture": { "File": "invisible", "Index": "0" }, "NoMiniMap": "", @@ -92181,17 +92390,17 @@ "DisplayId": "Wooden Burrito Pet Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "239" }, "SlotType": "10", - "Description": "One little toy I found during my adventures, now I need to find its owner.\\n\\nSprite Credits: noplaygame\\n\\nUnlocks Wooden Burrito 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!", + "Description": "One little toy I found during my adventures, now I need to find its owner.\\n\\nUnlocks Wooden Burrito 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": "23315" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" @@ -92241,55 +92450,55 @@ "skinType": "23318" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" }, { - "id": "Lil Davy", + "id": "Lil' Davy", "type": "0x5b18", "Pet": "", "Class": "Pet", "Texture": { "File": "lofiObj2", "Index": "0x32" }, "Family": "? ? ? ?", "Rarity": "Rare", - "DefaultSkin": "Lil Davy Pet Skin", + "DefaultSkin": "Lil' Davy Pet Skin", "Size": "80", "NoHatchOrFuse": "" }, { "type": "0x5b19", - "id": "Lil Davy Pet Skin", + "id": "Lil' Davy Pet Skin", "PetSkin": "", - "DisplayId": "Lil Davy", + "DisplayId": "Lil' Davy", "Class": "PetSkin", "Family": "? ? ? ?", "Rarity": "Rare", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "241" } }, { "type": "0x5b1a", - "id": "Lil Davy Pet Stone", - "DisplayId": "Lil Davy Pet Skin", + "id": "Lil' Davy Pet Stone", + "DisplayId": "Lil' Davy Pet Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "chars8x8rPets1", "Index": "241" }, "SlotType": "10", - "Description": "I might be tiny, but I'm as deadly as they come!\\n\\nSprite Credits: Wetx\\n\\nUnlocks Lil Davy 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!", + "Description": "I might be tiny, but I'm as deadly as they come!\\n\\nSprite Credits: Wetx\\n\\nUnlocks Lil' Davy 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": "23321" }, "Consumable": "", "Soulbound": "", "BagType": "8", "feedPower": "2000" @@ -98527,19 +98736,27 @@ "Index": "0x47" }, "AngleCorrection": "1" }, { "type": "0x192a", "id": "Wakizashi Pink", "Class": "Projectile", - "Texture": { - "File": "d3LofiObjEmbed", - "Index": "0x13f" + "RandomTexture": { + "Texture": [ + { + "File": "d2LofiObjEmbed", + "Index": "0xaf" + }, + { + "File": "d2LofiObjEmbed", + "Index": "0xbe" + } + ] }, "AngleCorrection": "1" }, { "type": "0x20be", "id": "Katana Akuma Slash", "Class": "Projectile", "Texture": { @@ -98549,17 +98766,17 @@ "AngleCorrection": "1" }, { "type": "0x20bf", "id": "Katana Akuma Slash big", "Class": "Projectile", "Texture": { "File": "d2LofiObjEmbed", - "Index": "0xaf" + "Index": "0xae" }, "AngleCorrection": "1" }, { "type": "0x2110", "id": "Stinger", "Class": "Projectile", "Texture": { @@ -111640,16 +111857,41 @@ "AnimatedTexture": { "File": "playerskins", "Index": "394" }, "PlayerClassType": "0x0323", "NoSkinSelect": "" }, { + "type": "0x7568", + "id": "Akuma SamuraiST", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins16", + "Index": "20" + }, + "PlayerClassType": "0x0311", + "UnlockSpecial": "Set Skin", + "NoSkinSelect": "" + }, + { + "type": "0x7524", + "id": "Mini Akuma", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "395" + }, + "PlayerClassType": "0x0311", + "NoSkinSelect": "" + }, + { "type": "0x0144", "id": "mini Paladin skin Placeholder", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "254" }, @@ -124725,20 +124967,20 @@ "id": "Testing Gift Silex", "Group": "Testing Gifts Armor", "Class": "Character", "StasisImmune": "", "Enemy": "", "NoMiniMap": "", "MaxHitPoints": "100", "Exp": "0", - "Size": "120", - "Texture": { - "File": "lofiObj5new", - "Index": "0x1d" + "Size": "160", + "AnimatedTexture": { + "File": "playerskins16", + "Index": "13" } }, { "type": "0x1200", "id": "Large Purple Pinstripe Cloth", "Class": "Dye", "DisplayId": "Large Purple Pinstripe Cloth", "Item": "", Binary files ../current/sheets/d2LofiObj.png and ./sheets/d2LofiObj.png differ Binary files ../current/sheets/playersSkins16Mask.png and ./sheets/playersSkins16Mask.png differ Binary files ../current/sheets/playersSkins16.png and ./sheets/playersSkins16.png differ Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.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 2018-06-28 17:10:32.039007220 +0000 +++ ./strings.json 2018-08-23 10:30:32.983025394 +0000 @@ -1985,27 +1985,27 @@ "stringlist.Oasis_Giant.everySoOften.1": "Minions! We shall have {PLAYER} for dinner!", "stringlist.Oasis_Giant.everySoOften.2": "You must be thirsty, {PLAYER}. Enter my waters!", "stringlist.Oasis_Giant.everySoOften.3": "Come closer, {PLAYER}! Yes, closer!", "stringlist.Oasis_Giant.everySoOften.4": "Surrender to my aquatic army, {PLAYER}!", "stringlist.Oasis_Giant.many.0": "My {COUNT} Oasis Giants will feast on your flesh!", "stringlist.Oasis_Giant.many.1": "You have no hope against my {COUNT} Oasis Giants!", "stringlist.Oasis_Giant.one.0": "A powerful Oasis Giant still fights for me!", "stringlist.Oasis_Giant.one.1": "You will never defeat me while an Oasis Giant remains!", - "stringlist.Oryx_the_Mad_God.everySoOften.0": "Fools! I still have {HITPOINTS} hitpoints!", - "stringlist.Oryx_the_Mad_God.everySoOften.1": "Puny mortals! My {HITPOINTS} hitpoints are more than enough!", - "stringlist.Oryx_the_Mad_God.everySoOften.2": "I have {HITPOINTS} hitpoints and I shall destroy you!", - "stringlist.Oryx_the_Mad_God.everySoOften.3": "Insignificant peons! I have {HITPOINTS} hitpoints!", - "stringlist.Oryx_the_Mad_God.everySoOften.4": "You cosmic peasants! My {HITPOINTS} hitpoints make me mightier than you!", + "stringlist.Oryx_the_Mad_God.everySoOften.0": "Fools! I still have {HITPOINTS}!", + "stringlist.Oryx_the_Mad_God.everySoOften.1": "Puny mortals! My {HITPOINTS} are more than enough!", + "stringlist.Oryx_the_Mad_God.everySoOften.2": "I have {HITPOINTS} and I shall destroy you!", + "stringlist.Oryx_the_Mad_God.everySoOften.3": "Insignificant peons! I have {HITPOINTS}!", + "stringlist.Oryx_the_Mad_God.everySoOften.4": "You cosmic peasants! My {HITPOINTS} make me mightier than you!", "stringlist.Oryx_the_Mad_God.mydeath.0": "You have defeated my simulacrum, but I remain safe in my wine cellar!", - "stringlist.Oryx_the_Mad_God_2.everySoOften.0": "Pathetic mortals! I have {HITPOINTS} hitpoints!", - "stringlist.Oryx_the_Mad_God_2.everySoOften.1": "Foolish humans! My {HITPOINTS} hitpoints give me strength!", - "stringlist.Oryx_the_Mad_God_2.everySoOften.2": "I have {HITPOINTS} hitpoints and I shall annihilate you!", - "stringlist.Oryx_the_Mad_God_2.everySoOften.3": "Miniscule worms! I still have {HITPOINTS} hitpoints!", - "stringlist.Oryx_the_Mad_God_2.everySoOften.4": "Galactic serfs! Cower before my {HITPOINTS} hitpoints!", + "stringlist.Oryx_the_Mad_God_2.everySoOften.0": "Pathetic mortals! I have {HITPOINTS}!", + "stringlist.Oryx_the_Mad_God_2.everySoOften.1": "Foolish humans! My {HITPOINTS} give me strength!", + "stringlist.Oryx_the_Mad_God_2.everySoOften.2": "I have {HITPOINTS} and I shall annihilate you!", + "stringlist.Oryx_the_Mad_God_2.everySoOften.3": "Miniscule worms! I still have {HITPOINTS}!", + "stringlist.Oryx_the_Mad_God_2.everySoOften.4": "Galactic serfs! Cower before my {HITPOINTS}!", "stringlist.Oryx_the_Mad_God_2.mydeath.0": "You puny mortals! I... shall... return...!", "stringlist.Pentaract.death.0": "That was but one of many Pentaracts!", "stringlist.Pentaract.death.1": "You have razed my Pentaract, but you will die here in my Realm!", "stringlist.Pentaract.killed.0": "{KILLER}, you lowly scum! You'll regret that you ever touched my Pentaract!", "stringlist.Pentaract.killed.1": "{KILLER}, you flea-ridden animal! You destroyed my Pentaract!", "stringlist.Pentaract.killed.2": "{KILLER}, by destroying my Pentaract you have sealed your own doom!", "stringlist.Pentaract.many.0": "Wretched creatures! {COUNT} Pentaracts remain!", "stringlist.Pentaract.many.1": "You detestable humans will never defeat my {COUNT} Pentaracts!",