Merge pull request #925 from SlappyBag/develop

Tokens = Gems for front-end display.
This commit is contained in:
Tyler Renelle
2013-05-11 10:43:45 -07:00
8 changed files with 21 additions and 20 deletions
+2 -2
View File
@@ -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
+1 -1
View File
@@ -41,7 +41,7 @@ module.exports.app = (appExports, model) ->
return if alreadyShown(before,after)
html = """
<img src='/img/sprites/wolf_border.png' style='width:30px;height:30px;float:left;padding-right:5px' />
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'
+1 -1
View File
@@ -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