diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/init.json ./init.json
--- ../current/init.json 2015-08-19 21:10:21.766020713 +0000
+++ ./init.json 2016-08-03 03:10:18.802810023 +0000
@@ -13,14 +13,14 @@
"80",
"120",
"200",
"300",
"450",
"600"
]
},
- "FilterList": "[a4]mmysh[o0]p\n\"[i1|l].{0,15}p[o0]?ts.{0,15}c[o0]?\"\n[i1|l]nst[a4]ntd[e3][il1|][i1|l]v[e3]ry\n[i1|l]nst[a4]p[o0]ts\n[i1|l]p[o0]?tsc?[o0]?\n\"[il1|]nst[a4].{0,15}p[0o]ts\"\n\"[o0]ryx.{0,5}in\"\n\"[o0]ryx{0,10}?pr[0o]\"\n[o0]ryxs[e3]t[o0][e3]u\n[o0]ryxsh[o0]pru\n[o0]w[il1|]y\nb[il1|]tly\nbuyfr[o0]mus\nch[e3][a4]p[o0]ryx\nch[e3][a4]pestp[o0]t[i1|l][0o]ns\nch[e3][a4]pst[a4]tp[o0]ts\nd[o0]tc[o0]\nd[o0]tn[e3]t\nfr[e3][e3]mu[il1|][e3]\nfr[e3][e3]r[o0]tmg\ng[0o][0o]gl\n\"nst[a4].{0,15}p[0o]t[s5]\"\n\"p[o0]t[i1|l][o0]ns.{0,15}?r[e3][a4][il1|]?m?(net)?\"\n\"p[o0]t[i1|l][o0]ns.{0,15}?r[o0]tmg\"\n\"r[0o]?tmg.{0,15}[0o]ut\"\n\"r[0o]?tmg.{0,15}c[a40o]\"\n\"r[0o]?tmg.{0,15}gu[i1|l][i1|l]ds\"\n\"r[0o]?tmg.{0,15}p[0o]t[s5]\"\n\"r[0o]?tmg.{0,15}pr[0o]sh[0o]p\"\n\"r[0o]?tmg.{0,15}s[a4][i1|l][e3]\"\n\"r[0o]?tmg.{0,15}sh[0o]pn[i1|l]\"\n\"r[0o]?tmg.{0,15}v[a4]u[i1|l]tc[0o]m\"\n\"r[e3][a4][i1|l]m.{0,15}g[o0][o0]ds\"\n\"r[e3][a4][i1|l]m.{0,15}g[o0]d\"\n\"r[e3][a4][i1|l]m.{0,15}k[i1|l]ng\"\n\"r[e3][a4][i1|l]m.{0,15}p[0o]ts\"\n\"r[e3][a4][i1|l]m.{0,15}w[i1|l]nn[e3]r\"\n\"r[o0]?tmg.{0,15}[o0]ut[l1i]et.{0,15}c[0o]m\"\n\"r[o0]?tmg.{0,15}[s5][a4][l1i|][e3]\"\n\"r[o0]?tmg.{0,15}m[0o]dz\"\n\"r[o0]?tmg.{0,15}p[0o].{0,15}c[0o]m\"\n\"r[o0]?tmg.{0,15}w[s5]\"\nt[il1|]nyur[il1|]\n\"wh[i1|l]t[e3].{0,15}b[a4]g.{0,15}d[0o]t\"\n\"wh[i1|l]t[e3].{0,15}b[a4]g.{0,15}n[e3]t\"\n\"wh[il1|]t[e3].{0,15}b[a4]g.{0,15}c[0o]m\"\nMMMMM",
+ "FilterList": "[a4]mmysh[o0]p\r\n\"[i1|l].{0,15}p[o0]?ts.{0,15}c[o0]?\"\r\n[i1|l]nst[a4]ntd[e3][il1|][i1|l]v[e3]ry\r\n[i1|l]nst[a4]p[o0]ts\r\n[i1|l]p[o0]?tsc?[o0]?\r\n\"[il1|]nst[a4].{0,15}p[0o]ts\"\r\n\"[o0]ryx.{0,5}in\"\r\n\"[o0]ryx{0,10}?pr[0o]\"\r\n[o0]ryxs[e3]t[o0][e3]u\r\n[o0]ryxsh[o0]pru\r\n[o0]w[il1|]y\r\nb[il1|]tly\r\nbuyfr[o0]mus\r\nch[e3][a4]p[o0]ryx\r\nch[e3][a4]pestp[o0]t[i1|l][0o]ns\r\nch[e3][a4]pst[a4]tp[o0]ts\r\nd[o0]tc[o0]\r\nd[o0]tn[e3]t\r\nfr[e3][e3]mu[il1|][e3]\r\nfr[e3][e3]r[o0]tmg\r\ng[0o][0o]gl\r\n\"nst[a4].{0,15}p[0o]t[s5]\"\r\n\"p[o0]t[i1|l][o0]ns.{0,15}?r[e3][a4][il1|]?m?(net)?\"\r\n\"p[o0]t[i1|l][o0]ns.{0,15}?r[o0]tmg\"\r\n\"r[0o]?tmg.{0,15}[0o]ut\"\r\n\"r[0o]?tmg.{0,15}c[a40o]\"\r\n\"r[0o]?tmg.{0,15}gu[i1|l][i1|l]ds\"\r\n\"r[0o]?tmg.{0,15}p[0o]t[s5]\"\r\n\"r[0o]?tmg.{0,15}pr[0o]sh[0o]p\"\r\n\"r[0o]?tmg.{0,15}s[a4][i1|l][e3]\"\r\n\"r[0o]?tmg.{0,15}sh[0o]pn[i1|l]\"\r\n\"r[0o]?tmg.{0,15}v[a4]u[i1|l]tc[0o]m\"\r\n\"r[e3][a4][i1|l]m.{0,15}g[o0][o0]ds\"\r\n\"r[e3][a4][i1|l]m.{0,15}g[o0]d\"\r\n\"r[e3][a4][i1|l]m.{0,15}k[i1|l]ng\"\r\n\"r[e3][a4][i1|l]m.{0,15}p[0o]ts\"\r\n\"r[e3][a4][i1|l]m.{0,15}w[i1|l]nn[e3]r\"\r\n\"r[o0]?tmg.{0,15}[o0]ut[l1i]et.{0,15}c[0o]m\"\r\n\"r[o0]?tmg.{0,15}[s5][a4][l1i|][e3]\"\r\n\"r[o0]?tmg.{0,15}m[0o]dz\"\r\n\"r[o0]?tmg.{0,15}p[0o].{0,15}c[0o]m\"\r\n\"r[o0]?tmg.{0,15}w[s5]\"\r\nt[il1|]nyur[il1|]\r\n\"wh[i1|l]t[e3].{0,15}b[a4]g.{0,15}d[0o]t\"\r\n\"wh[i1|l]t[e3].{0,15}b[a4]g.{0,15}n[e3]t\"\r\n\"wh[il1|]t[e3].{0,15}b[a4]g.{0,15}c[0o]m\"\r\nMMMMM",
"DisableRegist": "0",
"MysteryBoxRefresh": "600",
"SalesforceMobile": "0"
}
}
\ No newline at end of file
diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json
--- ../current/json/Objects.json 2016-07-26 00:30:23.348231815 +0000
+++ ./json/Objects.json 2016-08-03 03:10:21.606810029 +0000
@@ -17406,16 +17406,56 @@
"Consumable": "",
"Potion": "",
"Soulbound": "",
"BagType": "5",
"feedPower": "250",
"DisplayId": "Potion of Mana (SB)"
},
{
+ "type": "0x1561",
+ "id": "Olive Gladiator Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "playerskins16",
+ "Index": "06"
+ },
+ "SlotType": "10",
+ "Description": "Customize your Warrior with the Olive Gladiator Skin.",
+ "Activate": {
+ "_": "UnlockSkin",
+ "skinType": "1027"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "1",
+ "DisplayId": "Olive Gladiator Skin"
+ },
+ {
+ "type": "0x1562",
+ "id": "Ivory Gladiator Skin",
+ "Class": "Equipment",
+ "Item": "",
+ "AnimatedTexture": {
+ "File": "playerskins16",
+ "Index": "07"
+ },
+ "SlotType": "10",
+ "Description": "Customize your Warrior with the Ivory Gladiator Skin.",
+ "Activate": {
+ "_": "UnlockSkin",
+ "skinType": "1028"
+ },
+ "Consumable": "",
+ "Soulbound": "",
+ "BagType": "1",
+ "DisplayId": "Ivory Gladiator Skin"
+ },
+ {
"type": "0xab0",
"id": "Minor Health Potion",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj2",
"Index": "0xf6"
},
@@ -72565,16 +72605,48 @@
"Index": "05"
},
"PlayerClassType": "0x030e",
"UnlockSpecial": "Set Skin",
"NoSkinSelect": "",
"DisplayId": "Twilight Archmage Set Skin"
},
{
+ "type": "0x0403",
+ "id": "Olive Gladiator",
+ "Skin": "",
+ "Class": "Skin",
+ "AnimatedTexture": {
+ "File": "playerskins16",
+ "Index": "06"
+ },
+ "PlayerClassType": "0x031d",
+ "ActivateOnEquipAll": {
+ "_": "ChangeSkin",
+ "skinType": "0x0403",
+ "size": "70",
+ "color": "0xF5F5DC"
+ },
+ "NoSkinSelect": "",
+ "DisplayId": "Olive Gladiator"
+ },
+ {
+ "type": "0x0404",
+ "id": "Ivory Gladiator",
+ "Skin": "",
+ "Class": "Skin",
+ "AnimatedTexture": {
+ "File": "playerskins16",
+ "Index": "07"
+ },
+ "PlayerClassType": "0x031d",
+ "NoSkinSelect": "",
+ "DisplayId": "Ivory Gladiator"
+ },
+ {
"type": "0x0e28",
"id": "Snakepit Guard Spawner",
"Class": "Character",
"Enemy": "",
"NoMiniMap": "",
"AnimatedTexture": {
"File": "chars16x16dEncounters2",
"Index": "39"
Binary files ../current/sheets/playersSkins16Mask.png and ./sheets/playersSkins16Mask.png differ
diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/strings.json ./strings.json
--- ../current/strings.json 2016-07-26 00:30:20.364229003 +0000
+++ ./strings.json 2016-08-03 03:10:18.614810023 +0000
@@ -2314,16 +2314,18 @@
"equip.Customize_your_Ninja_with_the_Slime_Skin.": "Customize your Ninja with the Slime Skin.",
"equip.Customize_your_Paladin_with_the_Holy_Avenger_Skin._Thanks_t": "Customize your Paladin with the Holy Avenger Skin. Thanks to: Uomo",
"equip.Customize_your_Paladin_with_the_Slime_Skin.": "Customize your Paladin with the Slime Skin.",
"equip.Customize_your_Priest_with_the_Slime_Skin._Rarity:_Common": "Customize your Priest with the Slime Skin. Rarity: Common",
"equip.Customize_your_Rogue_with_the_Brigand_Skin._Rarity:_Uncommo": "Customize your Rogue with the Brigand Skin. Rarity: Uncommon",
"equip.Customize_your_Rogue_with_the_Slime_Skin.": "Customize your Rogue with the Slime Skin.",
"equip.Customize_your_Sorcerer_with_the_Slime_Skin.": "Customize your Sorcerer with the Slime Skin.",
"equip.Customize_your_Trickster_with_the_Slime_Skin.": "Customize your Trickster with the Slime Skin.",
+ "equip.Customize_your_Warrior_with_the_Ivory_Gladiator_Skin.": "Customize your Warrior with the Ivory Gladiator Skin.",
+ "equip.Customize_your_Warrior_with_the_Olive_Gladiator_Skin.": "Customize your Warrior with the Olive Gladiator Skin.",
"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",
@@ -2551,16 +2553,17 @@
"equip.Iron_Mail": "Iron Mail",
"equip.Iron_Quiver": "Iron Quiver",
"equip.Iron_Shield": "Iron Shield",
"equip.Ironwood_Bow": "Ironwood Bow",
"equip.ItAPOSs_cold_in_here.": "It's cold in here.",
"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_is_said_that_the_ring_attunes_itAPOSs_wearer_to_the_eart": "It is said that the ring attunes it's wearer to the earth and it's life force.",
"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.Ivory_Gladiator_Skin": "Ivory Gladiator Skin",
"equip.Jack_the_Ripper_Skin": "Jack the Ripper Skin",
"equip.Jester_Skin": "Jester Skin",
"equip.Jewel_Eye_Katana": "Jewel Eye Katana",
"equip.Join_my_legions_of_infected,_hero._Thanks_to:_WunderWafe": "Join my legions of infected, hero. Thanks to: WunderWafe",
"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",
@@ -2658,16 +2661,17 @@
"equip.Night_Edge": "Night Edge",
"equip.Nightwing_Venom": "Nightwing Venom",
"equip.No_mortal_can_fire_this_dreaded_bow_without_resting_in_betw": "No mortal can fire this dreaded bow without resting in between shots. It requires tremendous skill to wield.",
"equip.Not_all_sorcerers_are_male.": "Not all sorcerers are male.",
"equip.Nun_Skin": "Nun Skin",
"equip.Obsidian_Dagger": "Obsidian Dagger",
"equip.Ocean_Trench_Key": "Ocean Trench Key",
"equip.Old_Firecracker": "Old Firecracker",
+ "equip.Olive_Gladiator_Skin": "Olive Gladiator Skin",
"equip.On_simple_observation_this_robe_has_known_many_owners._All_": "On simple observation this robe has known many owners. All are dead.",
"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",
@@ -5069,30 +5073,32 @@
"skins.Geb_Set_Skin": "Geb Set Skin",
"skins.Gentleman": "Gentleman",
"skins.Ghost_Huntress": "Ghost Huntress",
"skins.Holy_Avenger": "Holy Avenger",
"skins.Hunchback": "Hunchback",
"skins.Huntsman": "Huntsman",
"skins.Iceman": "Iceman",
"skins.Infected_Assassin": "Infected Assassin",
+ "skins.Ivory_Gladiator": "Ivory Gladiator",
"skins.Jack_the_Ripper": "Jack the Ripper",
"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.Mischievous_Imp": "Mischievous Imp",
"skins.Morningstar": "Morningstar",
"skins.Nexus_no_Miko": "Nexus no Miko",
"skins.Nun": "Nun",
+ "skins.Olive_Gladiator": "Olive Gladiator",
"skins.Oryx_Set_Skin": "Oryx Set Skin",
"skins.Phylactery_Set_Skin": "Phylactery Set Skin",
"skins.Platinum_Knight": "Platinum Knight",
"skins.Platinum_Rogue": "Platinum Rogue",
"skins.Platinum_Warrior": "Platinum Warrior",
"skins.Poltergeist": "Poltergeist",
"skins.Puppet_Master": "Puppet Master",
"skins.Pyramid_Revenant": "Pyramid Revenant",