diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/constants.json ./constants.json
--- ../current/constants.json 2015-10-29 20:00:47.413455000 +0000
+++ ./constants.json 2015-12-03 19:36:12.810580324 +0000
@@ -1,8 +1,8 @@
{
"BUILD_VERSION": "27.7",
- "MINOR_VERSION": "1",
+ "MINOR_VERSION": "3",
"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' -x _ '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json
--- ../current/json/Objects.json 2015-09-14 22:00:25.845223527 +0000
+++ ./json/Objects.json 2015-12-03 19:35:45.730581685 +0000
@@ -10392,19 +10392,19 @@
"LifetimeMS": "2400"
},
"DisplayId": "Blue Flaming Skull"
},
{
"type": "0x0d59",
"id": "Cube God",
"Class": "Character",
- "Texture": {
- "File": "lofiChar216x16",
- "Index": "0x37"
+ "AnimatedTexture": {
+ "File": "chars16x16rEncounters",
+ "Index": "125"
},
"HitSound": "monster/cubes_hit",
"DeathSound": "monster/cubes_death",
"Size": "120",
"MaxHitPoints": "10000",
"Hero": "",
"Quest": "",
"God": "",
@@ -10432,19 +10432,19 @@
"Enemy": "",
"DisplayId": "Cube God"
},
{
"type": "0x0d5a",
"id": "Cube Overseer",
"Class": "Character",
"Enemy": "",
- "Texture": {
- "File": "lofiChar28x8",
- "Index": "0x40"
+ "AnimatedTexture": {
+ "File": "chars8x8rEncounters",
+ "Index": "120"
},
"HitSound": "monster/cubes_hit",
"DeathSound": "monster/cubes_death",
"MaxHitPoints": "1500",
"Cube": "",
"Projectile": [
{
"id": "0",
@@ -10466,19 +10466,19 @@
"DisplayId": "Cube Overseer"
},
{
"type": "0x0d5b",
"id": "Cube Defender",
"Group": "Cube Minions",
"Class": "Character",
"Enemy": "",
- "Texture": {
- "File": "lofiChar28x8",
- "Index": "0x41"
+ "AnimatedTexture": {
+ "File": "chars8x8rEncounters",
+ "Index": "121"
},
"HitSound": "monster/cubes_hit",
"DeathSound": "monster/cubes_death",
"MaxHitPoints": "1000",
"Cube": "",
"Projectile": {
"id": "0",
"ObjectId": "Yellow Magic",
@@ -10492,19 +10492,19 @@
"DisplayId": "Cube Defender"
},
{
"type": "0x0d5c",
"id": "Cube Blaster",
"Group": "Cube Minions",
"Class": "Character",
"Enemy": "",
- "Texture": {
- "File": "lofiChar28x8",
- "Index": "0x42"
+ "AnimatedTexture": {
+ "File": "chars8x8rEncounters",
+ "Index": "122"
},
"HitSound": "monster/cubes_hit",
"DeathSound": "monster/cubes_death",
"MaxHitPoints": "500",
"Cube": "",
"Projectile": [
{
"id": "0",
@@ -28263,16 +28263,96 @@
"Description": "Food for your pet. The nectar of the gods which holds great power!",
"BagType": "2",
"feedPower": "5000",
"Potion": "",
"Soulbound": "",
"DisplayId": "Ambrosia"
},
{
+ "type": "0xcd0",
+ "id": "Cranberries",
+ "Class": "Equipment",
+ "Item": "",
+ "SlotType": "10",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x15e"
+ },
+ "Description": "Food for your pet. Tart and tangy.",
+ "BagType": "2",
+ "feedPower": "250",
+ "Soulbound": "",
+ "DisplayId": "Cranberries"
+ },
+ {
+ "type": "0xcd1",
+ "id": "Ear of Corn",
+ "Class": "Equipment",
+ "Item": "",
+ "SlotType": "10",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x15d"
+ },
+ "Description": "Food for your pet. Buttery and Delicious.",
+ "BagType": "2",
+ "feedPower": "350",
+ "Soulbound": "",
+ "DisplayId": "Ear of Corn"
+ },
+ {
+ "type": "0xcd2",
+ "id": "Sliced Yam",
+ "Class": "Equipment",
+ "Item": "",
+ "SlotType": "10",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x15c"
+ },
+ "Description": "Food for your pet. Nice and sweet.",
+ "BagType": "2",
+ "feedPower": "500",
+ "Soulbound": "",
+ "DisplayId": "Sliced Yam"
+ },
+ {
+ "type": "0xcd3",
+ "id": "Pumpkin Pie",
+ "Class": "Equipment",
+ "Item": "",
+ "SlotType": "10",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x15b"
+ },
+ "Description": "Food for your pet. Fresh out of Oryx's kitchen.",
+ "BagType": "2",
+ "feedPower": "650",
+ "Soulbound": "",
+ "DisplayId": "Pumpkin Pie"
+ },
+ {
+ "type": "0xcd6",
+ "id": "Thanksgiving Turkey",
+ "Class": "Equipment",
+ "Item": "",
+ "SlotType": "10",
+ "Texture": {
+ "File": "lofiObj2",
+ "Index": "0x15f"
+ },
+ "Description": "Food for your pet. A whole Thanksgiving turkey!",
+ "BagType": "2",
+ "feedPower": "1621",
+ "Soulbound": "",
+ "DisplayId": "Thanksgiving Turkey"
+ },
+ {
"type": "0xccd",
"id": "Forest Maze Key",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x3de"
},
@@ -32240,17 +32320,17 @@
"setName": "Twilight Archmage Set",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x530"
},
"SlotType": "11",
- "Description": "A spell that blasts enemies with the fiery force of a thousand suns.",
+ "Description": "Magical blasts can be blocked by armor, but true fear will pierce their hides and strike their heart.",
"Sound": "spell/magic_nova",
"Projectile": {
"ObjectId": "Skull Wave",
"Speed": "100",
"MinDamage": "53",
"MaxDamage": "115",
"LifetimeMS": "1300",
"ArmorPiercing": ""
@@ -32292,17 +32372,17 @@
"setName": "Twilight Archmage Set",
"Class": "Equipment",
"Item": "",
"Texture": {
"File": "lofiObj3",
"Index": "0x538"
},
"SlotType": "9",
- "Description": "The dolomite stone makes you feel able to stand against anything.",
+ "Description": "An unsettling glow looms beneath the ancient gem's surface. Soon enough its power will be unleashed again.",
"ActivateOnEquip": [
{
"_": "IncrementStat",
"stat": "0",
"amount": "10"
},
{
"_": "IncrementStat",
@@ -81567,20 +81647,23 @@
{
"File": "lofiObjBig",
"Index": "0xce"
}
]
}
}
},
+ "Static": "",
+ "OccupySquare": "",
"HitSound": "monster/stone_walls_hit",
"DeathSound": "monster/stone_walls_death",
- "Static": "",
- "OccupySquare": ""
+ "MaxHitPoints": "2200",
+ "StasisImmune": "",
+ "Enemy": ""
},
{
"type": "0x1933",
"id": "Dragon Table LL",
"Class": "GameObject",
"Model": "Squatty3Side",
"Texture": {
"File": "lofiObjBig",
Binary files ../current/sheets/chars16x16rEncounters.png and ./sheets/chars16x16rEncounters.png differ
Binary files ../current/sheets/chars8x8rEncounters.png and ./sheets/chars8x8rEncounters.png differ
Binary files ../current/sheets/lofiInterfaceBig.png and ./sheets/lofiInterfaceBig.png differ
Binary files ../current/sheets/lofiObj2.png and ./sheets/lofiObj2.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 2015-09-14 22:00:22.745223717 +0000
+++ ./strings.json 2015-12-03 19:35:42.858581831 +0000
@@ -301,16 +301,33 @@
"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",
+ "Friend.AddButton": "Invite",
+ "Friend.AddTitle": "Enter Name",
+ "Friend.BlockRight": "Block",
+ "Friend.BlockRightDesc": "Invitations and messages from this player are now blocked.",
+ "Friend.BlockText": "Are you sure you want to block this person forever?",
+ "Friend.BlockTitle": "Block this person",
+ "Friend.FriendDefaultText": "No friends. Invite people to your friends list!",
+ "Friend.FriendInvitationDefaultText": "No invitations.",
+ "Friend.ReachCapacity": "You have reached the maximum number of friends.",
+ "Friend.RemoveRight": "Remove friend",
+ "Friend.RemoveRightDesc": "Remove this friend from your friend list.",
+ "Friend.RemoveText": "Are you sure you want to remove {name} from your friend list?",
+ "Friend.RemoveTitle": "Remove Friend",
+ "Friend.SentInvitationText": "Friend invitation sent to {name}.",
+ "Friend.TeleportDesc": "Connect to the server as your ",
+ "Friend.TeleportTitle": "Go to:",
+ "Friend.TotalFriend": "Total Friends: {total}",
"FusionStrength.Bad": "BAD",
"FusionStrength.Fantastic": "FANTASTIC",
"FusionStrength.Good": "GOOD",
"FusionStrength.Great": "GREAT",
"FusionStrength.Low": "LOW",
"FusionStrength.Maxed": "MAXED",
"FusionStrength.None": "NONE",
"FusionStrength.text": "Fusion Strength",
@@ -516,16 +533,18 @@
"Options.AutofireToggleDesc": "This key will toggle autofire",
"Options.BeginGuildChat": "Begin Guild Chat",
"Options.BeginGuildChatDesc": "This key will bring up a guild chat in the chat input box",
"Options.BeginTell": "Begin Tell",
"Options.BeginTellDesc": "This key will bring up a tell (private message) in the chat input box",
"Options.CenterOnPlayer": "Center On Player",
"Options.CenterOnPlayerDesc": "This toggles whether the player is centered or offset",
"Options.Chat": "Chat",
+ "Options.ChatFriend": "Friends Whisper Only",
+ "Options.ChatFriendDesc": "Turn this ON to only display whisper messages from your friends.",
"Options.ClickForGold": "Double Click for Gold",
"Options.ClickForGoldDesc": "Double clicking on gold/fame while in a Realm will open the payments screen",
"Options.ContextualClick": "Contextual Click",
"Options.ContextualClickDesc": "Toggle the contextual click functionality",
"Options.ContextualPotionBuy": "Potion Purchases",
"Options.ContextualPotionBuyDesc": "Toggle the ability to purchase potions with gold",
"Options.Controls": "Controls",
"Options.DefaultCameraAngle": "Default Camera Angle",
@@ -533,16 +552,19 @@
"Options.DrawShadows": "Draw Shadows",
"Options.DrawShadowsDesc": "This toggles whether to draw shadows",
"Options.DrawTextBubbles": "Draw Text Bubbles",
"Options.DrawTextBubblesDesc": "This toggles whether to draw text bubbles",
"Options.EscapeToNexus": "Escape To Nexus",
"Options.EscapeToNexusDesc": "This key will instantly escape you to the Nexus",
"Options.FilterOffensiveLanguage": "Filter Offensive Language",
"Options.FilterOffensiveLanguageDesc": "This toggles whether offensive language filtering will be attempted",
+ "Options.Friend": "Friends",
+ "Options.FriendList": "Show Friend List",
+ "Options.FriendListDesc": "Quickly show or hide the friend list panel.",
"Options.FullScreenMode": "Fullscreen Mode",
"Options.FullScreenModeDesc": "This toggles whether the game is run in fullscreen mode.",
"Options.Graphics": "Graphics",
"Options.HardwareAcc": "Hardware Acceleration",
"Options.HardwareAccDesc": "Enables hardware acceleration. This reduces load on the CPU and may increase performance.",
"Options.HardwareAccDescError": "Hardware Acceleration could not be enabled. Please check flash player settings (right click on title screen).",
"Options.HardwareAccHotkey": "Hardware Acc. Hotkey",
"Options.HardwareAccHotkeyDesc": "Quickly enable or disable hardware acceleration.",
@@ -606,16 +628,18 @@
"Options.ToggleFullscreen": "Toggle Fullscreen Mode",
"Options.ToggleFullscreenDesc": "Toggle whether the game is run in a window or fullscreen",
"Options.ToggleHPBar": "Toggle HP Bars",
"Options.ToggleHPBarDesc": "Toggle player and enemy HP bars",
"Options.ToggleParticleEffect": "Particle Effect",
"Options.ToggleParticleEffectDesc": "Reduce particle to help performance",
"Options.TogglePerformanceStats": "Toggle Performance Stats",
"Options.TogglePerformanceStatsDesc": "This key will toggle a display of fps and memory usage",
+ "Options.TradeWithFriends": "Trade Requests From Friends Only",
+ "Options.TradeWithFriendsDesc": "Only allow friends send you trade request. You can still initiate Trades with other players.",
"Options.UseBuyHealth": "Use/Buy Health Potion",
"Options.UseBuyHealthDesc": "This key will use health potions if available, buy if unavailable",
"Options.UseBuyMagic": "Use/Buy Magic Potion",
"Options.UseBuyMagicDesc": "This key will use magic potions if available, buy if unavailable",
"Options.UseSpecialAbility": "Use Special Ability",
"Options.UseSpecialAbilityDesc": "This key will activate your special ability",
"Options.chatAll": "Player Chat",
"Options.chatAllDesc": "Toggle Player chat ON / OFF. Does not hide System messages. NOTE: This also affects Whisper and Guild Chat options.",
@@ -1058,34 +1082,41 @@
"chat.registertoChat": "Please REGISTER to see in-game player chat.",
"client.buy_char_special_offer": "Normally {cost} gold. Save {save}%!",
"conditionEffect.ArmorBroken": "Armor Broken",
"conditionEffect.Armored": "Armored",
"conditionEffect.Berserk": "Berserk",
"conditionEffect.Bleeding": "Bleeding",
"conditionEffect.Blind": "Blind",
"conditionEffect.Confused": "Confused",
+ "conditionEffect.Curse": "Curse",
+ "conditionEffect.CurseImmune": "Curse Immune",
"conditionEffect.Damaging": "Damaging",
"conditionEffect.Darkness": "Darkness",
"conditionEffect.Dazed": "Dazed",
+ "conditionEffect.DazedImmune": "Dazed Immune",
"conditionEffect.Dead": "Dead",
"conditionEffect.Drunk": "Drunk",
"conditionEffect.Hallucinating": "Hallucinating",
"conditionEffect.Healing": "Healing",
"conditionEffect.Hexed": "Hexed",
"conditionEffect.Invincible": "Invincible",
"conditionEffect.Invisible": "Invisible",
"conditionEffect.Invulnerable": "Invulnerable",
"conditionEffect.NinjaSpeedy": "Ninja Speedy",
"conditionEffect.NotUsed": "Not Used",
"conditionEffect.Nothing": "Nothing",
"conditionEffect.Paralyzed": "Paralyzed",
+ "conditionEffect.ParalyzedImmune": "Paralyzed Immune",
"conditionEffect.Paused": "Paused",
+ "conditionEffect.Petrify": "Petrify",
+ "conditionEffect.PetrifyImmune": "Petrify Immune",
"conditionEffect.Quiet": "Quiet",
"conditionEffect.Sick": "Sick",
+ "conditionEffect.SlowImmune": "Slow Immune",
"conditionEffect.Slowed": "Slowed",
"conditionEffect.Speedy": "Speedy",
"conditionEffect.Stasis": "Stasis",
"conditionEffect.StasisImmune": "Stasis Immune",
"conditionEffect.StunImmune": "Stun Immune",
"conditionEffect.Stunned": "Stunned",
"conditionEffect.Unstable": "Unstable",
"conditionEffect.Weak": "Weak",
@@ -1740,16 +1771,17 @@
"equip.A_key_which_opens_a_portal_to_the_Haunted_Cemetery.": "A key which opens a portal to the Haunted Cemetery.",
"equip.A_key_which_opens_a_portal_to_the_Lair_of_Draconis.": "A key which opens a portal to the Lair of Draconis.",
"equip.A_key_which_opens_a_random_dungeon.": "A key which opens a random dungeon.",
"equip.A_key_which_opens_an_entrance_to_BelladonnaAPOSs_Garden.": "A key which opens an entrance to Belladonna's Garden.",
"equip.A_key_which_opens_an_entrance_to_BelladonnaAPOSs_Thicket.": "A key which opens an entrance to Belladonna's Thicket.",
"equip.A_key_which_opens_an_entrance_to_Deadwater_Docks.": "A key which opens an entrance to Deadwater Docks.",
"equip.A_key_which_opens_an_entrance_to_The_Crawling_Depths.": "A key which opens an entrance to The Crawling Depths.",
"equip.A_key_which_opens_an_entrance_to_The_Shatters.": "A key which opens an entrance to The Shatters.",
+ "equip.A_key_which_opens_an_entrance_to_a_Dungeon.": "A key which opens an entrance to a Dungeon.",
"equip.A_key_which_opens_an_entrance_to_a_Pirate_Cave.": "A key which opens an entrance to a Pirate Cave.",
"equip.A_key_which_opens_an_entrance_to_a_Snake_Pit.": "A key which opens an entrance to a Snake Pit.",
"equip.A_key_which_opens_an_entrance_to_a_Spider_Den.": "A key which opens an entrance to a Spider Den.",
"equip.A_key_which_opens_an_entrance_to_a_Sprite_World.": "A key which opens an entrance to a Sprite World.",
"equip.A_key_which_opens_an_entrance_to_a_Tomb_of_Ancients.": "A key which opens an entrance to a Tomb of Ancients.",
"equip.A_key_which_opens_an_entrance_to_an_Abyss_of_Demons.": "A key which opens an entrance to an Abyss of Demons.",
"equip.A_key_which_opens_an_entrance_to_an_Ocean_Trench.": "A key which opens an entrance to an Ocean Trench.",
"equip.A_key_which_opens_an_entrance_to_an_Undead_Lair.": "A key which opens an entrance to an Undead Lair.",
@@ -2117,16 +2149,17 @@
"equip.An_uncommon_pet_egg_of_an_unknown_pet_family.": "An uncommon pet egg of an unknown pet family.",
"equip.An_uncommon_reptile_pet_egg.": "An uncommon reptile pet egg.",
"equip.An_uncommon_spooky_pet_egg.": "An uncommon spooky pet egg.",
"equip.An_uncommon_water_pet_egg.": "An uncommon water pet egg.",
"equip.An_uncommon_woodland_pet_egg.": "An uncommon woodland pet egg.",
"equip.An_unfathomably_powerful_sword_that_absorbs_the_skulls_of_e": "An unfathomably powerful sword that absorbs the skulls of enemies and unleashes them with magical energy.",
"equip.An_unfathomably_powerful_sword_wielded_by_titanic_air_eleme": "An unfathomably powerful sword wielded by titanic air elementals in their great war of revolution.",
"equip.An_unimaginably_destructive_spell,_devised_by_the_great_mou": "An unimaginably destructive spell, devised by the great mountain thaumaturgists to battle against demonic giants.",
+ "equip.An_unsettling_glow_looms_beneath_the_ancient_gemAPOSs_surfa": "An unsettling glow looms beneath the ancient gem's surface. Soon enough its power will be unleashed again.",
"equip.Anatis_Staff": "Anatis Staff",
"equip.Ancient_Spell:_Pierce": "Ancient Spell: Pierce",
"equip.Ancient_Stone_Sword": "Ancient Stone Sword",
"equip.Annihilation_Armor": "Annihilation Armor",
"equip.Annoying_Firecracker_Katana": "Annoying Firecracker Katana",
"equip.ArbiterAPOSs_Wrath": "Arbiter's Wrath",
"equip.Arbiters_Wrath": "Arbiters Wrath",
"equip.Arcblast_Scepter": "Arcblast Scepter",
@@ -2242,16 +2275,17 @@
"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.Cranberries": "Cranberries",
"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.Crude,_but_effective.": "Crude, but effective.",
"equip.Crystal_Bone_Ring": "Crystal Bone Ring",
"equip.Crystal_Sword": "Crystal Sword",
"equip.Crystal_Wand": "Crystal Wand",
@@ -2325,18 +2359,20 @@
"equip.Draconis_Key": "Draconis Key",
"equip.Draconis_Potion": "Draconis Potion",
"equip.Dragonscale_Armor": "Dragonscale Armor",
"equip.Dragonsoul_Sword": "Dragonsoul Sword",
"equip.Dragonstalker_Trap": "Dragonstalker Trap",
"equip.Drain_10_MP/sec": "Drain 10 MP/sec",
"equip.Drake_Hide_Armor": "Drake Hide Armor",
"equip.Drow_Trickster_Skin": "Drow Trickster Skin",
+ "equip.Dungeon_Key": "Dungeon Key",
"equip.Duration": "Duration",
"equip.Dusky_Rose_Dagger": "Dusky Rose Dagger",
+ "equip.Ear_of_Corn": "Ear of Corn",
"equip.Effusion_of_Defense": "Effusion of Defense",
"equip.Effusion_of_Dexterity": "Effusion of Dexterity",
"equip.Effusion_of_Life": "Effusion of Life",
"equip.Effusion_of_Mana": "Effusion of Mana",
"equip.Eldritch_Wand": "Eldritch Wand",
"equip.Elemental_Detonation_Spell": "Elemental Detonation Spell",
"equip.Eligible_Bachelor_Skin": "Eligible Bachelor Skin",
"equip.Elixir_of_Health_1": "Elixir of Health",
@@ -2377,24 +2413,29 @@
"equip.Fire_Sword": "Fire Sword",
"equip.Fire_Wand": "Fire Wand",
"equip.Fire_Water": "Fire Water",
"equip.Firebrand_Staff": "Firebrand Staff",
"equip.Flame_Burst_Spell": "Flame Burst Spell",
"equip.Food_for_your_pet._A_classicBANG": "Food for your pet. A classic!",
"equip.Food_for_your_pet._A_delux_burgerBANG": "Food for your pet. A delux burger!",
"equip.Food_for_your_pet._A_hearty_classicBANG": "Food for your pet. A hearty classic!",
+ "equip.Food_for_your_pet._A_whole_Thanksgiving_turkeyBANG": "Food for your pet. A whole Thanksgiving turkey!",
+ "equip.Food_for_your_pet._Buttery_and_Delicious.": "Food for your pet. Buttery and Delicious.",
"equip.Food_for_your_pet._Cheesy_and_delicious.": "Food for your pet. Cheesy and delicious.",
"equip.Food_for_your_pet._Cheesy_and_delicous.": "Food for your pet. Cheesy and delicous.",
"equip.Food_for_your_pet._Cointains_fresh_salsaBANG": "Food for your pet. Cointains fresh salsa!",
"equip.Food_for_your_pet._Contains_fresh_salsaBANG": "Food for your pet. Contains fresh salsa!",
"equip.Food_for_your_pet._Fresh_cut_and_steaming_hotBANG": "Food for your pet. Fresh cut and steaming hot!",
+ "equip.Food_for_your_pet._Fresh_out_of_OryxAPOSs_kitchen.": "Food for your pet. Fresh out of Oryx's kitchen.",
"equip.Food_for_your_pet._Goes_best_with_milkBANG": "Food for your pet. Goes best with milk!",
+ "equip.Food_for_your_pet._Nice_and_sweet.": "Food for your pet. Nice and sweet.",
"equip.Food_for_your_pet._Super_healthy,_super_delicious,_super_wr": "Food for your pet. Super healthy, super delicious, super wrathful!",
"equip.Food_for_your_pet._Super_healthy,_super_delicousBANG": "Food for your pet. Super healthy, super delicous!",
+ "equip.Food_for_your_pet._Tart_and_tangy.": "Food for your pet. Tart and tangy.",
"equip.Food_for_your_pet._The_nectar_of_the_gods_which_holds_great": "Food for your pet. The nectar of the gods which holds great power!",
"equip.Food_for_your_pet._The_necter_of_the_gods_which_holds_great": "Food for your pet. The necter of the gods which holds great power!",
"equip.Food_for_your_pet._The_ultimate_deluxe_cheeseburgerBANG": "Food for your pet. The ultimate deluxe cheeseburger!",
"equip.Food_for_your_pet._To_quench_your_petAPOSs_thirstBANG": "Food for your pet. To quench your pet's thirst!",
"equip.For_Testing_Monster_Defense.": "For Testing Monster Defense.",
"equip.Force_Wand": "Force Wand",
"equip.Forest_Maze_Key": "Forest Maze Key",
"equip.Forest_Ward_Skin": "Forest Ward Skin",
@@ -2561,16 +2602,17 @@
"equip.Mad_God_Ale": "Mad God Ale",
"equip.Made_by_a_pretty_lazy_wizard._Hope_it_makes_something_worth": "Made by a pretty lazy wizard. Hope it makes something worthwhile. Rarity: Rare",
"equip.Made_of_a_strange_metal_not_known_to_the_living.": "Made of a strange metal not known to the living.",
"equip.Magesteel_Quiver": "Magesteel Quiver",
"equip.Magic_Mushroom": "Magic Mushroom",
"equip.Magic_Nova_Spell": "Magic Nova Spell",
"equip.Magic_Potion": "Magic Potion",
"equip.Magic_Quiver": "Magic Quiver",
+ "equip.Magical_blasts_can_be_blocked_by_armor,_but_true_fear_will_": "Magical blasts can be blocked by armor, but true fear will pierce their hides and strike their heart.",
"equip.Magical_cold_plate_armor_inscribed_with_tales_of_destructio": "Magical cold plate armor inscribed with tales of destruction and murder.",
"equip.Magically_concentrated_venom_of_the_carnivorous_leaping_tre": "Magically concentrated venom of the carnivorous leaping tree spider.",
"equip.Magically_enhanced_venom_of_the_savage_nightwing_dragon.": "Magically enhanced venom of the savage nightwing dragon.",
"equip.Magically_protective_leather_armor_made_from_chimera_hides.": "Magically protective leather armor made from chimera hides.",
"equip.Magically_refined_poison_of_the_rare_and_dangerous_felwasp.": "Magically refined poison of the rare and dangerous felwasp.",
"equip.Magnificent_leather_armor_made_from_the_hide_of_the_great_l": "Magnificent leather armor made from the hide of the great leviathan, slain hundreds of years ago in a savage battle in the vasting deeps.",
"equip.Mail_made_from_blued_steel.": "Mail made from blued steel.",
"equip.Manor_Key": "Manor Key",
@@ -2664,16 +2706,17 @@
"equip.Precisely_Calibrated_Stringstick": "Precisely Calibrated Stringstick",
"equip.Present_Dispensing_Wand": "Present Dispensing Wand",
"equip.Prism_of_Apparitions": "Prism of Apparitions",
"equip.Prism_of_Dancing_Swords": "Prism of Dancing Swords",
"equip.Prism_of_Figments": "Prism of Figments",
"equip.Prism_of_Phantoms": "Prism of Phantoms",
"equip.Protect_the_helpless,_embolden_the_heroic,_dispense_justice": "Protect the helpless, embolden the heroic, dispense justice to the unjust. - Inscription, in Fae.",
"equip.Protect_the_helpless,_embolden_the_heroic,_slow_the_progres": "Protect the helpless, embolden the heroic, slow the progress of evil. - Inscription, in Fae.",
+ "equip.Pumpkin_Pie": "Pumpkin Pie",
"equip.Puppet_MasterAPOSs_Encore_Key": "Puppet Master's Encore Key",
"equip.Puppet_Master_Skin": "Puppet Master Skin",
"equip.Purple_Drake_Egg": "Purple Drake Egg",
"equip.Purple_Gumball": "Purple Gumball",
"equip.Pyramid_Revenant_Skin": "Pyramid Revenant Skin",
"equip.Quiver_of_Elvish_Mastery": "Quiver of Elvish Mastery",
"equip.Quiver_of_Thunder": "Quiver of Thunder",
"equip.Ragetalon_Dagger": "Ragetalon Dagger",
@@ -2837,16 +2880,17 @@
"equip.Skeleton_Warrior_Skin": "Skeleton Warrior Skin",
"equip.Skeletons_are_basically_the_scariest_thing_ever.": "Skeletons are basically the scariest thing ever.",
"equip.Skull-splitter_Sword": "Skull-splitter Sword",
"equip.Skull_of_Endless_Torment": "Skull of Endless Torment",
"equip.Skullish_Remains_of_Esben": "Skullish Remains of Esben",
"equip.Sky_Edge": "Sky Edge",
"equip.Skysplitter_Sword": "Skysplitter Sword",
"equip.Slayer_Staff": "Slayer Staff",
+ "equip.Sliced_Yam": "Sliced Yam",
"equip.Slime_Archer_Skin": "Slime Archer Skin",
"equip.Slime_Assassin_Skin": "Slime Assassin Skin",
"equip.Slime_Huntress_Skin": "Slime Huntress Skin",
"equip.Slime_Knight_Skin": "Slime Knight Skin",
"equip.Slime_Mystic_Skin": "Slime Mystic Skin",
"equip.Slime_Necromancer_Skin": "Slime Necromancer Skin",
"equip.Slime_Ninja_Skin": "Slime Ninja Skin",
"equip.Slime_Paladin_Skin": "Slime Paladin Skin",
@@ -2922,16 +2966,17 @@
"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.Thanksgiving_Turkey": "Thanksgiving Turkey",
"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_Fool_Tarot_Card": "The Fool Tarot Card",
"equip.The_Forgotten_Crown": "The Forgotten Crown",
"equip.The_Forgotten_Ring": "The Forgotten Ring",
@@ -3238,17 +3283,17 @@
"hauntedCemetery.Skuld_Summoner": "Skuld Summoner",
"hauntedCemetery.Troll_1": "Forest Troll",
"hauntedCemetery.Troll_2": "Troll Pathfinder",
"hauntedCemetery.Troll_3": "Troll Matriarch",
"hauntedCemetery.Werewolf": "Werewolf",
"hauntedCemetery.Werewolf_Cub": "Werewolf Cub",
"hauntedCemetery.Zombie_Hulk": "Zombie Hulk",
"hauntedCemetery.Zombie_Rise": "Zombie Rise",
- "helpCommand": "Help: \\n[/pause]: pause the game (until you [/pause] again) \\n[/who]: list players online \\n[/tutorial]: enter the tutorial \\n[/yell <message>]: send message to all players in Nexus \\n[/tell <player name> <message>]: send a private message to a player \\n[/guild <message>]: send a message to your guild \\n[/ignore <player name>]: don't show chat messages from player \\n[/unignore <player name>]: stop ignoring a player \\n[/teleport <player name>]: teleport to a player \\n[/trade <player name>]: request a trade with a player \\n[/invite <player name>]: invite a player to your guild \\n[/join <guild name>]: join a guild (invite necessary) \\n[/lock <player name>]: lock a player to the player grid \\n[/unlock <player name>]: unlock a player from the player grid \\n[/help]: this message \\n",
+ "helpCommand": "Help: \\n[/pause]: pause the game (until you [/pause] again) \\n[/who]: list players online \\n[/tutorial]: enter the tutorial \\n[/yell <message>]: send message to all players in Nexus \\n[/tell <player name> <message>]: send a private message to a player \\n[/guild <message>]: send a message to your guild \\n[/block <player name>]: don't show chat messages from player \\n[/unignore <player name>]: stop ignoring a player \\n[/teleport <player name>]: teleport to a player \\n[/trade <player name>]: request a trade with a player \\n[/invite <player name>]: invite a player to your guild \\n[/join <guild name>]: join a guild (invite necessary) \\n[/lock <player name>]: lock a player to the player grid \\n[/unlock <player name>]: unlock a player from the player grid \\n[/help]: this message \\n",
"high.135-315_Diagonal_Trap": "Trap Element",
"high.45-225_Diagonal_Trap": "Trap Element",
"high.Adult_White_Dragon": "Adult White Dragon",
"high.Beer_God": "Beer God",
"high.Beer_God_Dead": "Beer God Dead",
"high.Dragon_Egg": "Dragon Egg",
"high.Flamer": "Flamer",
"high.Flamer_King": "Flamer King",
@@ -3725,16 +3770,17 @@
"objects.Daily_Quest_Portal": "Daily Quest Portal",
"objects.Davy_JonesAPOS_Locker_Portal": "Davy Jones' Locker",
"objects.Davy_JonesAPOSs_Locker_Portal": "Davy Jones's Locker",
"objects.Decoy": "Decoy",
"objects.Dodec": "Dodec",
"objects.Dreamscape_Labyrinth_Portal": "Dreamscape Labyrinth Portal",
"objects.Dungeon_Portal": "Dungeon Portal",
"objects.Event_Chest": "Event Chest",
+ "objects.Event_Chest_Portal": "Event Chest",
"objects.Forbidden_Jungle_Portal": "Forbidden Jungle Portal",
"objects.Fortune_Ground_Object": "Fortune Ground Object",
"objects.G_Door_Opener": "G Door Opener",
"objects.Gift_Chest": "Gift Chest",
"objects.Gift_Chest_Closed": "Gift Chest Closed",
"objects.Glowing_Portal": "Glowing Portal",
"objects.Glowing_Portal_of_Cowardice": "Glowing Portal of Cowardice",
"objects.Glowing_Realm_Portal": "Glowing Realm Portal",
@@ -4819,17 +4865,17 @@
"server.potion_cooldown_active": "You cannot buy another potion yet",
"server.purchasing": "Purchasing {item} for {cost}",
"server.quest_complete": "Quest Complete!",
"server.quiet": "Quiet",
"server.rank_too_low": "Rank not high enough",
"server.realm_full": "Realm is full",
"server.realm_of_the_mad_god": "Realm of the Mad God",
"server.removed_from_ignore": "Removed {player} from ignore list",
- "server.resumed": "Game resumed",
+ "server.resumed": "Game Resumed",
"server.sale_succeeds": "Purchase Successful",
"server.self_invite": "Inviting yourself?",
"server.self_trade": "Trading with yourself is too pointless to attempt.",
"server.sick": "Sick",
"server.slowed": "Slowed",
"server.teleport_cooldown": "You need to wait at least 10 seconds between teleports",
"server.teleport_needs_name": "You can only teleport to players who have selected a unique name.",
"server.teleport_to_self": "You are already at yourself and always will be.",
@@ -5100,29 +5146,29 @@
"stringlist.Bonegrind_the_Butcher.everySoOften.0": "Oryx's minions will eat well tonight!",
"stringlist.Bonegrind_the_Butcher.everySoOften.1": "Ahhhh!! Fresh meat for the minions!",
"stringlist.Bonegrind_the_Butcher.everySoOften.2": "More mortals for the minions to feast on!",
"stringlist.Bonegrind_the_Butcher.everySoOften.3": "Plump and fleshy! Just like I like them!",
"stringlist.Bonegrind_the_Butcher.everySoOften.4": "Guards! Bring in another prisoner!",
"stringlist.Bonegrind_the_Butcher.everySoOften.5": "Oryx always feeds his minions well!",
"stringlist.Bonegrind_the_Butcher.everySoOften.6": "Another glorious day in Oryx's kitchens!",
"stringlist.Bonegrind_the_Butcher.everySoOften.7": "This one can go in the soup!",
- "stringlist.Cube_God.death.0": "You have dispatched my Cube God, but you will never escape my Realm!",
- "stringlist.Cube_God.killed.0": "{KILLER}, you pathetic swine! How dare you assault my Cube God?",
- "stringlist.Cube_God.killed.1": "{KILLER}, you wretched dog! You killed my Cube God!",
- "stringlist.Cube_God.killed.2": "{KILLER}, you may have destroyed my Cube God but you will never defeat me!",
- "stringlist.Cube_God.killed.3": "I have many more Cube Gods, {KILLER}!",
- "stringlist.Cube_God.many.0": "You piteous cretins! {COUNT} Cube Gods still guard me!",
- "stringlist.Cube_God.many.1": "Your pathetic rabble will never survive against my {COUNT} Cube Gods!",
- "stringlist.Cube_God.many.2": "Filthy vermin! My {COUNT} Cube Gods will exterminate you!",
- "stringlist.Cube_God.many.3": "You feeble creatures have no hope against my {COUNT} Cube Gods!",
- "stringlist.Cube_God.many.4": "Loathsome slugs! My {COUNT} Cube Gods will defeat you!",
- "stringlist.Cube_God.new.0": "Your meager abilities cannot possibly challenge a Cube God!",
- "stringlist.Cube_God.one.0": "Worthless mortals! A mighty Cube God defends me!",
- "stringlist.Cube_God.one.1": "Wretched mongrels! An unconquerable Cube God is my bulwark!",
+ "stringlist.Cube_God.death.0": "You have dispatched my Turkey God, but you will never escape my Realm!",
+ "stringlist.Cube_God.killed.0": "{KILLER}, you pathetic swine! How dare you assault my Turkey God?",
+ "stringlist.Cube_God.killed.1": "{KILLER}, you wretched dog! You killed my Turkey God!",
+ "stringlist.Cube_God.killed.2": "{KILLER}, you may have destroyed my Turkey God but you will never defeat me!",
+ "stringlist.Cube_God.killed.3": "I have many more Turkey Gods, {KILLER}!",
+ "stringlist.Cube_God.many.0": "You piteous cretins! {COUNT} Turkey Gods still guard me!",
+ "stringlist.Cube_God.many.1": "Your pathetic rabble will never survive against my {COUNT} Turkey Gods!",
+ "stringlist.Cube_God.many.2": "Filthy vermin! My {COUNT} Turkey Gods will exterminate you!",
+ "stringlist.Cube_God.many.3": "You feeble creatures have no hope against my {COUNT} Turkey Gods!",
+ "stringlist.Cube_God.many.4": "Loathsome slugs! My {COUNT} Turkey Gods will defeat you!",
+ "stringlist.Cube_God.new.0": "Your meager abilities cannot possibly challenge a Turkey God!",
+ "stringlist.Cube_God.one.0": "Worthless mortals! A mighty Turkey God defends me!",
+ "stringlist.Cube_God.one.1": "Wretched mongrels! An unconquerable Turkey God is my bulwark!",
"stringlist.Cyclops_God.everySoOften.0": "Leave my castle!",
"stringlist.Cyclops_God.everySoOften.1": "You will be my food, {PLAYER}!",
"stringlist.Cyclops_God.everySoOften.2": "I will suck the marrow from your bones!",
"stringlist.Cyclops_God.everySoOften.3": "More wine!",
"stringlist.Cyclops_God.everySoOften.4": "Blargh!!",
"stringlist.Cyclops_God.everySoOften.5": "I will floss with your tendons!",
"stringlist.Cyclops_God.everySoOften.6": "Die, puny human!",
"stringlist.Cyclops_God.everySoOften.7": "I smell the blood of an Englishman!",