diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/constants.json ./constants.json --- ../current/constants.json 2016-01-07 01:30:57.951552041 +0000 +++ ./constants.json 2016-05-26 00:10:52.478623336 +0000 @@ -1,8 +1,8 @@ { "BUILD_VERSION": "27.7", - "MINOR_VERSION": "6", + "MINOR_VERSION": "7", "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' -x _ '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2015-12-12 00:30:27.568166791 +0000 +++ ./json/Objects.json 2016-05-26 00:10:23.390585624 +0000 @@ -37149,16 +37149,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x0b" }, "HitSound": "monster/flayers_hit", "DeathSound": "monster/flayers_death", "Size": "100", "MaxHitPoints": "140", + "XpMult": "0.0", "Defense": "8", "Terrain": "HighSand", "Projectile": { "id": "0", "ObjectId": "Blue Magic", "Damage": "40", "Speed": "50", "LifetimeMS": "2700" @@ -37174,16 +37175,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x0c" }, "HitSound": "monster/flayers_hit", "DeathSound": "monster/flayers_death", "Size": "100", "MaxHitPoints": "280", + "XpMult": "0.0", "Defense": "0", "Terrain": "HighSand", "Projectile": { "id": "0", "ObjectId": "Purple Magic", "Damage": "50", "Speed": "80", "LifetimeMS": "1500" @@ -37199,16 +37201,17 @@ "Texture": { "File": "lofiChar16x16", "Index": "0x51" }, "HitSound": "monster/flayers_hit", "DeathSound": "monster/flayers_death", "Size": "100", "MaxHitPoints": "1400", + "XpMult": "2.0", "Defense": "12", "Terrain": "HighSand", "SpawnProb": "1.0", "God": "", "Projectile": [ { "id": "0", "ObjectId": "Green Magic", @@ -37300,16 +37303,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x00" }, "HitSound": "monster/undead_dwarves_hit", "DeathSound": "monster/undead_dwarves_death", "Size": "90", "MaxHitPoints": "250", + "XpMult": "0.0", "Defense": "7", "Terrain": "HighPlains", "Projectile": { "id": "0", "ObjectId": "Blade", "Damage": "40", "Speed": "60", "LifetimeMS": "1200" @@ -37325,16 +37329,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x01" }, "HitSound": "monster/undead_dwarves_hit", "DeathSound": "monster/undead_dwarves_death", "Size": "90", "MaxHitPoints": "260", + "XpMult": "0.0", "Defense": "7", "Terrain": "HighPlains", "Projectile": { "id": "0", "ObjectId": "Blade", "Damage": "50", "Speed": "120", "LifetimeMS": "400" @@ -37350,16 +37355,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x02" }, "HitSound": "monster/undead_dwarves_hit", "DeathSound": "monster/undead_dwarves_death", "Size": "90", "MaxHitPoints": "210", + "XpMult": "0.0", "Defense": "0", "Terrain": "HighPlains", "Projectile": { "id": "0", "ObjectId": "Blue Bolt", "Damage": "29", "Speed": "50", "LifetimeMS": "2400", @@ -37376,16 +37382,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x04" }, "HitSound": "monster/undead_dwarves_hit", "DeathSound": "monster/undead_dwarves_death", "Size": "90", "MaxHitPoints": "400", + "XpMult": "0.0", "Defense": "7", "Terrain": "HighPlains", "Projectile": { "id": "0", "ObjectId": "Blade", "Damage": "55", "Speed": "100", "LifetimeMS": "600" @@ -37401,16 +37408,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x05" }, "HitSound": "monster/undead_dwarves_hit", "DeathSound": "monster/undead_dwarves_death", "Size": "90", "MaxHitPoints": "250", + "XpMult": "0.0", "Defense": "11", "Terrain": "HighPlains", "Projectile": { "id": "0", "ObjectId": "Blue Magic", "Damage": "55", "Speed": "70", "LifetimeMS": "1700" @@ -37427,16 +37435,17 @@ "File": "lofiChar16x16", "Index": "0x4b" }, "HitSound": "monster/dwarf_god_hit", "DeathSound": "monster/dwarf_god_death", "Size": "90", "MaxHitPoints": "800", "Defense": "11", + "XpMult": "4.0", "Terrain": "HighPlains", "SpawnProb": "1.0", "Projectile": [ { "id": "0", "ObjectId": "Pink Bolt", "Damage": "30", "Speed": "70", @@ -37920,16 +37929,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x0d" }, "HitSound": "monster/night_elves_hit", "DeathSound": "monster/night_elves_death", "Size": "100", "MaxHitPoints": "240", + "XpMult": "0.0", "Defense": "0", "Terrain": "HighForest", "Projectile": { "id": "0", "ObjectId": "Blue Arrow", "Damage": "36", "Speed": "75", "LifetimeMS": "2000" @@ -37945,16 +37955,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x0e" }, "HitSound": "monster/night_elves_hit", "DeathSound": "monster/night_elves_death", "Size": "100", "MaxHitPoints": "280", + "XpMult": "0.0", "Defense": "2", "Terrain": "HighForest", "Projectile": { "id": "0", "ObjectId": "Blade", "Damage": "40", "Speed": "100", "LifetimeMS": "800" @@ -37970,16 +37981,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x0f" }, "HitSound": "monster/night_elves_hit", "DeathSound": "monster/night_elves_death", "Size": "100", "MaxHitPoints": "220", + "XpMult": "0.0", "Defense": "0", "Terrain": "HighForest", "Projectile": { "id": "0", "ObjectId": "Blue Magic", "Damage": "40", "Speed": "60", "LifetimeMS": "2000", @@ -37996,16 +38008,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x10" }, "HitSound": "monster/night_elves_hit", "DeathSound": "monster/night_elves_death", "Size": "100", "MaxHitPoints": "300", + "XpMult": "0.0", "Defense": "4", "Terrain": "HighForest", "Projectile": { "id": "0", "ObjectId": "Gold Arrow", "Damage": "52", "Speed": "80", "LifetimeMS": "2000", @@ -38023,16 +38036,17 @@ "AnimatedTexture": { "File": "chars8x8rHigh", "Index": "0x12" }, "HitSound": "monster/night_elves_hit", "DeathSound": "monster/night_elves_death", "Size": "100", "MaxHitPoints": "180", + "XpMult": "0.0", "Defense": "5", "Terrain": "HighForest", "Projectile": { "id": "0", "ObjectId": "Green Magic", "Damage": "60", "Speed": "70", "LifetimeMS": "1200" @@ -38048,16 +38062,17 @@ "Texture": { "File": "lofiChar16x16", "Index": "0x49" }, "HitSound": "monster/lizard_god_hit", "DeathSound": "monster/lizard_god_death", "Size": "100", "MaxHitPoints": "900", + "XpMult": "4.0", "Defense": "12", "Terrain": "HighForest", "God": "", "SpawnProb": "1.0", "Projectile": { "id": "0", "ObjectId": "Green Bolt", "Damage": "30",