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-12-11 23:30:36.786282843 +0000 +++ ./constants.json 2014-12-13 00:10:38.079947656 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "27.0", + "BUILD_VERSION": "27.1", "MINOR_VERSION": "0", "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-12-11 23:30:24.298263883 +0000 +++ ./json/Objects.json 2014-12-13 00:10:25.323938975 +0000 @@ -181,16 +181,45 @@ "File": "invisible", "Index": "0" }, "MaxHitPoints": "10", "Size": "0", "DisplayId": "Archdemon SafeGround" }, { + "type": "0x673", + "id": "White Demon of the Abyss", + "Group": "Greater Demons", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars16x16dMountains1", + "Index": "0x00" + }, + "HitSound": "monster/greater_demons_hit", + "DeathSound": "monster/greater_demons_death", + "Size": "100", + "MaxHitPoints": "1000", + "Defense": "12", + "Flying": "", + "God": "", + "Projectile": { + "id": "0", + "ObjectId": "White Demon Shot", + "Damage": "45", + "Speed": "50", + "LifetimeMS": "2000", + "Size": "60", + "ArmorPiercing": "", + "MultiHit": "" + }, + "DisplayId": "White Demon of the Abyss" + }, + { "type": "0x66d", "id": "Imp of the Abyss", "Group": "Abyss Demons", "Enemy": "", "Class": "Character", "Texture": { "File": "lofiChar28x8", "Index": "0x20" @@ -28645,17 +28674,16 @@ "id": "Skull-splitter Sword", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x458" }, "SlotType": "1", - "Tier": "11", "Description": "An unfathomably powerful sword that absorbs the skulls of enemies and unleashes them with magical energy.", "RateOfFire": "1", "Sound": "weapon/mithril_sword", "Projectile": { "ObjectId": "Halloween SSS", "Speed": "100", "MinDamage": "210", "MaxDamage": "270", @@ -29937,17 +29965,16 @@ "SlotType": "10", "Description": "Knight of the Platinum Order. Thanks to: DELer", "Activate": { "_": "UnlockSkin", "skinType": "8964" }, "Consumable": "", "BagType": "1", - "Soulbound": "", "DisplayId": "Platinum Knight Skin" }, { "type": "0x2315", "id": "Platinum Warrior Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -29957,17 +29984,16 @@ "SlotType": "10", "Description": "Warrior of the Platinum Order. Thanks to: DELer", "Activate": { "_": "UnlockSkin", "skinType": "8965" }, "Consumable": "", "BagType": "1", - "Soulbound": "", "DisplayId": "Platinum Warrior Skin" }, { "type": "0x2316", "id": "Platinum Rogue Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -29977,17 +30003,16 @@ "SlotType": "10", "Description": "Rogue of the Platinum Order. Thanks to: DELer", "Activate": { "_": "UnlockSkin", "skinType": "8966" }, "Consumable": "", "BagType": "1", - "Soulbound": "", "DisplayId": "Platinum Rogue Skin" }, { "type": "0x2333", "id": "Witch Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -37692,32 +37717,34 @@ "Texture": { "File": "invisible", "Index": "0" }, "NoMiniMap": "", "Size": "100", "ShadowSize": "0", "XpMult": "0.0", - "StasisImmune": "" + "StasisImmune": "", + "StunImmune": "" }, { "type": "0x761", "id": "ic boss purifier generator", "Class": "Character", "Enemy": "", "Texture": { "File": "invisible", "Index": "0" }, "Size": "200", "ShadowSize": "0", "XpMult": "0.0", "MaxHitPoints": "10000", "StasisImmune": "", + "StunImmune": "", "AltTexture": { "id": "1", "AnimatedTexture": { "File": "chars16x16rEncounters", "Index": "122" } }, "Projectile": { @@ -37794,30 +37821,34 @@ "ArmorPiercing": "", "MultiHit": "", "Size": "100" } }, { "type": "0x75F", "id": "ic Esben the Unwilling", - "DisplayId": "Esben the The Unwilling", + "DisplayId": "Esben the Unwilling", "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "chars16x16rEncounters", "Index": "121" }, "HitSound": "monster/skeletons_hit", "DeathSound": "monster/skeletons_death", "Size": "200", "ShadowSize": "100", "MaxHitPoints": "90000", "Defense": "20", "XpMult": "0.0", + "StasisImmune": "", + "StunImmune": "", + "ParalyzeImmune": "", + "DazedImmune": "", "AltTexture": [ { "id": "1", "Texture": { "File": "invisible", "Index": "0" }, "Effect": { @@ -47911,17 +47942,17 @@ "Terrain": "Mountains", "SpawnProb": "1.0", "Spawn": { "Mean": "2", "StdDev": "1", "Min": "2", "Max": "4" }, - "PerRealmMax": "200", + "PerRealmMax": "2000", "Flying": "", "God": "", "Projectile": { "id": "0", "ObjectId": "White Demon Shot", "Damage": "45", "Speed": "50", "LifetimeMS": "2000", diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/strings.json ./strings.json --- ../current/strings.json 2014-12-11 23:30:21.314259344 +0000 +++ ./strings.json 2014-12-13 00:10:22.747937221 +0000 @@ -141,16 +141,17 @@ "EquipmentToolTip.decoy": "Decoy: {data}", "EquipmentToolTip.doses": "Doses {dose}", "EquipmentToolTip.doubleClickEquip": "Double-Click to equip", "EquipmentToolTip.doubleClickOrShiftClickToUse": "Double-Click or Shift-Click on item to use", "EquipmentToolTip.doubleClickTake": "Double-Click to take", "EquipmentToolTip.doubleClickTakeShiftClickUse": "Double-Click to take & Shift-Click to use", "EquipmentToolTip.effectForDuration": "{effect} for {duration} seconds", "EquipmentToolTip.effectOnSelf": "Effect on Self: {effect}", + "EquipmentToolTip.enemyEffect": "Enemy Effect: {effect}", "EquipmentToolTip.equippedToUse": "Must be equipped to use", "EquipmentToolTip.fameBonus": "Fame Bonus: {percent}", "EquipmentToolTip.fillPartyMagic": "Fill Party Magic", "EquipmentToolTip.incrementStat": "{statAmount}{statName}", "EquipmentToolTip.keyCodeToUse": "Press [{keyCode}] in world to use", "EquipmentToolTip.lightning": "Lightning: {data}", "EquipmentToolTip.mpCost": "MP Cost: {cost}", "EquipmentToolTip.notUsableBy": "Not usable by {unUsableClass}", @@ -965,16 +966,17 @@ "abyssOfDemons.Demon_Mage_of_the_Abyss": "Demon Mage of the Abyss", "abyssOfDemons.Demon_Warrior_of_the_Abyss": "Demon Warrior of the Abyss", "abyssOfDemons.Demon_of_the_Abyss": "Demon of the Abyss", "abyssOfDemons.Imp_of_the_Abyss": "Imp of the Abyss", "abyssOfDemons.LavaTrigger": "LavaTrigger", "abyssOfDemons.Malphas_Flamer": "Malphas Flamer", "abyssOfDemons.Malphas_Missile": "Malphas Missile", "abyssOfDemons.Malphas_Protector": "Malphas Protector", + "abyssOfDemons.White_Demon_of_the_Abyss": "White Demon of the Abyss", "activeEffect.ArmorBroken": "Armor Broken", "activeEffect.Armored": "Armored", "activeEffect.Berserk": "Berserk", "activeEffect.Damaging": "Damaging", "activeEffect.Drunk": "Drunk", "activeEffect.Hallucinating": "Hallucinating", "activeEffect.Healing": "Healing", "activeEffect.Hexed": "Hexed", @@ -3239,17 +3241,17 @@ "high.Undead_Dwarf_Warrior": "Undead Dwarf Warrior", "high.Urgle": "Urgle", "high.White_Dragon_Whelp": "White Dragon Whelp", "icecave.Big_Yeti": "Big Yeti", "icecave.Mini_Yeti": "Mini Yeti", "icecave.Snow_Bat": "Snow Bat", "icecave.Snow_Bat_Mama": "Snow Bat Mama", "icecave.ic_CreepyTime": "Creepy Weird Dark Spirit Mirror Image Monster", - "icecave.ic_Esben_the_Unwilling": "Esben the The Unwilling", + "icecave.ic_Esben_the_Unwilling": "Esben the Unwilling", "icecave.ic_Loot_Balloon": "Test Chest", "icecave.ic_Whirlwind": "Icy Whirlwind", "icecave.ic_boss_manager": "A Voice From Beyond", "icecave.ic_boss_purifier": "Cursed Grave", "icecave.ic_boss_purifier_generator": "ic boss purifier generator", "icecave.ic_boss_spawner_live": "A Strange Presence", "icecave.ic_shielded_king": "Creepy Weird Dark Spirit Mirror Image Monster", "item.emptySlot": "Empty {itemType} Slot",