change chewing gum to not be a stimulant (CleverRaven#67004)

* change chewing gum to not be a stimulant * Remove chewing gum from med.json * add chewing gum to other.json, change comestible_type to FOOD
Maleclypse · Jul 20, 2023 · 60a9620 · 60a9620
1 parent d7ab3d9
commit 60a9620
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
@@ -678,26 +678,6 @@
     "use_action": [ "FLU_VACCINE" ],
     "flags": [ "NO_INGEST", "NPC_SAFE", "IRREPLACEABLE_CONSUMABLE" ]
   },
-  {
-    "id": "gum",
-    "type": "COMESTIBLE",
-    "comestible_type": "MED",
-    "name": { "str_sp": "chewing gum" },
-    "description": "Bright pink sugar-free chewing gum.",
-    "category": "food",
-    "weight": "3 g",
-    "volume": "250 ml",
-    "price": 100,
-    "price_postapoc": 100,
-    "charges": 10,
-    "stack_size": 100,
-    "symbol": "*",
-    "color": "pink",
-    "stim": 1,
-    "fun": 2,
-    "flags": [ "NO_INGEST" ],
-    "use_action": [ "CHEW" ]
-  },
   {
     "id": "handrolled_cig",
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -27,6 +27,25 @@
     "volume": "2500 ml",
     "flags": [ "INEDIBLE" ]
   },
+  {
+    "id": "gum",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str_sp": "chewing gum" },
+    "description": "Bright pink sugar-free chewing gum.",
+    "category": "food",
+    "weight": "3 g",
+    "volume": "250 ml",
+    "price": 100,
+    "price_postapoc": 100,
+    "charges": 10,
+    "stack_size": 100,
+    "symbol": "*",
+    "color": "pink",
+    "fun": 2,
+    "flags": [ "NO_INGEST" ],
+    "use_action": [ "CHEW" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "slime_scrap",