Commit Graph

496 Commits

Author SHA1 Message Date
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
Tyler Renelle 31e1639cd1 Merge pull request #74 from HabitRPG/sabe/tweak
Add some value to high Mana pools
2014-01-05 08:49:53 -08:00
Sabe Jones ceb7bc20bf Add some value to high Mana pools 2014-01-05 09:14:21 -06:00
Tyler Renelle 2d8dd47414 autoAllocate: more code compactifying (for fun) 2014-01-04 18:11:13 -07:00
Tyler Renelle fdd856c2f8 autoAllocate: small tweak to taskbased to make it more apparent which is kicking 2014-01-04 17:32:14 -07: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 0e6f352e70 Merge pull request #71 from JasonGross/greener->bluer
Tasks get blue when you do them often, and the text for Pickpocket should reflect this
2014-01-02 20:20:11 -08:00
Tyler Renelle 1803bdb2ed fix https://github.com/HabitRPG/habitrpg/issues/2073 2014-01-02 21:09:26 -07:00
Jason Gross 3fbb454886 Tasks get blue when you do them often, not green.
I believe the sequence is red -> yellow -> green -> blue.  The text for 'Pickpocket' now reflects this slightly better, I believe.
2014-01-02 21:25:58 -05:00
Tyler Renelle 93201b5d39 back to normal winter npc sprites 2014-01-02 16:35:49 -07:00
Tyler Renelle 24b99617e6 grunt 2014-01-02 16:31:23 -07:00
Tyler Renelle 8523f68672 expose api.pets 2014-01-02 16:30:25 -07:00
Tyler Renelle 72f021b4bc Merge pull request #70 from colegleason/crit-notif
Add Critical Hit notificaiton via user._tmp
2014-01-02 11:59:15 -08:00
Cole Gleason 737fbd737c Add Critical Hit notificaiton via user._tmp 2014-01-02 13:36:49 -06:00
Matteo Pagliazzi 604c8ab7b2 moved locales and locales-old from habitrpg, @lefnire I left them in habitrpg so that the strings already translated will continue to work, I will make sure to remove them when everything is done 2014-01-02 20:22:19 +01:00
Tyler Renelle 8d2d1e9276 Merge pull request #69 from Alys/patch-1
Tools of the Trade description now mentions drops
2014-01-01 21:57:04 -08: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
Dušan Juretić 3549659d94 Added test for max MP calculation 2014-01-01 22:53:19 -03: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 0285de5098 winter: use npc_ian from holiday-event pngs, disable gif for now (revert this later) 2013-12-31 08:47:10 -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 8cc55b1ee5 rebirth fix tests 2013-12-31 08:02:58 -07: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
Tyler Renelle bb80176920 checklists WIP 2013-12-29 22:37:12 -07:00
Tyler Renelle bb5fe9c6e5 classes: temporary stopgap for
https://github.com/HabitRPG/habitrpg/issues/2150 , burst-of-flames being
too powerful. This isn't the real solution we need something better
2013-12-29 16:58:45 -07:00
Tyler Renelle af499a0663 fix https://github.com/HabitRPG/habitrpg/issues/2172 save task.tags 2013-12-29 16:46:25 -07:00
Tyler Renelle dfa25c6f3a fix https://github.com/HabitRPG/habitrpg/issues/2156 stack stealth 2013-12-28 22:01:44 -07:00
Tyler Renelle 77a1c91422 grunt 2013-12-28 16:35:38 -07:00
Sabe Jones 0478323efc Change out one if chain for a switch, put stats in 3:2:1:1 order in code (@paglias) 2013-12-28 17:26:17 -06:00
Tyler Renelle dfd2a17ef9 APIv2: instead of passing req to callback, passing response object so API can return the object when wrapped on the server 2013-12-28 11:51:38 -07:00
Sabe Jones 6997cd9821 Implement new "flat" and "classbased" automatic allocation modes 2013-12-28 11:56:36 -06:00
Tyler Renelle bafa3ffd21 winter: add snowball achievement 2013-12-27 09:48:35 -07:00
Tyler Renelle de0f2d5e48 #64 move hair_color_wips to project_files/ so they dont' get compiled to
the spritesheet (we'll move them back when they're complete). Add
 updated healer shields to shop_*, remove artifact from
 hair_bangs_rot. @crystalphoenix thanks for hard work!
2013-12-27 09:17:59 -07:00
Tyler Renelle ebd9872474 grunt with sabe's changes 2013-12-27 09:09:49 -07:00
Tyler Renelle aebfe7c63c Merge pull request #64 from crystalphoenix/develop
Redone healer shields, start on new bang colors
2013-12-27 08:09:32 -08:00
Tyler Renelle 0c9c078928 Merge pull request #59 from HabitRPG/sabe/classes
Content update to match #2019 fix
2013-12-27 07:58:55 -08:00
Tyler Renelle 4ee8e47700 Merge pull request #62 from HabitRPG/sabe/tweak
Improve food drop notification phrasing
2013-12-27 07:58:09 -08:00
Tyler Renelle 82afe6e796 spritesmith: swap xmas bailey => winter bailey @lemoness 2013-12-26 15:25:51 -07:00