From 13ab60cafe287c7d3215a3f6303e562588060297 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 28 Jul 2015 13:28:45 -0500 Subject: [PATCH] feat(drops): Enable pets at Level 3 --- common/locales/en/npc.json | 8 ++++---- common/script/index.coffee | 4 +--- website/src/models/user.js | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/common/locales/en/npc.json b/common/locales/en/npc.json index 88e2e494db..a7927997a2 100644 --- a/common/locales/en/npc.json +++ b/common/locales/en/npc.json @@ -3,7 +3,7 @@ "npcText": "Backed the Kickstarter project at the maximum level!", "mattBoch": "Matt Boch", "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!", - "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.", + "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Starting at level 3, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 3, and they'll grow into hardy mounts.", "daniel": "Daniel", "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.", "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.", @@ -57,10 +57,10 @@ "tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!", "tourGuildsPage": "Guilds are common-interest chat groups created by the players, for the players. Browse through the list and join the Guilds that interest you. Be sure to check out the popular Newbies Guild, where anyone can ask questions about HabitRPG!", "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win Gem prizes!", - "tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market.", + "tourMarketPage": "Starting at Level 3, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market.", "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to HabitRPG, too!", - "tourPetsPage": "This is the Stable! After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.", - "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 4.) Click a mount to saddle up!", + "tourPetsPage": "This is the Stable! After level 3, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 3, and they'll grow into powerful mounts.", + "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 3.) Click a mount to saddle up!", "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"", "tourOkay": "Okay!", diff --git a/common/script/index.coffee b/common/script/index.coffee index 1626637fda..3ae0fc6be4 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -1616,9 +1616,7 @@ api.wrap = (user, main=true) -> user.flags.customizationsNotification = true if !user.flags.itemsEnabled and (user.stats.exp > 10 or user.stats.lvl > 1) user.flags.itemsEnabled = true - if !user.flags.partyEnabled and user.stats.lvl >= 3 - user.flags.partyEnabled = true - if !user.flags.dropsEnabled and user.stats.lvl >= 4 + if !user.flags.dropsEnabled and user.stats.lvl >= 3 user.flags.dropsEnabled = true if user.items.eggs["Wolf"] > 0 then user.items.eggs["Wolf"]++ else user.items.eggs["Wolf"] = 1 if !user.flags.classSelected and user.stats.lvl >= 10 diff --git a/website/src/models/user.js b/website/src/models/user.js index e8dc06e60f..eb63c5aa69 100644 --- a/website/src/models/user.js +++ b/website/src/models/user.js @@ -142,7 +142,6 @@ var UserSchema = new Schema({ itemsEnabled: {type: Boolean, 'default': false}, newStuff: {type: Boolean, 'default': false}, rewrite: {type: Boolean, 'default': true}, - partyEnabled: Boolean, // FIXME do we need this? contributor: Boolean, classSelected: {type: Boolean, 'default': false}, mathUpdates: Boolean,