Commit Graph

1084 Commits

Author SHA1 Message Date
Tyler Renelle 082ec6fe1d Merge pull request #221 from Alys/fix
fix #3513 - if contrib level is NaN, use 0
2014-05-22 02:26:48 -06:00
Alice Harris c09e06e73a fix #3513 - if contrib level is NaN, use 0
Fixes (I hope) https://github.com/HabitRPG/habitrpg/issues/3513. NOTE that private code will need to be edited too - ref https://github.com/HabitRPG/habitrpg-shared/commit/f49ed5436c60d6b135909a3c8714347d99499701
2014-05-22 16:25:08 +10:00
Tyler Renelle 25ce644915 feat(mystery): 0 GP mystery items @deilann 2014-05-21 08:49:51 -06:00
Tyler Renelle 912f2152a1 chore(grunt): grunt 2014-05-21 08:29:35 -06:00
Matteo Pagliazzi ff5bddff24 fix(i18n): update broken code inside translations 2014-05-20 17:20:05 +02:00
Matteo Pagliazzi 3ca2d012c1 chore(i18n): update locales 2014-05-20 16:48:42 +02:00
Sabe Jones 365993870a fix(text): The Potion that gives Health...
...is a Health Potion.
2014-05-19 19:00:37 -05:00
Sabe Jones f49ed5436c feat(drops): Tweak contrib bonuses
At @deilann's request, divide the drop chance bonus for contributor levels in half and add a +1/level contributor bonus (subject to the subscription multiplier once implemented in private code) to drop cap.
2014-05-18 22:42:31 -05:00
Matteo Pagliazzi 893164c535 fix(i18n): another possible hotfix for wrong language, @lefnire this one works on my local computer but maybe it will not work on prod like the other one 2014-05-18 20:19:50 +02:00
Matteo Pagliazzi 65da01cd2a chore(i18n): update locales 2014-05-18 20:14:10 +02:00
Tyler Renelle b0f4c9e9e3 Merge pull request #217 from Alys/messageEvolve
insert messageEvolve into correct locations, replacing incorrect messageAlreadyMount
2014-05-17 19:21:24 -06:00
Tyler Renelle fea7e9e69d Merge pull request #218 from Alys/todo-with-checklist-untick
fix bug where an un-checked to-do with checklist removes only part of reward
2014-05-17 19:20:48 -06:00
Tyler Renelle 84ef7e8543 Merge pull request #219 from Alys/messageEquipped
add correct message for equipping equipment
2014-05-17 19:13:26 -06:00
Alice Harris 7edeb53cda add correct message for equipping equipment
Currently, when you put on equipment, you see the messageBought notification. There was no messageEquipped notification in the code so I've added one.

I've updated ALL locale files IN ENGLISH, following the convention already in place for using English when there is no translation (e.g., locales/pl/messages.json, locales/sv/messages.json).
2014-05-18 10:45:24 +10:00
Alice Harris 8f07f06cb0 fix bug where an un-checked to-do with checklist removes only part of reward
When a to-do is checked off, the rewards are increased by the number of checklist items that have been completed. However as reported in https://github.com/HabitRPG/habitrpg/issues/3474, if the to-do is later un-checked, then the rewards subtracted are not being similarly increased by the number of checklist items completed. This fix will change that - the number of checklist items completed will have an equal effect on checking and unchecking a to-do.

