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-08-13 19:10:39.044853604 +0000 +++ ./constants.json 2014-08-14 21:30:33.477307222 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "22.6", + "BUILD_VERSION": "22.7", "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/init.json ./init.json --- ../current/init.json 2014-08-09 20:40:21.770380804 +0000 +++ ./init.json 2014-08-14 21:30:20.433306867 +0000 @@ -641,16 +641,55 @@ "File": "playerskins", "Index": "42" }, "PlayerClassType": "0x0307", "UnlockSpecial": "Month of the Mad God 2014 Release", "DisplayId": "Ranger" }, { + "type": "0x2304", + "id": "Platinum Knight", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "55" + }, + "PlayerClassType": "0x031e", + "UnlockSpecial": "First Release: August 2014", + "DisplayId": "Platinum Knight" + }, + { + "type": "0x2305", + "id": "Platinum Warrior", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "56" + }, + "PlayerClassType": "0x031d", + "UnlockSpecial": "First Release: August 2014", + "DisplayId": "Platinum Warrior" + }, + { + "type": "0x2306", + "id": "Platinum Rogue", + "Skin": "", + "Class": "Skin", + "AnimatedTexture": { + "File": "playerskins", + "Index": "57" + }, + "PlayerClassType": "0x0300", + "UnlockSpecial": "First Release: August 2014", + "DisplayId": "Platinum Rogue" + }, + { "type": "0x2334", "id": "Witch", "Skin": "", "Class": "Skin", "AnimatedTexture": { "File": "playerskins", "Index": "71" }, 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-08-09 20:40:23.734380394 +0000 +++ ./json/Objects.json 2014-08-14 21:30:22.453306922 +0000 @@ -29358,32 +29358,32 @@ "id": "Sword of the Mad God", "Class": "Equipment", "Item": "", "Texture": { "File": "lofiObj3", "Index": "0x4CD" }, "SlotType": "1", + "Tier": "12", "Description": "A detailed sword crafted out of blackened metal and precious bloodstone by Oryx's minions as a tribute to their overlord.", "RateOfFire": "1", "Sound": "weapon/mithril_sword", "Projectile": { "ObjectId": "Oryx Sword Attack", "Speed": "100", "MinDamage": "220", "MaxDamage": "275", "LifetimeMS": "350", "Size": "80" }, "BagType": "4", "FameBonus": "4", "OldSound": "bladeSwing", "feedPower": "450", - "Soulbound": "", "DisplayId": "Sword of the Mad God" }, { "type": "0x232a", "id": "Dagger of the Amethyst Prism", "Class": "Equipment", "Item": "", "Texture": { @@ -29657,16 +29657,73 @@ "_": "UnlockSkin", "skinType": "888" }, "Consumable": "", "BagType": "0", "DisplayId": "Ranger Skin" }, { + "type": "0x2314", + "id": "Platinum Knight Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "55" + }, + "SlotType": "10", + "Description": "Knight of the Platinum Order. Thanks to: DELer", + "Activate": { + "_": "UnlockSkin", + "skinType": "8964" + }, + "Consumable": "", + "BagType": "1", + "DisplayId": "Platinum Knight Skin" + }, + { + "type": "0x2315", + "id": "Platinum Warrior Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "56" + }, + "SlotType": "10", + "Description": "Warrior of the Platinum Order. Thanks to: DELer", + "Activate": { + "_": "UnlockSkin", + "skinType": "8965" + }, + "Consumable": "", + "BagType": "1", + "DisplayId": "Platinum Warrior Skin" + }, + { + "type": "0x2316", + "id": "Platinum Rogue Skin", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "playerskins", + "Index": "57" + }, + "SlotType": "10", + "Description": "Rogue of the Platinum Order. Thanks to: DELer", + "Activate": { + "_": "UnlockSkin", + "skinType": "8966" + }, + "Consumable": "", + "BagType": "1", + "DisplayId": "Platinum Rogue Skin" + }, + { "type": "0x2333", "id": "Witch Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { "File": "playerskins", "Index": "71" }, @@ -33967,16 +34024,17 @@ }, "HitSound": "monster/sprites_hit", "DeathSound": "monster/sprites_death", "Size": "75", "ShadowSize": "75", "MaxHitPoints": "2500", "Defense": "20", "Z": ".4", + "XpMult": "0.0", "Projectile": { "id": "0", "ObjectId": "Blue Magic", "Damage": "60", "Speed": "70", "LifetimeMS": "900", "Size": "80" } diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/Regions.json ./json/Regions.json --- ../current/json/Regions.json 2014-08-09 20:40:23.746380390 +0000 +++ ./json/Regions.json 2014-08-14 21:30:22.465306921 +0000 @@ -126,16 +126,96 @@ "Color": "0x336666" }, { "type": "0x24", "id": "Store 24", "Color": "0x66999" }, { + "type": "0x2a", + "id": "Store 25", + "Color": "0x669966" + }, + { + "type": "0x2b", + "id": "Store 26", + "Color": "0x445566" + }, + { + "type": "0x2c", + "id": "Store 27", + "Color": "0xFFDD11" + }, + { + "type": "0x2d", + "id": "Store 28", + "Color": "0xCCDDBB" + }, + { + "type": "0x2e", + "id": "Store 29", + "Color": "0x440033" + }, + { + "type": "0x2f", + "id": "Store 30", + "Color": "0xDDAA99" + }, + { + "type": "0x30", + "id": "Store 31", + "Color": "0xAA22FF" + }, + { + "type": "0x31", + "id": "Store 32", + "Color": "111AAA" + }, + { + "type": "0x32", + "id": "Store 33", + "Color": "0xFF99AA" + }, + { + "type": "0x33", + "id": "Store 34", + "Color": "0x113344" + }, + { + "type": "0x34", + "id": "Store 35", + "Color": "0x778899" + }, + { + "type": "0x35", + "id": "Store 36", + "Color": "0x654321" + }, + { + "type": "0x36", + "id": "Store 37", + "Color": "0x432343" + }, + { + "type": "0x37", + "id": "Store 38", + "Color": "0x526496" + }, + { + "type": "0x38", + "id": "Store 39", + "Color": "0x3C3C3C" + }, + { + "type": "0x39", + "id": "Store 40", + "Color": "0x980000" + }, + { "type": "0x09", "id": "Vault", "Color": "0x828492" }, { "type": "0x0a", "id": "Loot", "Color": "0x7E2BCB" Only in ./sheets: d3Chars16x16r.png Only in ./sheets: d3Chars8x8r.png Binary files ../current/sheets/d3LofiObjBig.png and ./sheets/d3LofiObjBig.png differ Only in ./sheets: d3LofiObj.png 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-08-05 17:07:31.966808022 +0000 +++ ./strings.json 2014-08-14 21:30:20.153306859 +0000 @@ -3389,16 +3389,17 @@ "mountains.Rock_Bot": "Rock Construct", "mountains.Slime_God": "Slime God", "mountains.Sprite_Child": "Sprite Child", "mountains.Sprite_God": "Sprite God", "mountains.Steel_Bot": "Steel Construct", "mountains.White_Demon": "White Demon", "nextClassQuest_.text": "Next Goal: Earn {nextStarFame} Fame with {typeToDisplay}", "nexus.Cloth_Bazaar": "Cloth Bazaar", + "nexus.Daily_Quest_Room": "The Tinkerer", "nexus.Guild_Hall": "Guild Hall", "nexus.Guild_Hall_2": "Guild Hall", "nexus.Guild_Hall_3": "Guild Hall", "nexus.Guild_Hall_4": "Guild Hall", "nexus.Nexus": "Nexus", "nexus.Pet_Yard": "Pet Yard", "nexus.Pet_Yard_2": "Pet Yard", "nexus.Pet_Yard_3": "Pet Yard", @@ -3484,23 +3485,25 @@ "objects.Brown_Den_Spider": "Brown Den Spider", "objects.Candyland_Portal": "Candyland Portal", "objects.Charachter_Changer_Maker": "Charachter Changer Maker", "objects.Charachter_Changer_Maker_LF": "Charachter Changer Maker LF", "objects.Closed_Vault_Chest": "Closed Vault Chest", "objects.Cloth_Bazaar_Portal": "Cloth Bazaar Portal", "objects.Cloth_Bazaar_Portal_Maker": "Cloth Bazaar Portal Maker", "objects.Cube": "Cube", + "objects.Daily_Quest_Portal": "Daily Quest Portal", "objects.Davy_JonesAPOS_Locker_Portal": "Davy Jones' Locker", "objects.Davy_JonesAPOSs_Locker_Portal": "Davy Jones's Locker", "objects.Decoy": "Decoy", "objects.Dodec": "Dodec", "objects.Dreamscape_Labyrinth_Portal": "Dreamscape Labyrinth Portal", "objects.Dungeon_Portal": "Dungeon Portal", "objects.Forbidden_Jungle_Portal": "Forbidden Jungle Portal", + "objects.Fortune_Ground_Object": "Fortune Ground Object", "objects.G_Door_Opener": "G Door Opener", "objects.Gift_Chest": "Gift Chest", "objects.Gift_Chest_Closed": "Gift Chest Closed", "objects.Glowing_Portal": "Glowing Portal", "objects.Glowing_Portal_of_Cowardice": "Glowing Portal of Cowardice", "objects.Glowing_Realm_Portal": "Glowing Realm Portal", "objects.Gravestone": "Gravestone", "objects.Gravestone_1": "Gravestone 1", @@ -3551,16 +3554,18 @@ "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.Pyramid": "Pyramid", + "objects.Quest_Rewards": "Quest Rewards", + "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", "objects.Soulbound_Loot_Bag": "Soulbound Loot Bag", "objects.Spider_Den_Portal": "Spider Den Portal", "objects.Spider_Egg_Sac": "Spider Egg Sac", @@ -3576,16 +3581,19 @@ "objects.Undead_Lair_Portal": "Undead Lair Portal", "objects.Vault_Chest": "Vault Chest", "objects.Vault_Explanation_Portal": "Vault Explanation", "objects.Vault_Portal": "Vault Portal", "objects.White_Fountain": "White Fountain", "objects.Winter_Bunny": "Winter Bunny", "objects.Winter_Fountain_Frozen": "Winter Fountain Frozen", "objects.Winter_now": "Winter now", + "objects.ft_Vases": "ft Vases", + "objects.ft_Vases_with_rug": "ft Vases with rug", + "objects.ft_shopkeep": "Fortune Teller Shop", "objects.lod_Abnormal_Treasure_Pile": "lod Abnormal Treasure Pile", "objects.lod_Golden_Loot": "lod Golden Loot", "objects.lod_Golden_Statue": "lod Golden Statue", "objects.lod_Large_Golden_Loot": "lod Large Golden Loot", "objects.mb_shopkeep1": "Mystery Box Shop", "objects.mb_shopkeep2": "Mystery Box Shop", "oceanTrench.Coral": "Coral", "oceanTrench.Coral_Bomb_Big": "Coral Bomb Big",