Commit Graph

33 Commits

Author SHA1 Message Date
Tyler Renelle f662b3af18 Merge branch 'master' into classes
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	script/items.coffee
2013-12-01 19:24:40 -07:00
Tyler Renelle 9976610652 classes: armory WIP 2013-11-30 16:32:09 -07:00
Sabe Jones b2a4d215a8 Draft of names, descriptions, stats, and costs for class-based equipment. 2013-11-29 17:31:43 -06:00
Nick Gordon 328a9d28dc suggested fix for adding "special" pets so that the list does not have to be duplicated multiple times. the user model can be updated in habitrpg to pull from here instead of hard coding it 2013-11-27 22:50:19 -08:00
Tyler Renelle 3d93f63216 classes: multi-class items WIP 2013-11-23 17:00:55 -07:00
Daniel the Bard c2810a4074 Merge branch 'classes' of https://github.com/DanielTheBard/habitrpg-shared into classes
Conflicts:
	script/items.coffee
2013-11-23 14:27:50 -05:00
Daniel the Bard fc39169b7a Updated Abilities
Not sure how balanced they are. Will probably require some play-testing. I'm sure we'll make adjustments as we go along.
Also built this on the assumption of maybe starting with maybe 30mp, and gaining 2 mp per point of INT?
2013-11-23 14:03:30 -05:00
Daniel the Bard 2544c13045 Class Abilities Updated 2013-11-23 13:41:42 -05:00
Tyler Renelle 1ef6bb18a8 classes WIP 2013-11-21 10:15:44 -08:00
Sabe Jones 4fbc31d1e6 Change "HP" to "Health" and clarify Potion type 2013-11-17 09:55:04 -06:00
Tyler Renelle 30b19b5e7d pets: add adjectives (@SabreCat) 2013-11-14 14:05:44 -08:00
Tyler Renelle a52eaee62f mounts: simpler, cleaner breakdown of potion rarity 2013-11-14 12:37:34 -08:00
Tyler Renelle ba548ed67b mounts: more item DRY-ing and cleanup 2013-11-14 12:12:49 -08:00
Tyler Renelle d124968273 mounts: add egg.mountText so "cub" text doesn't show up for mounts 2013-11-14 11:49:37 -08:00
Tyler Renelle 69d9ebe5d3 mounts: some item-def DRYing, provide defaults rather than requiring defined 2013-11-10 19:38:06 -08:00
Tyler Renelle d747559429 mounts: rewrite item definitions as objects, rather than arrays, to
support UserSchema overhaul. Add items.food & items.mounts
2013-11-10 13:25:13 -08:00
Tyler Renelle 761887da18 contrib: move equipped() helper to items.coffee, use a more robust
method of determining which item is available in the store, and which
items i can legally equip. It's a bit wild, I think we should find a
different approach
2013-11-07 13:11:35 -08:00
Matteo Pagliazzi d7416117f9 award ultimate gear achievement 2013-10-27 12:13:06 +01:00
Tyler Renelle 6a3b2fc1a1 add potion & reroll to itemstore, add taskDefaults helper 2013-08-25 14:53:45 -04:00
Tyler Renelle 18f0755e4e cast user.items[type] to int, this was the "not enough gp" bug 2013-08-18 20:42:27 -04:00
Tyler Renelle b13c909fe7 possible fix to #1330 2013-08-18 20:12:24 -04:00
Tyler Renelle d7083bd442 woops, can't alert on server! 2013-08-15 00:26:39 -04:00
Tyler Renelle 2ffade083e cast also during purchasing 2013-08-15 00:12:45 -04:00
Tyler Renelle 0362de7f0f encapsulate items.buyItem better in habitrpg-shared/items.coffee so we can call from API, derby, & mobile app 2013-08-12 23:47:49 -04:00
Tyler Renelle 4df34095aa Merge branch 'develop' 2013-08-04 22:32:41 -04:00
Sabe Jones 07907ae28f Remove misleading "one day" from egg drop text
Pouring a potion on an egg hatches the pet instantly. Until such time as that feature is changed, I've removed the "one day" from the relevant string.
2013-07-31 16:19:16 -05:00
Tyler Renelle dab72e5865 cap items to maximum in their array, in case the user manually entered
a number larger than the max allowed item in the "restore" modal
2013-07-24 16:45:48 -04:00
Brandon McPhail 8f6fe2456a Enforced Shield -> Reinforced Shield
Renamed.
2013-05-26 00:29:31 -06:00
Tyler Renelle 4a3e8fdcfa backer tier bug fix 2013-05-23 19:41:28 +01:00
Tyler Renelle a8ab98f99a not on instant-use potion 2013-05-22 11:14:59 +01:00
Tyler Renelle 1feb209c24 Moving back to the Browserify method of concat'd JS files, which will
then be exposed to the browser as a global. This was decided between
@yangit and me, as we found RequireJS to be too painful to setup for
our use case. This Browserify + Global works just fine for us, and it
fits perfectly as require() statements in our node.js backend
2013-05-19 18:01:01 +01:00
yangit 28aa7d2e4f Requred items.js from algos.coffee We do not need to pass items{} to scoring function anymore.
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 21:59:01 +08:00
yangit ff8721b4a3 Require.js example.
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 13:27:17 +08:00