diff --git a/locales/en/app.json b/locales/en/app.json index 1f8fb01f93..672753bef2 100644 --- a/locales/en/app.json +++ b/locales/en/app.json @@ -282,10 +282,10 @@ "_commentmisc": "MISC & GLOBAL", - "Tokens" : "Tokens", + "Gems" : "Gems", "RemoveAds": "Remove Ads", "WhyAds": "Why Ads?", - "WhyAdsContent1": "Habit an open source project, and can use all the help it can get - consider this a donation to the contributors. You also get 20 tokens from the purchase, which you can use to buy special items.", + "WhyAdsContent1": "Habit an open source project, and can use all the help it can get - consider this a donation to the contributors. You also get 20 Gems from the purchase, which you can use to buy special items.", "WhyAdsContent2": "'Hey, I backed the Kickstarter!' - follow ", "WhyAdsContent3": "these instructions.", "_commentbuttons": "BUTTONS", @@ -302,4 +302,4 @@ "Yesterday":"Yesterday", "DaysAgo":"days ago" -} \ No newline at end of file +} diff --git a/public/img/sprites/pet_sprites.css b/public/img/sprites/pet_sprites.css index 4bff991a0d..8dfeceafdb 100644 --- a/public/img/sprites/pet_sprites.css +++ b/public/img/sprites/pet_sprites.css @@ -93,3 +93,4 @@ .Pet-BearCub-Base {background-position: -7290px 0; width: 81px; height: 99px} .Pet-Wolf-Base {background-position: -7371px 0; width: 81px; height: 99px} .Pet-Egg {background: url("/img/sprites/egg.png") no-repeat; width: 39px; height: 42px;} +.Gems{background: url("/img/sprites/Egg_Sprite_Sheet.png"); background-position: -57px 50px; display:inline-block; margin-right:5px;border-style:none; width: 30px; height: 30px} diff --git a/src/app/pets.coffee b/src/app/pets.coffee index 51b95ba213..051c821b7b 100644 --- a/src/app/pets.coffee +++ b/src/app/pets.coffee @@ -56,7 +56,7 @@ module.exports.app = (appExports, model) -> newHatchingPotion = _.findWhere hatchingPotions, name: name tokens = user.get('balance') * 4 if tokens >= newHatchingPotion.value - if confirm "Buy this hatching potion with #{newHatchingPotion.value} of your #{tokens} tokens?" + if confirm "Buy this hatching potion with #{newHatchingPotion.value} of your #{tokens} Gems?" user.push 'items.hatchingPotions', newHatchingPotion.name user.set 'balance', (tokens - newHatchingPotion.value) / 4 else @@ -67,7 +67,7 @@ module.exports.app = (appExports, model) -> newEgg = _.findWhere pets, name: name tokens = user.get('balance') * 4 if tokens >= newEgg.value - if confirm "Buy this egg with #{newEgg.value} of your #{tokens} tokens?" + if confirm "Buy this egg with #{newEgg.value} of your #{tokens} Gems?" user.push 'items.eggs', newEgg user.set 'balance', (tokens - newEgg.value) / 4 else diff --git a/src/app/unlock.coffee b/src/app/unlock.coffee index 7a240aea7e..1680e7a9b1 100644 --- a/src/app/unlock.coffee +++ b/src/app/unlock.coffee @@ -41,7 +41,7 @@ module.exports.app = (appExports, model) -> return if alreadyShown(before,after) html = """ - You have unlocked Pets! You can now buy pets with tokens (note, you replenish tokens with real-life money - so chose your pets wisely!) + You have unlocked Pets! You can now buy pets with Gems (note, you replenish Gems with real-life money - so chose your pets wisely!) """ showPopover '#rewardsTabs', 'Pets Unlocked', html, 'left' diff --git a/src/server/private.coffee b/src/server/private.coffee index fb9945bb57..c332dc104f 100644 --- a/src/server/private.coffee +++ b/src/server/private.coffee @@ -26,7 +26,7 @@ module.exports.app = (appExports, model) -> address: false amount: 500 name: "Checkout" - description: "Buy 20 Tokens, #{disableAds}Support the Developers" + description: "Buy 20 Gems, #{disableAds}Support the Developers" panelLabel: "Checkout" token: token diff --git a/views/app/modals.html b/views/app/modals.html index a82b1bbef5..a07fb04a3d 100644 --- a/views/app/modals.html +++ b/views/app/modals.html @@ -36,27 +36,27 @@

Highly discouraged because red tasks provide good incentive to improve (read more). However, this becomes necessary after long bouts of bad habits.

- <@footer> + <@footer> {#if lt(_user.balance,1)} - Buy More TokensNot enough tokens + Buy More GemsNot enough Gems {else} - Re-Roll4 Tokens + Re-Roll4 Gems {/} - - + + -

Oops, out of tokens, which are used to buy special items! Habit is an open source project, and can use all the help it can get - buy more tokens to receive this pet, and consider it a donation to the contributors

+

Oops, out of Gems, which are used to buy special items! Habit is an open source project, and can use all the help it can get - buy more Gems to receive this pet, and consider it a donation to the contributors

<@footer> - Buy More TokensNot enough tokens + Buy More GemsNot enough Gems

- Habit an open source project, and can use all the help it can get - consider this a donation to the contributors. You also get 20 tokens from the purchase, which you can use to buy special items. + Habit an open source project, and can use all the help it can get - consider this a donation to the contributors. You also get 20 Gems from the purchase, which you can use to buy special items.

"Hey, I backed the Kickstarter!" - follow these instructions. diff --git a/views/app/pets.html b/views/app/pets.html index 7a8e866d08..3873742228 100644 --- a/views/app/pets.html +++ b/views/app/pets.html @@ -33,13 +33,13 @@

- {.text}
{.value} tokens + {.text}
{.value} Gems
- {.text}
{.value} tokens + {.text}
{.value} Gems diff --git a/views/app/rewards.html b/views/app/rewards.html index bde72795f2..55eb97157b 100644 --- a/views/app/rewards.html +++ b/views/app/rewards.html @@ -12,7 +12,7 @@
- +
{gold(floor(_user.stats.gp))} @@ -53,9 +53,9 @@ - + ＋ - {tokens(_user.balance)} Tokens +
{tokens(_user.balance)} Gems