Commit Graph

67 Commits

Author SHA1 Message Date
Tyler Renelle 04de115877 don't run drops on the client. they will be wiped on refresh anyway,
only run on the server (we still need a way to notify users when a drop
happened on the server)
2013-09-02 20:51:21 -04:00
Tyler Renelle 4174412b11 small tweaks to user._tmp, and fixing my own icon 2013-09-02 17:35:00 -04:00
Tyler Renelle d29f267425 move browserify step to Grunt instead of Make (for consistency). Build files now in dist/ as dist/habitrpg-shared.js & dist/spritesheets.css 2013-08-26 22:09:02 -04:00
Tyler Renelle 2e0441e0b6 start reorganizing everything so we can make use of shared
spritesheets. !note! this will break master, and will only work on the rewrite
2013-08-26 20:42:22 -04:00
Tyler Renelle 6a3b2fc1a1 add potion & reroll to itemstore, add taskDefaults helper 2013-08-25 14:53:45 -04:00
Tyler Renelle bff1b50e42 build browser scripts 2013-08-25 09:07:58 -04:00
Tyler Renelle 9af5d2d29b no more 'new' deafult lastCron, set it to +new Date() 2013-08-24 19:07:42 -04:00
Tyler Renelle 6aa9483a0b cron: add timezone calculation into the midst. Note: this requires user.preferences.timezoneOffset exist on the user, otherwise it will default to the script-runner timezone (which works fine if user or browser) 2013-08-20 21:40:39 -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 fc3d863feb cast values to their appropriate types when running scoring functions 2013-08-15 00:00:12 -04:00
Tyler Renelle 8ae6e361b8 cleanup corrupt stats too 2013-08-14 22:58:20 -04:00
Tyler Renelle c40ec44644 typo on corrupt task cleanup 2013-08-14 22:51:47 -04:00
Tyler Renelle 81f83be160 safeguard against NaN & null-value tasks 2013-08-13 20:27:42 -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 9e1341f0e6 derbyUserToAPI - allow pass in user as object, not scope 2013-08-12 20:40:59 -04:00
Tyler Renelle 65881a178e fix to "set undefined path", _.each exits early if it receives false :(
:( :(
2013-08-12 13:18:05 -04:00
Tyler Renelle cafcde01ec bug fixes: don't allow dotSet/Get on undefined paths, remove @hydrate
from derbyUserToAPI()
2013-08-11 12:18:58 -04:00
Tyler Renelle 6b56067668 add some derby-specific routes that are required by the new api, upgrade
lodash so we can use _.transofrm
2013-08-10 23:30:17 -04:00
Tyler Renelle c88fa701a5 add revive to algos.coffee, needed by apiv2 & mobile 2013-08-04 23:45:58 -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
Tyler Renelle a5eb64f771 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-07-12 16:56:47 -04:00
Tyler Renelle 2bb5ad43e0 require items, algos, helpers locally instead of via index.js 2013-07-12 16:32:28 -04:00
yangit 68e8819c21 Merge remote-tracking branch 'remotes/upstream/master' 2013-06-26 09:56:29 +07:00
yangit 014f2df5c7 remove buying rewards for health (you can buy for money only) 2013-06-26 09:52:40 +07:00
Tyler Renelle 7bb95795c7 Merge branch 'develop' 2013-06-20 20:39:13 -04:00
Tyler Renelle 6bf0305ea4 fixed the empty helpers issue. it was circular dependencies - algos
dep'd helpers, helpers dep'd algos. Since one came first, it didn't
have the other - so it was an empty object. maybe this top-level
index.js combinging ./script/* files isn't such a good idea, because I
think manual requires from within a file will resolve circular
dependencies @yangit
2013-06-18 21:40:43 -04:00
Tyler Renelle 6998fb70f3 export all scripts into top-level index.js, so that coffeeify includes
can import these properly. Hopefully this fixes the empty helpers bug.
@yangit I'll merge this into master once I'm sure it works
2013-06-18 18:21:27 -04:00
yangit f6750ffc16 fix for confirmation window when buying rewards w\o money. 2013-06-14 15:07:18 +08:00
Tyler Renelle 06a2989d3b Revert "change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea"
This reverts commit 6ca82b2443.
2013-06-04 12:51:33 -04:00
Tyler Renelle 6ca82b2443 change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea 2013-06-04 12:41:50 -04:00
Tyler Renelle 9e7a02ef78 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-06-03 14:45:37 -04:00
Shane Lister de73086f56 Update algos.coffee
Increase egg drop percentage by 10 decrease potion percentage by 10.
2013-06-03 11:03:12 -06:00
Tyler Renelle ac74cb0d74 challenges: new party invitation setup 2013-05-28 17:32:31 +01:00
Tyler Renelle 4e7233f100 Merge branch 'master' into challenges 2013-05-27 14:44:52 +01:00
Tyler Renelle fe86a11854 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-05-27 14:38:24 +01:00
Tyler Renelle 66290274b2 cron cleanup (removing shouldCron) 2013-05-27 14:37:31 +01:00
Tyler Renelle 41da6c2162 pull in taskClasses changes for the website challenges branch 2013-05-26 15:22:49 +01:00
Brandon McPhail 8f6fe2456a Enforced Shield -> Reinforced Shield
Renamed.
2013-05-26 00:29:31 -06:00
Tyler Renelle 002d4f9541 very strange bug here. If called form the API, require() statements
sometimes return blank objects, but only when required from within
habitrpg-shared - i can require the files directly from the API just
fine. Doesn't help however since habitrpg-shared has dependencies on
itself. @yangit any thoughts?
2013-05-25 19:34:45 +01:00
Tyler Renelle 51a80b6626 some bug-fixes on shouldDo() for today-check 2013-05-25 18:26:07 +01:00
Tyler Renelle c4e18b5f04 tests: first pass at cron tests 2013-05-25 16:53:35 +01:00
Tyler Renelle 85eb6789ac update daily.value when checked off, not on cron. Better for
testability, and I'm not sure why I was doing it the other way before?
2013-05-25 15:22:04 +01:00
Tyler Renelle f5b7968132 tests: all the simple scoring test, getting ready for the complex cron
stuff.
2013-05-25 15:03:03 +01:00
Tyler Renelle 6e4f1a40f8 fixes #1036 2013-05-24 18:54:39 +01:00
Tyler Renelle d293f7415f always pass paths in options{} for consistency, and that way we can add extra uncommon params to the options{} param without needing to pass paths param 2013-05-24 16:12:25 +01:00