From 881019f4e93fd77bd515e4c132d4925d81ecfb0c Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 1 Sep 2012 19:30:18 -0400 Subject: [PATCH] update item costs, they were too expensive Conflicts: src/app/content.coffee --- lib/app/content.js | 32 ++++++++++++++++++-------------- src/app/content.coffee | 34 +++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/lib/app/content.js b/lib/app/content.js index 80dc1d2c78..8a86df5017 100644 --- a/lib/app/content.js +++ b/lib/app/content.js @@ -114,42 +114,42 @@ module.exports = { text: "Sword 2", icon: 'item-sword2', notes: 'Increases experience gain by 3%.', - value: 50 + value: 20 }, { type: 'weapon', index: 2, text: "Axe", icon: 'item-axe', notes: 'Increases experience gain by 6%.', - value: 100 + value: 30 }, { type: 'weapon', index: 3, text: "Morningstar", icon: 'item-morningstar', notes: 'Increases experience gain by 9%.', - value: 150 + value: 45 }, { type: 'weapon', index: 4, text: "Blue Sword", icon: 'item-bluesword', notes: 'Increases experience gain by 12%.', - value: 200 + value: 65 }, { type: 'weapon', index: 5, text: "Red Sword", icon: 'item-redsword', notes: 'Increases experience gain by 15%.', - value: 250 + value: 90 }, { type: 'weapon', index: 6, text: "Golden Sword", icon: 'item-goldensword', notes: 'Increases experience gain by 18%.', - value: 300 + value: 120 } ], armor: [ @@ -166,50 +166,54 @@ module.exports = { text: "Leather Armor", icon: 'item-leatherarmor', notes: 'Decreases HP loss by 3%.', - value: 50 + value: 30 }, { type: 'armor', index: 2, text: "Chain Mail", icon: 'item-mailarmor', notes: 'Decreases HP loss by 6%.', - value: 100 + value: 45 }, { type: 'armor', index: 3, text: "Plate Mail", icon: 'item-platearmor', notes: 'Decreases HP loss by 9%.', - value: 150 + value: 65 }, { type: 'armor', index: 4, text: "Red Armor", icon: 'item-redarmor', notes: 'Decreases HP loss by 12%.', - value: 200 + value: 90 }, { type: 'armor', index: 5, text: "Golden Armor", icon: 'item-goldenarmor', notes: 'Decreases HP loss by 15%.', - value: 250 + value: 120 } ], potion: { type: 'potion', text: "Potion", notes: "Recover 15 HP", - value: 30, + value: 25, icon: 'item-flask' }, reroll: { type: 'reroll', text: "Re-Roll", icon: 'favicon', - notes: "Reset your task values to 0. Do this only if you're really struggling.", - value: 100 + notes: "Reset your tasks. When you're struggling and everything's red, use for a clean slate. Use sparingly, it costs real money.", + rerollWarning: { + title: "This item costs real money", + content: "Each use is $1, can use 5 times before checkout." + }, + value: 0 } } }; diff --git a/src/app/content.coffee b/src/app/content.coffee index 9e147138cd..e9b5e4c6ee 100644 --- a/src/app/content.coffee +++ b/src/app/content.coffee @@ -61,23 +61,31 @@ module.exports = { #TODO: figure out how to calculate index & type without having to store it in the JSON weapon: [ {type: 'weapon', index: 0, text: "Sword 1", icon: "item-sword1", notes:'Training weapon.', value:0} - {type: 'weapon', index: 1, text: "Sword 2", icon:'item-sword2', notes:'Increases experience gain by 3%.', value:50} - {type: 'weapon', index: 2, text: "Axe", icon:'item-axe', notes:'Increases experience gain by 6%.', value:100} - {type: 'weapon', index: 3, text: "Morningstar", icon:'item-morningstar', notes:'Increases experience gain by 9%.', value:150} - {type: 'weapon', index: 4, text: "Blue Sword", icon:'item-bluesword', notes:'Increases experience gain by 12%.', value:200} - {type: 'weapon', index: 5, text: "Red Sword", icon:'item-redsword', notes:'Increases experience gain by 15%.', value:250} - {type: 'weapon', index: 6, text: "Golden Sword", icon:'item-goldensword', notes:'Increases experience gain by 18%.', value:300} + {type: 'weapon', index: 1, text: "Sword 2", icon:'item-sword2', notes:'Increases experience gain by 3%.', value:20} + {type: 'weapon', index: 2, text: "Axe", icon:'item-axe', notes:'Increases experience gain by 6%.', value:30} + {type: 'weapon', index: 3, text: "Morningstar", icon:'item-morningstar', notes:'Increases experience gain by 9%.', value:45} + {type: 'weapon', index: 4, text: "Blue Sword", icon:'item-bluesword', notes:'Increases experience gain by 12%.', value:65} + {type: 'weapon', index: 5, text: "Red Sword", icon:'item-redsword', notes:'Increases experience gain by 15%.', value:90} + {type: 'weapon', index: 6, text: "Golden Sword", icon:'item-goldensword', notes:'Increases experience gain by 18%.', value:120} ] armor: [ {type: 'armor', index: 0, text: "Cloth Armor", icon: 'item-clotharmor', notes:'Training armor.', value:0} - {type: 'armor', index: 1, text: "Leather Armor", icon: 'item-leatherarmor', notes:'Decreases HP loss by 3%.', value:50} - {type: 'armor', index: 2, text: "Chain Mail", icon: 'item-mailarmor', notes:'Decreases HP loss by 6%.', value:100} - {type: 'armor', index: 3, text: "Plate Mail", icon: 'item-platearmor', notes:'Decreases HP loss by 9%.', value:150} - {type: 'armor', index: 4, text: "Red Armor", icon: 'item-redarmor', notes:'Decreases HP loss by 12%.', value:200} - {type: 'armor', index: 5, text: "Golden Armor", icon: 'item-goldenarmor', notes:'Decreases HP loss by 15%.', value:250} + {type: 'armor', index: 1, text: "Leather Armor", icon: 'item-leatherarmor', notes:'Decreases HP loss by 3%.', value:30} + {type: 'armor', index: 2, text: "Chain Mail", icon: 'item-mailarmor', notes:'Decreases HP loss by 6%.', value:45} + {type: 'armor', index: 3, text: "Plate Mail", icon: 'item-platearmor', notes:'Decreases HP loss by 9%.', value:65} + {type: 'armor', index: 4, text: "Red Armor", icon: 'item-redarmor', notes:'Decreases HP loss by 12%.', value:90} + {type: 'armor', index: 5, text: "Golden Armor", icon: 'item-goldenarmor', notes:'Decreases HP loss by 15%.', value:120} ] - potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP", value: 30, icon: 'item-flask'} - reroll: {type: 'reroll', text: "Re-Roll", icon: 'favicon', notes: "Reset your task values to 0. Do this only if you're really struggling.", value:100} + potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP", value: 25, icon: 'item-flask'} + reroll: + type: 'reroll' + text: "Re-Roll" + icon: 'favicon' + notes: "Reset your tasks. When you're struggling and everything's red, use for a clean slate. Use sparingly, it costs real money." + rerollWarning: + title: "This item costs real money" + content: "Each use is $1, can use 5 times before checkout." + value:0 } }