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-10-03 20:20:34.614800515 +0000 +++ ./constants.json 2014-10-08 02:00:36.162157075 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "24.0", - "MINOR_VERSION": "2", + "BUILD_VERSION": "24.1", + "MINOR_VERSION": "0", "PORT": 2050, "RANDOM1": "311f80691451c71b09a13a2a6e", "RANDOM2": "72c5583cafb6818995cbd74b80", "RSA_PUBLIC_KEY": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCKFctVrhfF3m2Kes0FBL/JFeOcmNg9eJz8k/hQy1kadD+XFUpluRqa//Uxp2s9W2qE0EoUCu59ugcf/p7lGuL99UoSGmQEynkBvZct+/M40L0E0rZ4BVgzLOJmIbXMp0J4PnPcb6VLZvxazGcmSfjauC7F3yWYqUbZd/HCBtawwIDAQAB\n-----END PUBLIC KEY-----" } \ No newline at end of file diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2014-09-26 00:20:24.176548886 +0000 +++ ./json/Objects.json 2014-10-08 02:00:24.002158814 +0000 @@ -30376,16 +30376,158 @@ "Index": "0x466" }, "MaxHitPoints": "120000", "Defense": "0", "Size": "160", "XpMult": "0.0" }, { + "type": "0xf10", + "id": "Wand of Ancient Terror", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x500" + }, + "SlotType": "8", + "Description": "This wand has been used countless times to raise Lord Ruthven from the dead.", + "RateOfFire": "1", + "Sound": "weapon/wand_of_death", + "Projectile": { + "ObjectId": "Terror Orb", + "Speed": "130", + "MinDamage": "90", + "MaxDamage": "130", + "LifetimeMS": "770", + "ParticleTrail": "0x000000" + }, + "BagType": "4", + "FameBonus": "3", + "OldSound": "magicShoot", + "feedPower": "310", + "DisplayId": "Wand of Ancient Terror" + }, + { + "_": "\n \n \n \n \n .\n \n \n \n \n \n \n \n \n \n ", + "type": "0xf11", + "id": "Dagger of the Terrible Talon", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x501" + }, + "SlotType": "2", + "Description": "A claw-shard from Feargus, the Obsidian Dragon.", + "RateOfFire": "1", + "Sound": "weapon/fire_dagger", + "Projectile": { + "ObjectId": "Obsidian Vortex", + "Speed": "140", + "MinDamage": "90", + "MaxDamage": "175", + "LifetimeMS": "400" + }, + "BagType": "4", + "FameBonus": "3", + "OldSound": "daggerSwing", + "feedPower": "310", + "DisplayId": "Dagger of the Terrible Talon" + }, + { + "type": "0xf12", + "id": "Bow of Nightmares", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x502" + }, + "SlotType": "3", + "Description": "You can hear the screams of tortured souls as you draw this bow.", + "RateOfFire": "1", + "Sound": "weapon/golden_bow", + "Projectile": { + "ObjectId": "Purple Batshot", + "Speed": "160", + "MinDamage": "45", + "MaxDamage": "70", + "LifetimeMS": "440", + "MultiHit": "", + "ParticleTrail": "0x97357f" + }, + "BagType": "4", + "FameBonus": "3", + "NumProjectiles": "3", + "OldSound": "arrowShoot", + "feedPower": "310", + "DisplayId": "Bow of Nightmares" + }, + { + "type": "0xf13", + "id": "Staff of Horrific Knowledge", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x503" + }, + "SlotType": "17", + "Description": "It seems to dispense special runes upon use. Perhaps...some things are better left unknown.", + "RateOfFire": "1", + "Sound": "weapon/wand_of_death", + "Projectile": { + "ObjectId": "Runes of Horror", + "Speed": "180", + "MinDamage": "55", + "MaxDamage": "100", + "LifetimeMS": "475", + "Amplitude": "0.5", + "Frequency": "2", + "Size": "70" + }, + "BagType": "4", + "FameBonus": "3", + "NumProjectiles": "2", + "ArcGap": "0", + "OldSound": "magicShoot", + "feedPower": "310", + "DisplayId": "Staff of Horrific Knowledge" + }, + { + "type": "0xf14", + "id": "Corrupted Cleaver", + "Class": "Equipment", + "Item": "", + "Texture": { + "File": "lofiObj3", + "Index": "0x504" + }, + "SlotType": "24", + "Description": "This blade is drenched in the blood of heroes. Are you sure this blade is meant for you?", + "RateOfFire": "1", + "Sound": "weapon/long_sword", + "Projectile": { + "ObjectId": "Cleaved Eyeball", + "Speed": "120", + "MinDamage": "110", + "MaxDamage": "170", + "LifetimeMS": "350", + "MultiHit": "", + "ParticleTrail": "0xbe0406" + }, + "BagType": "4", + "FameBonus": "3", + "OldSound": "bladeSwing", + "feedPower": "310", + "DisplayId": "Corrupted Cleaver" + }, + { "type": "0x0dc0", "id": "Great Temple Snake", "Class": "Character", "Enemy": "", "Size": "100", "ShadowSize": "90", "MaxHitPoints": "50", "Defense": "20", @@ -63231,16 +63373,77 @@ "Class": "Projectile", "Texture": { "File": "lofiObj3", "Index": "0x4EC" }, "AngleCorrection": "3" }, { + "type": "0xcf3", + "id": "Terror Orb", + "Class": "Projectile", + "Texture": { + "File": "lofiObj3", + "Index": "0x505" + }, + "Rotation": "185" + }, + { + "type": "0xcf4", + "id": "Obsidian Vortex", + "Class": "Projectile", + "Texture": { + "File": "lofiObj3", + "Index": "0x506" + }, + "Rotation": "185" + }, + { + "type": "0xcf5", + "id": "Purple Batshot", + "Class": "Projectile", + "Texture": { + "File": "lofiObj3", + "Index": "0x507" + }, + "AngleCorrection": "2" + }, + { + "type": "0xcf6", + "id": "Runes of Horror", + "Class": "Projectile", + "RandomTexture": { + "Texture": [ + { + "File": "lofiObj3", + "Index": "0x508" + }, + { + "File": "lofiObj3", + "Index": "0x509" + }, + { + "File": "lofiObj3", + "Index": "0x50A" + } + ] + } + }, + { + "type": "0xcf7", + "id": "Cleaved Eyeball", + "Class": "Projectile", + "Texture": { + "File": "lofiObj3", + "Index": "0x50B" + }, + "AngleCorrection": "0" + }, + { "type": "0x7433", "id": "The Puppet Master", "DisplayId": "The Puppet Master", "Class": "Character", "Group": "Master", "Enemy": "", "AnimatedTexture": { "File": "chars16x16rEncounters", 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-09-26 00:20:21.408549888 +0000 +++ ./strings.json 2014-10-08 02:00:21.578159161 +0000 @@ -1608,16 +1608,17 @@ "equip.A_broad-bladed_steel_sword.": "A broad-bladed steel sword.", "equip.A_bronze-plated_lieutenantAPOSs_helm,_effective_for_invigor": "A bronze-plated lieutenant's helm, effective for invigorating the fighting spirit of nearby allies.", "equip.A_captainAPOSs_helm_of_distinctive_black_iron,_capable_of_i": "A captain's helm of distinctive black iron, capable of inspiring great courage.", "equip.A_centuries-old_wand_of_great_power,_heralding_long-destine": "A centuries-old wand of great power, heralding long-destined destruction.", "equip.A_ceremonial_robe_worn_by_ritual_leaders_during_the_celebra": "A ceremonial robe worn by ritual leaders during the celebration of the Summer Solstice. Its golden threads shine with the light of the sun.", "equip.A_chicken_leg_of_doom.": "A chicken leg of doom.", "equip.A_citrine_set_in_a_gold_ring.": "A citrine set in a gold ring.", "equip.A_citrine_set_in_a_silver_ring.": "A citrine set in a silver ring.", + "equip.A_claw-shard_from_Feargus,_the_Obsidian_Dragon.": "A claw-shard from Feargus, the Obsidian Dragon.", "equip.A_commanding_scepter_of_authority,_wielded_by_cloud_titan_n": "A commanding scepter of authority, wielded by cloud titan nobles from the elemental plane of air.", "equip.A_common__?_?_?_?__pet_egg.": "A common ? ? ? ? pet egg.", "equip.A_common_aquatic_pet_egg.": "A common aquatic pet egg.", "equip.A_common_automaton_pet_egg.": "A common automaton pet egg.", "equip.A_common_avian_pet_egg.": "A common avian pet egg.", "equip.A_common_bird_pet_egg.": "A common bird pet egg.", "equip.A_common_canine_pet_egg.": "A common canine pet egg.", "equip.A_common_exotic_pet_egg.": "A common exotic pet egg.", @@ -2139,16 +2140,17 @@ "equip.Boost_Attack": "Boost Attack", "equip.Boost_Dexterity": "Boost Dexterity", "equip.Bow_of_Covert_Havens": "Bow of Covert Havens", "equip.Bow_of_Deep_Enchantment": "Bow of Deep Enchantment", "equip.Bow_of_Eternal_Frost": "Bow of Eternal Frost", "equip.Bow_of_Fey_Magic": "Bow of Fey Magic", "equip.Bow_of_Innocent_Blood": "Bow of Innocent Blood", "equip.Bow_of_Mystical_Energy": "Bow of Mystical Energy", + "equip.Bow_of_Nightmares": "Bow of Nightmares", "equip.Bow_of_the_Morning_Star": "Bow of the Morning Star", "equip.Bracer_of_the_Guardian": "Bracer of the Guardian", "equip.Breathtaker_Skull": "Breathtaker Skull", "equip.Brigand_Skin": "Brigand Skin", "equip.Broad_Sword": "Broad Sword", "equip.Bronze_Helm": "Bronze Helm", "equip.Bronze_Medal": "Bronze Medal", "equip.Buster_Katana": "Buster Katana", @@ -2206,16 +2208,17 @@ "equip.Concentrated,_lethal_venom_of_the_winged_ethereal_baneserpe": "Concentrated, lethal venom of the winged ethereal baneserpent.", "equip.Conducting_Wand": "Conducting Wand", "equip.Consolation_Key": "Consolation Key", "equip.Coral_Bow": "Coral Bow", "equip.Coral_Juice": "Coral Juice", "equip.Coral_Ring": "Coral Ring", "equip.Coral_Silk_Armor": "Coral Silk Armor", "equip.Coral_Venom_Trap": "Coral Venom Trap", + "equip.Corrupted_Cleaver": "Corrupted Cleaver", "equip.Cracked_Crystal_Skull": "Cracked Crystal Skull", "equip.Cream_Spirit": "Cream Spirit", "equip.Created_by_a_lonely_Sorcerer._This_sentient_eye_doesnAPOSt_": "Created by a lonely Sorcerer. This sentient eye doesn't make a very good friend. It does, however, make fruit. Rarity: Rare, I guess", "equip.Crossbow": "Crossbow", "equip.Crown": "Crown", "equip.Crystal_Bone_Ring": "Crystal Bone Ring", "equip.Crystal_Sword": "Crystal Sword", "equip.Crystal_Wand": "Crystal Wand", @@ -2241,16 +2244,17 @@ "equip.Customize_your_Warrior_with_the_Shoveguy_Skin.": "Customize your Warrior with the Shoveguy Skin.", "equip.Customize_your_Warrior_with_the_Slime_Skin.": "Customize your Warrior with the Slime Skin.", "equip.Customize_your_Wizard_with_the_Gentleman_Skin._Rarity:_Rare": "Customize your Wizard with the Gentleman Skin. Rarity: Rare Indeed", "equip.Dagger_of_Amethyst_Protection": "Dagger of Amethyst Protection", "equip.Dagger_of_Dire_Hatred": "Dagger of Dire Hatred", "equip.Dagger_of_Foul_Malevolence": "Dagger of Foul Malevolence", "equip.Dagger_of_Sinister_Deeds": "Dagger of Sinister Deeds", "equip.Dagger_of_the_Amethyst_Prism": "Dagger of the Amethyst Prism", + "equip.Dagger_of_the_Terrible_Talon": "Dagger of the Terrible Talon", "equip.Damages_monsters.": "Damages monsters.", "equip.Damages_monsters_for_longer_while_celebrating_Independence_": "Damages monsters for longer while celebrating Independence Day. Happy 4th of July!", "equip.Damages_monsters_while_celebrating_Independence_Day._Happy_": "Damages monsters while celebrating Independence Day. Happy 4th of July!", "equip.DavyAPOSs_Key": "Davy's Key", "equip.Deadly_Vixen_Skin": "Deadly Vixen Skin", "equip.Deadly_magical_poison_taken_from_the_two_headed_pit_snakes_": "Deadly magical poison taken from the two headed pit snakes of the underworld.", "equip.Deadly_poison_of_the_swamp_centipede.": "Deadly poison of the swamp centipede.", "equip.Deadwater_Docks_Key": "Deadwater Docks Key", @@ -2431,16 +2435,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.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.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", @@ -2782,16 +2787,17 @@ "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_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", "equip.Staff_of_the_Vital_Unity": "Staff of the Vital Unity", "equip.Stanley_the_Spring_Bunny_Skin": "Stanley the Spring Bunny Skin", @@ -2845,32 +2851,34 @@ "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_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_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.", "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_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", "equip.Thousand_Suns_Spell": "Thousand Suns Spell", "equip.Thunder_Katana": "Thunder Katana", "equip.Thunderclap_Scepter": "Thunderclap Scepter", "equip.Timelock_Orb": "Timelock Orb", @@ -2915,16 +2923,17 @@ "equip.Unstable_Anomaly": "Unstable Anomaly", "equip.Use_this_to_make_an_awesome_sand_castleBANG_(Heals_nearby_i": "Use this to make an awesome sand castle! (Heals nearby injured players.)", "equip.Used_only_by_the_pirates_who_would_make_themselves_kings,_t": "Used only by the pirates who would make themselves kings, this cutlass is said to be cursed as each Pirate King seems to be killed rather unexpectedly.", "equip.Useless_Katana": "Useless Katana", "equip.Vengeance_Armor": "Vengeance Armor", "equip.Verdant_Bow": "Verdant Bow", "equip.Vinesword": "Vinesword", "equip.Vintage_Port": "Vintage Port", + "equip.Wand_of_Ancient_Terror": "Wand of Ancient Terror", "equip.Wand_of_Ancient_Warning": "Wand of Ancient Warning", "equip.Wand_of_Arcane_Flame": "Wand of Arcane Flame", "equip.Wand_of_Budding": "Wand of Budding", "equip.Wand_of_Budding_Romance": "Wand of Budding Romance", "equip.Wand_of_Dark_Magic": "Wand of Dark Magic", "equip.Wand_of_Death": "Wand of Death", "equip.Wand_of_Deep_Sorcery": "Wand of Deep Sorcery", "equip.Wand_of_Egg-cellence": "Wand of Egg-cellence", @@ -2956,16 +2965,17 @@ "equip.Wyvern_Skin_Armor": "Wyvern Skin Armor", "equip.XP_Booster": "XP Booster", "equip.XP_Booster_1_hr": "XP Booster 1 hr", "equip.XP_Booster_20_min": "XP Booster 20 min", "equip.XP_Booster_Test": "XP Booster Test", "equip.Yellow_Drake_Egg": "Yellow Drake Egg", "equip.Yellow_Gumball": "Yellow Gumball", "equip.You_are_not_a_unique_snowflake._YouAPOSre_like_one_of_five_": "You are not a unique snowflake. You're like one of five or something.", + "equip.You_can_hear_the_screams_of_tortured_souls_as_you_draw_this": "You can hear the screams of tortured souls as you draw this bow.", "error.loadError": "Load error, retrying", "forbiddenJungle.Basilisk": "Basilisk", "forbiddenJungle.Basilisk_Baby": "Basilisk Baby", "forbiddenJungle.Boss_Totem": "Boss Totem", "forbiddenJungle.Great_Coil_Snake": "Great Coil Snake", "forbiddenJungle.Great_Snake_Egg": "Great Snake Egg", "forbiddenJungle.Great_Temple_Snake": "Great Temple Snake", "forbiddenJungle.Jungle_Brazier": "Jungle Brazier",