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-09-19 00:10:36.233828467 +0000 +++ ./constants.json 2014-09-26 00:20:36.240544518 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "23.2", - "MINOR_VERSION": "1", + "BUILD_VERSION": "24.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/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2014-09-19 00:10:24.453833827 +0000 +++ ./json/Objects.json 2014-09-26 00:20:24.176548886 +0000 @@ -23452,29 +23452,29 @@ "_": "IncrementStat", "stat": "0", "amount": "40" } ], "Usable": "", "BagType": "6", "FameBonus": "6", - "MpCost": "85", + "MpCost": "95", "Activate": [ { "_": "Decoy", "duration": "5" }, { "_": "Decoy", "duration": "5", "angleOffset": "180" } ], - "feedPower": "0", + "feedPower": "400", "Soulbound": "", "DisplayId": "Prism of Dancing Swords" }, { "type": "0xb21", "id": "Chicken Leg of Doom", "Class": "Equipment", "Item": "", @@ -29757,26 +29757,26 @@ "setType": "0x0001", "Class": "Equipment", "Item": "", "Texture": { "File": "d3LofiObjEmbed", "Index": "0x00" }, "SlotType": "7", + "Tier": "13", "Description": "A piece of heavy plate mail forged in the dungeons of Oryx's castle, it is decorated with dark red Almandine stones.", "ActivateOnEquip": { "_": "IncrementStat", "stat": "21", "amount": "24" }, "BagType": "4", "FameBonus": "4", "feedPower": "435", - "Soulbound": "", "DisplayId": "Almandine Armor of Anger" }, { "type": "0x2338", "id": "Almandine Ring of Wrath", "setType": "0x0001", "Class": "Equipment", "Item": "", @@ -29849,17 +29849,16 @@ }, "Usable": "", "BagType": "4", "FameBonus": "4", "MpCost": "100", "Activate": "Shoot", "NumProjectiles": "5", "feedPower": "380", - "Soulbound": "", "DisplayId": "Onyx Shield of the Mad God" }, { "type": "0x233a", "id": "The Devil Tarot Card", "Class": "Equipment", "Item": "", "SlotType": "10", @@ -30132,16 +30131,36 @@ "_": "UnlockSkin", "skinType": "9028" }, "Consumable": "", "BagType": "1", "DisplayId": "Slime Necromancer Skin" }, { + "type": "0x2352", + "id": "Theatre Key", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x4FF" + }, + "SlotType": "10", + "Description": "A key which opens an entrance to the Puppet Master's Theatre", + "Sound": "use_key", + "Consumable": "", + "Soulbound": "", + "Activate": { + "_": "Create", + "id": "Puppet Theatre Portal" + }, + "DisplayId": "Theatre Key" + }, + { "type": "0x234E", "id": "Slime Assassin Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "playerskins", "Index": "28" }, @@ -30265,16 +30284,108 @@ "Consumable": "", "Soulbound": "", "Activate": "MysteryPortal", "feedPower": "225", "Track": "", "DisplayId": "Emerald Mystery Key" }, { + "type": "0x7448", + "id": "Harlequin Armor", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x0b" + }, + "SlotType": "6", + "Description": "A festive piece of armor, complete with bells. Try not to get too crazy.", + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "21", + "amount": "14" + }, + { + "_": "IncrementStat", + "stat": "27", + "amount": "5" + }, + { + "_": "IncrementStat", + "stat": "22", + "amount": "3" + }, + { + "_": "IncrementStat", + "stat": "3", + "amount": "80" + } + ], + "FameBonus": "5", + "BagType": "6", + "feedPower": "250", + "Soulbound": "", + "DisplayId": "Harlequin Armor" + }, + { + "type": "0x7449", + "id": "Puppet Master Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "72" + }, + "SlotType": "10", + "Description": "A stunning costume to wear for your theatre debut.", + "Activate": { + "_": "UnlockSkin", + "skinType": "29770" + }, + "Consumable": "", + "BagType": "6", + "DisplayId": "Puppet Master Skin" + }, + { + "type": "0x744c", + "id": "Jester Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "73" + }, + "SlotType": "10", + "Description": "Hee Hee, Ha Ha, Ho Ho! Want to hear a joke?", + "Activate": { + "_": "UnlockSkin", + "skinType": "29771" + }, + "Consumable": "", + "BagType": "6", + "DisplayId": "Jester Skin" + }, + { + "type": "0x744D", + "id": "Event Chest", + "DisplayId": "Event Chest", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x466" + }, + "MaxHitPoints": "120000", + "Defense": "0", + "Size": "160", + "XpMult": "0.0" + }, + { "type": "0x0dc0", "id": "Great Temple Snake", "Class": "Character", "Enemy": "", "Size": "100", "ShadowSize": "90", "MaxHitPoints": "50", "Defense": "20", @@ -35815,388 +35926,16 @@ "Speed": "55", "Size": "140", "LifetimeMS": "800" } ], "DisplayId": "Beer God" }, { - "type": "0x7433", - "id": "The Puppet Master", - "DisplayId": "The Puppet Master", - "Class": "Character", - "Group": "Master", - "Enemy": "", - "AnimatedTexture": { - "File": "chars16x16rEncounters", - "Index": "120" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "120", - "ShadowSize": "25", - "MaxHitPoints": "110000", - "Defense": "30", - "XpMult": "1.5", - "Level": "20", - "StasisImmune": "", - "DazedImmune": "", - "ParalyzeImmune": "", - "Projectile": [ - { - "id": "0", - "ObjectId": "Jester Bolt", - "Speed": "30", - "MinDamage": "75", - "MaxDamage": "95", - "LifetimeMS": "4000" - }, - { - "id": "1", - "ObjectId": "Lightning Spiral", - "Speed": "60", - "MinDamage": "100", - "MaxDamage": "125", - "LifetimeMS": "4500", - "ConditionEffect": { - "_": "Paralyzed", - "duration": "2.5" - } - }, - { - "id": "2", - "ObjectId": "Big Zombie Blast", - "Speed": "100", - "MinDamage": "95", - "MaxDamage": "115", - "LifetimeMS": "2000", - "ConditionEffect": { - "_": "Slowed", - "duration": "2.5" - } - }, - { - "id": "3", - "ObjectId": "Armor Pierce Bullet", - "Speed": "30", - "ArmorPiercing": "", - "MinDamage": "75", - "MaxDamage": "85", - "LifetimeMS": "6000" - } - ], - "AltTexture": { - "id": "1", - "Texture": { - "File": "invisible", - "Index": "0" - } - } - }, - { - "type": "0x7435", - "id": "Puppet Wizard", - "DisplayId": "Wizard Puppet", - "Class": "Character", - "Enemy": "", - "AnimatedTexture": { - "File": "chars8x8rEncounters", - "Index": "105" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "120", - "ShadowSize": "25", - "MaxHitPoints": "8000", - "Defense": "15", - "XpMult": "0.4", - "Level": "20", - "StunImmune": "", - "Projectile": { - "id": "0", - "ObjectId": "White Bolt", - "Speed": "30", - "MinDamage": "50", - "MaxDamage": "65", - "LifetimeMS": "1500" - }, - "AltTexture": [ - { - "id": "1", - "Texture": { - "File": "lofiObj3", - "Index": "0x4ED" - } - }, - { - "id": "2", - "Texture": { - "File": "lofiObj3", - "Index": "0x4EE" - } - }, - { - "id": "3", - "Texture": { - "File": "lofiObj3", - "Index": "0x4EF" - } - }, - { - "id": "4", - "Texture": { - "File": "lofiObj3", - "Index": "0x4F0" - } - } - ] - }, - { - "type": "0x7436", - "id": "Puppet Knight", - "DisplayId": "Knight Puppet", - "Class": "Character", - "Enemy": "", - "AnimatedTexture": { - "File": "chars8x8rEncounters", - "Index": "103" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "120", - "ShadowSize": "25", - "MaxHitPoints": "9000", - "Defense": "25", - "XpMult": "0.4", - "Level": "20", - "StunImmune": "", - "Projectile": { - "id": "0", - "ObjectId": "Fire Shield", - "Speed": "30", - "MinDamage": "100", - "MaxDamage": "120", - "LifetimeMS": "1500", - "ConditionEffect": { - "_": "Armor Broken", - "duration": "4" - }, - "ParticleTrail": "0xf7941d" - } - }, - { - "type": "0x7437", - "id": "Puppet Priest", - "DisplayId": "Priest Puppet", - "Class": "Character", - "Group": "Healers", - "Enemy": "", - "AnimatedTexture": { - "File": "chars8x8rEncounters", - "Index": "104" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "120", - "ShadowSize": "25", - "MaxHitPoints": "7000", - "Defense": "18", - "XpMult": "0.4", - "Level": "20", - "StunImmune": "", - "StasisImmune": "", - "AltTexture": [ - { - "id": "1", - "Texture": { - "File": "lofiObj3", - "Index": "0x4F1" - } - }, - { - "id": "2", - "Texture": { - "File": "lofiObj3", - "Index": "0x4F2" - } - }, - { - "id": "3", - "Texture": { - "File": "lofiObj3", - "Index": "0x4F3" - } - }, - { - "id": "4", - "Texture": { - "File": "lofiObj3", - "Index": "0x4F4" - } - } - ] - }, - { - "type": "0x7438", - "id": "False Puppet Master", - "DisplayId": "The Puppet Master", - "Class": "Character", - "Group": "Master", - "Enemy": "", - "AnimatedTexture": { - "File": "chars16x16rEncounters", - "Index": "120" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "120", - "ShadowSize": "25", - "MaxHitPoints": "50000", - "Defense": "30", - "XpMult": "1.5", - "Level": "20", - "StasisImmune": "", - "DazedImmune": "", - "ParalyzeImmune": "", - "Projectile": [ - { - "id": "0", - "ObjectId": "Jester Bolt", - "Speed": "30", - "MinDamage": "75", - "MaxDamage": "95", - "LifetimeMS": "4000" - }, - { - "id": "2", - "ObjectId": "Big Zombie Blast", - "Speed": "100", - "MinDamage": "95", - "MaxDamage": "115", - "LifetimeMS": "2000", - "ConditionEffect": { - "_": "Slowed", - "duration": "2.5" - } - } - ] - }, - { - "type": "0x7439", - "id": "Healer Puppet", - "DisplayId": "Priest Puppet", - "Class": "Character", - "Group": "Healers", - "Enemy": "", - "AnimatedTexture": { - "File": "chars8x8rEncounters", - "Index": "104" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "100", - "ShadowSize": "25", - "MaxHitPoints": "7000", - "Defense": "15", - "XpMult": "0.4", - "Level": "20", - "StasisImmune": "", - "Projectile": { - "id": "0", - "ObjectId": "Purple Magic", - "Speed": "50", - "MinDamage": "100", - "MaxDamage": "110", - "LifetimeMS": "1500" - } - }, - { - "type": "0x743a", - "id": "Archer Puppet", - "DisplayId": "Archer Puppet", - "Class": "Character", - "Group": "DPS", - "Enemy": "", - "AnimatedTexture": { - "File": "chars8x8rEncounters", - "Index": "115" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "100", - "ShadowSize": "25", - "MaxHitPoints": "8000", - "Defense": "25", - "XpMult": "0.4", - "Level": "20", - "ParalyzeImmune": "", - "Projectile": [ - { - "id": "0", - "ObjectId": "Gold Arrow", - "Speed": "50", - "MinDamage": "95", - "MaxDamage": "110", - "LifetimeMS": "1200", - "ConditionEffect": { - "_": "Slowed", - "duration": "4" - } - }, - { - "id": "1", - "ObjectId": "Indigo Arrow", - "Speed": "75", - "Damage": "125", - "LifetimeMS": "1600", - "ConditionEffect": { - "_": "Paralyzed", - "duration": "2" - } - } - ] - }, - { - "type": "0x743b", - "id": "Rogue Puppet", - "DisplayId": "Rogue Puppet", - "Class": "Character", - "Group": "DPS", - "Enemy": "", - "AnimatedTexture": { - "File": "chars8x8rEncounters", - "Index": "110" - }, - "HitSound": "monster/skeletons_hit", - "DeathSound": "monster/skeletons_death", - "Size": "100", - "ShadowSize": "25", - "MaxHitPoints": "8000", - "Defense": "20", - "XpMult": "0.4", - "Level": "20", - "ParalyzeImmune": "", - "Projectile": { - "id": "0", - "ObjectId": "Darkness Bolt", - "Speed": "50", - "MinDamage": "100", - "MaxDamage": "120", - "LifetimeMS": "800" - }, - "AltTexture": { - "id": "1", - "Texture": { - "File": "invisible", - "Index": "0" - } - } - }, - { "type": "0x7500", "id": "NM Altar of Draconis", "DisplayId": "Altar of Draconis", "Class": "Character", "Texture": { "File": "lofiObjBig", "Index": "0xda" }, @@ -48684,46 +48423,42 @@ "Index": "0x4f8" } } ] }, "DisplayId": "Daily Quest Portal" }, { - "type": "0x743c", - "id": "Puppet Theatre Observer Halls", - "Class": "Character", - "Enemy": "", + "type": "0x2353", + "id": "Puppet Theatre Portal", + "DisplayId": "The Puppet Master's Theatre", + "Class": "Portal", + "IntergamePortal": "", + "DungeonName": "Puppet Master's Theatre", "Texture": { - "File": "invisible", - "Index": "0" - }, - "NoMiniMap": "", - "Size": "0", - "XpMult": "0.0", - "StasisImmune": "", - "StunImmune": "", - "DisplayId": "Puppet Theatre Observer Halls" + "File": "lofiObj3", + "Index": "0x4FE" + } }, { - "type": "0x743d", - "id": "Puppet Theatre Observer Halls 2", + "type": "0x7443", + "id": "Puppet Theatre Boss Spawn", "Class": "Character", "Enemy": "", "Texture": { "File": "invisible", "Index": "0" }, "NoMiniMap": "", "Size": "0", "XpMult": "0.0", "StasisImmune": "", "StunImmune": "", - "DisplayId": "Puppet Theatre Observer Halls 2" + "DisplayId": "Puppet Theatre Boss Spawn" }, { "type": "0x1700", "id": "Fishman Warrior", "Group": "Ocean Trench", "Enemy": "", "Class": "Character", "AnimatedTexture": { @@ -63496,46 +63231,779 @@ "Class": "Projectile", "Texture": { "File": "lofiObj3", "Index": "0x4EC" }, "AngleCorrection": "3" }, { - "type": "0x50a", - "id": "atst Wall", - "Class": "Wall", - "Texture": { - "File": "lofiEnvironment2", - "Index": "0x161" - }, - "Top": { - "Texture": { - "File": "lofiEnvironment2", - "Index": "0x161" - } - }, - "HitSound": "monster/stone_walls_hit", - "DeathSound": "monster/stone_walls_death", - "Static": "", - "FullOccupy": "", - "OccupySquare": "", - "EnemyOccupySquare": "", - "BlocksSight": "" - }, - { - "type": "0x741a", - "id": "atst Low Range Obj", - "Enemy": "", + "type": "0x7433", + "id": "The Puppet Master", + "DisplayId": "The Puppet Master", "Class": "Character", + "Group": "Master", + "Enemy": "", "AnimatedTexture": { - "File": "chars8x8rHero1", - "Index": "0x01" - }, + "File": "chars16x16rEncounters", + "Index": "120" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "110000", + "Defense": "30", + "XpMult": "1.5", + "Level": "20", + "StasisImmune": "", + "StunImmune": "", + "ParalyzeImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "Jester Bolt", + "Speed": "30", + "MinDamage": "75", + "MaxDamage": "95", + "LifetimeMS": "4000" + }, + { + "id": "1", + "ObjectId": "Lightning Spiral", + "Speed": "60", + "MinDamage": "80", + "MaxDamage": "100", + "LifetimeMS": "4500", + "ConditionEffect": { + "_": "Paralyzed", + "duration": "1.5" + } + }, + { + "id": "2", + "ObjectId": "Big Zombie Blast", + "Speed": "80", + "MinDamage": "95", + "MaxDamage": "115", + "LifetimeMS": "2000", + "ConditionEffect": { + "_": "Slowed", + "duration": "2.5" + } + }, + { + "id": "3", + "ObjectId": "Armor Pierce Bullet", + "Speed": "30", + "ArmorPiercing": "", + "MinDamage": "75", + "MaxDamage": "85", + "LifetimeMS": "6000" + } + ], + "AltTexture": { + "id": "1", + "Texture": { + "File": "invisible", + "Index": "0" + } + } + }, + { + "type": "0x7435", + "id": "Puppet Wizard", + "DisplayId": "Wizard Puppet", + "Class": "Character", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "105" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "3000", + "Defense": "15", + "XpMult": "0.8", + "Level": "20", + "StunImmune": "", + "Projectile": { + "id": "0", + "ObjectId": "White Bolt", + "Speed": "30", + "MinDamage": "50", + "MaxDamage": "65", + "LifetimeMS": "1500" + }, + "AltTexture": [ + { + "id": "1", + "Texture": { + "File": "lofiObj3", + "Index": "0x4ED" + } + }, + { + "id": "2", + "Texture": { + "File": "lofiObj3", + "Index": "0x4EE" + } + }, + { + "id": "3", + "Texture": { + "File": "lofiObj3", + "Index": "0x4EF" + } + }, + { + "id": "4", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F0" + } + } + ] + }, + { + "type": "0x743e", + "id": "Puppet Wizard 2", + "DisplayId": "Wizard Puppet", + "Class": "Character", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "105" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "3000", + "Defense": "15", + "XpMult": "0.0", + "Level": "20", + "StunImmune": "", + "Projectile": { + "id": "0", + "ObjectId": "White Bolt", + "Speed": "30", + "MinDamage": "50", + "MaxDamage": "65", + "LifetimeMS": "1500" + }, + "AltTexture": [ + { + "id": "1", + "Texture": { + "File": "lofiObj3", + "Index": "0x4ED" + } + }, + { + "id": "2", + "Texture": { + "File": "lofiObj3", + "Index": "0x4EE" + } + }, + { + "id": "3", + "Texture": { + "File": "lofiObj3", + "Index": "0x4EF" + } + }, + { + "id": "4", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F0" + } + } + ] + }, + { + "type": "0x7436", + "id": "Puppet Knight", + "DisplayId": "Knight Puppet", + "Class": "Character", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "103" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "5000", + "Defense": "25", + "XpMult": "0.8", + "Level": "20", + "StunImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "Fire Shield", + "Speed": "30", + "MinDamage": "100", + "MaxDamage": "120", + "LifetimeMS": "1500", + "ConditionEffect": { + "_": "Armor Broken", + "duration": "4" + }, + "ParticleTrail": "0xf7941d" + }, + { + "id": "1", + "ObjectId": "Fire Bolt", + "Speed": "45", + "MinDamage": "100", + "MaxDamage": "120", + "LifetimeMS": "1200" + } + ] + }, + { + "type": "0x743f", + "id": "Puppet Knight 2", + "DisplayId": "Knight Puppet", + "Class": "Character", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "103" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "5000", + "Defense": "25", + "XpMult": "0.0", + "Level": "20", + "StunImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "Fire Shield", + "Speed": "30", + "MinDamage": "100", + "MaxDamage": "120", + "LifetimeMS": "1500", + "ConditionEffect": { + "_": "Armor Broken", + "duration": "4" + }, + "ParticleTrail": "0xf7941d" + }, + { + "id": "1", + "ObjectId": "Fire Bolt", + "Speed": "45", + "MinDamage": "100", + "MaxDamage": "120", + "LifetimeMS": "1200" + } + ] + }, + { + "type": "0x7437", + "id": "Puppet Priest", + "DisplayId": "Priest Puppet", + "Class": "Character", + "Group": "Healers", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "104" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "3000", + "Defense": "18", + "XpMult": "0.8", + "Level": "20", + "StunImmune": "", + "StasisImmune": "", + "AltTexture": [ + { + "id": "1", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F1" + } + }, + { + "id": "2", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F2" + } + }, + { + "id": "3", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F3" + } + }, + { + "id": "4", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F4" + } + } + ] + }, + { + "type": "0x7440", + "id": "Puppet Priest 2", + "DisplayId": "Priest Puppet", + "Class": "Character", + "Group": "Healers", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "104" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "3000", + "Defense": "18", + "XpMult": "0.0", + "Level": "20", + "StunImmune": "", + "StasisImmune": "", + "AltTexture": [ + { + "id": "1", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F1" + } + }, + { + "id": "2", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F2" + } + }, + { + "id": "3", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F3" + } + }, + { + "id": "4", + "Texture": { + "File": "lofiObj3", + "Index": "0x4F4" + } + } + ] + }, + { + "type": "0x7442", + "id": "Assassin Puppet", + "DisplayId": "Assassin Puppet", + "Class": "Character", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "107" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "4000", + "Defense": "15", + "XpMult": "0.8", + "Level": "20", + "StunImmune": "", + "Projectile": { + "id": "0", + "ObjectId": "Green Bolt", + "Speed": "75", + "MinDamage": "50", + "MaxDamage": "65", + "LifetimeMS": "1500" + } + }, + { + "type": "0x7438", + "id": "False Puppet Master", + "DisplayId": "The Puppet Master", + "Class": "Character", + "Group": "Master", + "Enemy": "", + "AnimatedTexture": { + "File": "chars16x16rEncounters", + "Index": "120" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "120", + "ShadowSize": "25", + "MaxHitPoints": "15000", + "Defense": "30", + "XpMult": "1.5", + "Level": "20", + "StasisImmune": "", + "DazedImmune": "", + "ParalyzeImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "Jester Bolt", + "Speed": "30", + "MinDamage": "75", + "MaxDamage": "95", + "LifetimeMS": "4000" + }, + { + "id": "1", + "ObjectId": "Lightning Spiral", + "Speed": "60", + "MinDamage": "1", + "MaxDamage": "1", + "LifetimeMS": "4500", + "ConditionEffect": { + "_": "Paralyzed", + "duration": "3.5" + } + }, + { + "id": "2", + "ObjectId": "Big Zombie Blast", + "Speed": "100", + "MinDamage": "95", + "MaxDamage": "115", + "LifetimeMS": "2000", + "ConditionEffect": { + "_": "Slowed", + "duration": "2.5" + } + } + ] + }, + { + "type": "0x7444", + "id": "Oryx Puppet", + "DisplayId": "Oryx Puppet", + "Class": "Character", + "Group": "Treasure Boss", + "Enemy": "", + "AnimatedTexture": { + "File": "d3Chars16x16rEmbed", + "Index": "0x00" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "100", + "ShadowSize": "25", + "MaxHitPoints": "45000", + "Defense": "20", + "XpMult": "1.3", + "Level": "20", + "StunImmune": "", + "StasisImmune": "", + "ParalyzeImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "White Superblast", + "Speed": "55", + "Damage": "100", + "LifetimeMS": "1500", + "MultiHit": "", + "ConditionEffect": { + "_": "Weak", + "duration": "4" + } + }, + { + "id": "1", + "ObjectId": "White Bullet", + "Speed": "60", + "Damage": "100", + "Size": "100", + "LifetimeMS": "900", + "MultiHit": "" + }, + { + "id": "2", + "ObjectId": "White Bullet", + "Speed": "60", + "Damage": "75", + "Size": "85", + "LifetimeMS": "1000", + "MultiHit": "" + } + ] + }, + { + "type": "0x7445", + "id": "Minion Puppet", + "DisplayId": "Minion Puppet", + "Class": "Character", + "Group": "Treasure Minion", + "Enemy": "", + "AnimatedTexture": { + "File": "d3Chars8x8rEmbed", + "Index": "0x00" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "100", + "ShadowSize": "25", + "MaxHitPoints": "7000", + "Defense": "15", + "XpMult": "1.3", + "Level": "20", + "StunImmune": "", + "StasisImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "Fire Bolt", + "Speed": "55", + "Damage": "65", + "Size": "80", + "LifetimeMS": "1300" + }, + { + "id": "1", + "ObjectId": "Green Star", + "Speed": "60", + "Damage": "55", + "Size": "100", + "LifetimeMS": "1600", + "ConditionEffect": { + "_": "Slowed", + "duration": "6" + }, + "MultiHit": "" + } + ] + }, + { + "type": "0x7446", + "id": "Mini Guardian Element", + "DisplayId": "Mini Guardian Element", + "Group": "AttackType", + "Class": "Character", + "MaxHitPoints": "100000", + "Defense": "1000", + "Size": "65", + "Enemy": "", + "StasisImmune": "", + "Texture": { + "File": "lofiObj2", + "Index": "0x4a" + }, + "Projectile": { + "id": "0", + "ObjectId": "White Flame", + "Damage": "50", + "Size": "60", + "Speed": "55", + "LifetimeMS": "920", + "MultiHit": "" + }, + "XpMult": "0.0" + }, + { + "type": "0x7439", + "id": "Healer Puppet", + "DisplayId": "Priest Puppet", + "Class": "Character", + "Group": "Healers", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "104" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "100", + "ShadowSize": "25", + "MaxHitPoints": "3000", + "Defense": "15", + "XpMult": "0.4", + "Level": "20", + "StasisImmune": "", + "Projectile": { + "id": "0", + "ObjectId": "Purple Magic", + "Speed": "50", + "MinDamage": "65", + "MaxDamage": "85", + "LifetimeMS": "1500" + } + }, + { + "type": "0x743a", + "id": "Archer Puppet", + "DisplayId": "Archer Puppet", + "Class": "Character", + "Group": "DPS", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "115" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "100", + "ShadowSize": "25", + "MaxHitPoints": "4000", + "Defense": "25", + "XpMult": "0.4", + "Level": "20", + "ParalyzeImmune": "", + "Projectile": [ + { + "id": "0", + "ObjectId": "Gold Arrow", + "Speed": "50", + "MinDamage": "75", + "MaxDamage": "85", + "LifetimeMS": "1200", + "ConditionEffect": { + "_": "Slowed", + "duration": "4" + } + }, + { + "id": "1", + "ObjectId": "Indigo Arrow", + "Speed": "95", + "Damage": "125", + "LifetimeMS": "1600", + "ConditionEffect": { + "_": "Paralyzed", + "duration": "2" + } + } + ] + }, + { + "type": "0x743b", + "id": "Rogue Puppet", + "DisplayId": "Rogue Puppet", + "Class": "Character", + "Group": "DPS", + "Enemy": "", + "AnimatedTexture": { + "File": "chars8x8rEncounters", + "Index": "110" + }, + "HitSound": "monster/skeletons_hit", + "DeathSound": "monster/skeletons_death", + "Size": "100", + "ShadowSize": "25", + "MaxHitPoints": "4000", + "Defense": "20", + "XpMult": "0.4", + "Level": "20", + "ParalyzeImmune": "", + "Projectile": { + "id": "0", + "ObjectId": "Darkness Bolt", + "Speed": "50", + "MinDamage": "75", + "MaxDamage": "100", + "LifetimeMS": "800" + }, + "AltTexture": { + "id": "1", + "Texture": { + "File": "invisible", + "Index": "0" + } + } + }, + { + "type": "0x7441", + "id": "Puppet Loot Chest", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x466" + }, + "MaxHitPoints": "30000", + "Defense": "35", + "Size": "160", + "XpMult": "0.0", + "StasisImmune": "", + "DisplayId": "Puppet Loot Chest" + }, + { + "type": "0x7447", + "id": "Puppet Treasure Chest", + "Class": "Character", + "Enemy": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x466" + }, + "MaxHitPoints": "30000", + "Defense": "35", + "Size": "160", + "XpMult": "0.0", + "StasisImmune": "", + "DisplayId": "Puppet Treasure Chest" + }, + { + "type": "0x50a", + "id": "atst Wall", + "Class": "Wall", + "Texture": { + "File": "lofiEnvironment2", + "Index": "0x161" + }, + "Top": { + "Texture": { + "File": "lofiEnvironment2", + "Index": "0x161" + } + }, + "HitSound": "monster/stone_walls_hit", + "DeathSound": "monster/stone_walls_death", + "Static": "", + "FullOccupy": "", + "OccupySquare": "", + "EnemyOccupySquare": "", + "BlocksSight": "" + }, + { + "type": "0x741a", + "id": "atst Low Range Obj", + "Enemy": "", + "Class": "Character", + "AnimatedTexture": { + "File": "chars8x8rHero1", + "Index": "0x01" + }, "HitSound": "monster/skeletons_hit", "DeathSound": "monster/skeletons_death", "Size": "100", "MaxHitPoints": "5000", "Defense": "0", "XpMult": "0.0", "Projectile": { "id": "0", @@ -67392,16 +67860,42 @@ "Index": "00" }, "PlayerClassType": "0x031e", "UnlockSpecial": "Set Skin", "NoSkinSelect": "", "DisplayId": "Oryx Set Skin" }, { + "type": "0x744a", + "id": "Puppet Master", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "72" + }, + "PlayerClassType": "0x0320", + "UnlockSpecial": "Looted by those who defeat the Puppet Master in his theatre.", + "DisplayId": "Puppet Master" + }, + { + "type": "0x744b", + "id": "Jester", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "73" + }, + "PlayerClassType": "0x0324", + "UnlockSpecial": "Looted by those who defeat the Puppet Master in his Theatre. Thanks to: Thq32df and ViciousTwo ", + "DisplayId": "Jester" + }, + { "type": "0x0e28", "id": "Snakepit Guard Spawner", "Class": "Character", "Enemy": "", "NoMiniMap": "", "AnimatedTexture": { "File": "chars16x16dEncounters2", "Index": "39" @@ -83849,16 +84343,62 @@ "SlotType": "10", "Description": "A small bolt of cloth", "Activate": "Dye", "Sound": "use_potion", "Consumable": "", "Soulbound": "", "BagType": "2" }, + { + "type": "0x125a", + "id": "Large Jester Argyle Cloth", + "Class": "Dye", + "DisplayId": "Large Jester Argyle Cloth", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x1b" + }, + "Mask": { + "File": "lofiObj3", + "Index": "0x1c" + }, + "Tex1": "0xa000038", + "SlotType": "10", + "Description": "A large bolt of cloth", + "Activate": "Dye", + "Sound": "use_potion", + "Consumable": "", + "Soulbound": "", + "BagType": "2" + }, + { + "type": "0x135a", + "id": "Small Jester Argyle Cloth", + "Class": "Dye", + "DisplayId": "Small Jester Argyle Cloth", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x1d" + }, + "Mask": { + "File": "lofiObj3", + "Index": "0x1e" + }, + "Tex2": "0xa000038", + "SlotType": "10", + "Description": "A small bolt of cloth", + "Activate": "Dye", + "Sound": "use_potion", + "Consumable": "", + "Soulbound": "", + "BagType": "2" + }, { "type": "0x0d40", "id": "Tomb Portal of Cowardice", "DisplayId": "Portal of Cowardice", "Class": "Portal", "IntergamePortal": "", "Texture": { "File": "lofiEnvironment", Binary files ../current/sheets/d3Chars16x16r.png and ./sheets/d3Chars16x16r.png differ Binary files ../current/sheets/d3Chars8x8r.png and ./sheets/d3Chars8x8r.png differ Binary files ../current/sheets/d3LofiObj.png and ./sheets/d3LofiObj.png differ Binary files ../current/sheets/lofiObj3.png and ./sheets/lofiObj3.png differ Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.png differ Binary files ../current/sheets/textile10x10.png and ./sheets/textile10x10.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-09-18 20:50:22.430124540 +0000 +++ ./strings.json 2014-09-26 00:20:21.408549888 +0000 @@ -1656,16 +1656,17 @@ "equip.A_deadly_wand_that_channels_magefire_from_the_nether_planes": "A deadly wand that channels magefire from the nether planes.", "equip.A_deep_blue_prism_of_sun_cut_topaz,_used_by_doppelganger_sp": "A deep blue prism of sun cut topaz, used by doppelganger spies to aid in their vile missions of assassination and murder.", "equip.A_deep_blue_prism_of_suncut_topaz,_used_by_doppleganger_spi": "A deep blue prism of suncut topaz, used by doppleganger spies to aid their vile missions of assassination and murder.", "equip.A_detailed_sword_crafted_out_of_blackened_metal_and_preciou": "A detailed sword crafted out of blackened metal and precious bloodstone by Oryx's minions as a tribute to their overlord.", "equip.A_devious_magical_prism_that_creates_an_illusory_ally.": "A devious magical prism that creates an illusory ally.", "equip.A_diamondwire_bow_used_by_guardians_of_the_unseen_ethereal_": "A diamondwire bow used by guardians of the unseen ethereal shrines.", "equip.A_dwarven_skull_desecrated_by_foul_enchantments.": "A dwarven skull desecrated by foul enchantments.", "equip.A_fearsome_wand_that_fires_bolts_of_penetrating_death_magic": "A fearsome wand that fires bolts of penetrating death magic.", + "equip.A_festive_piece_of_armor,_complete_with_bells._Try_not_to_g": "A festive piece of armor, complete with bells. Try not to get too crazy.", "equip.A_fiery_blade_capable_of_burning_flesh_and_bone.": "A fiery blade capable of burning flesh and bone.", "equip.A_forestcloth_quiver_of_highest_quality,_exhibiting_excepti": "A forestcloth quiver of highest quality, exhibiting exceptional magic powers and used by the foremost masters of Elven archery.", "equip.A_formidable_fire_spell_used_by_dwarven_magi_in_their_war_a": "A formidable fire spell used by dwarven magi in their war against the trolls.", "equip.A_foul_poison_harvested_from_the_corpses_of_plague_victims.": "A foul poison harvested from the corpses of plague victims. It infects many targets, but kills slowly.", "equip.A_ghostly_fabric_from_the_other_side.": "A ghostly fabric from the other side.", "equip.A_gleaming_obsidian_sword_of_imperial_power,_fashioned_by_e": "A gleaming obsidian sword of imperial power, fashioned by enslaved demons for the personal use of a world-conquering leader of mortals.", "equip.A_glittering_golden_scepter_charged_with_magical_lightning.": "A glittering golden scepter charged with magical lightning.", "equip.A_glittering_magical_prism_that_fabricates_potent_images_in": "A glittering magical prism that fabricates potent images in the minds of the weak-willed.", @@ -1728,16 +1729,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_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.", "equip.A_large_onyx_set_in_a_glittering_gold_ring.": "A large onyx set in a glittering gold ring.", @@ -1933,16 +1935,17 @@ "equip.A_staff_that_harnesses_the_energy_of_shooting_stars.": "A staff that harnesses the energy of shooting stars.", "equip.A_steel-and-ruby_scepter_that_blasts_electrical_arcs.": "A steel-and-ruby scepter that blasts electrical arcs.", "equip.A_steel_and_platinum_helm_of_ancient_design,_worn_by_earthr": "A steel and platinum helm of ancient design, worn by earthrazer generals during the great orcish war.", "equip.A_steel_shield_supported_by_iron_ribbing.": "A steel shield supported by iron ribbing.", "equip.A_steel_short_sword.": "A steel short sword.", "equip.A_strange_looking_mushroom.": "A strange looking mushroom.", "equip.A_striking_fine-edged_weapon.": "A striking fine-edged weapon.", "equip.A_strong_quiver_of_magical_iron.": "A strong quiver of magical iron.", + "equip.A_stunning_costume_to_wear_for_your_theatre_debut.": "A stunning costume to wear for your theatre debut.", "equip.A_sturdy_helm_used_by_battlefield_sergeants_to_improve_mora": "A sturdy helm used by battlefield sergeants to improve morale in nearby allies.", "equip.A_stylish_witch,_community_choice_winner:_Project_Realmway_": "A stylish witch, community choice winner: Project Realmway 2. Thanks to: DieGo", "equip.A_sugary-sweet_natural_grenade_found_in_the_Candyland_Hunti": "A sugary-sweet natural grenade found in the Candyland Hunting Grounds.", "equip.A_superior_enchanting_quiver_made_of_high_quality_magesteel": "A superior enchanting quiver made of high quality magesteel.", "equip.A_superior_shield_forged_in_deep_armories_for_the_construct": "A superior shield forged in deep armories for the construct armies of the underworld.", "equip.A_superlative_bow_of_sunsteel_and_diamondwire,_created_by_a": "A superlative bow of sunsteel and diamondwire, created by a secretive race of star-dwelling entities.", "equip.A_sweet_tropical_drink_that_boosts_attack_and_dexterity.": "A sweet tropical drink that boosts attack and dexterity.", "equip.A_swift_and_hungry_blade_that_is_never_satisfied_with_just_": "A swift and hungry blade that is never satisfied with just one kill.", @@ -2311,16 +2314,17 @@ "equip.Elixir_of_Magic_7": "Elixir of Magic", "equip.Elvencraft_Quiver": "Elvencraft Quiver", "equip.Emerald_Mystery_Key": "Emerald Mystery Key", "equip.Emeraldshard_Dagger": "Emeraldshard Dagger", "equip.Energy_Staff": "Energy Staff", "equip.Enter_this_destroyed_Nexus_at_your_own_peril.": "Enter this destroyed Nexus at your own peril.", "equip.Essence_Tap_Skull": "Essence Tap Skull", "equip.Eucalyptus_can_be_incredibly_effective_at_looking_awesome.": "Eucalyptus can be incredibly effective at looking awesome.", + "equip.Event_Chest": "Event Chest", "equip.Experimental_Ring": "Experimental Ring", "equip.Exquisitely_decorated_adamantine_armor_smithed_by_underdeep": "Exquisitely decorated adamantine armor smithed by underdeep dwarves for the wardens of the demonclefts.", "equip.Eye_of_Osiris": "Eye of Osiris", "equip.Falchion": "Falchion", "equip.Felwasp_Toxin": "Felwasp Toxin", "equip.Fire_Bow": "Fire Bow", "equip.Fire_Dagger": "Fire Dagger", "equip.Fire_Dragon_Battle_Armor": "Fire Dragon Battle Armor", @@ -2394,26 +2398,28 @@ "equip.Gum_that_temporarily_boosts_your_attack.": "Gum that temporarily boosts your attack.", "equip.Gum_that_temporarily_boosts_your_defense.": "Gum that temporarily boosts your defense.", "equip.Gum_that_temporarily_boosts_your_dexterity.": "Gum that temporarily boosts your dexterity.", "equip.Gum_that_temporarily_boosts_your_speed.": "Gum that temporarily boosts your speed.", "equip.Gum_that_temporarily_boosts_your_vitality.": "Gum that temporarily boosts your vitality.", "equip.Hallucination_Prism": "Hallucination Prism", "equip.Hamburger": "Hamburger", "equip.Harbinger_of_hard-boiled_justice._Sprite_by_Linkshot,_Sues,": "Harbinger of hard-boiled justice. Sprite by Linkshot, Sues, and Wylem.", + "equip.Harlequin_Armor": "Harlequin Armor", "equip.Harnessing_Bella_Donna’s_unusual_powers,_these_flowers_are_": "Harnessing Bella Donna’s unusual powers, these flowers are beautiful but deadly!", "equip.Harnessing_the_unusual_power_of_Bella_DonnaAPOSs_flowers_th": "Harnessing the unusual power of Bella Donna's flowers these shots are beautiful but deadly!", "equip.HeAPOSs_big,_heAPOSs_bad,_and_heAPOSs_a_wolf._Thanks_to:_Ro": "He's big, he's bad, and he's a wolf. Thanks to: RotMGBeige", "equip.Heal": "Heal", "equip.Healing_Ichor": "Healing Ichor", "equip.Healing_Tome": "Healing Tome", "equip.Health_Potion": "Health Potion", "equip.Heartfind_Dagger": "Heartfind Dagger", "equip.Heartstealer_Skull": "Heartstealer Skull", "equip.Heavy_Crossbow": "Heavy Crossbow", + "equip.Hee_Hee,_Ha_Ha,_Ho_HoBANG_Want_to_hear_a_joke?": "Hee Hee, Ha Ha, Ho Ho! Want to hear a joke?", "equip.HellAPOSs_Fire_Wand": "Hell's Fire Wand", "equip.Helm_of_the_Great_General": "Helm of the Great General", "equip.Helm_of_the_Juggernaut": "Helm of the Juggernaut", "equip.Hippogriff_Hide_Armor": "Hippogriff Hide Armor", "equip.Holy_Avenger_Skin": "Holy Avenger Skin", "equip.Holy_Cross": "Holy Cross", "equip.Holy_Water": "Holy Water", "equip.Hunting_Trap": "Hunting Trap", @@ -2425,16 +2431,17 @@ "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.Iron_Mail": "Iron Mail", "equip.Iron_Quiver": "Iron Quiver", "equip.Iron_Shield": "Iron Shield", "equip.Ironwood_Bow": "Ironwood Bow", "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.Jester_Skin": "Jester Skin", "equip.Jewel_Eye_Katana": "Jewel Eye Katana", "equip.Kendo_Stick": "Kendo Stick", "equip.King_Knifeula_Skin": "King Knifeula Skin", "equip.Knight_of_the_Platinum_Order._Thanks_to:_DELer": "Knight of the Platinum Order. Thanks to: DELer", "equip.KoalaPOW": "KoalaPOW", "equip.Lab_Key": "Lab Key", "equip.Large_Firecracker": "Large Firecracker", "equip.Leaf_Bow": "Leaf Bow", @@ -2572,16 +2579,17 @@ "equip.Potion_of_Wisdom": "Potion of Wisdom", "equip.Power_Pizza": "Power Pizza", "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.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", "equip.Rare_????_Egg": "Rare ???? Egg", @@ -2835,16 +2843,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_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_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_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_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.", "equip.This_helm_was_forged_of_metal_that_fell_from_the_sky.__It_i": "This helm was forged of metal that fell from the sky. It is strangely light and emits a faint hum.", "equip.This_legendary_dagger_was_commissioned_by_a_band_of_mad_rog": "This legendary dagger was commissioned by a band of mad rogues to prove the worth of the Dirk.", "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.", @@ -3619,18 +3628,20 @@ "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_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", "objects.Realm_Portal": "Realm Portal", "objects.Red_Spotted_Den_Spider": "Red Spotted Den Spider", "objects.Sheep": "Sheep", "objects.Snake_Pit_Portal": "Snake Pit Portal", @@ -4492,16 +4503,33 @@ "protips.2": "If you are with another player, you both earn full XP for each kill", "protips.3": "Hit [O] to see all the keys and options", "protips.4": "Escape to the Nexus by clicking the temple button", "protips.5": "You earn fame when you die. Spend it in the Nexus!", "protips.6": "Activate your special ability with either shift-click or a hotkey", "protips.7": "Shift-Click or Double-Click a potion to drink it", "protips.8": "Double-Click items in your inventory to use/equip them", "protips.9": "Use the /tell command to talk to other players anywhere in the game", + "puppetMaster.Archer_Puppet": "Archer Puppet", + "puppetMaster.Assassin_Puppet": "Assassin Puppet", + "puppetMaster.False_Puppet_Master": "The Puppet Master", + "puppetMaster.Healer_Puppet": "Priest Puppet", + "puppetMaster.Mini_Guardian_Element": "Mini Guardian Element", + "puppetMaster.Minion_Puppet": "Minion Puppet", + "puppetMaster.Oryx_Puppet": "Oryx Puppet", + "puppetMaster.Puppet_Knight": "Knight Puppet", + "puppetMaster.Puppet_Knight_2": "Knight Puppet", + "puppetMaster.Puppet_Loot_Chest": "Puppet Loot Chest", + "puppetMaster.Puppet_Priest": "Priest Puppet", + "puppetMaster.Puppet_Priest_2": "Priest Puppet", + "puppetMaster.Puppet_Treasure_Chest": "Puppet Treasure Chest", + "puppetMaster.Puppet_Wizard": "Wizard Puppet", + "puppetMaster.Puppet_Wizard_2": "Wizard Puppet", + "puppetMaster.Rogue_Puppet": "Rogue Puppet", + "puppetMaster.The_Puppet_Master": "The Puppet Master", "server.added_to_ignore": "Added {player} to ignore list", "server.admin_cleared": "You are no longer an admin", "server.admin_set": "Admin set", "server.already_nexus": "You are already in the nexus", "server.bleeding": "Bleeding", "server.break_item": "{player}'s {item} breaks and he disappears", "server.buy_success": "Purchase Successful", "server.cancelled_trade": "{player} cancelled the trade.", @@ -4793,31 +4821,33 @@ "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.Gentleman": "Gentleman", "skins.Holy_Avenger": "Holy Avenger", "skins.Iceman": "Iceman", + "skins.Jester": "Jester", "skins.Juggernaught": "Juggernaught", "skins.Juggernaut": "Juggernaut", "skins.King_Knifeula": "King Knifeula", "skins.Knight_of_the_Round": "Knight of the Round", "skins.Lil_Red": "Lil Red", "skins.Little_Helper": "Little Helper", "skins.Loki": "Loki", "skins.Merlin": "Merlin", "skins.Morningstar": "Morningstar", "skins.Nexus_no_Miko": "Nexus no Miko", "skins.Nun": "Nun", "skins.Oryx_Set_Skin": "Oryx Set Skin", "skins.Platinum_Knight": "Platinum Knight", "skins.Platinum_Rogue": "Platinum Rogue", "skins.Platinum_Warrior": "Platinum Warrior", + "skins.Puppet_Master": "Puppet Master", "skins.Pyramid_Revenant": "Pyramid Revenant", "skins.Ranger": "Ranger", "skins.Red_Marauder": "Red Marauder", "skins.Robed_Priest": "Robed Priest", "skins.Robin_Hood": "Robin Hood", "skins.Santa": "Santa", "skins.Scarlet_Order_Necromancer": "Scarlet Order Necromancer", "skins.Scarlett": "Scarlett", @@ -5136,16 +5166,17 @@ "textiles.Large_Green_Dragon_Scale_Cloth": "Large Green Dragon Scale Cloth", "textiles.Large_Green_Weave_Cloth": "Large Green Weave Cloth", "textiles.Large_Grey_Scaly_Cloth": "Large Grey Scaly Cloth", "textiles.Large_Heart_Cloth": "Large Heart Cloth", "textiles.Large_Heavy_Chainmail_Cloth": "Large Heavy Chainmail Cloth", "textiles.Large_Hibiscus_Beach_Wrap_Cloth": "Large Hibiscus Beach Wrap Cloth", "textiles.Large_Intense_Clovers_Cloth": "Large Intense Clovers Cloth", "textiles.Large_Ivory_Dragon_Scale_Cloth": "Large Ivory Dragon Scale Cloth", + "textiles.Large_Jester_Argyle_Cloth": "Large Jester Argyle Cloth", "textiles.Large_Jester_Cloth": "Large Jester Cloth", "textiles.Large_Lemon-Lime_Cloth": "Large Lemon-Lime Cloth", "textiles.Large_Leopard_Print_Cloth": "Large Leopard Print Cloth", "textiles.Large_Loud_Spotted_Cloth": "Large Loud Spotted Cloth", "textiles.Large_Lush_Camo_Cloth": "Large Lush Camo Cloth", "textiles.Large_Midnight_Dragon_Scale_Cloth": "Large Midnight Dragon Scale Cloth", "textiles.Large_Nautical_Cloth": "Large Nautical Cloth", "textiles.Large_Party_Cloth": "Large Party Cloth", @@ -5227,16 +5258,17 @@ "textiles.Small_Green_Dragon_Scale_Cloth": "Small Green Dragon Scale Cloth", "textiles.Small_Green_Weave_Cloth": "Small Green Weave Cloth", "textiles.Small_Grey_Scaly_Cloth": "Small Grey Scaly Cloth", "textiles.Small_Heart_Cloth": "Small Heart Cloth", "textiles.Small_Heavy_Chainmail_Cloth": "Small Heavy Chainmail Cloth", "textiles.Small_Hibiscus_Beach_Wrap_Cloth": "Small Hibiscus Beach Wrap Cloth", "textiles.Small_Intense_Clovers_Cloth": "Small Intense Clovers Cloth", "textiles.Small_Ivory_Dragon_Scale_Cloth": "Small Ivory Dragon Scale Cloth", + "textiles.Small_Jester_Argyle_Cloth": "Small Jester Argyle Cloth", "textiles.Small_Jester_Cloth": "Small Jester Cloth", "textiles.Small_Lemon-Lime_Cloth": "Small Lemon-Lime Cloth", "textiles.Small_Leopard_Print_Cloth": "Small Leopard Print Cloth", "textiles.Small_Loud_Spotted_Cloth": "Small Loud Spotted Cloth", "textiles.Small_Lush_Camo_Cloth": "Small Lush Camo Cloth", "textiles.Small_Midnight_Dragon_Scale_Cloth": "Small Midnight Dragon Scale Cloth", "textiles.Small_Nautical_Cloth": "Small Nautical Cloth", "textiles.Small_Party_Cloth": "Small Party Cloth",