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-04 23:00:39.615940600 +0000 +++ ./constants.json 2014-12-11 23:30:36.786282843 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "26.0", - "MINOR_VERSION": "1", + "BUILD_VERSION": "27.0", + "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/GroundTypes.json ./json/GroundTypes.json --- ../current/json/GroundTypes.json 2014-11-06 20:10:24.343301154 +0000 +++ ./json/GroundTypes.json 2014-12-11 23:30:22.014260415 +0000 @@ -2184,18 +2184,19 @@ "Index": "0x1bb" }, { "File": "lofiObj3", "Index": "0x1bc" } ] }, + "SlideAmount": "0.95", "BlendPriority": "20", - "Speed": ".888" + "Speed": "1" }, { "type": "0xb9", "id": "Snow", "RandomTexture": { "Texture": [ { "File": "lofiObj3", 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-04 23:00:26.395940894 +0000 +++ ./json/Objects.json 2014-12-11 23:30:24.298263883 +0000 @@ -22822,17 +22822,17 @@ "id": "Skull of Endless Torment", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj2", "Index": "0x59" }, "SlotType": "19", - "Description": "This skull glows with stolen life force of Shaitan.", + "Description": "This skull glows with the stolen life force of Shaitan.", "ActivateOnEquip": [ { "_": "IncrementStat", "stat": "21", "amount": "3" }, { "_": "IncrementStat", @@ -24466,16 +24466,37 @@ "Activate": { "_": "Create", "id": "Forbidden Jungle Portal" }, "feedPower": "145", "DisplayId": "Totem Key" }, { + "type": "0x748C", + "id": "Ice Cave Key", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x54E" + }, + "SlotType": "10", + "Description": "It's cold in here.", + "Sound": "use_key", + "Consumable": "", + "Soulbound": "", + "Activate": { + "_": "Create", + "id": "Ice Cave Portal" + }, + "feedPower": "145", + "DisplayId": "Ice Cave Key" + }, + { "type": "0xc1a", "id": "Pollen Powder", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj2", "Index": "0x19" }, @@ -31908,26 +31929,120 @@ "id": "Puppet Master's Encore Key", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x1b" }, "SlotType": "10", - "Description": "{equip.A_key_which_opens_an_entrance_to_the_Puppet_MasterAPOSs_Enc}", + "Description": "A key which opens an entrance to the Puppet Master's Encore.", "Sound": "use_key", "Consumable": "", "Soulbound": "", "Activate": { "_": "Create", "id": "Puppet Encore Portal" }, "feedPower": "200", - "DisplayId": "{equip.Puppet_MasterAPOSs_Encore_Key}" + "DisplayId": "Puppet Master's Encore Key" + }, + { + "type": "0x766", + "id": "Staff of Esben", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x550" + }, + "SlotType": "17", + "Description": "Perhaps all that remains of Esben, whoever he was. Thanks to Pfiffel for Design Concept.", + "RateOfFire": "0.7", + "Sound": "weapon/sprite_wand", + "Projectile": { + "ObjectId": "Pfiffel Esben Shot", + "Speed": "100", + "Size": "90", + "MinDamage": "60", + "MaxDamage": "95", + "LifetimeMS": "720", + "Amplitude": "1.35", + "Frequency": "0.49", + "MultiHit": "" + }, + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "20", + "amount": "1" + }, + { + "_": "IncrementStat", + "stat": "22", + "amount": "3" + } + ], + "BagType": "6", + "FameBonus": "4", + "NumProjectiles": "2", + "ArcGap": "0", + "OldSound": "magicShoot", + "feedPower": "400", + "Soulbound": "", + "DisplayId": "Staff of Esben" + }, + { + "type": "0x767", + "id": "Skullish Remains of Esben", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x551" + }, + "SlotType": "19", + "Description": "The skull still seems to contain some of the Dark Spirit's power.", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "22", + "amount": "-3" + }, + { + "_": "IncrementStat", + "stat": "20", + "amount": "4" + } + ], + "Usable": "", + "BagType": "6", + "FameBonus": "4", + "MpCost": "135", + "Activate": [ + { + "_": "VampireBlast", + "radius": "3", + "totalDamage": "150" + }, + { + "_": "GenericActivate", + "effect": "Slowed", + "duration": "2.5", + "range": "3", + "color": "0x05c2b5", + "target": "enemy", + "center": "mouse", + "visualEffect": "0", + "useWisMod": "false" + } + ], + "feedPower": "250", + "Soulbound": "", + "DisplayId": "Skullish Remains of Esben" }, { "type": "0x0dc0", "id": "Great Temple Snake", "Class": "Character", "Enemy": "", "Size": "100", "ShadowSize": "90", @@ -37470,16 +37585,490 @@ "Speed": "55", "Size": "140", "LifetimeMS": "800" } ], "DisplayId": "Beer God" }, { + "type": "0x762", + "id": "ic CreepyTime", + "DisplayId": "Creepy Weird Dark Spirit Mirror Image Monster", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "122" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "200", + "MaxHitPoints": "3000", + "Defense": "0", + "XpMult": "0.0", + "Projectile": { + "id": "0", + "ObjectId": "Ice Bullet", + "Speed": "35", + "ArmorPiercing": "", + "MinDamage": "20", + "MaxDamage": "32", + "LifetimeMS": "1500", + "ConditionEffect": [ + { + "_": "Quiet", + "duration": "1.5" + }, + { + "_": "Dazed", + "duration": "1.5" + } + ] + } + }, + { + "type": "0x765", + "id": "ic Whirlwind", + "DisplayId": "Icy Whirlwind", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "117" + }, + "HitSound": "monster/dark_elves_hit", + "DeathSound": "monster/dark_elves_death", + "Size": "100", + "MaxHitPoints": "3000", + "Defense": "0", + "XpMult": "0.0", + "Projectile": [ + { + "id": "0", + "ObjectId": "Ice Burst", + "Damage": "70", + "Speed": "25", + "LifetimeMS": "1000", + "ArmorPiercing": "", + "MultiHit": "", + "Size": "100" + }, + { + "id": "1", + "ObjectId": "Confuse Shuriken", + "Speed": "25", + "ArmorPiercing": "", + "MinDamage": "75", + "MaxDamage": "85", + "LifetimeMS": "1000", + "ConditionEffect": { + "_": "Confused", + "duration": "1.5" + } + } + ] + }, + { + "type": "0x748e", + "id": "ic boss spawner live", + "DisplayId": "A Strange Presence", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "invisible", + "Index": "0" + }, + "NoMiniMap": "", + "Size": "100", + "ShadowSize": "0", + "XpMult": "0.0", + "StasisImmune": "" + }, + { + "type": "0x764", + "id": "ic boss manager", + "DisplayId": "A Voice From Beyond", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "invisible", + "Index": "0" + }, + "NoMiniMap": "", + "Size": "100", + "ShadowSize": "0", + "XpMult": "0.0", + "StasisImmune": "" + }, + { + "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": "", + "AltTexture": { + "id": "1", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "122" + } + }, + "Projectile": { + "id": "0", + "ObjectId": "Ice Bullet", + "Speed": "25", + "MinDamage": "20", + "MaxDamage": "20", + "LifetimeMS": "2000", + "ConditionEffect": { + "_": "Paralyzed", + "duration": "0.5" + } + }, + "DisplayId": "ic boss purifier generator" + }, + { + "type": "0x760", + "id": "ic boss purifier", + "DisplayId": "Cursed Grave", + "Class": "Character", + "Model": "Monument 3", + "Texture": { + "File": "lofiObjBig", + "Index": "0x32" + }, + "HitSound": "monster/trees_hit", + "DeathSound": "monster/trees_death", + "MaxHitPoints": "8000", + "XpMult": "0.0", + "Size": "100", + "Enemy": "", + "StasisImmune": "", + "Projectile": { + "id": "0", + "ObjectId": "Paralyze Bullet", + "Damage": "0", + "Speed": "30", + "Size": "125", + "LifetimeMS": "2200", + "ConditionEffect": { + "_": "Paralyzed", + "duration": "0.7" + } + } + }, + { + "type": "0x763", + "id": "ic shielded king", + "DisplayId": "Creepy Weird Dark Spirit Mirror Image Monster", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "122" + }, + "Effect": { + "_": "XMLEffect", + "particle": "SwirlingMist", + "cooldown": "0.5" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "100", + "MaxHitPoints": "3500", + "Defense": "0", + "XpMult": "0.0", + "Projectile": { + "id": "0", + "ObjectId": "Ice Burst", + "Damage": "60", + "Speed": "60", + "LifetimeMS": "2000", + "ArmorPiercing": "", + "MultiHit": "", + "Size": "100" + } + }, + { + "type": "0x75F", + "id": "ic Esben the Unwilling", + "DisplayId": "Esben the 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", + "AltTexture": [ + { + "id": "1", + "Texture": { + "File": "invisible", + "Index": "0" + }, + "Effect": { + "_": "XMLEffect", + "particle": "SwirlingMist", + "cooldown": "0.5" + } + }, + { + "id": "2", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "116" + } + }, + { + "id": "3", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "122" + } + } + ], + "Projectile": [ + { + "id": "0", + "ObjectId": "Sound Wave", + "Speed": "60", + "MinDamage": "70", + "MaxDamage": "70", + "LifetimeMS": "8000", + "ConditionEffect": { + "_": "Unstable", + "duration": "7" + }, + "Size": "100" + }, + { + "id": "1", + "ObjectId": "Armor Pierce Bullet", + "Damage": "75", + "Speed": "60", + "LifetimeMS": "8000", + "ArmorPiercing": "", + "MultiHit": "", + "Size": "100" + }, + { + "id": "2", + "ObjectId": "Ice Burst", + "Damage": "70", + "Speed": "60", + "LifetimeMS": "8000", + "ArmorPiercing": "", + "MultiHit": "", + "Size": "100" + }, + { + "id": "3", + "ObjectId": "Ice Bullet", + "Speed": "55", + "MinDamage": "40", + "MaxDamage": "50", + "LifetimeMS": "8000", + "ConditionEffect": [ + { + "_": "Quiet", + "duration": "3.5" + }, + { + "_": "Dazed", + "duration": "3.5" + } + ], + "Size": "100" + } + ] + }, + { + "type": "0x0e5b", + "id": "Snow Bat Mama", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "124" + }, + "HitSound": "monster/bats_hit", + "DeathSound": "monster/bats_death", + "MaxHitPoints": "4240", + "Defense": "10", + "XpMult": "1", + "Z": "0.14", + "Flying": "", + "Size": "120", + "ShadowSize": "80", + "Projectile": [ + { + "id": "0", + "ObjectId": "Confuse Shuriken", + "Damage": "80", + "Speed": "50", + "Size": "100", + "LifetimeMS": "1500", + "ConditionEffect": { + "_": "Dazed", + "duration": "0.5" + } + }, + { + "id": "1", + "ObjectId": "Confuse Shuriken", + "Damage": "80", + "Speed": "50", + "Size": "100", + "LifetimeMS": "1500", + "ConditionEffect": { + "_": "Confused", + "duration": "1.0" + } + }, + { + "id": "2", + "ObjectId": "Confuse Shuriken", + "Damage": "80", + "Speed": "50", + "Size": "100", + "LifetimeMS": "1500", + "ConditionEffect": { + "_": "Confused", + "duration": "2.75" + } + }, + { + "id": "3", + "ObjectId": "Sonic Bat Spinner", + "Damage": "80", + "Speed": "65", + "Size": "100", + "LifetimeMS": "2000", + "ConditionEffect": { + "_": "Unstable", + "duration": "2.75" + } + } + ], + "DisplayId": "Snow Bat Mama" + }, + { + "type": "0x0e5a", + "id": "Snow Bat", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "119" + }, + "HitSound": "monster/bats_hit", + "DeathSound": "monster/bats_death", + "MaxHitPoints": "1200", + "Defense": "5", + "XpMult": "0", + "Z": "0.24", + "Flying": "", + "Size": "80", + "ShadowSize": "80", + "Projectile": { + "id": "0", + "ObjectId": "Invisible", + "Damage": "77", + "Speed": "0", + "Size": "80", + "LifetimeMS": "100" + }, + "DisplayId": "Snow Bat" + }, + { + "type": "0x0e59", + "id": "Mini Yeti", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "118" + }, + "HitSound": "monster/default_hit", + "DeathSound": "monster/dark_elves_death", + "Size": "100", + "XpMult": "0", + "ShadowSize": "100", + "MaxHitPoints": "2890", + "Projectile": { + "id": "0", + "ObjectId": "Ice Burst", + "Damage": "60", + "Speed": "40", + "LifetimeMS": "3000", + "ArmorPiercing": "", + "Size": "100" + }, + "DisplayId": "Mini Yeti" + }, + { + "type": "0x0e58", + "id": "Big Yeti", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "123" + }, + "HitSound": "monster/default_hit", + "DeathSound": "monster/dark_elves_death", + "Size": "120", + "ShadowSize": "80", + "MaxHitPoints": "7000", + "XpMult": "1", + "Defense": "0", + "BloodProb": "0.5", + "BloodColor": "0xED454D", + "Projectile": { + "id": "0", + "ObjectId": "Ice Burst", + "Damage": "60", + "Speed": "60", + "LifetimeMS": "2000", + "ArmorPiercing": "", + "Size": "100" + }, + "DisplayId": "Big Yeti" + }, + { + "type": "0x768", + "id": "ic Loot Balloon", + "DisplayId": "Test Chest", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x466" + }, + "MaxHitPoints": "120000", + "Size": "160", + "XpMult": "0.0" + }, + { "type": "0x7461", "id": "Puppet Master v2", "DisplayId": "The Puppet Master", "Class": "Character", "Group": "Master", "Enemy": "", "AnimatedTexture": { "File": "d3Chars16x16rEmbed", @@ -47322,16 +47911,17 @@ "Terrain": "Mountains", "SpawnProb": "1.0", "Spawn": { "Mean": "2", "StdDev": "1", "Min": "2", "Max": "4" }, + "PerRealmMax": "200", "Flying": "", "God": "", "Projectile": { "id": "0", "ObjectId": "White Demon Shot", "Damage": "45", "Speed": "50", "LifetimeMS": "2000", @@ -50808,26 +51398,50 @@ "XpMult": "0.0", "StasisImmune": "", "StunImmune": "", "DisplayId": "Puppet Theatre Boss Spawn" }, { "type": "0x7466", "id": "Puppet Encore Portal", - "DisplayId": "{objects.Puppet_Encore_Portal}", + "DisplayId": "The Puppet Master's Encore", "Class": "Portal", "IntergamePortal": "", "DungeonName": "Puppet Master's Encore", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x1a" } }, { + "type": "0x748b", + "id": "Ice Cave Portal", + "DisplayId": "Ice Cave", + "Class": "Portal", + "IntergamePortal": "", + "DungeonName": "Ice Cave", + "Texture": { + "File": "lofiObj3", + "Index": "0x54F" + } + }, + { + "type": "0x748d", + "id": "Inner Sanctum Portal", + "Class": "Portal", + "IntergamePortal": "", + "DungeonName": "The Inner Sanctum", + "Texture": { + "File": "lofiObj3", + "Index": "0x54F" + }, + "DisplayId": "Inner Sanctum Portal" + }, + { "type": "0x744D", "id": "Event Chest", "DisplayId": "Event Chest", "Class": "Character", "Enemy": "", "Texture": { "File": "lofiObj3", "Index": "0x466" @@ -65741,16 +66355,26 @@ "id": "Dark Purple Magic", "Class": "Projectile", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x19" } }, { + "type": "0x2377", + "id": "Pfiffel Esben Shot", + "Class": "Projectile", + "Texture": { + "File": "lofiObj3", + "Index": "0x552" + }, + "AngleCorrection": "1" + }, + { "type": "0x7433", "id": "The Puppet Master", "DisplayId": "The Puppet Master", "Class": "Character", "Group": "Master", "Enemy": "", "AnimatedTexture": { "File": "chars16x16rEncounters", @@ -70875,17 +71499,17 @@ "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "82" }, "PlayerClassType": "0x031e", "UnlockSpecial": "Unlocked during Halloween 2014. Thanks to: Beige", - "DisplayId": "{skins.FrankensteinAPOSs_Monster}" + "DisplayId": "Frankenstein's Monster" }, { "type": "0x7470", "id": "Jack the Ripper", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", @@ -79986,17 +80610,17 @@ "Top": { "Texture": { "File": "lofiObj3", "Index": "0x3a5" } }, "HitSound": "monster/stone_walls_hit", "DeathSound": "monster/stone_walls_death", - "MaxHitPoints": "500", + "MaxHitPoints": "5000", "Static": "", "FullOccupy": "", "OccupySquare": "", "EnemyOccupySquare": "", "Enemy": "", "XpMult": "0.0", "BlocksSight": "" }, @@ -90716,153 +91340,16 @@ "size": "3", "rise": "3", "riseVariance": ".1", "rangeX": "3.5", "rangeY": "1.5" } }, { - "type": "0x0e5b", - "id": "Snow Bat Mama", - "Enemy": "", - "Class": "Character", - "RemoteTexture": { - "Instance": "testing", - "Id": "7776164" - }, - "HitSound": "monster/bats_hit", - "DeathSound": "monster/bats_death", - "MaxHitPoints": "500", - "Defense": "10", - "XpMult": "1", - "Z": "0.14", - "Flying": "", - "Size": "120", - "ShadowSize": "80", - "Projectile": [ - { - "id": "0", - "ObjectId": "Sonic Bat Boom", - "Damage": "24", - "Speed": "80", - "Size": "200", - "LifetimeMS": "600" - }, - { - "id": "1", - "ObjectId": "Sonic Bat Boom", - "Damage": "12", - "Speed": "70", - "Size": "150", - "LifetimeMS": "600" - }, - { - "id": "2", - "ObjectId": "Sonic Bat Boom", - "Damage": "6", - "Speed": "60", - "Size": "100", - "LifetimeMS": "600" - }, - { - "id": "3", - "ObjectId": "Sonic Bat Spinner", - "Damage": "5", - "Speed": "65", - "Size": "100", - "LifetimeMS": "2000", - "ConditionEffect": { - "_": "Confused", - "duration": "3" - } - } - ] - }, - { - "type": "0x0e5a", - "id": "Snow Bat", - "Enemy": "", - "Class": "Character", - "RemoteTexture": { - "Instance": "testing", - "Id": "7776165" - }, - "HitSound": "monster/bats_hit", - "DeathSound": "monster/bats_death", - "MaxHitPoints": "25", - "Defense": "5", - "XpMult": "1", - "Z": "0.24", - "Flying": "", - "Size": "80", - "ShadowSize": "80", - "Projectile": { - "id": "0", - "ObjectId": "Invisible", - "Damage": "15", - "Speed": "0", - "Size": "80", - "ConditionEffect": { - "_": "Stasis", - "duration": "5", - "target": "1" - }, - "LifetimeMS": "100" - } - }, - { - "type": "0x0e59", - "id": "Mini Yeti", - "Enemy": "", - "Class": "Character", - "RemoteTexture": { - "Instance": "testing", - "Id": "7766504", - "Right": "" - }, - "HitSound": "monster/default_hit", - "DeathSound": "monster/dark_elves_death", - "Size": "100", - "ShadowSize": "100", - "MaxHitPoints": "250", - "Defense": "100", - "Projectile": { - "id": "0", - "ObjectId": "Yetti Attack SM", - "Damage": "15", - "Speed": "30", - "Size": "80", - "LifetimeMS": "1000", - "ConditionEffect": { - "_": "Unstable", - "duration": "3" - } - } - }, - { - "type": "0x0e58", - "id": "Big Yeti", - "Enemy": "", - "Class": "Character", - "RemoteTexture": { - "Instance": "testing", - "Id": "7775062", - "Right": "" - }, - "HitSound": "monster/default_hit", - "DeathSound": "monster/dark_elves_death", - "Size": "120", - "ShadowSize": "80", - "MaxHitPoints": "2000", - "Defense": "100", - "BloodProb": "0.5", - "BloodColor": "0xED454D" - }, - { "type": "0x0e16", "id": "LavaBomb", "Class": "Character", "RemoteTexture": { "Instance": "testing", "Id": "4798003", "Right": "" }, Binary files ../current/sheets/chars16x16rEncounters.png and ./sheets/chars16x16rEncounters.png differ Binary files ../current/sheets/chars8x8rEncounters.png and ./sheets/chars8x8rEncounters.png differ Binary files ../current/sheets/lofiCharBig.png and ./sheets/lofiCharBig.png differ Binary files ../current/sheets/lofiObj3.png and ./sheets/lofiObj3.png differ 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-11-14 01:40:22.608893646 +0000 +++ ./strings.json 2014-12-11 23:30:21.314259344 +0000 @@ -1109,21 +1109,23 @@ "dungeons.Lair_of_Shaitain": "Lair of Shaitain", "dungeons.Lair_of_Shaitan": "Lair of Shaitan", "dungeons.Mad_Lab": "Mad Lab", "dungeons.Manor_of_the_Immortals": "Manor of the Immortals", "dungeons.Mountain_Temple": "Mountain Temple", "dungeons.Ocean_Trench": "Ocean Trench", "dungeons.Parasite_Den": "Parasite Den", "dungeons.Pirate_Cave": "Pirate Cave", + "dungeons.Puppet_MasterAPOSs_Encore": "Puppet Master's Encore", "dungeons.Puppet_MasterAPOSs_Theatre": "Puppet Master's Theatre", "dungeons.Snake_Pit": "Snake Pit", "dungeons.Spider_Den": "Spider Den", "dungeons.Sprite_World": "Sprite World", "dungeons.The_Crawling_Depths": "The Crawling Depths", + "dungeons.The_Inner_Sanctum": "The Inner Sanctum", "dungeons.The_Ivory_Wyvern": "The Ivory Wyvern", "dungeons.The_Shatters": "The Shatters", "dungeons.Tomb_of_the_Ancients": "Tomb of the Ancients", "dungeons.Undead_Lair": "Undead Lair", "dungeons.Woodland_Labyrinth": "Woodland Labyrinth", "dye.clothing_description": "A vial of dye for coloring clothing", "dyes.Alice_Blue_Accessory_Dye": "Alice Blue Accessory Dye", "dyes.Alice_Blue_Clothing_Dye": "Alice Blue Clothing Dye", @@ -1737,16 +1739,17 @@ "equip.A_key_which_opens_an_entrance_to_a_Snake_Pit.": "A key which opens an entrance to a Snake Pit.", "equip.A_key_which_opens_an_entrance_to_a_Spider_Den.": "A key which opens an entrance to a Spider Den.", "equip.A_key_which_opens_an_entrance_to_a_Sprite_World.": "A key which opens an entrance to a Sprite World.", "equip.A_key_which_opens_an_entrance_to_a_Tomb_of_Ancients.": "A key which opens an entrance to a Tomb of Ancients.", "equip.A_key_which_opens_an_entrance_to_an_Abyss_of_Demons.": "A key which opens an entrance to an Abyss of Demons.", "equip.A_key_which_opens_an_entrance_to_an_Ocean_Trench.": "A key which opens an entrance to an Ocean Trench.", "equip.A_key_which_opens_an_entrance_to_an_Undead_Lair.": "A key which opens an entrance to an Undead Lair.", "equip.A_key_which_opens_an_entrance_to_the_Forest_Maze.": "A key which opens an entrance to the Forest Maze.", + "equip.A_key_which_opens_an_entrance_to_the_Puppet_MasterAPOSs_Enc": "A key which opens an entrance to the Puppet Master's Encore.", "equip.A_key_which_opens_an_entrance_to_the_Puppet_MasterAPOSs_The": "A key which opens an entrance to the Puppet Master's Theatre", "equip.A_key_which_opens_an_entrance_to_the_Tomb_of_the_Ancients.": "A key which opens an entrance to the Tomb of the Ancients.", "equip.A_key_which_opens_an_entrance_to_the_Woodland_Labyrinth.": "A key which opens an entrance to the Woodland Labyrinth.", "equip.A_key_which_opens_the_way_to_the_Candyland_Hunting_Grounds.": "A key which opens the way to the Candyland Hunting Grounds.", "equip.A_key_which_reveals_the_way_to_the_Mad_Lab.": "A key which reveals the way to the Mad Lab.", "equip.A_large_amethyst_set_in_a_glittering_gold_ring.": "A large amethyst set in a glittering gold ring.", "equip.A_large_citrine_set_in_a_glittering_gold_ring.": "A large citrine set in a glittering gold ring.", "equip.A_large_emerald_set_in_a_glittering_gold_ring.": "A large emerald set in a glittering gold ring.", @@ -2458,27 +2461,29 @@ "equip.Holy_Cross": "Holy Cross", "equip.Holy_Water": "Holy Water", "equip.Hunchback_Skin": "Hunchback Skin", "equip.Hunting_Trap": "Hunting Trap", "equip.Huntsman_Skin": "Huntsman Skin", "equip.Hydra_Skin_Armor": "Hydra Skin Armor", "equip.IAPOSm_not_really_sure_where_the_term_APOSwitchAPOS_came_fr": "I'm not really sure where the term 'witch' came from.", "equip.I_was_a_fool_before,_but_now_everything_is_so_clear._The_ph": "I was a fool before, but now everything is so clear. The phylactery speaks to me, knows me, protects me.", + "equip.Ice_Cave_Key": "Ice Cave Key", "equip.Ice_Star": "Ice Star", "equip.Ichimonji": "Ichimonji", "equip.Illusion_Prism": "Illusion Prism", "equip.Impenetrable_forceplate_armor_worn_by_the_blackguard_conque": "Impenetrable forceplate armor worn by the blackguard conquerers of the necromantic uprising.", "equip.Imprisonment_Orb": "Imprisonment Orb", "equip.Indestructible_magical_armor_made_for_the_elite_stoneborn_c": "Indestructible magical armor made for the elite stoneborn champions of the eastern citadels.", "equip.Infected_Skin": "Infected Skin", "equip.Iron_Mail": "Iron Mail", "equip.Iron_Quiver": "Iron Quiver", "equip.Iron_Shield": "Iron Shield", "equip.Ironwood_Bow": "Ironwood Bow", + "equip.ItAPOSs_cold_in_here.": "It's cold in here.", "equip.It_doesnAPOSt_seem_like_drinking_this_would_be_a_good_idea.": "It doesn't seem like drinking this would be a good idea.", "equip.It_is_said_that_the_ring_attunes_itAPOSs_wearer_to_the_eart": "It is said that the ring attunes it's wearer to the earth and it's life force.", "equip.It_seems_to_dispense_special_runes_upon_use._Perhaps...some": "It seems to dispense special runes upon use. Perhaps...some things are better left unknown.", "equip.Jack_the_Ripper_Skin": "Jack the Ripper Skin", "equip.Jester_Skin": "Jester Skin", "equip.Jewel_Eye_Katana": "Jewel Eye Katana", "equip.Join_my_legions_of_infected,_hero._Thanks_to:_WunderWafe": "Join my legions of infected, hero. Thanks to: WunderWafe", "equip.Kendo_Stick": "Kendo Stick", @@ -2586,16 +2591,17 @@ "equip.Only_cheaters_wear_this_robe.": "Only cheaters wear this robe.", "equip.Onyx_Shield_of_the_Mad_God": "Onyx Shield of the Mad God", "equip.Orange_Drake_Egg": "Orange Drake Egg", "equip.Orb_of_Conflict": "Orb of Conflict", "equip.Oryx_Stout": "Oryx Stout", "equip.Outstanding_leather_armor_made_from_the_virtually_impregnab": "Outstanding leather armor made from the virtually impregnable hide of a great desert wyrm.", "equip.Pearl_Necklace": "Pearl Necklace", "equip.Penetrating_Blast_Spell": "Penetrating Blast Spell", + "equip.Perhaps_all_that_remains_of_Esben,_whoever_he_was._Thanks_t": "Perhaps all that remains of Esben, whoever he was. Thanks to Pfiffel for Design Concept.", "equip.PharaohAPOSs_Mask": "Pharaoh's Mask", "equip.Piercing._Thought_to_have_been_lost_to_the_ages,_the_wisdom": "Piercing. Thought to have been lost to the ages, the wisdom imparted in this tablet will summon a power unrivaled by any modern spell.", "equip.Pink_Passion_Breeze": "Pink Passion Breeze", "equip.Pirate_Cave_Key": "Pirate Cave Key", "equip.Pirate_KingAPOSs_Cutlass": "Pirate King's Cutlass", "equip.Pirate_Rum": "Pirate Rum", "equip.Pit_Viper_Poison": "Pit Viper Poison", "equip.Pixie-Enchanted_Sword": "Pixie-Enchanted Sword", @@ -2629,16 +2635,17 @@ "equip.Power_Wand": "Power Wand", "equip.Precisely_Calibrated_Stringstick": "Precisely Calibrated Stringstick", "equip.Prism_of_Apparitions": "Prism of Apparitions", "equip.Prism_of_Dancing_Swords": "Prism of Dancing Swords", "equip.Prism_of_Figments": "Prism of Figments", "equip.Prism_of_Phantoms": "Prism of Phantoms", "equip.Protect_the_helpless,_embolden_the_heroic,_dispense_justice": "Protect the helpless, embolden the heroic, dispense justice to the unjust. - Inscription, in Fae.", "equip.Protect_the_helpless,_embolden_the_heroic,_slow_the_progres": "Protect the helpless, embolden the heroic, slow the progress of evil. - Inscription, in Fae.", + "equip.Puppet_MasterAPOSs_Encore_Key": "Puppet Master's Encore Key", "equip.Puppet_Master_Skin": "Puppet Master Skin", "equip.Purple_Drake_Egg": "Purple Drake Egg", "equip.Purple_Gumball": "Purple Gumball", "equip.Pyramid_Revenant_Skin": "Pyramid Revenant Skin", "equip.Quiver_of_Elvish_Mastery": "Quiver of Elvish Mastery", "equip.Quiver_of_Thunder": "Quiver of Thunder", "equip.Ragetalon_Dagger": "Ragetalon Dagger", "equip.Ranger_Skin": "Ranger Skin", @@ -2793,16 +2800,17 @@ "equip.Silver_Chainmail": "Silver Chainmail", "equip.Silver_Dagger": "Silver Dagger", "equip.Silver_Medal": "Silver Medal", "equip.Silver_Star": "Silver Star", "equip.Skeleton_Warrior_Skin": "Skeleton Warrior Skin", "equip.Skeletons_are_basically_the_scariest_thing_ever.": "Skeletons are basically the scariest thing ever.", "equip.Skull-splitter_Sword": "Skull-splitter Sword", "equip.Skull_of_Endless_Torment": "Skull of Endless Torment", + "equip.Skullish_Remains_of_Esben": "Skullish Remains of Esben", "equip.Sky_Edge": "Sky Edge", "equip.Skysplitter_Sword": "Skysplitter Sword", "equip.Slayer_Staff": "Slayer Staff", "equip.Slime_Archer_Skin": "Slime Archer Skin", "equip.Slime_Assassin_Skin": "Slime Assassin Skin", "equip.Slime_Huntress_Skin": "Slime Huntress Skin", "equip.Slime_Knight_Skin": "Slime Knight Skin", "equip.Slime_Mystic_Skin": "Slime Mystic Skin", @@ -2840,16 +2848,17 @@ "equip.Spirit_Salve_Tome": "Spirit Salve Tome", "equip.Sprite_Wand": "Sprite Wand", "equip.Sprite_World_Key": "Sprite World Key", "equip.St._AbrahamAPOSs_Wand": "St. Abraham's Wand", "equip.Staff_of_Adoration": "Staff of Adoration", "equip.Staff_of_Astral_Knowledge": "Staff of Astral Knowledge", "equip.Staff_of_Destruction": "Staff of Destruction", "equip.Staff_of_Diabolic_Secrets": "Staff of Diabolic Secrets", + "equip.Staff_of_Esben": "Staff of Esben", "equip.Staff_of_Extreme_Prejudice": "Staff of Extreme Prejudice", "equip.Staff_of_Horrific_Knowledge": "Staff of Horrific Knowledge", "equip.Staff_of_Horror": "Staff of Horror", "equip.Staff_of_Necrotic_Arcana": "Staff of Necrotic Arcana", "equip.Staff_of_the_Cosmic_Whole": "Staff of the Cosmic Whole", "equip.Staff_of_the_Crystal_Serpent": "Staff of the Crystal Serpent", "equip.Staff_of_the_Fundamental_Core": "Staff of the Fundamental Core", "equip.Staff_of_the_Rising_Sun": "Staff of the Rising Sun", @@ -2905,16 +2914,17 @@ "equip.The_azule_stone_makes_you_feel_ready_for_any_situation.": "The azule stone makes you feel ready for any situation.", "equip.The_dolomite_stone_makes_you_feel_able_to_stand_against_any": "The dolomite stone makes you feel able to stand against anything.", "equip.The_fabled_weapon_of_the_Sauce_Boss_himself.": "The fabled weapon of the Sauce Boss himself.", "equip.The_fool_represents_innocence,_it_is_the_beginning._When_in": "The fool represents innocence, it is the beginning. When inverted, the fool represents recklessness.", "equip.The_malachite_stone_makes_you_feel_at_peace_with_the_land.": "The malachite stone makes you feel at peace with the land.", "equip.The_sacred_blade_of_the_Cult_of_Admin._Not_to_be_trifled_wi": "The sacred blade of the Cult of Admin. Not to be trifled with.", "equip.The_sacred_blade_of_the_Cult_of_Admin.__Not_to_be_trifled_w": "The sacred blade of the Cult of Admin. Not to be trifled with.", "equip.The_skull_of_a_vampire_lord,_further_desecrated_with_the_de": "The skull of a vampire lord, further desecrated with the depraved magics of soul thievery.", + "equip.The_skull_still_seems_to_contain_some_of_the_Dark_SpiritAPO": "The skull still seems to contain some of the Dark Spirit's power.", "equip.The_unusual_shots_that_this_staff_fires_have_been_known_to_": "The unusual shots that this staff fires have been known to bind the hearts of your foes for all eternity, or at least until death do you part.", "equip.Theatre_Key": "Theatre Key", "equip.This?_DonAPOSt_be_afraid_of_me._My_spell_just_backfired,_it": "This? Don't be afraid of me. My spell just backfired, it will wear off soon.", "equip.This_blade_is_drenched_in_the_blood_of_heroes._Are_you_sure": "This blade is drenched in the blood of heroes. Are you sure this blade is meant for you?", "equip.This_bunny_is_hopping_mad_that_players_have_been_looting_al": "This bunny is hopping mad that players have been looting all the eggs he hid.", "equip.This_colorful_platemail_is_enchanted_with_special_protectio": "This colorful platemail is enchanted with special protections, a gift from the kind fairies that dwell in the Realm.", "equip.This_dagger_is_said_to_point_in_the_direction_of_the_one_yo": "This dagger is said to point in the direction of the one you love. Or intend to stab. Thanks to: ngbro", "equip.This_foul-smelling_spider_ichor_restores_health.": "This foul-smelling spider ichor restores health.", @@ -2923,16 +2933,17 @@ "equip.This_legendary_sword_is_used_to_summon_the_beautiful_power_": "This legendary sword is used to summon the beautiful power of bears.", "equip.This_massive_shield_was_created_for_the_wealthy_and_powerfu": "This massive shield was created for the wealthy and powerful Ogre kings as a sign of their unrivaled strength.", "equip.This_orb_of_ancient_bloodstone_has_a_dark_reputation_of_twi": "This orb of ancient bloodstone has a dark reputation of twisting those who wield it.", "equip.This_prism_has_a_deep_flaw_that_causes_it_to_scatter_light_": "This prism has a deep flaw that causes it to scatter light in two directions.", "equip.This_probably_doesnAPOSt_have_a_chance_of_making_monsters_f": "This probably doesn't have a chance of making monsters fall in love with you. I mean, I don't think so.", "equip.This_scepterAPOSs_blast_is_so_powerful_it_will_slow_opponen": "This scepter's blast is so powerful it will slow opponents.", "equip.This_skull_glows_with_stolen_life_force_of_Shaitan.": "This skull glows with stolen life force of Shaitan.", "equip.This_skull_glows_with_stolen_lifeforce_of_ancient_demons.": "This skull glows with stolen lifeforce of ancient demons.", + "equip.This_skull_glows_with_the_stolen_life_force_of_Shaitan.": "This skull glows with the stolen life force of Shaitan.", "equip.This_spellAPOSs_destructive_power_is_so_notorious_that_cast": "This spell's destructive power is so notorious that casting it was banned for many generations.", "equip.This_strange_quiver_that_was_created_in_a_forgotten_age_by_": "This strange quiver that was created in a forgotten age by a lost tribe of Dark Elves.", "equip.This_strange_weapon_was_used_by_ancient_battle_mages_to_det": "This strange weapon was used by ancient battle mages to deter invaders. The secret to its construction has long been lost.", "equip.This_wand_has_been_used_countless_times_to_raise_Lord_Ruthv": "This wand has been used countless times to raise Lord Ruthven from the dead.", "equip.This_wand_is_powerful_at_conducting_magical_energy_into_a_d": "This wand is powerful at conducting magical energy into a devastating blast.", "equip.This_was_all_the_rage_a_few_Winter_Solstices_ago.__Rarity:_": "This was all the rage a few Winter Solstices ago. Rarity: Common", "equip.Thought_to_have_been_lost_to_the_ages,_the_wisdom_imparted_": "Thought to have been lost to the ages, the wisdom imparted in this tablet will summon a power unrivaled by any modern spell.", "equip.Thousand_Shot": "Thousand Shot", @@ -3223,16 +3234,29 @@ "high.Top_Vertical_Trap": "Trap Element", "high.Undead_Dwarf_Axebearer": "Undead Dwarf Axebearer", "high.Undead_Dwarf_God": "Undead Dwarf God", "high.Undead_Dwarf_King": "Undead Dwarf King", "high.Undead_Dwarf_Mage": "Undead Dwarf Mage", "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_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", "item.toolTip": "item", "kitchen.Break_through_the_wall|and_show_them_what|youAPOSre_made_": "Break through the wall|and show them what|you're made of!", "kitchen.It_is_time_to_take_on|your_first_true_minion_of_Oryx": "It is time to take on|your first true minion of Oryx", "kitchen.Start_on_the_beachBANG|Forests_are_dangerous|for_the_inex": "Start on the beach!|Forests are dangerous|for the inexperienced!", "kitchen.This_portal_leads|to_OryxAPOSs_RealmBANG": "This portal leads|to Oryx's Realm!", "kitchen.You_have_defeated|your_first_minion_of_OryxBANG": "You have defeated|your first minion of Oryx!", "kitchen.Your_progress_is|saved_automatically": "Your progress is|saved automatically", @@ -3688,17 +3712,19 @@ "objects.Green_Den_Spider_Hatchling": "Green Den Spider Hatchling", "objects.Guild_Explanation_Portal": "Guild Explanation", "objects.Guild_Hall_Portal": "Guild Hall Portal", "objects.Guild_Hall_Upgrade_1": "Guild Hall Upgrade", "objects.Guild_Hall_Upgrade_2": "Guild Hall Upgrade", "objects.Guild_Hall_Upgrade_3": "Guild Hall Upgrade", "objects.Halloween_Bat": "Halloween Bat", "objects.Haunted_Cemetery_Portal": "Haunted Cemetery Portal", + "objects.Ice_Cave_Portal": "Ice Cave", "objects.Ico": "Ico", + "objects.Inner_Sanctum_Portal": "Inner Sanctum Portal", "objects.Invisible_Placeholder": "Invisible Placeholder", "objects.Kitchen_Portal": "Kitchen Portal", "objects.Lair_of_Shaitain_Portal": "Shaitan's Portal", "objects.Lair_of_Shaitan_Portal": "Shaitan's Portal", "objects.Locked_Wine_Cellar_Portal": "Locked Wine Cellar Portal", "objects.Loot_Bag": "Loot Bag", "objects.Loot_Bag_2": "Loot Bag", "objects.Loot_Bag_3": "Loot Bag", @@ -3721,16 +3747,17 @@ "objects.Ocean_Vent": "Ocean Vent", "objects.Octa": "Octa", "objects.Pet_Upgrader": "Pet Upgrader", "objects.Pet_Yard_Portal": "{objects.Pet_Yard_Portal}", "objects.Pirate_Cave_Portal": "Pirate Cave Portal", "objects.Portal_of_Cowardice": "Portal of Cowardice", "objects.Portal_to_Nexus": "Portal to Nexus", "objects.Pumpkin1": "Creepy Talking Jack-O-Lantern", + "objects.Puppet_Encore_Portal": "The Puppet Master's Encore", "objects.Puppet_Theatre_Boss_Spawn": "Puppet Theatre Boss Spawn", "objects.Puppet_Theatre_Observer_Halls": "Puppet Theatre Observer Halls", "objects.Puppet_Theatre_Observer_Halls_2": "Puppet Theatre Observer Halls 2", "objects.Puppet_Theatre_Portal": "The Puppet Master's Theatre", "objects.Pyramid": "Pyramid", "objects.Quest_Rewards": "The Tinkerer", "objects.Quest_Rewards_Inv_Object": "Quest Rewards Inv Object", "objects.Random_Realm_Portal": "Random Realm Portal", @@ -4925,16 +4952,17 @@ "skins.Demon_Spawn": "Demon Spawn", "skins.Down_Under": "Down Under", "skins.Drow_Trickster": "Drow Trickster", "skins.Elder_Wizard": "Elder Wizard", "skins.Eligible_Bachelor": "Eligible Bachelor", "skins.Father_Time": "Father Time", "skins.Forest_Ward": "Forest Ward", "skins.Founding_Father": "Founding Father", + "skins.FrankensteinAPOSs_Monster": "Frankenstein's Monster", "skins.Frankensteins_Monster": "Frankensteins Monster", "skins.Geb_Set_Skin": "Geb Set Skin", "skins.Gentleman": "Gentleman", "skins.Ghost_Huntress": "Ghost Huntress", "skins.Holy_Avenger": "Holy Avenger", "skins.Hunchback": "Hunchback", "skins.Huntsman": "Huntsman", "skins.Iceman": "Iceman",