Commit Graph

301 Commits

Author SHA1 Message Date
Dušan Juretić c9ddf0e15d Fix typos 2014-01-11 17:54:50 -03:00
Steve 4f467caa1a Typo
Fixes https://github.com/HabitRPG/habitrpg/issues/2330
2014-01-09 18:04:48 -05:00
Tyler Renelle 7ef3706803 Merge pull request #84 from colegleason/wibbly-wobbly
Custom Day Start: change condition on when we run cron
2014-01-09 09:57:54 -08:00
Cole Gleason 3bd81abda3 startOfDay: if between midnight and custom day start, jump back to previous day 2014-01-08 22:30:56 -06:00
Tyler Renelle 87aa1ab731 Revert "#85 i heart lodash"
This reverts commit 8097dc38d1.
2014-01-08 18:55:46 -07:00
Tyler Renelle 8097dc38d1 #85 i heart lodash 2014-01-08 18:49:13 -07:00
Sabe Jones a89ef25e23 Rebirth fix: flip owned items to explicit false instead of wiping them out, so limited edition gear can be repurchased 2014-01-08 19:35:54 -06:00
Tyler Renelle 60641524cf Merge pull request #82 from HabitRPG/sabe/preferences
New user preference: open new tasks in edit mode
2014-01-08 14:31:29 -08:00
Tyler Renelle 221574bcb2 #83 ski-sassin offhand pole should match 2nd-best regular offhand 2014-01-08 09:38:24 -07:00
Sabe Jones 7732f4af32 New user preference: open new tasks in edit mode 2014-01-07 20:16:35 -06:00
Tyler Renelle 84637ad336 fix https://github.com/HabitRPG/habitrpg/issues/2276 provide
newly-created tags with an id from the browser
2014-01-07 17:23:47 -07:00
Tyler Renelle 398a919afb Merge pull request #79 from HabitRPG/sabe/fix
Server side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock
2014-01-07 11:55:52 -08:00
Tyler Renelle 939ce14185 https://github.com/HabitRPG/habitrpg/issues/2010 allow wrapping members (don't add ops to them) 2014-01-07 10:43:00 -07:00
Sabe Jones 9d9cf0788f Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:04:50 -06:00
Sabe Jones d2542b05ca Rebirth fix: force Costume preference off so avatar will display new gear prior to Market unlock 2014-01-06 21:30:47 -06:00
Tyler Renelle 2635db9e51 winter: weapons should be 2nd best, not 1st. Some refactoring 2014-01-06 18:24:31 -07:00
Tyler Renelle 4b16317c15 winter: add winter-specific class gear as event-timed specials (@lemoness) 2014-01-06 17:14:17 -07:00
Tyler Renelle c01d5d79d6 event-items: try a different approach than "unbreakable" (1335750). If they've owned it before (item==false), then they canOwn() again. In those cases, set item to 'event' 2014-01-06 17:13:44 -07:00
Tyler Renelle 1335750804 add unbreakable special items, so we can add special-event gear which users can buy during a certain period of time, but which they can't lose on death. Starting with party-hats 2014-01-06 14:15:21 -07:00
Sabe Jones cd38cc9fb8 Merge pull request #75 from HabitRPG/sabe/tweak2
Rebirth fixes: deequip pets and mounts, allow stacking at max level
2014-01-05 15:33:02 -08:00
Sabe Jones d7fd82039f Fix assignment operator bug 2014-01-05 17:31:08 -06:00
Tyler Renelle 01fae2a2f0 Merge pull request #76 from Alys/patch-3
subtract MP when unticking a todo (instead of add)
2014-01-05 14:52:50 -08:00
Tyler Renelle 9692338a73 Merge pull request #73 from Alys/patch-2
fix(?) for issue 2222 - untick removes too little XP,GP
2014-01-05 14:49:49 -08:00
Tyler Renelle f923798388 Merge pull request #72 from Alys/patch-1
change food.key to food.text (displayed text only)
2014-01-05 14:48:53 -08:00
Alice Harris 9ce3749d65 subtract MP when unticking a todo (instead of add)
Currently, when you untick a completed todo, you GAIN MP. Lines 837-839 of this change will cause you to loose it instead.

