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-14 21:30:33.477307222 +0000 +++ ./constants.json 2014-08-22 19:40:35.369893333 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "22.7", + "BUILD_VERSION": "23.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-08-14 21:30:22.453306922 +0000 +++ ./json/Objects.json 2014-08-22 19:40:23.485893225 +0000 @@ -28619,16 +28619,17 @@ "Description": "Customize your Wizard with the Gentleman Skin. Rarity: Rare Indeed", "Activate": { "_": "UnlockSkin", "skinType": "914" }, "Consumable": "", "BagType": "1", "Track": "", + "Soulbound": "", "DisplayId": "Gentleman Skin" }, { "type": "0x258a", "id": "Bow of Eternal Frost", "Class": "Equipment", "Item": "", "Texture": { @@ -29635,16 +29636,17 @@ "SlotType": "10", "Description": "Cursed by responsibility and awesome knife skills. Thanks to: IrondogdogROTMG", "Activate": { "_": "UnlockSkin", "skinType": "8969" }, "Consumable": "", "BagType": "1", + "Soulbound": "", "DisplayId": "King Knifeula Skin" }, { "type": "0x225c", "id": "Ranger Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -29673,16 +29675,17 @@ "SlotType": "10", "Description": "Knight of the Platinum Order. Thanks to: DELer", "Activate": { "_": "UnlockSkin", "skinType": "8964" }, "Consumable": "", "BagType": "1", + "Soulbound": "", "DisplayId": "Platinum Knight Skin" }, { "type": "0x2315", "id": "Platinum Warrior Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -29692,16 +29695,17 @@ "SlotType": "10", "Description": "Warrior of the Platinum Order. Thanks to: DELer", "Activate": { "_": "UnlockSkin", "skinType": "8965" }, "Consumable": "", "BagType": "1", + "Soulbound": "", "DisplayId": "Platinum Warrior Skin" }, { "type": "0x2316", "id": "Platinum Rogue Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -29711,16 +29715,17 @@ "SlotType": "10", "Description": "Rogue of the Platinum Order. Thanks to: DELer", "Activate": { "_": "UnlockSkin", "skinType": "8966" }, "Consumable": "", "BagType": "1", + "Soulbound": "", "DisplayId": "Platinum Rogue Skin" }, { "type": "0x2333", "id": "Witch Skin", "Class": "Equipment", "Item": "", "AnimatedTexture": { @@ -29733,16 +29738,75 @@ "_": "UnlockSkin", "skinType": "9012" }, "Consumable": "", "BagType": "1", "DisplayId": "Witch Skin" }, { + "type": "0x2339", + "id": "Onyx Shield of the Mad God", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x02" + }, + "SlotType": "5", + "Tier": "6", + "Description": "A pitch-black shield looted from the depths of Oryx's Castle.", + "Sound": "spell/fire_spray", + "Projectile": { + "ObjectId": "Silver Shield", + "Speed": "160", + "MinDamage": "300", + "MaxDamage": "360", + "LifetimeMS": "200", + "Size": "140", + "ConditionEffect": { + "_": "Stunned", + "duration": "3" + }, + "MultiHit": "", + "PassesCover": "", + "ParticleTrail": "0xbb0101" + }, + "ActivateOnEquip": [ + { + "_": "IncrementStat", + "stat": "21", + "amount": "12" + }, + { + "_": "IncrementStat", + "stat": "26", + "amount": "2" + }, + { + "_": "IncrementStat", + "stat": "27", + "amount": "2" + } + ], + "ConditionEffect": { + "_": "Stunned", + "duration": "3" + }, + "Usable": "", + "BagType": "4", + "FameBonus": "4", + "MpCost": "100", + "Activate": "Shoot", + "NumProjectiles": "5", + "feedPower": "380", + "Soulbound": "", + "DisplayId": "Onyx Shield of the Mad God" + }, + { "type": "0x0dc0", "id": "Great Temple Snake", "Class": "Character", "Enemy": "", "Size": "100", "ShadowSize": "90", "MaxHitPoints": "50", "Defense": "20", @@ -39353,16 +39417,206 @@ "Size": "70", "LifetimeMS": "2900", "Boomerang": "" } ], "DisplayId": "Forest Nymph" }, { + "type": "0x750d", + "id": "ft orb", + "DisplayId": "Fortune Teller Orb", + "Class": "Character", + "Texture": { + "File": "lofiCharBig", + "Index": "0x140" + }, + "Size": "40", + "ShadowSize": "1", + "Animation": { + "prob": "1", + "period": "1.8", + "Frame": [ + { + "time": "0.1", + "Texture": { + "File": "lofiCharBig", + "Index": "0x140" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x141" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiCharBig", + "Index": "0x142" + } + }, + { + "time": "0.1", + "Texture": { + "File": "lofiCharBig", + "Index": "0x143" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x144" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiCharBig", + "Index": "0x145" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x146" + } + }, + { + "time": "0.1", + "Texture": { + "File": "lofiCharBig", + "Index": "0x145" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x146" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiCharBig", + "Index": "0x145" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x146" + } + } + ] + } + }, + { + "type": "0x750e", + "id": "ft big orb", + "DisplayId": "Fortune Teller Crystal Ball", + "Class": "Character", + "Texture": { + "File": "lofiCharBig", + "Index": "0x80" + }, + "Size": "60", + "ShadowSize": "1", + "Animation": { + "prob": "1", + "period": "1.8", + "Frame": [ + { + "time": "0.1", + "Texture": { + "File": "lofiCharBig", + "Index": "0x80" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x81" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiCharBig", + "Index": "0x82" + } + }, + { + "time": "0.1", + "Texture": { + "File": "lofiCharBig", + "Index": "0x83" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x84" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiCharBig", + "Index": "0x85" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x86" + } + }, + { + "time": "0.1", + "Texture": { + "File": "lofiCharBig", + "Index": "0x85" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x86" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiCharBig", + "Index": "0x85" + } + }, + { + "time": "0.2", + "Texture": { + "File": "lofiCharBig", + "Index": "0x86" + } + } + ] + } + }, + { "type": "0x0975", "id": "Mad Scientist Summoner", "Class": "Character", "Texture": { "File": "invisible", "Index": "0" }, "NoMiniMap": "", @@ -47481,16 +47735,125 @@ "ShowName": "", "Texture": { "File": "lofiObjBig", "Index": "0x173" }, "DisplayId": "lod Abnormal Treasure Pile" }, { + "type": "0x22f0", + "id": "Fortune Ground Object", + "Class": "FortuneGround", + "NoMiniMap": "", + "ShadowSize": "0", + "Size": "0", + "Texture": { + "File": "lofiObj3", + "Index": "0x494" + }, + "StasisImmune": "", + "DisplayId": "Fortune Ground Object" + }, + { + "type": "0x22f1", + "id": "ft shopkeep", + "DisplayId": "The Alchemist", + "Class": "FortuneTeller", + "ShadowSize": "50", + "Size": "100", + "Texture": { + "File": "lofiObj3", + "Index": "0x4f0" + }, + "StasisImmune": "" + }, + { + "type": "0x1757", + "id": "ft Vases with rug", + "Class": "GameObject", + "ShowName": "", + "Size": "100", + "Texture": { + "File": "lofiCharBig", + "Index": "0x170" + }, + "DisplayId": "ft Vases with rug" + }, + { + "type": "0x1758", + "id": "ft Vases", + "Class": "GameObject", + "ShowName": "", + "Size": "100", + "Texture": { + "File": "lofiCharBig", + "Index": "0x171" + }, + "DisplayId": "ft Vases" + }, + { + "type": "0x1754", + "id": "Quest Rewards", + "Class": "QuestRewards", + "DisplayId": "The Tinkerer", + "ShadowSize": "50", + "Size": "120", + "Texture": { + "File": "lofiObj3", + "Index": "0x4f1" + }, + "StasisImmune": "" + }, + { + "type": "0x1755", + "id": "Quest Rewards Inv Object", + "Class": "QuestRewards", + "ShadowSize": "0", + "Size": "0", + "Texture": { + "File": "invisible", + "Index": "0" + }, + "StasisImmune": "", + "DisplayId": "Quest Rewards Inv Object" + }, + { + "type": "0x1756", + "id": "Daily Quest Portal", + "Class": "Portal", + "DungeonName": "Daily Quest Room", + "IntergamePortal": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x4f3" + }, + "Animation": { + "prob": "1", + "period": ".8", + "Frame": [ + { + "time": "0.4", + "Texture": { + "File": "lofiObj3", + "Index": "0x4f2" + } + }, + { + "time": "0.4", + "Texture": { + "File": "lofiObj3", + "Index": "0x4f3" + } + } + ] + }, + "DisplayId": "Daily Quest Portal" + }, + { "type": "0x1700", "id": "Fishman Warrior", "Group": "Ocean Trench", "Enemy": "", "Class": "Character", "AnimatedTexture": { "File": "chars16x16rEncounters", "Index": "10" @@ -74848,16 +75211,47 @@ "Index": "0xe0" }, "ShadowSize": "50", "Static": "", "OccupySquare": "", "Z": "-.01" }, { + "type": "0x1882", + "id": "Fortune Pillar", + "Class": "GameObject", + "Model": "Pillar2", + "Texture": { + "File": "lofiObjBig", + "Index": "0x174" + }, + "Rotation": "0", + "Static": "", + "FullOccupy": "", + "OccupySquare": "", + "EnemyOccupySquare": "" + }, + { + "type": "0x1883", + "id": "Fortune Platform", + "Class": "GameObject", + "Model": "Platform", + "Texture": { + "File": "lofiObjBig", + "Index": "0x174" + }, + "Color": "0x9E5D21", + "Rotation": "0", + "Static": "", + "FullOccupy": "", + "OccupySquare": "", + "EnemyOccupySquare": "" + }, + { "type": "0x1942", "id": "Pet Upgrader Terminal", "Class": "GameObject", "Model": "Pet Upgrader Obj", "Rotation": "180", "Texture": { "File": "lofiObjBig", "Index": "0xcf" Only in ./sheets: DarknessBackground.png Binary files ../current/sheets/lofiCharBig.png and ./sheets/lofiCharBig.png differ Binary files ../current/sheets/lofiObj3.png and ./sheets/lofiObj3.png differ Only in ./sheets: StarburstSpinner.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-14 21:30:20.153306859 +0000 +++ ./strings.json 2014-08-22 19:40:21.197893204 +0000 @@ -292,16 +292,18 @@ "FameView.OryxKills": "Oryx Kills", "FameView.PartyMemberLevelUps": "Party Member Level Ups", "FameView.QuestsCompleted": "Quests Completed", "FameView.Shots": "Shots", "FameView.TilesSeen": "Tiles Seen", "FameView.deathInfoLong": "killed on {date} by {killer}", "FameView.deathInfoShort": "died {date}", "FameView.totalFameEarned": "Total Fame Earned", + "FortuneGroundPanel.alchemist": "The Alchemist", + "FortuneGroundPanel.play": "Play", "Frame.cancel": "Cancel", "Frame.maxChar": "Maximum {maxChars} characters", "Frame.replace": "Replace", "Frame.restrictChar": "No numbers, spaces or punctuation", "FusionStrength.Bad": "BAD", "FusionStrength.Fantastic": "FANTASTIC", "FusionStrength.Good": "GOOD", "FusionStrength.Great": "GREAT", @@ -1784,16 +1786,18 @@ "equip.A_mysterious_runewood_staff_decorated_with_horrific_figures": "A mysterious runewood staff decorated with horrific figures.", "equip.A_mysterious_wand_of_otherworldly_origin,_imbued_with_the_p": "A mysterious wand of otherworldly origin, imbued with the purest of arcane energies.", "equip.A_mystical_grey_cloak_once_used_by_blackguard_tricksters_fo": "A mystical grey cloak once used by blackguard tricksters for flanking maneuvers and sneak attacks.", "equip.A_mystical_shuriken_formed_from_ever-frozen_ice.": "A mystical shuriken formed from ever-frozen ice.", "equip.A_ninja-star_with_curved_spiraling_blades.": "A ninja-star with curved spiraling blades.", "equip.A_ninja-star_with_four_razor-sharp_points.": "A ninja-star with four razor-sharp points.", "equip.A_peerless_triple_bow_crafted_of_nightmatter_and_diamondwir": "A peerless triple bow crafted of nightmatter and diamondwire by the exalted bowyers of the primeval overgods.", "equip.A_phenomenal_robe_magically_woven_from_fibers_of_sapphire,_": "A phenomenal robe magically woven from fibers of sapphire, topaz and lapis lazuli, created for the archwizard of the seraphic realms.", + "equip.A_piece_of_heavy_plate_mail_forged_in_the_dungeons_of_OryxA": "A piece of heavy plate mail forged in the dungeons of Oryx's castle, it is decorated with dark red Almandine stones.", + "equip.A_pitch-black_shield_looted_from_the_depths_of_OryxAPOSs_Ca": "A pitch-black shield looted from the depths of Oryx's Castle.", "equip.A_potent_draught_from_OryxAPOSs_wine_cellar.": "A potent draught from Oryx's wine cellar.", "equip.A_potent_trap_powered_by_angelic_spirits,_used_by_demon_hun": "A potent trap powered by angelic spirits, used by demon hunters in the nether realms.", "equip.A_potion_that_boosts_the_tier_level_of_dropped_loot._Up_to_": "A potion that boosts the tier level of dropped loot. Up to +3 tiers! Lasts 30 minutes.", "equip.A_potion_that_causes_enemies_to_drop_more_lootBANG_Lasts_30": "A potion that causes enemies to drop more loot! Lasts 30 minutes.", "equip.A_potion_that_instantly_restores_health_points.": "A potion that instantly restores health points.", "equip.A_potion_that_instantly_restores_magic_points.": "A potion that instantly restores magic points.", "equip.A_potion_that_permanently_increases_attack_power.": "A potion that permanently increases attack power.", "equip.A_potion_that_permanently_increases_defense_power.": "A potion that permanently increases defense power.", @@ -1976,16 +1980,18 @@ "equip.Acropolis_Armor": "Acropolis Armor", "equip.Adds_attack_to_everyone_reduces_speed_for_self.": "Adds attack to everyone reduces speed for self.", "equip.Adds_speed_and_reduces_attack.": "Adds speed and reduces attack.", "equip.Admin_Staff": "Admin Staff", "equip.Admin_Sword": "Admin Sword", "equip.Adventurous_Hobbit_Skin": "Adventurous Hobbit Skin", "equip.Agateclaw_Dagger": "Agateclaw Dagger", "equip.Agent_Skin": "Agent Skin", + "equip.Almandine_Armor_of_Anger": "Almandine Armor of Anger", + "equip.Almandine_Ring_of_Wrath": "Almandine Ring of Wrath", "equip.Ambrosia": "Ambrosia", "equip.America_Ring": "America Ring", "equip.Amulet_of_Resurrection": "Cursed Amulet of Zombification", "equip.An_American_heroAPOSs_ring.": "An American hero's ring.", "equip.An_Olympic_bronze_medal_in_synchronised_swimming.": "An Olympic bronze medal in synchronised swimming.", "equip.An_Olympic_gold_medal_in_synchronised_swimming.": "An Olympic gold medal in synchronised swimming.", "equip.An_Olympic_silver_medal_in_synchronised_swimming.": "An Olympic silver medal in synchronised swimming.", "equip.An_amethyst_set_in_a_gold_ring.": "An amethyst set in a gold ring.", @@ -2487,16 +2493,17 @@ "equip.Obsidian_Dagger": "Obsidian Dagger", "equip.Ocean_Trench_Key": "Ocean Trench Key", "equip.Old_Firecracker": "Old Firecracker", "equip.Once_the_most_powerful_staff_in_existence;_a_crack_in_its_f": "Once the most powerful staff in existence; a crack in its frame has rendered it incapable of focusing fire. It remains uniquely deadly.", "equip.One_of_the_Dark_Elves_that_have_recently_began_showing_up_i": "One of the Dark Elves that have recently began showing up in the Realm. Thanks to: SteeleAlt", "equip.One_of_the_legendary_great_blades_of_the_master_Ichimonji.": "One of the legendary great blades of the master Ichimonji.", "equip.Only_cheaters_wear_this_armor.": "Only cheaters wear this armor.", "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.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.", @@ -2672,16 +2679,17 @@ "equip.Seal_of_the_Aspirant": "Seal of the Aspirant", "equip.Seal_of_the_Blessed_Champion": "Seal of the Blessed Champion", "equip.Seal_of_the_Divine": "Seal of the Divine", "equip.Seal_of_the_Holy_Warrior": "Seal of the Holy Warrior", "equip.Seal_of_the_Initiate": "Seal of the Initiate", "equip.Seal_of_the_Pilgrim": "Seal of the Pilgrim", "equip.Seal_of_the_Seeker": "Seal of the Seeker", "equip.Serpentine_Staff": "Serpentine Staff", + "equip.Set_with_stones_as_red_as_OryxAPOSs_favorite_Cabernet_Sauvi": "Set with stones as red as Oryx's favorite Cabernet Sauvignon.", "equip.ShaitanAPOSs_Key": "Shaitan's Key", "equip.Shatters_Key": "Shatters Key", "equip.Shield_of_Ogmur": "Shield of Ogmur", "equip.Shiraz": "Shiraz", "equip.Short_Sword": "Short Sword", "equip.Shortbow": "Shortbow", "equip.Shoveguy_Skin": "Shoveguy Skin", "equip.Silver_Chainmail": "Silver Chainmail", @@ -3554,17 +3562,17 @@ "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": "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", "objects.Soulbound_Loot_Bag": "Soulbound Loot Bag", "objects.Spider_Den_Portal": "Spider Den Portal", @@ -3583,17 +3591,17 @@ "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.ft_shopkeep": "The Alchemist", "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",