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-27 00:20:35.449490663 +0000 +++ ./constants.json 2014-08-28 21:00:35.295431433 +0000 @@ -1,8 +1,8 @@ { - "BUILD_VERSION": "23.0", - "MINOR_VERSION": "1", + "BUILD_VERSION": "23.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-08-27 00:20:23.037475658 +0000 +++ ./json/Objects.json 2014-08-28 21:00:23.615434727 +0000 @@ -29805,16 +29805,200 @@ "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", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x03" + }, + "Description": "The Devil - Card XV of the Major Arcana. Thanks to Dappertron. ", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "1 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The Devil Tarot Card" + }, + { + "type": "0x233b", + "id": "The Sun Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x04" + }, + "Description": "The Sun - Card XIX of the Major Arcana. Thanks to Dappertron.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "2 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The Sun Tarot Card" + }, + { + "type": "0x233c", + "id": "Death Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x05" + }, + "Description": "Death - Card XIII of the Major Arcana. Thanks to Dappertron.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "3 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "Death Tarot Card" + }, + { + "type": "0x233d", + "id": "The Tower Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x06" + }, + "Description": "The Tower - Card XVI of the Major Arcana. Thanks to Dappertron.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "4 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The Tower Tarot Card" + }, + { + "type": "0x233e", + "id": "The Magician Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x07" + }, + "Description": "The Magician - Card I of the Major Arcana. Thanks to Dappertron.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "5 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The Magician Tarot Card" + }, + { + "type": "0x233f", + "id": "The World Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x08" + }, + "Description": "The World - Card XXI of the Major Arcana. Thanks to Dappertron.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "6 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The World Tarot Card" + }, + { + "type": "0x2340", + "id": "The Chariot Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x09" + }, + "Description": "The Chariot - Card VII of the Major Arcana. Thanks to Dappertron.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "7 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The Chariot Tarot Card" + }, + { + "type": "0x2341", + "id": "The Moon Tarot Card", + "Class": "Equipment", + "Item": "", + "SlotType": "10", + "Texture": { + "File": "d3LofiObjEmbed", + "Index": "0x0a" + }, + "Description": "The Moon - Card XVIII of the Major Arcana. Thanks to LabdaABeta.", + "ExtraTooltipData": { + "EffectInfo": { + "name": "Treasure", + "description": "8 of 8" + } + }, + "Sound": "spell/fire_nova", + "BagType": "4", + "Treasure": "", + "feedPower": "250", + "DisplayId": "The Moon Tarot Card" + }, + { "type": "0x0dc0", "id": "Great Temple Snake", "Class": "Character", "Enemy": "", "Size": "100", "ShadowSize": "90", "MaxHitPoints": "50", "Defense": "20", Binary files ../current/sheets/d3LofiObj.png and ./sheets/d3LofiObj.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-08-27 00:20:20.593472703 +0000 +++ ./strings.json 2014-08-28 21:00:21.187435412 +0000 @@ -1563,23 +1563,31 @@ "epicspiderDen.The_Crawling_Depths_Key": "The Crawling Depths Key", "epicspiderDen.The_Crawling_Depths_Portal": "The Crawling Depths Portal", "epicspiderDen.Yellow_Egg_Summoner": "Yellow Egg Summoner", "epicspiderDen.Yellow_Son_of_Arachna_Giant_Egg_Sac": "Yellow Son of Arachna Giant Egg Sac", "equip.+20": "+20", "equip.1_hour": "1 hour", "equip.1_of_2": "1 of 2", "equip.1_of_3": "1 of 3", + "equip.1_of_8": "1 of 8", "equip.20_min": "20 min", "equip.20_minutes": "20 minutes", "equip.25_sec": "25 sec", "equip.2_of_2": "2 of 2", "equip.2_of_3": "2 of 3", + "equip.2_of_8": "2 of 8", "equip.30_min": "30 min", "equip.3_of_3": "3 of 3", + "equip.3_of_8": "3 of 8", + "equip.4_of_8": "4 of 8", + "equip.5_of_8": "5 of 8", + "equip.6_of_8": "6 of 8", + "equip.7_of_8": "7 of 8", + "equip.8_of_8": "8 of 8", "equip.A_Sorcerer_who_has_mastered_the_art_so_acutely_that_they_ha": "A Sorcerer who has mastered the art so acutely that they have raised their consciousness. Thanks to: NoobLegend", "equip.A_Wizard_who_has_comitted_themselves_to_star_magic._Thanks_": "A Wizard who has comitted themselves to star magic. Thanks to: Ed_Stark", "equip.A_backpack_thatAPOSll_double_your_inventory_spaceBANG": "A backpack that'll double your inventory space!", "equip.A_backpack_that_will_double_your_inventory_spaceBANG": "A backpack that will double your inventory space!", "equip.A_basic_katana.": "A basic katana.", "equip.A_basic_ninja-star.": "A basic ninja-star.", "equip.A_beautiful_and_versatile_robe_of_the_lightest_magethread.": "A beautiful and versatile robe of the lightest magethread.", "equip.A_beautiful_katana,_forged_and_cooled_by_the_mists_atop_a_g": "A beautiful katana, forged and cooled by the mists atop a great mountain.", @@ -2225,26 +2233,29 @@ "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", + "equip.Death_-_Card_XIII_of_the_Major_Arcana._Thanks_to_Dappertron": "Death - Card XIII of the Major Arcana. Thanks to Dappertron.", + "equip.Death_Tarot_Card": "Death Tarot Card", "equip.Deception_Prism": "Deception Prism", "equip.Decoy_Prism": "Decoy Prism", "equip.Deepforest_Trap": "Deepforest Trap", "equip.Def_Test_Sword": "Def Test Sword", "equip.Demon_Blade": "Demon Blade", "equip.Demon_Edge": "Demon Edge", "equip.Demonhunter_Trap": "Demonhunter Trap", "equip.Desolation_Armor": "Desolation Armor", "equip.Despite_having_a_serious_rap_sheet,_heAPOSs_quite_handsome.": "Despite having a serious rap sheet, he's quite handsome. Thanks to: Flawks", "equip.Destruction_Sphere_Spell": "Destruction Sphere Spell", + "equip.Devil_Tarot_Card": "Devil Tarot Card", "equip.Diamond_Bladed_Katana": "Diamond Bladed Katana", "equip.Diamonds_are_a_girls_best_friend,_they_also_happen_to_make_": "Diamonds are a girls best friend, they also happen to make for great blades…so shiny!", "equip.Dirk": "Dirk", "equip.Dirk_of_Cronus": "Dirk of Cronus", "equip.Discharge_Scepter": "Discharge Scepter", "equip.Doctor_Swordsworth": "Doctor Swordsworth", "equip.Doku_No_Ken": "Doku No Ken", "equip.Dominion_Armor": "Dominion Armor", @@ -2774,19 +2785,33 @@ "equip.Sword_of_Splendor": "Sword of Splendor", "equip.Sword_of_the_Mad_God": "Sword of the Mad God", "equip.Tablet_of_the_KingAPOSs_Avatar": "Tablet of the King's Avatar", "equip.Taco": "Taco", "equip.Test_Egg_1": "Test Egg 1", "equip.Test_Egg_2": "Test Egg 2", "equip.Test_Egg_4": "Test Egg 4", "equip.Test_Egg_Specific": "Test Egg Specific", + "equip.The_Chariot_-_Card_VII_of_the_Major_Arcana._Thanks_to_Dappe": "The Chariot - Card VII of the Major Arcana. Thanks to Dappertron.", + "equip.The_Chariot_Tarot_Card": "The Chariot Tarot Card", "equip.The_Crawling_Depths_Key": "The Crawling Depths Key", + "equip.The_Devil_-_Card_XV_of_the_Major_Arcana._Thanks_to_Dappertr": "The Devil - Card XV of the Major Arcana. Thanks to Dappertron. ", + "equip.The_Devil_Tarot_Card": "The Devil Tarot Card", "equip.The_Forgotten_Crown": "The Forgotten Crown", + "equip.The_Magician_-_Card_I_of_the_Major_Arcana._Thanks_to_Dapper": "The Magician - Card I of the Major Arcana. Thanks to Dappertron.", + "equip.The_Magician_Tarot_Card": "The Magician Tarot Card", + "equip.The_Moon_-_Card_XVIII_of_the_Major_Arcana._Thanks_to_LabdaA": "The Moon - Card XVIII of the Major Arcana. Thanks to LabdaABeta.", + "equip.The_Moon_Tarot_Card": "The Moon Tarot Card", + "equip.The_Sun_-_Card_XIX_of_the_Major_Arcana._Thanks_to_Dappertro": "The Sun - Card XIX of the Major Arcana. Thanks to Dappertron.", + "equip.The_Sun_Tarot_Card": "The Sun Tarot Card", + "equip.The_Tower_-_Card_XVI_of_the_Major_Arcana._Thanks_to_Dappert": "The Tower - Card XVI of the Major Arcana. Thanks to Dappertron.", + "equip.The_Tower_Tarot_Card": "The Tower Tarot Card", "equip.The_Twilight_Gemstone": "The Twilight Gemstone", + "equip.The_World_-_Card_XXI_of_the_Major_Arcana._Thanks_to_Dappert": "The World - Card XXI of the Major Arcana. Thanks to Dappertron.", + "equip.The_World_Tarot_Card": "The World Tarot Card", "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.",