Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(various): News and sprites

Browse Source 
Also tweaks the drop probability of equipment from 70% to 60%.
This commit is contained in:
Sabe Jones
2015-06-05 10:22:22 -05:00
parent 8f744b043a
commit 804cced3ff
6 changed files with 407 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/dist/sprites/habitrpg-shared.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
common/dist/sprites/spritesmith4.css
Vendored
+391 -391
View File
File diff suppressed because it is too large Load Diff
common/dist/sprites/spritesmith4.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 679 KiB

After

Width:  |  Height:  |  Size: 681 KiB

common/img/sprites/spritesmith/promo/promo_enchanted_armoire.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

common/script/index.coffee
+2 -2
View File
@@ -852,13 +852,13 @@ api.wrap = (user, main=true) ->
else if item.key is 'armoire'
armoireResult = user.fns.predictableRandom()
eligibleEquipment = _.filter(content.gear.flat, ((i)->i.klass is 'armoire' and !user.items.gear.owned[i.key]))
if !_.isEmpty(eligibleEquipment) and (armoireResult < .7 or !user.flags.armoireOpened)
if !_.isEmpty(eligibleEquipment) and (armoireResult < .6 or !user.flags.armoireOpened)
drop = user.fns.randomVal(eligibleEquipment)
user.items.gear.owned[drop.key] = true
user.flags.armoireOpened = true
message = i18n.t('armoireEquipment', {image: '<span class="shop_'+drop.key+' pull-left"></span>', dropText: drop.text(req.language)}, req.language)
if api.countArmoire(user.items.gear.owned) is 0 then user.flags.armoireEmpty = true
else if (!_.isEmpty(eligibleEquipment) and armoireResult < .85) or armoireResult < .6
else if (!_.isEmpty(eligibleEquipment) and armoireResult < .8) or armoireResult < .5
drop = user.fns.randomVal _.where(content.food, {canDrop:true})
user.items.food[drop.key] ?= 0
user.items.food[drop.key] += 1
website/views/shared/new-stuff.jade
+13 -2
View File
@@ -1,5 +1,16 @@
h5 6/1/2015 - JUNE BACKGROUNDS AND NEW MOUNT POSITIONING!
h5 6/1/2015 - NEW EQUIPMENT: THE ENCHANTED ARMOIRE, JUNE BACKGROUNDS, AND NEW MOUNT POSITIONING!
hr
tr
td
.promo_enchanted_armoire.pull-right
h5 New Equipment: The Enchanted Armoire!
p Now after you achieve Ultimate Gear, you'll unlock a new Reward: THE ENCHANTED ARMOIRE!
br
p Click on the Enchanted Armoire, a 100 GP Reward in the Rewards Column, for a random chance at special Equipment! It may also give you random XP or food items. We'll be adding new equipment to it every month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP.
br
p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you...
p.small.muted by Lemoness and SabreCat
p.small.muted Art by Kiwibot, Starsystemic, UncommonCriminal, Zoebeagle, and Andrews38
tr
td
.background_island_waterfalls.pull-right
@@ -17,7 +28,7 @@ a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
h5 6/1/2015 - JUNE MYSTERY ITEM AND NEW MOUNT POSITIONING!
h5 6/1/2015 - JUNE MYSTERY ITEM!
tr
td
.inventory_present_06.pull-right