diff --git a/src/app/character.coffee b/src/app/character.coffee index 9734c916a0..15b7563625 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -38,7 +38,7 @@ module.exports.app = (appExports, model) -> taskTypes = ['habit', 'daily', 'todo', 'reward'] batch.set 'tasks', {} _.each taskTypes, (type) -> batch.set "#{type}Ids", [] - batch.set 'balance', 1 if user.get('balance') < 1 #only if they haven't manually bought tokens + batch.set 'balance', 1 if user.get('balance') < 1 #only if they haven't manually bought gems # Reset stats batch.set 'stats.hp', 50 diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee index 406fca72b2..b0963580bd 100644 --- a/src/app/helpers.coffee +++ b/src/app/helpers.coffee @@ -58,7 +58,7 @@ viewHelpers = (view) -> view.fn "truarr", (num) -> num-1 view.fn 'count', (arr) -> arr?.length or 0 - view.fn "tokens", (gp) -> return gp/0.25 + view.fn "gems", (gp) -> return gp/0.25 view.fn "encodeiCalLink", (uid, apiToken) -> loc = window?.location.host or process.env.BASE_URL diff --git a/src/app/pets.coffee b/src/app/pets.coffee index 051c821b7b..9f43d82aeb 100644 --- a/src/app/pets.coffee +++ b/src/app/pets.coffee @@ -54,21 +54,21 @@ module.exports.app = (appExports, model) -> appExports.buyHatchingPotion = (e, el) -> name = $(el).attr 'data-hatchingPotion' 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} Gems?" + gems = user.get('balance') * 4 + if gems >= newHatchingPotion.value + if confirm "Buy this hatching potion with #{newHatchingPotion.value} of your #{gems} Gems?" user.push 'items.hatchingPotions', newHatchingPotion.name - user.set 'balance', (tokens - newHatchingPotion.value) / 4 + user.set 'balance', (gems - newHatchingPotion.value) / 4 else - $('#more-tokens-modal').modal 'show' + $('#more-gems-modal').modal 'show' appExports.buyEgg = (e, el) -> name = $(el).attr 'data-egg' 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} Gems?" + gems = user.get('balance') * 4 + if gems >= newEgg.value + if confirm "Buy this egg with #{newEgg.value} of your #{gems} Gems?" user.push 'items.eggs', newEgg - user.set 'balance', (tokens - newEgg.value) / 4 + user.set 'balance', (gems - newEgg.value) / 4 else - $('#more-tokens-modal').modal 'show' + $('#more-gems-modal').modal 'show' diff --git a/styles/app/index.styl b/styles/app/index.styl index 5160eb070c..f70d29d61f 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -82,11 +82,11 @@ hr } } -/* Tokens +/* Gems -------------------------------------------------- */ /* Adaptation of GH's social-count for Tokens */ -.token-cost +.gem-cost border: 1px solid #D4D4D4; font-size: 11px; font-weight: bold; @@ -98,7 +98,7 @@ hr background-color: #FAFAFA; position: relative; -.token-cost::before +.gem-cost::before content: ""; display: block; width: 0; @@ -111,7 +111,7 @@ hr top: 50%; margin-top: -6px; -.token-cost::after +.gem-cost::after content: ""; display: block; width: 0; diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 9668099c8d..911dcead61 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -1,11 +1,11 @@ -.token-wallet +.gem-wallet cursor: pointer .tile background-color: darken($neutral, 10%) - .add-token-btn + .add-gems-btn opacity: 0 &:hover, &:focus - .add-token-btn + .add-gems-btn opacity: 1 background-color: $good .tile diff --git a/views/app/game-pane.html b/views/app/game-pane.html index d5651094ce..5584342b81 100644 --- a/views/app/game-pane.html +++ b/views/app/game-pane.html @@ -2,7 +2,7 @@
- +