diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 5def0751a6..b2985aab60 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -13947,28 +13947,34 @@ api.backgrounds = { }; api.subscriptionBlocks = { - "1": { + basic_earned: { months: 1, - price: 5, - key: 'basic_earned' + price: 5 }, - "3": { + basic_3mo: { months: 3, - price: 15, - key: 'basic_3mo' + price: 15 }, - "6": { + basic_6mo: { months: 6, - price: 30, - key: 'basic_6mo' + price: 30 }, - "12": { + google_6mo: { + months: 6, + price: 24, + discount: true, + original: 30 + }, + basic_12mo: { months: 12, - price: 48, - key: 'basic_12mo' + price: 48 } }; +_.each(api.subscriptionBlocks, function(b, k) { + return b.key = k; +}); + repeat = { m: true, t: true, @@ -16493,5 +16499,5 @@ api.wrap = function(user, main) { }; -}).call(this,require("/Users/blade/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js")) -},{"./content.coffee":5,"./i18n.coffee":6,"/Users/blade/habitrpg/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1]) \ No newline at end of file +}).call(this,require("/Users/lefnire/Google Drive/Sync/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js")) +},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Google Drive/Sync/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1]) \ No newline at end of file diff --git a/script/content.coffee b/script/content.coffee index 6bfe25fe1a..8404409f9e 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -1438,10 +1438,12 @@ api.backgrounds = notes: t('backgroundSouthPoleNotes') api.subscriptionBlocks = - "1": months:1, price:5, key: 'basic_earned' - "3": months:3, price:15, key: 'basic_3mo' - "6": months:6, price:30, key: 'basic_6mo' - "12": months:12, price:48, key: 'basic_12mo' + basic_earned: months:1, price:5 + basic_3mo: months:3, price:15 + basic_6mo: months:6, price:30 + google_6mo: months:6, price:24, discount:true, original:30 + basic_12mo: months:12, price:48 +_.each api.subscriptionBlocks, (b,k)->b.key = k repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true} api.userDefaults =