Line 841 will prevent your MP becoming negative if you used up all your MP before unticking the todo... BUT do we want to prevent negative MP under that circumstance? Perhaps it should be allowed to go negative? The circumstance I'm thinking of is:
1. You tick off a todo, causing your MP to reach (for example) 10.
2. You cast a spell that costs 10 MP. MP is now 0.
3. You realise that you had ticked off the todo accidentally (or deliberately to rort the system!) and so you untick the todo, which (without line 841) would cause your MP to go to -1. Strictly speaking, it SHOULD be -1 because you had spent MP that you hadn't truly earned, but negative MP might look weird and cause "bug" reports. Line 841 will prevent it being negative.
2014-01-06 07:38:26 +10:00
Sabe Jones 319689afea Rebirth fixes: deequip pets and mounts, allow stacking at max level 2014-01-05 10:17:18 -06:00
Sabe Jones ceb7bc20bf Add some value to high Mana pools 2014-01-05 09:14:21 -06:00
Alice Harris 6c5eae1847 fix(?) for issue 2222 - untick removes too little XP,GP
This is a proposed fix for issue 2222 ("unticking a todo with a checklist removes much less XP and GP than it should") BUT I HAVE NOT TESTED THIS (I don't have a local install yet - sorry). Please see my comments at the end of that issue. Note that I don't know why "if direction is 'up'" was originally included - there might have been (and still be) a good reason for it.
2014-01-05 19:46:27 +10:00
Tyler Renelle 2d8dd47414 autoAllocate: more code compactifying (for fun) 2014-01-04 18:11:13 -07:00
Alice Harris fc39ae4a4a change food.key to food.text (displayed text only)
Change food.key to food.text in displayed text, to stop the "potatoe" typo being seen.
2014-01-05 10:37:07 +10:00
Tyler Renelle 2721800f37 autoAllocate: compactify some code (no reason, just for the ninja
feel). Add simulation script to show results for all auto-allocate
methods for levels 1-20
2014-01-04 17:16:45 -07:00
Tyler Renelle f4f6dcebdc Merge remote-tracking branch 'origin/sabe/attributes' into develop 2014-01-04 15:58:16 -07:00
Tyler Renelle 20376d69c0 don't hide completed todos from challenge progress modals 2014-01-03 14:42:18 -07:00
Tyler Renelle 81ca8d15b5 bring @JasonGross changes back in. Jason, updates should go to
script/content.coffee (dist/habitrpg-shared.js is a compiled file and
gets clobbered)
2014-01-03 14:18:35 -07:00
Tyler Renelle b0666cb1e3 challenges: don't remove challenge todos on clear-completed 2014-01-03 14:17:02 -07:00
Tyler Renelle 1803bdb2ed fix https://github.com/HabitRPG/habitrpg/issues/2073 2014-01-02 21:09:26 -07:00
Tyler Renelle 8523f68672 expose api.pets 2014-01-02 16:30:25 -07:00
Cole Gleason 737fbd737c Add Critical Hit notificaiton via user._tmp 2014-01-02 13:36:49 -06:00
Alice Harris 93531ac24a Tools of the Trade description now mentions drops
Edited description for Tools of the Trade to state that it increases the chance of drops (because the spell buffs PER and PER is used to calculate "chance" in the randomDrop function)
2014-01-02 11:58:30 +10:00
Sabe Jones 3df4724999 Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:37 -06:00
Tyler Renelle b76b275a7c winter: party hat fix, big snowball in inventory (@lemoness). Still
small one in spells list, those are 32x22. I say we just leave it
2013-12-31 08:54:26 -07:00
Tyler Renelle 549fd7bac0 new year's eve event: party hat, new NPCs 2013-12-31 08:44:01 -07:00
Sabe Jones 4662fe151b Implement "training" over the course of a level, for task-based attribute allocation 2013-12-31 09:05:03 -06:00
Tyler Renelle 640da7aa54 rebirth: return user in response 2013-12-31 08:00:47 -07:00
Tyler Renelle 19f53c3675 Merge remote-tracking branch 'origin/sabe/rebirth' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
2013-12-31 07:56:35 -07:00
Sabe Jones c4a82d4edd Daily derp! Don't return PER when STR is suggested 2013-12-30 23:09:47 -06:00
Tyler Renelle eb016649e1 checklists: grant GP bonus for CLIs on To-Dos 2013-12-30 14:51:49 -07:00
Tyler Renelle 85c96886a3 checklists: point-match TDs for each CL-item. Bug fix on resetting CLs
on cron
2013-12-30 13:23:48 -07:00
Sabe Jones 9f4efc31ed Break out autoAllocate to its own function 2013-12-30 11:39:53 -06:00
Sabe Jones 958ec99f1a Merge branch 'develop' into sabe/attributes 2013-12-30 10:27:58 -06:00