Allow gourmand overeating. (cataclysmbnteam#1990)

* Update consumption.cpp * astyle * Update mutations.json
leoCottret · Oct 15, 2022 · 2863e13 · 2863e13
1 parent 3b88e28
commit 2863e13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -386,11 +386,10 @@
     "id": "GOURMAND",
     "name": { "str": "Gourmand" },
     "points": 2,
-    "description": "You eat faster, and can eat and drink more, than anyone else!  You also enjoy food more; delicious food is better for your morale, and you don't mind unsavory meals as much.  Activate to skip prompt for overeating.",
+    "description": "You eat faster, and can eat and drink more, than anyone else!  You also enjoy food more; delicious food is better for your morale, and you don't mind unsavory meals as much.",
     "starting_trait": true,
     "category": [ "MOUSE", "LUPINE" ],
-    "valid": false,
-    "active": true
+    "valid": false
   },
   {
     "type": "mutation",

diff --git a/src/consumption.cpp b/src/consumption.cpp
@@ -1243,7 +1243,8 @@ bool Character::consume_effects( item &food )
     mod_thirst( -contained_food.type->comestible->quench );
 
 
-    if( ( excess_kcal > 0 || excess_quench > 0 ) && !food.has_flag( flag_NO_BLOAT ) ) {
+    if( ( excess_kcal > 0 || excess_quench > 0 ) && !food.has_flag( flag_NO_BLOAT ) &&
+        !has_trait( trait_GOURMAND ) ) {
         add_effect( effect_bloated, 5_minutes );
     }