Commit graph

44 commits

Author SHA1 Message Date
Tyler Renelle
a1a85241d5 add "hatching powder" (as temporary pet food), clean up some dialogs,
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
Tyler Renelle
0f8b50c806 remove 'veteran' pet 2013-03-21 13:58:23 -06:00
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
2013-03-21 13:51:38 -06:00
Tyler Renelle
0bcea534ae better "reroll" comment 2013-03-17 09:13:25 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Daniel Saewitz
ab332d5f23 Save eggs as object so we can grab text easily 2013-03-09 20:03:24 -05:00
Tyler Renelle
65b7f432a9 get the pets working for the avatar box, with consistent names (need
to manually apply with model.set for now)
2013-03-09 12:03:38 -05:00
Tyler Renelle
c8c7d76efd renaming some pets for consistency, adding foods 2013-03-09 11:36:27 -05:00
Tyler Renelle
8ecf3eacc0 Merge branch 'inventory' of github.com:switz/habitrpg into switz-inventory
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-09 11:04:54 -05:00
Daniel Saewitz
31c0099119 Drop an egg when the user htis level 4 2013-03-09 08:30:06 -05:00
Daniel Saewitz
db132fad19 Show meats in inventory 2013-03-09 08:17:02 -05:00
Tyler Renelle
e280be3f62 gut old pet images, now we're using sprites. begin on new items.pets[] structure 2013-03-08 13:01:29 -05:00
Daniel Saewitz
510bcda47c wip 2013-03-08 12:44:21 -05:00
Daniel Saewitz
d17de8c5c9 Enable drops at level 4 2013-03-08 12:16:44 -05:00
Tyler Renelle
b6564828ce use different rewards selector for items-unlocked popover, wasn't getting it 2013-03-05 21:41:01 -05:00
Philip How
9283b8adb4 Add death notification and algorithm fixes 2013-03-02 20:02:57 +00:00
Philip How
08839278b3 Notification and Algorithim changes 2013-03-02 18:23:43 +00:00
Tyler Renelle
39a98446b9 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 23:27:01 -05:00
Stan Lindsey
d28ae976fa Update src/app/items.coffee 2013-02-21 02:26:31 +00:00
Stan Lindsey
843ead6de9 Update src/app/items.coffee 2013-02-21 02:26:15 +00:00
Tyler Renelle
7133295dbe set lower default tokens 2013-02-13 02:02:31 -05:00
Tyler Renelle
c67a65582a "pets unlocked" dialog typo 2013-02-11 12:24:39 -05:00
Tyler Renelle
cddd94bf86 golden wolf value typo 2013-02-11 02:56:54 -05:00
Tyler Renelle
3dbfd50813 rename some wolves 2013-02-11 02:38:33 -05:00
Tyler Renelle
8d920a7ea1 unlock pets feature 2013-02-11 01:55:45 -05:00
Tyler Renelle
967589baf7 update balance, display real value of pet 2013-02-11 01:38:27 -05:00
Tyler Renelle
81edf7ede3 fix up dynamic "owned pet" determination 2013-02-11 01:34:01 -05:00
Tyler Renelle
3c91355581 show buy more tokens modal if out 2013-02-11 01:22:22 -05:00
Tyler Renelle
f298aa8b3d tokens vs GP based on active rewards tab 2013-02-11 01:17:41 -05:00
Tyler Renelle
61c46e83d9 pet tooltips, checkmark when purchased 2013-02-11 01:07:01 -05:00
Tyler Renelle
5d343f3c5f begin "select pet" functionality 2013-02-11 00:23:23 -05:00
Stan Lindsey
80701dbeb5 Update src/app/items.coffee 2013-02-10 22:52:18 +00:00
Stan Lindsey
4ac7c324a6 Change items costs & stats
To better reflect value differences between Armour, Helm & Shield. 
As well as promote different Armour setups

Armour Worth most in terms of cost & effectiveness
Shield worth second in terms of cost & effectiveness
Helm worth least in terms of cost & effectiveness

Max defense = 24% with a full set of gold. 
Which should be balanced as there are now 3 items to purchase instead of one
2013-02-09 14:42:39 +00:00
Tyler Renelle
51848acec1 add popovr customizations notification 2013-02-08 18:22:26 -05:00
Tyler Renelle
63bef37e98 fixes to gold / silver. Add copper, but not using it in the html (it's
currently always calculated at 00)
2013-02-08 16:41:04 -05:00
Tyler Renelle
6f3d958a21 add in missing first shield (@Pandoro I just got what you did there, clever) 2013-02-08 16:09:01 -05:00
Tyler Renelle
f71948ecdf fix modifiers - they're helping the user too much :) 2013-02-08 15:50:46 -05:00
Tyler Renelle
e6cc875e5b rename some items 2013-02-08 14:58:07 -05:00
Tyler Renelle
4e1d1f6f83 actually apply armor/weapon modifiers 2013-02-08 14:54:52 -05:00
Tyler Renelle
dc1639ceb4 fix to reroll & potion 2013-02-08 14:13:52 -05:00
Tyler Renelle
6ec5f818d5 use potion and reroll from shop sheet 2013-02-08 13:57:12 -05:00
Tyler Renelle
5160595354 add @Pandoro's new sprites to /styl, clean up 2013-02-08 13:22:09 -05:00
Tyler Renelle
9250b8b2b5 some more fixes on "nextItem" 2013-02-08 12:50:37 -05:00
Tyler Renelle
8b9b277036 update schema 2013-02-08 02:30:26 -05:00