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-07-31 16:40:42.496071287 +0000 +++ ./json/Objects.json 2018-07-31 18:40:41.984614364 +0000 @@ -36468,17 +36468,17 @@ { "type": "0x1e1a", "id": "Mark of the Fountain Spirit", "Class": "Equipment", "Item": "", "SlotType": "10", "Texture": { "File": "d2LofiObjEmbed", - "Index": "0x8e" + "Index": "0x7e" }, "Description": "A medallion infused with the essence of the Fountain Spirit.", "ExtraTooltipData": { "EffectInfo": [ { "name": "Type", "description": "Quest item" }, @@ -183704,17 +183704,17 @@ "StunImmune": "", "ParalyzeImmune": "", "AnimatedTexture": { "File": "oryxHordeChars8x8", "Index": "1" }, "HitSound": "monster/ents_hit", "DeathSound": "monster/traps_hit", - "MaxHitPoints": "10000", + "MaxHitPoints": "2000", "Projectile": [ { "id": "0", "ObjectId": "Lightning Spiral", "Speed": "45", "Damage": "250", "Size": "120", "LifetimeMS": "3000", @@ -183903,17 +183903,17 @@ "AnimatedTexture": { "File": "oryxHordeChars16x16", "Index": "6" } } ], "HitSound": "monster/rocks_hit", "DeathSound": "monster/rocks_death", - "MaxHitPoints": "35000", + "MaxHitPoints": "20000", "Projectile": [ { "id": "0", "ObjectId": "Purple Blast", "Speed": "80", "Damage": "150", "Size": "100", "LifetimeMS": "4000" @@ -183983,17 +183983,17 @@ "AnimatedTexture": { "File": "oryxHordeChars16x16", "Index": "11" } } ], "HitSound": "monster/rocks_hit", "DeathSound": "monster/rocks_death", - "MaxHitPoints": "35000", + "MaxHitPoints": "20000", "Projectile": [ { "id": "0", "ObjectId": "Red Blast", "Speed": "80", "Damage": "150", "Size": "100", "LifetimeMS": "4000" @@ -184091,17 +184091,17 @@ "id": "1", "AnimatedTexture": { "File": "oryxHordeChars16x16", "Index": "0" } }, "HitSound": "monster/rocks_hit", "DeathSound": "monster/rocks_death", - "MaxHitPoints": "35000", + "MaxHitPoints": "25000", "Projectile": [ { "id": "0", "ObjectId": "Dark Mossy Boomerang", "Speed": "54", "Damage": "93", "Size": "200", "LifetimeMS": "600", @@ -184171,17 +184171,17 @@ "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "oryxHordeChars8x8", "Index": "0" }, "HitSound": "monster/rocks_hit", "DeathSound": "monster/rocks_death", - "MaxHitPoints": "6830", + "MaxHitPoints": "3000", "Projectile": [ { "id": "0", "ObjectId": "Small Mossy zigzag", "Speed": "40", "Damage": "90", "Size": "100", "LifetimeMS": "1000" @@ -184258,17 +184258,17 @@ "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "oryxHordeChars16x16", "Index": "12" }, "HitSound": "monster/oryx_hit", "DeathSound": "monster/oryx_death", - "MaxHitPoints": "42000", + "MaxHitPoints": "25000", "Size": "200", "Defense": "75", "Exp": "312", "StasisImmune": "", "StunImmune": "", "ParalyzeImmune": "", "Projectile": [ { @@ -184441,17 +184441,17 @@ "File": "oryxHordeChars16x16", "Index": "13" }, "StasisImmune": "", "StunImmune": "", "ParalyzeImmune": "", "HitSound": "monster/rocks_hit", "DeathSound": "monster/rocks_death", - "MaxHitPoints": "35000", + "MaxHitPoints": "20000", "Defense": "0", "Exp": "0", "Size": "200", "ShadowSize": "100", "AltTexture": [ { "id": "1", "Texture": { @@ -185258,17 +185258,17 @@ "File": "oryxHordeObjects16x16", "Index": "0x15" }, "StasisImmune": "", "StunImmune": "", "ParalyzeImmune": "", "HitSound": "monster/rocks_hit", "DeathSound": "monster/rocks_death", - "MaxHitPoints": "35000", + "MaxHitPoints": "20000", "Defense": "0", "Exp": "0", "Size": "200", "ShadowSize": "100", "NoMiniMap": "", "AltTexture": [ { "id": "1",