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-09-28 18:20:37.963516392 +0000 +++ ./json/Objects.json 2018-09-28 20:20:38.012031027 +0000 @@ -20335,17 +20335,17 @@ { "_": "IncrementStat", "stat": "3", "amount": "100" } ], "BagType": "6", "FameBonus": "5", - "feedPower": "700", + "feedPower": "900", "Soulbound": "" }, { "type": "0xba1", "id": "Ring of the Nile", "Class": "Equipment", "Item": "", "Texture": { @@ -40872,17 +40872,17 @@ }, "RateOfFire": "1.2", "NumProjectiles": "1", "ActivateOnEquip": { "_": "IncrementStat", "stat": "26", "amount": "-2" }, - "BagType": "4", + "BagType": "8", "feedPower": "750", "FameBonus": "5", "Soulbound": "" }, { "type": "0xbd9", "id": "AssassinST1", "setType": "0x0011", @@ -40915,17 +40915,17 @@ { "_": "IncrementStat", "stat": "26", "amount": "-2" } ], "MpCost": "120", "Usable": "", - "BagType": "4", + "BagType": "8", "feedPower": "850", "FameBonus": "6", "Soulbound": "" }, { "type": "0xbda", "id": "AssassinST2", "setType": "0x0011", @@ -40951,17 +40951,17 @@ "amount": "6" }, { "_": "IncrementStat", "stat": "26", "amount": "-2" } ], - "BagType": "4", + "BagType": "8", "feedPower": "700", "FameBonus": "4", "Soulbound": "" }, { "type": "0xbdb", "id": "AssassinST3", "setType": "0x0011", @@ -40992,17 +40992,17 @@ "amount": "5" }, { "_": "IncrementStat", "stat": "26", "amount": "-2" } ], - "BagType": "4", + "BagType": "8", "feedPower": "650", "FameBonus": "4", "Soulbound": "" }, { "type": "0x7030", "id": "Mouthwatering Melon", "Class": "Equipment", @@ -41510,25 +41510,26 @@ "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": "Katana Placeholder.", + "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", @@ -41540,84 +41541,29 @@ "NumProjectiles": "2", "ArcGap": "0", "BagType": "8", "FameBonus": "4", "feedPower": "500", "Soulbound": "" }, { - "type": "0x203f", - "id": "SamuraiST1", - "Class": "Equipment", - "Item": "", - "Texture": { - "File": "d2LofiObjEmbed", - "Index": "0xaa" - }, - "SlotType": "27", - "Description": "Waki Placeholder.", - "Projectile": { - "ObjectId": "Wakizashi Pink", - "Speed": "160", - "MinDamage": "400", - "MaxDamage": "500", - "LifetimeMS": "400", - "PassesCover": "", - "MultiHit": "", - "ConditionEffect": { - "_": "Exposed", - "duration": "3.5" - } - }, - "ActivateOnEquip": { - "_": "IncrementStat", - "stat": "20", - "amount": "2" - }, - "Usable": "", - "MpCost": "80", - "Activate": [ - { - "_": "BulletCreate", - "numShots": "2", - "gapAngle": "-45", - "gapTiles": "0.5", - "offsetAngle": "+75", - "minDistance": "0.0", - "maxDistance": "4.8" - }, - { - "_": "BulletCreate", - "numShots": "2", - "gapAngle": "+45", - "gapTiles": "0.5", - "offsetAngle": "-75", - "minDistance": "0.0", - "maxDistance": "4.8" - } - ], - "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": "Armor Placeholder.", + "Description": "While being made of soft fabric, this outfit is mysteriously sturdy.", "ActivateOnEquip": [ { "_": "IncrementStat", "stat": "21", "amount": "14" }, { "_": "IncrementStat", @@ -41635,59 +41581,61 @@ "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": "Ring Placeholder.", + "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": "3" + "amount": "1" } ], "BagType": "8", "FameBonus": "4", "feedPower": "500", "Soulbound": "" }, { "type": "0xf3c", - "id": "SamuraiST1b", + "id": "SamuraiST1", "setType": "0xf3d", "setName": "Akuma Slayer Set", + "DisplayId": "Ryu's Blade", "Class": "Equipment", "Item": "", "Texture": { "File": "d2LofiObjEmbed", "Index": "0xaa" }, "SlotType": "27", - "Description": "2*4 shot converging. Medium Damage and armorpierce bullet + Exposed 3.5sec", + "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": "", Binary files ../current/sheets/playersSkins16Mask.png and ./sheets/playersSkins16Mask.png differ Binary files ../current/sheets/playersSkins16.png and ./sheets/playersSkins16.png differ