This of course won't fix the problem of, upon unchecking, not being able to calculate the exact value of the rewards that had been given upon checking, so there will still be a discrepancy between checking and unchecking, but it will be much smaller than it is currently.
2014-05-17 19:55:08 +10:00
Alice Harris 01595fcf1a insert messageEvolve into correct locations, replacing incorrect messageAlreadyMount
Currently, when you feed a pet enough to turn it into a mount, you see the messageAlreadyMount notification ("You already have that mount. Try feeding another pet."). This fix changes it to the messageEvolve notification ("You have tamed <%= egg %>, let's go for a ride!").
2014-05-17 19:44:59 +10:00
Sabe Jones 3f9daafb8e fix(spells fix): I guess Snowball is an aura
Effectively reverts my previous commit. Derpsauce.
2014-05-16 22:08:53 -05:00
Tyler Renelle 519154dc89 Revert "feat(archive_todo)" (see http://goo.gl/mCygbz) 2014-05-15 23:48:02 -06:00
Sabe Jones 26163b8930 fix(spells): Snowball is not an aura
Was seeing "String 'spellSpecialSnowballText' not found."; this should fix it.
2014-05-15 22:59:45 -05:00
Matteo Pagliazzi f1e1ea11ef fix(i18n): super fast fix for i18n issues, REVISIT, cc @lefnire 2014-05-15 23:35:07 +02:00
Matteo Pagliazzi 0d1d53fff6 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop 2014-05-15 23:12:18 +02:00
Matteo Pagliazzi 77c7e1aa93 fix(i18n): recognize t() funcs 2014-05-15 23:11:52 +02:00
Matteo Pagliazzi a78dcabddd Merge pull request #215 from Alys/develop
change spellSpecialSnowballNotes to spellSpecialSnowballAuraNotes
2014-05-15 22:56:31 +02:00
Matteo Pagliazzi 78589f9af4 fix(i18n): fallback to english if locale not avalaible 2014-05-15 22:45:22 +02:00
Matteo Pagliazzi ab7b79e79d chore(i18n): update locales 2014-05-15 22:40:07 +02:00
Alice Harris 321258cd27 change spellSpecialSnowballNotes to spellSpecialSnowballAuraNotes 2014-05-16 06:13:33 +10:00
deilann 466ef85c29 Merge pull request #214 from Alys/develop
change spellSpecialSnowballText to the correct spellSpecialSnowballAuraText
2014-05-15 03:31:03 -07:00
Alice Harris cc38f9c9b6 change spellSpecialSnowballText to the correct spellSpecialSnowballAuraText
https://github.com/HabitRPG/habitrpg/issues/3466#issuecomment-43166675
2014-05-15 19:56:43 +10:00
deilann e130938e52 Merge pull request #213 from Alys/develop
replace messageBought with messageUnEquipped in the equip function
2014-05-14 23:58:05 -07:00
Alice Harris 9f97b5528a replace messageBought with messageUnEquipped in the equip function
Users are getting "Bought <item name>" messages when they take off their equipment.
2014-05-15 16:19:58 +10:00
deilann 948e25f69f Merge pull request #212 from Alys/develop
fix typo : Canycane -> Candycane
2014-05-14 22:26:56 -07:00
Alice Harris a7a3abd462 fix typo : Canycane -> Candycane
"Candycane" had the "d" left out in headSpecialCanycaneText and headSpecialCanycaneNotes. I've inserted the "d" in all places that needed it.

I've checked all locale files and none of them had that typo.
2014-05-15 15:16:09 +10:00
deilann 1965f93c65 Merge pull request #211 from Alys/questFix
fix incorrect text for Light Crystals, fix Plain Egg pluralisation, remove excess word
2014-05-14 20:56:32 -07:00
Alice Harris a25564cc43 fix incorrect text for Light Crystals, fix Plain Egg pluralisation, remove excess word
For questEggHuntCollectPlainEgg, I've pluralised the text (Plain Eggs) because that reads better in the messages it appears in (and plurals are used in questEvilSanta2CollectTracks and questEvilSanta2CollectBranches).

For questRatCompletion, I've removed "out" from this: "we let out down our guard"
2014-05-15 13:47:03 +10:00
Matteo Pagliazzi e7d3a5da1a chore(i18n): update locales, upload romanian 2014-05-14 22:11:56 +02:00
Tyler Renelle 4353b91e17 Merge remote-tracking branch 'Alys/tourGoalToTask' into develop 2014-05-14 10:30:15 -06:00
Matteo Pagliazzi f8be09dc78 chore(i18n): use t() syntax for questEggs, grunt, update locales 2014-05-14 17:09:15 +02:00
Tyler Renelle 86c51535c5 feat(rat): add rat quest 2014-05-14 08:47:43 -06:00
Alice Harris 073488fde7 change "goal" to "task" throughout Tour (2nd attempt)
Repeat https://github.com/HabitRPG/habitrpg-shared/pull/205 without conflicts.

In productivity contexts, "goals" tend to be large, long-term projects, whereas "tasks" are smaller actions, and I think "tasks" better matches HabitRPG's features.

"task" is used in Habit's code in many places. The wiki uses "tasks" rather than "goals" throughout, although admittedly that was a fairly recent change. Many players use "task" when describing habits/dailies/to-dos in the Tavern.
2014-05-14 11:56:07 +10:00
Tyler Renelle d5409172e3 fix(i18n): escaped quotes in npc.json 2014-05-13 16:32:05 -06:00
Tyler Renelle 810b2eaeb0 Merge remote-tracking branch 'Alys/patch-5' into develop
Conflicts:
	locales/en/npc.json
2014-05-13 16:25:20 -06:00
Tyler Renelle 7c17d0f493 Merge pull request #209 from Alys/patch-8
Tour - To-Dos: change "deadline" to "date" (2nd attempt)
2014-05-13 16:17:46 -06:00
Alice Harris 6667853ee4 Tour - To-Dos: change "deadline" to "date" (2nd attempt)
Repeat of https://github.com/HabitRPG/habitrpg-shared/pull/207 but without conflicts.

"Deadline" (or even "due date") implies that something happens when the date is reached. "Date" implies that to a lesser degree. We get questions in the Tavern and Newbies Guild about the effect of dates on to-dos, so maybe this is a change worth making.
2014-05-13 21:15:16 +10:00
Tyler Renelle f0e49d75eb Merge pull request #208 from Alys/patch-7
Tour: updates for new toolbar design
2014-05-12 11:57:01 -06:00
Matteo Pagliazzi 05727964d1 chore(i18n): update locales 2014-05-12 17:19:06 +02:00
Matteo Pagliazzi f8912c8506 fix(i18n): mistery -> mystery 2014-05-12 17:16:11 +02:00
Alice Harris e16d48a6a9 Tour: updates for new toolbar design
I'm REALLY not happy with the way I've worded these changes because they sound clunky and messy, but the original text is wrong now, to the extent that it would induce frustration rather than being helpful. It might be better to just delete the two sentences I changed. The day start settings might be a bit advanced for an introductory tour? The "Social" thing that I wrote would be better on its own Tour page.
2014-05-12 21:30:20 +10:00
Alice Harris 57a9ef2895 Tour - Avatar Customization: "scroll all the way down"
Added Leslie's requested text "Make sure you scroll all the way down - we have hairstyle and head accessories available as well!" from https://plus.google.com/u/0/107946115700776803839/posts/Tgob3LvHCMv
2014-05-12 21:08:43 +10:00
Tyler Renelle cc424dac03 chore(grunt): grunt 2014-05-11 21:10:17 -06:00
deilann 8e2f0a08e9 fix(tests): remove level 100 test
Keeps built from failing due to https://github.com/HabitRPG/habitrpg-shared/pull/203
2014-05-11 16:52:53 -07:00