krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

(in)definite articles for food items. Partial fix for https://github.com/HabitRPG/habitica/issues/3571 (#9658)

Browse Source 
* testing additional event trigger for sendMessage

* moved keyup event to newmessage

* added keyup event to tavern vue too

* all food items now have version with definite and indefinite article. foodText also adapted in messages json

* modified api.food, and feed, armoire and drop mechanism

* drops now ok, removed dropArticle, corrected feed test

* test correction

* api doc modification for task completion
This commit is contained in:
Feywood
2018-02-05 19:43:12 +01:00
committed by Matteo Pagliazzi
parent 9a00779698
commit 7c6dd6a6bd
12 changed files with 134 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/tasks/task.vue
View File

@@ -758,9 +758,9 @@ export default {
dropNotes = Content.eggs[drop.key].notes();
this.drop(this.$t('messageDropEgg', {dropText, dropNotes}), drop);
} else if (drop.type === 'Food') {
dropText = Content.food[drop.key].text();
dropText = Content.food[drop.key].textA();
dropNotes = Content.food[drop.key].notes();
this.drop(this.$t('messageDropFood', {dropArticle: drop.article, dropText, dropNotes}), drop);
this.drop(this.$t('messageDropFood', {dropText, dropNotes}), drop);
} else if (drop.type === 'Quest') {
// TODO $rootScope.selectedQuest = Content.quests[drop.key];
// $rootScope.openModal('questDrop', {controller:'PartyCtrl', size:'sm'});