diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/constants.json ./constants.json --- ../current/constants.json 2014-10-30 21:20:37.299241998 +0000 +++ ./constants.json 2014-10-31 21:50:37.676974333 +0000 @@ -1,8 +1,8 @@ { "BUILD_VERSION": "25.0", - "MINOR_VERSION": "1", + "MINOR_VERSION": "2", "PORT": 2050, "RANDOM1": "311f80691451c71b09a13a2a6e", "RANDOM2": "72c5583cafb6818995cbd74b80", "RSA_PUBLIC_KEY": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCKFctVrhfF3m2Kes0FBL/JFeOcmNg9eJz8k/hQy1kadD+XFUpluRqa//Uxp2s9W2qE0EoUCu59ugcf/p7lGuL99UoSGmQEynkBvZct+/M40L0E0rZ4BVgzLOJmIbXMp0J4PnPcb6VLZvxazGcmSfjauC7F3yWYqUbZd/HCBtawwIDAQAB\n-----END PUBLIC KEY-----" } \ No newline at end of file diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2014-10-30 21:20:25.315248742 +0000 +++ ./json/Objects.json 2014-10-31 21:50:25.336972303 +0000 @@ -10986,16 +10986,22 @@ "type": "0x744f", "id": "Zombie Horde", "Enemy": "", "Class": "Character", "Texture": { "File": "invisible", "Index": "0" }, + "Portrait": { + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "50" + } + }, "HitSound": "monster/ghost_god_hit", "DeathSound": "monster/ghost_god_death", "Size": "160", "MaxHitPoints": "55000", "Defense": "25", "God": "", "Hero": "", "Quest": "", @@ -11016,21 +11022,18 @@ }, "HitSound": "monster/ghost_god_hit", "DeathSound": "monster/ghost_god_death", "Size": "160", "MaxHitPoints": "55000", "Defense": "25", "God": "", "Hero": "", - "Quest": "", - "Encounter": "", "Level": "20", "XpMult": "0.0", - "PerRealmMax": "10", "DisplayId": "Horde Spawner" }, { "type": "0x075c", "id": "Woodland Labyrinth", "Class": "Portal", "IntergamePortal": "", "DungeonName": "Woodland Labyrinth", @@ -28681,17 +28684,17 @@ "Sound": "weapon/mithril_sword", "Projectile": { "ObjectId": "Halloween SSS", "Speed": "100", "MinDamage": "210", "MaxDamage": "270", "LifetimeMS": "350" }, - "BagType": "2", + "BagType": "4", "FameBonus": "3", "OldSound": "bladeSwing", "feedPower": "310", "DisplayId": "Skull-splitter Sword" }, { "type": "0x224b", "id": "Potion of Health1", @@ -45859,17 +45862,17 @@ "Index": "50" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Coral Arrow", "Damage": "55", "Speed": "70", "LifetimeMS": "1500", "Size": "75" }, @@ -45886,17 +45889,17 @@ "Index": "51" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Fire Bolt", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -45913,17 +45916,17 @@ "Index": "52" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Fire Missile", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100", "Amplitude": "0.5", @@ -45942,17 +45945,17 @@ "Index": "53" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Rainbow Magic", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -45969,17 +45972,17 @@ "Index": "54" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Directed Explosion", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "50" }, @@ -45996,17 +45999,17 @@ "Index": "55" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Stone Slash", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -46023,17 +46026,17 @@ "Index": "56" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Aqua Slash", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -46050,17 +46053,17 @@ "Index": "57" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Aqua Missile", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100", "Amplitude": "0.5", @@ -46079,17 +46082,17 @@ "Index": "58" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Black Arrow", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -46106,17 +46109,17 @@ "Index": "59" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Crystal Serpent Missile", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100", "Amplitude": "0.5", @@ -46135,17 +46138,17 @@ "Index": "60" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Spirit Dagger Slash", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -46162,17 +46165,17 @@ "Index": "61" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Blue Magic", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -46189,17 +46192,17 @@ "Index": "62" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Green Bolt", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, @@ -46216,17 +46219,17 @@ "Index": "63" }, "HitSound": "monster/slimes_death", "DeathSound": "monster/flying_brain_death", "Size": "100", "ShadowSize": "0", "MaxHitPoints": "2500", "Defense": "20", - "XpMult": "0.62", + "XpMult": "0.105", "Projectile": { "id": "0", "ObjectId": "Jewel Slash", "Damage": "55", "Speed": "60", "LifetimeMS": "1000", "Size": "100" }, Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.png differ