sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-20 12:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove reroll from items.coffee

Browse source
This commit is contained in:
Tyler Renelle 2013-12-08 19:02:50 -07:00
parent c28eb2f11c
commit 1144752f52
5 changed files with 784 additions and 607 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dist/habitrpg-shared.js vendored
View file

@ -10781,8 +10781,7 @@ try {
/*
---------------------------------------------------------------
Potion & Re-roll
TODO rename / remove re-roll?
Potion
---------------------------------------------------------------
*/
@ -10795,13 +10794,6 @@ try {
key: 'potion'
};
items.reroll = {
type: 'reroll',
text: "Re-Roll",
notes: "Resets your task values back to 0 (yellow). Useful when everything's red and it's hard to stay alive.",
value: 0
};
/*
---------------------------------------------------------------
Spells
@ -11261,7 +11253,6 @@ try {
}
}));
changes.push(items.potion);
changes.push(items.reroll);
return _.sortBy(changes, function(item) {
switch (item.type) {
case 'weapon':
@ -11274,10 +11265,8 @@ try {
return 4;
case 'potion':
return 5;
case 'reroll':
return 6;
default:
return 7;
return 6;
}
});
};

2
dist/spritesheets.css vendored
View file

File diff suppressed because one or more lines are too long

1366
dist/spritesmith.css vendored
View file

File diff suppressed because it is too large Load diff

BIN
dist/spritesmith.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 277 KiB

After

Width:  |  Height:  |  Size: 285 KiB

8
script/items.coffee
View file

@ -172,13 +172,11 @@ _.each ['weapon', 'armor', 'head', 'shield'], (type) ->
###
---------------------------------------------------------------
Potion & Re-roll
TODO rename / remove re-roll?
Potion
---------------------------------------------------------------
###
items.potion = type: 'potion', text: "Health Potion", notes: "Recover 15 Health (Instant Use)", value: 25, key: 'potion'
items.reroll = type: 'reroll', text: "Re-Roll", notes: "Resets your task values back to 0 (yellow). Useful when everything's red and it's hard to stay alive.", value:0
###
---------------------------------------------------------------
@ -471,7 +469,6 @@ module.exports.updateStore = (user) ->
m.push v if v.canOwn?(user) && !user.items.gear.owned[v.key]
changes.push items.potion
changes.push items.reroll
# Return sorted store (array)
_.sortBy changes, (item) ->
@ -481,8 +478,7 @@ module.exports.updateStore = (user) ->
when 'head' then 3
when 'shield' then 4
when 'potion' then 5
when 'reroll' then 6
else 7
else 6
###
Gets an item, and caps max to the last item in its array