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-11-08 18:20:28.879492601 +0000
+++ ./json/Objects.json 2016-11-17 17:30:23.891736804 +0000
@@ -10330,16 +10330,17 @@
"DeathSound": "monster/skull_shrine_death",
"Size": "120",
"MaxHitPoints": "10000",
"Defense": "40",
"Enemy": "",
"Hero": "",
"Quest": "",
"God": "",
+ "Encounter": "",
"StasisImmune": "",
"Level": "20",
"Projectile": {
"ObjectId": "Purple Magic",
"Speed": "100",
"Damage": "100",
"LifetimeMS": "2400"
},
@@ -10407,17 +10408,16 @@
"DeathSound": "monster/skull_shrine_death",
"Size": "120",
"MaxHitPoints": "20000",
"Defense": "40",
"Enemy": "",
"Hero": "",
"Quest": "",
"God": "",
- "Encounter": "",
"StasisImmune": "",
"Level": "20",
"Projectile": {
"ObjectId": "Purple Magic",
"Speed": "100",
"Damage": "100",
"LifetimeMS": "2400"
},
@@ -11106,17 +11106,16 @@
"Index": "50"
}
},
"MaxHitPoints": "100000",
"XpMult": "0.0",
"God": "",
"Hero": "",
"Quest": "",
- "Encounter": "",
"Level": "20",
"PerRealmMax": "10",
"DisplayId": "Zombie Horde"
},
{
"type": "0x0e5c",
"id": "Bonegrind 2",
"DisplayId": "Bonegrind the Undead Butcher",
@@ -64779,17 +64778,17 @@
{
"type": "0x003e",
"id": "Bark Bolt",
"Class": "Projectile",
"Texture": {
"File": "lofiObj2",
"Index": "0x43"
},
- "Rotation": "0.2"
+ "Rotation": "50"
},
{
"type": "0x003f",
"id": "Eldritch Zap",
"Class": "Projectile",
"Texture": {
"File": "lofiObj2",
"Index": "0x44"
@@ -86484,28 +86483,19 @@
"Defense": "10"
},
{
"type": "0x0932",
"id": "Oryx the Mad God 2",
"DisplayId": "Oryx the Mad God",
"Enemy": "",
"Class": "Character",
- "AnimatedTexture": {
- "File": "d3Chars16x16rEmbed",
- "Index": "0x07",
- "Right": ""
- },
- "AltTexture": {
- "id": "1",
- "AnimatedTexture": {
- "File": "d3Chars16x16rEmbed",
- "Index": "0x06",
- "Right": ""
- }
+ "Texture": {
+ "File": "lofiChar16x16",
+ "Index": "0x54"
},
"HitSound": "monster/oryx_hit",
"DeathSound": "monster/oryx_death",
"Size": "120",
"MaxHitPoints": "75000",
"Defense": "60",
"Quest": "",
"God": "",
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-11-08 18:20:24.559493398 +0000
+++ ./strings.json 2016-11-17 17:30:20.827739253 +0000
@@ -424,36 +424,43 @@
"MoneyFrame.gold": "Gold Amount",
"MoneyFrame.payment": "Payment Method",
"MoneyFrame.rightButton": "Cancel",
"MoneyFrame.title": "Support the game and buy Realm",
"MustBeNamed.desc": "You must name your character to enter the arena.",
"MustBeNamed.title": "Named Character Required",
"MyPlayerToolTip.NextClassQuest": "Next Goal: Earn {nextStarFame} Fame\\n with a {character}",
"MysteryBoxError.blockedForUser": "Sorry, your account is not eligible for this purchase only accounts created before {date} can purchase this offer",
- "MysteryBoxError.maxPurchase": "You have reached the maximum number of purchases for this box or it may be sold out. It is possible that buying a single box will work.",
+ "MysteryBoxError.box": "box",
+ "MysteryBoxError.boxes": "boxes",
+ "MysteryBoxError.maxPurchase": "You have reached the maximum purchase number of this box.",
+ "MysteryBoxError.maxPurchaseLeft": "You can purchase only {left} more of this box.",
"MysteryBoxError.noFame": "Not enough Fame",
"MysteryBoxError.noGold": "Not enough Gold",
"MysteryBoxError.outdated": "Outdated Mystery Box information",
- "MysteryBoxError.soldOut": "You have reached the maximum number of purchases for this box or it may be sold out. It is possible that buying a single box will work.",
- "MysteryBoxInfo.saleEndStringDays": "This sale ends in {amount} days",
- "MysteryBoxInfo.saleEndStringHours": "This sale ends in {amount} hours",
- "MysteryBoxInfo.saleEndStringMinutes": "This sale ends in {amount} minutes",
+ "MysteryBoxError.soldOutAll": "Sorry, sold out",
+ "MysteryBoxError.soldOutButton": "Sold out",
+ "MysteryBoxError.soldOutLeft": "Only {left} {box} left.",
+ "MysteryBoxInfo.saleEndStringDays": "Ends in {amount} days",
+ "MysteryBoxInfo.saleEndStringHours": "Ends in {amount} hours",
+ "MysteryBoxInfo.saleEndStringMinutes": "Ends in {amount} minutes",
"MysteryBoxPanel.checkBackLater": "Check Back Later",
"MysteryBoxPanel.mysteryBoxShop": "Mystery Box Shop",
"MysteryBoxPanel.open": "Open",
"MysteryBoxRollModal.okString": "OK",
"MysteryBoxRollModal.playAgainString": "Play Again for {cost}",
"MysteryBoxRollModal.playAgainXTimesString": "Play {repeat} Times for {cost}",
"MysteryBoxRollModal.pleaseTryAgainString": "Please Try Again",
"MysteryBoxRollModal.purchaseFailedString": "Purchase Failed",
"MysteryBoxRollModal.rewardsInVaultString": "Rewards will be placed in your Vault!",
"MysteryBoxRollModal.youWonString": "You Won!",
+ "MysteryBoxSelectEntry.left": "left",
"MysteryBoxSelectEntry.newString": "New!",
"MysteryBoxSelectEntry.onSaleString": "On Sale",
+ "MysteryBoxSelectEntry.was": "Was",
"MysteryBoxSelectModal.titleString": "Mystery Boxes!",
"NameChangerPanel.change": "Change {cost}",
"NameChangerPanel.choose": "Choose",
"NameChangerPanel.requireRank": "Rank Required",
"NameChangerPanel.text": "Choose Account Name",
"NameChangerPanel.yourName": "Your name is:\\n{name}",
"NameChangerPanelMediator.text": "In order to choose an account name, you must be registered",
"NewAbility.gratz": "New Ability",
@@ -5263,116 +5270,16 @@
"thehive.TH_Maggots": "Larve",
"thehive.TH_Mini_Hive": "TH Mini Hive",
"thehive.TH_Queen_Bee": "Queen Bee",
"thehive.TH_Queen_Bee_Summoner": "TH Queen Bee Summoner",
"thehive.TH_Red_Fat_Bees": "Fat Angry Bee",
"thehive.TH_Red_Fat_Bees_2": "Fat Angry Bee",
"thehive.TH_Small_Bees": "Small Bee",
"thehive.TH_honey_Heal": "TH honey Heal",
- "token.Halloween_Candy_Token_x_1": "Halloween Candy Token x 1",
- "token.Halloween_Candy_Token_x_10": "Halloween Candy Token x 10",
- "token.Halloween_Candy_Token_x_11": "Halloween Candy Token x 11",
- "token.Halloween_Candy_Token_x_12": "Halloween Candy Token x 12",
- "token.Halloween_Candy_Token_x_13": "Halloween Candy Token x 13",
- "token.Halloween_Candy_Token_x_14": "Halloween Candy Token x 14",
- "token.Halloween_Candy_Token_x_15": "Halloween Candy Token x 15",
- "token.Halloween_Candy_Token_x_16": "Halloween Candy Token x 16",
- "token.Halloween_Candy_Token_x_17": "Halloween Candy Token x 17",
- "token.Halloween_Candy_Token_x_18": "Halloween Candy Token x 18",
- "token.Halloween_Candy_Token_x_19": "Halloween Candy Token x 19",
- "token.Halloween_Candy_Token_x_2": "Halloween Candy Token x 2",
- "token.Halloween_Candy_Token_x_20": "Halloween Candy Token x 20",
- "token.Halloween_Candy_Token_x_21": "Halloween Candy Token x 21",
- "token.Halloween_Candy_Token_x_22": "Halloween Candy Token x 22",
- "token.Halloween_Candy_Token_x_23": "Halloween Candy Token x 23",
- "token.Halloween_Candy_Token_x_24": "Halloween Candy Token x 24",
- "token.Halloween_Candy_Token_x_25": "Halloween Candy Token x 25",
- "token.Halloween_Candy_Token_x_26": "Halloween Candy Token x 26",
- "token.Halloween_Candy_Token_x_27": "Halloween Candy Token x 27",
- "token.Halloween_Candy_Token_x_28": "Halloween Candy Token x 28",
- "token.Halloween_Candy_Token_x_29": "Halloween Candy Token x 29",
- "token.Halloween_Candy_Token_x_3": "Halloween Candy Token x 3",
- "token.Halloween_Candy_Token_x_30": "Halloween Candy Token x 30",
- "token.Halloween_Candy_Token_x_31": "Halloween Candy Token x 31",
- "token.Halloween_Candy_Token_x_32": "Halloween Candy Token x 32",
- "token.Halloween_Candy_Token_x_33": "Halloween Candy Token x 33",
- "token.Halloween_Candy_Token_x_34": "Halloween Candy Token x 34",
- "token.Halloween_Candy_Token_x_35": "Halloween Candy Token x 35",
- "token.Halloween_Candy_Token_x_36": "Halloween Candy Token x 36",
- "token.Halloween_Candy_Token_x_37": "Halloween Candy Token x 37",
- "token.Halloween_Candy_Token_x_38": "Halloween Candy Token x 38",
- "token.Halloween_Candy_Token_x_39": "Halloween Candy Token x 39",
- "token.Halloween_Candy_Token_x_4": "Halloween Candy Token x 4",
- "token.Halloween_Candy_Token_x_40": "Halloween Candy Token x 40",
- "token.Halloween_Candy_Token_x_41": "Halloween Candy Token x 41",
- "token.Halloween_Candy_Token_x_42": "Halloween Candy Token x 42",
- "token.Halloween_Candy_Token_x_43": "Halloween Candy Token x 43",
- "token.Halloween_Candy_Token_x_44": "Halloween Candy Token x 44",
- "token.Halloween_Candy_Token_x_45": "Halloween Candy Token x 45",
- "token.Halloween_Candy_Token_x_46": "Halloween Candy Token x 46",
- "token.Halloween_Candy_Token_x_47": "Halloween Candy Token x 47",
- "token.Halloween_Candy_Token_x_48": "Halloween Candy Token x 48",
- "token.Halloween_Candy_Token_x_49": "Halloween Candy Token x 49",
- "token.Halloween_Candy_Token_x_5": "Halloween Candy Token x 5",
- "token.Halloween_Candy_Token_x_50": "Halloween Candy Token x 50",
- "token.Halloween_Candy_Token_x_6": "Halloween Candy Token x 6",
- "token.Halloween_Candy_Token_x_7": "Halloween Candy Token x 7",
- "token.Halloween_Candy_Token_x_8": "Halloween Candy Token x 8",
- "token.Halloween_Candy_Token_x_9": "Halloween Candy Token x 9",
- "token.Halloween_Candy_x_10_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 10 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_11_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 11 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_12_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 12 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_13_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 13 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_14_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 14 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_15_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 15 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_16_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 16 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_17_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 17 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_18_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 18 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_19_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 19 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_1_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 1 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_20_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 20 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_21_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 21 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_22_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 22 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_23_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 23 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_24_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 24 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_25_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 25 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_26_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 26 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_27_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 27 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_28_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 28 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_29_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 29 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_2_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 2 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_30_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 30 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_31_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 31 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_32_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 32 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_33_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 33 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_34_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 34 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_35_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 35 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_36_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 36 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_37_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 37 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_38_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 38 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_39_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 39 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_3_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 3 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_40_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 40 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_41_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 41 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_42_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 42 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_43_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 43 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_44_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 44 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_45_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 45 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_46_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 46 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_47_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 47 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_48_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 48 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_49_-_Can_be_stacked_up_to_50_times,_just_": "Halloween Candy x 49 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_4_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 4 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_50_-_Double_click_to_create_a_Headless_Ri": "Halloween Candy x 50 - Double click to create a Headless Rider Skin. Doing so will consume the candies",
- "token.Halloween_Candy_x_5_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 5 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_6_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 6 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_7_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 7 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_8_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 8 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
- "token.Halloween_Candy_x_9_-_Can_be_stacked_up_to_50_times,_just_c": "Halloween Candy x 9 - Can be stacked up to 50 times, just click and drag the candy onto another candy",
"tombOfTheAncients.Active_Sarcophagus": "Sarcophagus",
"tombOfTheAncients.Beam_Priest": "Worshiping Priest",
"tombOfTheAncients.Beam_Priestess": "Worshiping Priestess",
"tombOfTheAncients.Bloated_Mummy": "Bloated Mummy",
"tombOfTheAncients.Blue_Swarm_Masters": "Blue Swarm Masters",
"tombOfTheAncients.Blue_Swarm_Minions": "Blue Swarm Minions",
"tombOfTheAncients.Canopic_Jar_1": "Canopic Jar",
"tombOfTheAncients.Canopic_Jar_2": "Canopic Jar",