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 2017-08-22 18:20:42.719175340 +0000 +++ ./json/EquipmentSets.json 2017-10-03 18:00:51.622186002 +0000 @@ -328,16 +328,81 @@ { "_": "IncrementStat", "stat": "22", "amount": "5" } ] }, { + "type": "0x000e", + "id": "Hollow King Necromancer Set", + "Setpiece": [ + { + "_": "Equipment", + "slot": "0", + "itemtype": "0x9dc" + }, + { + "_": "Equipment", + "slot": "1", + "itemtype": "0x9dd" + }, + { + "_": "Equipment", + "slot": "2", + "itemtype": "0x9de" + }, + { + "_": "Equipment", + "slot": "3", + "itemtype": "0x9df" + } + ], + "ActivateOnEquipAll": [ + { + "_": "ChangeSkin", + "skinType": "0x4c04", + "size": "80", + "color": "0x1a4a6b", + "bulletType": "SuperSpiritSpiral" + }, + { + "_": "IncrementStat", + "stat": "0", + "amount": "25" + }, + { + "_": "IncrementStat", + "stat": "3", + "amount": "30" + }, + { + "_": "IncrementStat", + "stat": "21", + "amount": "4" + }, + { + "_": "IncrementStat", + "stat": "28", + "amount": "5" + }, + { + "_": "IncrementStat", + "stat": "26", + "amount": "6" + }, + { + "_": "IncrementStat", + "stat": "20", + "amount": "7" + } + ] + }, + { "type": "0x0004", "id": "Phylactery Mystic Set", "Setpiece": [ { "_": "Equipment", "slot": "0", "itemtype": "0x2363" }, 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 2017-09-28 19:01:04.270397959 +0000 +++ ./json/Objects.json 2017-10-03 18:00:59.450188395 +0000 @@ -34603,16 +34603,180 @@ }, "BagType": "6", "FameBonus": "4", "OldSound": "bladeSwing", "feedPower": "900", "Soulbound": "" }, { + "type": "0x9dc", + "id": "NecroST0", + "setType": "0x000e", + "setName": "Hollow King Necromancer Set", + "DisplayId": "Edictum Praetoris", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0xf8" + }, + "SlotType": "17", + "Description": "My staff led me to a strange arena, which seemed to have a dark aura about it.", + "RateOfFire": "0.75", + "Sound": "weapon/wand_of_dark_magic", + "Projectile": { + "ObjectId": "SpiritSpiral", + "Speed": "150", + "MinDamage": "40", + "MaxDamage": "105", + "LifetimeMS": "570", + "Frequency": "1", + "Amplitude": "0.3", + "Size": "70" + }, + "NumProjectiles": "3", + "ArcGap": "3", + "FameBonus": "5", + "feedPower": "700", + "BagType": "4", + "Soulbound": "", + "OldSound": "magicShoot" + }, + { + "type": "0x9dd", + "id": "NecroST1", + "setType": "0x000e", + "setName": "Hollow King Necromancer Set", + "DisplayId": "Memento Mori", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0xf9" + }, + "Usable": "", + "SlotType": "19", + "Description": "I found a great spectre floating above me. He reached out and granted me his cranium.", + "MpCost": "120", + "Activate": [ + { + "_": "VampireBlast", + "radius": "3.5", + "totalDamage": "400", + "ignoreDef": "400", + "healRange": "0", + "color": "1a4a6b" + }, + { + "_": "ConditionEffectSelf", + "effect": "Damaging", + "duration": "3", + "color": "-1" + } + ], + "ActivateOnEquip": { + "_": "IncrementStat", + "stat": "26", + "amount": "5" + }, + "ExtraTooltipData": { + "EffectInfo": { + "name": "", + "description": "Does not heal." + } + }, + "FameBonus": "6", + "feedPower": "900", + "BagType": "4", + "Soulbound": "" + }, + { + "type": "0x9de", + "id": "NecroST2", + "setType": "0x000e", + "setName": "Hollow King Necromancer Set", + "DisplayId": "Toga Picta", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0xfa" + }, + "SlotType": "14", + "Description": "His gift was gracious, but I would not dabble in spirits. He challenged me to a duel.", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "20", + "amount": "8" + }, + { + "_": "IncrementStat", + "stat": "21", + "amount": "13" + }, + { + "_": "IncrementStat", + "stat": "26", + "amount": "4" + }, + { + "_": "IncrementStat", + "stat": "28", + "amount": "-3" + }, + { + "_": "IncrementStat", + "stat": "3", + "amount": "35" + } + ], + "FameBonus": "4", + "feedPower": "600", + "BagType": "4", + "Soulbound": "" + }, + { + "type": "0x9df", + "id": "NecroST3", + "setType": "0x000e", + "setName": "Hollow King Necromancer Set", + "DisplayId": "Interregnum", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0xfb" + }, + "SlotType": "9", + "Description": "Our fight was glorious, but in the end, I fell in battle and joined him in undeath.", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "0", + "amount": "75" + }, + { + "_": "IncrementStat", + "stat": "20", + "amount": "5" + }, + { + "_": "IncrementStat", + "stat": "26", + "amount": "5" + } + ], + "FameBonus": "4", + "feedPower": "650", + "BagType": "4", + "Soulbound": "" + }, + { "type": "0x258a", "id": "Bow of Eternal Frost", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x491" }, @@ -41721,17 +41885,17 @@ "id": "Mark of Dr Terrible", "Class": "Equipment", "Item": "", "SlotType": "10", "Texture": { "File": "d2LofiObjEmbed", "Index": "0x4a" }, - "Description": "A medallion infused with the essence of Dr. Terrible.", + "Description": "A medallion infused with the essence of Dr Terrible.", "ExtraTooltipData": { "EffectInfo": [ { "name": "Type", "description": "Quest item" }, { "name": "Drop location", @@ -83193,16 +83357,36 @@ "Class": "Projectile", "Texture": { "File": "lostHallsObjects8x8", "Index": "0xc3" }, "AngleCorrection": "1" }, { + "type": "0x9da", + "id": "SpiritSpiral", + "Class": "Projectile", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0xf6" + }, + "Rotation": "50" + }, + { + "type": "0x9db", + "id": "SuperSpiritSpiral", + "Class": "Projectile", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0xf7" + }, + "Rotation": "70" + }, + { "type": "0x7443", "id": "Puppet Theatre Boss Spawn", "Class": "Character", "Enemy": "", "Texture": { "File": "invisible", "Index": "0" }, @@ -89356,16 +89540,29 @@ "File": "playerskins16", "Index": "12" }, "PlayerClassType": "0x0322", "UnlockSpecial": "Set Skin", "NoSkinSelect": "" }, { + "type": "0x4c04", + "id": "Hollow King Set Skin", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins16", + "Index": "16" + }, + "PlayerClassType": "0x0321", + "UnlockSpecial": "Set Skin", + "NoSkinSelect": "" + }, + { "type": "0x7492", "id": "Mini Geb", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "98" }, @@ -104635,16 +104832,32 @@ "XpMult": "0.0", "Size": "40", "AnimatedTexture": { "File": "playerskins16", "Index": "14" } }, { + "type": "0x8fc", + "id": "Testing Gift ST Hollow", + "Group": "Testing Gifts ST", + "Class": "Character", + "StasisImmune": "", + "Enemy": "", + "NoMiniMap": "", + "MaxHitPoints": "100", + "XpMult": "0.0", + "Size": "40", + "AnimatedTexture": { + "File": "playerskins16", + "Index": "16" + } + }, + { "type": "0x1200", "id": "Large Purple Pinstripe Cloth", "Class": "Dye", "DisplayId": "Large Purple Pinstripe Cloth", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x1b" Binary files ../current/sheets/d3LofiObj.png and ./sheets/d3LofiObj.png differ Binary files ../current/sheets/playersSkins16Mask.png and ./sheets/playersSkins16Mask.png differ Binary files ../current/sheets/playersSkins16.png and ./sheets/playersSkins16.png differ