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-12-18 20:50:42.690589980 +0000 +++ ./json/Objects.json 2018-12-20 13:30:42.615958138 +0000 @@ -12056,17 +12056,17 @@ } }, { "type": "0x0d5e", "id": "Pentaract Tower", "Enemy": "", "Class": "Character", "Texture": { - "File": "lofiChar216x16", + "File": "oryxHordeObjects16x16", "Index": "0x38" }, "Animation": { "prob": "1.0", "period": "0.0", "Frame": [ { "time": "0.2", @@ -12899,16 +12899,17 @@ }, "HitSound": "monster/sprites_hit", "DeathSound": "monster/sprites_death", "Size": "0", "ShadowSize": "0", "NoMiniMap": "", "PerRealmMax": "1", "Encounter": "", + "Level": "20", "Projectile": { "id": "0", "ObjectId": "Invisible", "Damage": "75", "Speed": "0", "Size": "100", "LifetimeMS": "5000", "MultiHit": "" @@ -12945,17 +12946,17 @@ "cooldown": "0.2" } } ], "HitSound": "monster/stone_walls_death", "DeathSound": "monster/flaming_skulls_death", "Size": "130", "ShadowSize": "100", - "MaxHitPoints": "66000", + "MaxHitPoints": "50000", "Defense": "40", "Flying": "", "Hero": "", "Level": "20", "Quest": "", "God": "", "StasisImmune": "", "StunImmune": "", @@ -54859,19 +54860,18 @@ "description": "Oryxmas Skins" } }, "Activate": { "_": "UnlockSkin", "skinType": "19659" }, "Consumable": "", - "Soulbound": "", "BagType": "8", - "feedPower": "500" + "feedPower": "250" }, { "type": "0x5ea9", "id": "Time Traveler Trickster Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "playerskins", @@ -59276,16 +59276,17 @@ "File": "chars8x8rHero1", "Index": "0x0a" }, "HitSound": "monster/ghosts_hit", "DeathSound": "monster/ghosts_death", "Size": "95", "MaxHitPoints": "300000", "Defense": "7", + "StasisImmune": "", "Hero": "", "Quest": "", "Level": "15", "Projectile": { "id": "0", "ObjectId": "White Bullet", "Damage": "50", "Speed": "60", @@ -59302,16 +59303,17 @@ "File": "chars8x8rHero1", "Index": "0x0b" }, "HitSound": "monster/ghosts_hit", "DeathSound": "monster/ghosts_death", "Size": "100", "MaxHitPoints": "100000", "Defense": "2", + "StasisImmune": "", "Exp": "1", "Projectile": { "id": "0", "ObjectId": "Blue Arrow", "Damage": "30", "Speed": "80", "Size": "140", "LifetimeMS": "2000" @@ -59328,16 +59330,17 @@ "File": "chars8x8rHero1", "Index": "0x0a" }, "HitSound": "monster/ghosts_hit", "DeathSound": "monster/ghosts_death", "Size": "95", "MaxHitPoints": "5000", "Defense": "7", + "StasisImmune": "", "Hero": "", "Quest": "", "Level": "15", "Projectile": { "id": "0", "ObjectId": "White Bullet", "Damage": "50", "Speed": "60", @@ -59686,16 +59689,17 @@ "File": "oryxHordeChars8x8", "Index": "5" }, "HitSound": "monster/ents_hit", "DeathSound": "monster/ents_death", "Size": "140", "MaxHitPoints": "300000", "Defense": "7", + "StasisImmune": "", "Hero": "", "Quest": "", "Level": "11", "Exp": "0", "Projectile": { "id": "0", "ObjectId": "Bark Bolt", "Damage": "35", @@ -59715,16 +59719,17 @@ "File": "oryxHordeChars8x8", "Index": "5" }, "HitSound": "monster/ents_hit", "DeathSound": "monster/ents_death", "Size": "140", "MaxHitPoints": "1200", "Defense": "15", + "StasisImmune": "", "Hero": "", "Quest": "", "Level": "11", "Exp": "384", "Projectile": [ { "id": "0", "ObjectId": "Bark Bolt", @@ -59924,16 +59929,17 @@ "File": "chars8x8rHero1", "Index": "0x06" }, "HitSound": "monster/skeletons_hit", "DeathSound": "monster/skeletons_death", "Size": "120", "MaxHitPoints": "300000", "Defense": "7", + "StasisImmune": "", "Hero": "", "Quest": "", "Level": "9", "Exp": "0", "Projectile": [ { "id": "0", "ObjectId": "Blue Magic", @@ -59965,16 +59971,17 @@ "File": "chars8x8rHero1", "Index": "0x06" }, "HitSound": "monster/skeletons_hit", "DeathSound": "monster/skeletons_death", "Size": "120", "MaxHitPoints": "1100", "Defense": "7", + "StasisImmune": "", "Hero": "", "Quest": "", "Level": "9", "Exp": "165", "Projectile": [ { "id": "0", "ObjectId": "Blue Magic", @@ -60006,16 +60013,17 @@ "Index": "3" }, "HitSound": "monster/ghosts_hit", "DeathSound": "monster/ghosts_death", "Size": "80", "MaxHitPoints": "6000", "Defense": "4", "Exp": "58", + "StasisImmune": "", "Projectile": [ { "id": "0", "ObjectId": "Sparkling Bolt", "Damage": "35", "Speed": "60", "Size": "50", "LifetimeMS": "2000" @@ -74749,19 +74757,21 @@ "Exp": "0", "BlocksSight": "" }, { "type": "0x0d71", "id": "Suit of Armor", "Class": "Character", "Texture": { - "File": "lofiChar216x16", - "Index": "0x07" + "File": "d3LofiObjEmbed16", + "Index": "0x18" }, + "ShadowSize": "80", + "ShadowColor": "0xa0cde9", "HitSound": "monster/stone_walls_hit", "DeathSound": "monster/stone_walls_death", "MaxHitPoints": "4000", "Size": "80", "StasisImmune": "", "Enemy": "", "Exp": "0" }, @@ -74921,46 +74931,46 @@ "Enemy": "", "Class": "Character", "StasisImmune": "", "ParalyzeImmune": "", "StunImmune": "", "Quest": "", "Level": "20", "AnimatedTexture": { - "File": "chars16x16dEncounters", - "Index": "20" + "File": "d3Chars16x16rEmbed", + "Index": "14" }, "AltTexture": [ { "id": "1", "AnimatedTexture": { - "File": "chars16x16dEncounters", - "Index": "21" + "File": "d3Chars16x16rEmbed", + "Index": "15" } }, { "id": "2", "AnimatedTexture": { - "File": "chars16x16dEncounters", - "Index": "22" + "File": "d3Chars16x16rEmbed", + "Index": "16" } }, { "id": "3", "AnimatedTexture": { - "File": "chars16x16dEncounters", - "Index": "23" + "File": "d3Chars16x16rEmbed", + "Index": "17" } }, { "id": "4", "AnimatedTexture": { - "File": "chars16x16dEncounters2", - "Index": "0" + "File": "d3Chars16x16rEmbed", + "Index": "18" } } ], "HitSound": "monster/stone_walls_death", "DeathSound": "monster/flying_brain_death", "MaxHitPoints": "60000", "Projectile": [ { @@ -75000,46 +75010,46 @@ "Enemy": "", "Class": "Character", "StasisImmune": "", "ParalyzeImmune": "", "StunImmune": "", "Quest": "", "Level": "20", "AnimatedTexture": { - "File": "chars16x16dEncounters2", - "Index": "2" + "File": "d3Chars16x16rEmbed", + "Index": "19" }, "AltTexture": [ { "id": "1", "AnimatedTexture": { - "File": "chars16x16dEncounters2", - "Index": "3" + "File": "d3Chars16x16rEmbed", + "Index": "20" } }, { "id": "2", "AnimatedTexture": { - "File": "chars16x16dEncounters2", - "Index": "4" + "File": "d3Chars16x16rEmbed", + "Index": "21" } }, { "id": "3", "AnimatedTexture": { - "File": "chars16x16dEncounters2", - "Index": "5" + "File": "d3Chars16x16rEmbed", + "Index": "22" } }, { "id": "4", "AnimatedTexture": { - "File": "chars16x16dEncounters2", - "Index": "6" + "File": "d3Chars16x16rEmbed", + "Index": "23" } } ], "HitSound": "monster/stone_walls_death", "DeathSound": "monster/flying_brain_death", "MaxHitPoints": "60000", "Projectile": [ { @@ -75443,32 +75453,32 @@ "Group": "Oryx's Minions", "Class": "GameObject", "Enemy": "", "HitSound": "monster/stone_walls_hit", "DeathSound": "monster/stone_walls_death", "MaxHitPoints": "2600", "DrawOnGround": "", "Texture": { - "File": "lofiEnvironment3", - "Index": "0x1d" + "File": "d3LofiObjEmbed", + "Index": "0x4d" }, "AltTexture": [ { "id": "1", "Texture": { - "File": "lofiEnvironment3", - "Index": "0x1e" + "File": "d3LofiObjEmbed", + "Index": "0x4e" } }, { "id": "2", "Texture": { - "File": "lofiEnvironment3", - "Index": "0x1f" + "File": "d3LofiObjEmbed", + "Index": "0x4f" } } ], "Projectile": { "id": "0", "ObjectId": "Mute Spell", "Speed": "40", "Damage": "20", @@ -75542,32 +75552,32 @@ "Group": "Oryx's Minions", "Class": "GameObject", "Enemy": "", "HitSound": "monster/stone_walls_hit", "DeathSound": "monster/stone_walls_death", "MaxHitPoints": "2600", "DrawOnGround": "", "Texture": { - "File": "lofiEnvironment3", - "Index": "0x1d" + "File": "d3LofiObjEmbed", + "Index": "0x4d" }, "AltTexture": [ { "id": "1", "Texture": { - "File": "lofiEnvironment3", - "Index": "0x1e" + "File": "d3LofiObjEmbed", + "Index": "0x4e" } }, { "id": "2", "Texture": { - "File": "lofiEnvironment3", - "Index": "0x1f" + "File": "d3LofiObjEmbed", + "Index": "0x4f" } } ], "Projectile": { "id": "0", "ObjectId": "Mute Spell", "Speed": "40", "Damage": "20", @@ -168847,16 +168857,33 @@ "HitSound": "monster/stone_walls_hit", "DeathSound": "monster/stone_walls_death", "Size": "120", "MaxHitPoints": "50000", "Defense": "0", "Exp": "0" }, { + "type": "0xe71", + "id": "Event Chest Xmas", + "DisplayId": "Freed Frozen Chest", + "Class": "Character", + "Enemy": "", + "KeepDamageRecord": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x466" + }, + "MaxHitPoints": "60000", + "Defense": "0", + "Size": "160", + "Exp": "1000", + "StasisImmune": "" + }, + { "type": "0x5b4a", "id": "Halloween Haunted Event Chest", "DisplayId": "Event Chest", "Class": "Character", "Enemy": "", "KeepDamageRecord": "", "Texture": { "File": "autumnNexusObjects16x16", @@ -227936,25 +227963,67 @@ "_": "Stasis", "duration": "10", "target": "1" } }, "StasisImmune": "" }, { - "type": "0x3fdc", - "id": "XN Sn Jm spwnr", + "type": "0x3ff4", + "id": "XN IceTrack Tree", "Class": "Character", "NoMiniMap": "", "Texture": { "File": "xmasNexusObjects16x16", - "Index": "0x146" + "Index": "0x158" }, - "Size": "0" + "AltTexture": [ + { + "id": "1", + "Texture": { + "File": "xmasNexusObjects16x16", + "Index": "0x159" + } + }, + { + "id": "2", + "Texture": { + "File": "xmasNexusObjects16x16", + "Index": "0x15a" + } + }, + { + "id": "3", + "Texture": { + "File": "xmasNexusObjects16x16", + "Index": "0x15b" + } + }, + { + "id": "4", + "Texture": { + "File": "xmasNexusObjects16x16", + "Index": "0x158" + } + } + ], + "Size": "100" + }, + { + "type": "0x3ff5", + "id": "XN IceTrack Snowman", + "Class": "Character", + "DisplayId": "Race Expert", + "NoMiniMap": "", + "Texture": { + "File": "xmasNexusObjects8x8", + "Index": "0x8f" + }, + "Size": "100" }, { "type": "0x3fce", "id": "XN S spwnr", "DisplayId": "S spawner", "Class": "Character", "Texture": { "File": "invisible", Binary files ../current/sheets/xmasNexusObjects16x16.png and ./sheets/xmasNexusObjects16x16.png differ Binary files ../current/sheets/xmasNexusObjects8x8.png and ./sheets/xmasNexusObjects8x8.png differ