Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

Daved27hundred · Nov 17, 2023 · e6fe6ec · e6fe6ec
2 parents 46e2fcd + 56f4059
commit e6fe6ec
Show file tree

Hide file tree

Showing 339 changed files with 5,611 additions and 2,072 deletions.
diff --git a/data/json/artifact/artifact_item_types.json b/data/json/artifact/artifact_item_types.json
@@ -5,6 +5,7 @@
     "category": "artifacts",
     "name": { "str": "smooth sphere" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "1 L",
     "weight": "1 kg",
@@ -17,6 +18,7 @@
     "category": "artifacts",
     "name": { "str": "slim rod" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "|",
     "volume": "235 ml",
     "weight": "300 g",
@@ -30,6 +32,7 @@
     "category": "artifacts",
     "name": { "str": "teardrop-shaped stone" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "35 ml",
     "weight": "50 g",
@@ -41,6 +44,7 @@
     "category": "artifacts",
     "name": { "str": "hollow, transparent cube" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "[",
     "volume": "1 L",
     "weight": "80 g",
@@ -52,6 +56,7 @@
     "category": "artifacts",
     "name": { "str": "winding, flexible rod" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "S",
     "volume": "215 ml",
     "weight": "300 g",
@@ -65,6 +70,7 @@
     "category": "artifacts",
     "name": { "str": "smooth disc" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "340 ml",
     "weight": "575 g",
@@ -77,6 +83,7 @@
     "category": "artifacts",
     "name": { "str": "string of beads", "str_pl": "strings of beads" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "76 ml",
     "weight": "125 g",
@@ -88,6 +95,7 @@
     "category": "artifacts",
     "name": { "str": "very thin sheet" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "[",
     "volume": "2 ml",
     "weight": "1 g",
@@ -99,6 +107,7 @@
     "category": "artifacts",
     "name": { "str": "spiked sphere" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "1 L",
     "weight": "800 g",
@@ -111,6 +120,7 @@
     "category": "artifacts",
     "name": { "str": "malleable blob" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "O",
     "volume": "1 L",
     "weight": "800 g",
@@ -122,6 +132,7 @@
     "category": "artifacts",
     "name": { "str": "spiraling rod" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "@",
     "volume": "3400 ml",
     "weight": "300 g",
@@ -135,6 +146,7 @@
     "category": "artifacts",
     "name": { "str": "small pin" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "|",
     "volume": "1 ml",
     "weight": "50 mg",
@@ -148,6 +160,7 @@
     "category": "artifacts",
     "name": { "str": "hollow tube" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "|",
     "volume": "188 ml",
     "weight": "50 mg",
@@ -160,6 +173,7 @@
     "category": "artifacts",
     "name": { "str": "regular tetrahedron" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "A",
     "volume": "1 L",
     "weight": "1 kg",
@@ -172,6 +186,7 @@
     "category": "artifacts",
     "name": { "str": "translucent crystal" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "A",
     "volume": "500 ml",
     "weight": "400 g",
@@ -184,6 +199,7 @@
     "category": "artifacts",
     "name": { "str": "twisted, knotted cord" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "b",
     "volume": "400 ml",
     "weight": "400 g",
@@ -195,6 +211,7 @@
     "category": "artifacts",
     "name": { "str": "crescent-shaped stone" },
     "description": "It is the only one of its kind.\nIt may have unknown powers; try activating them.",
+    "material": [ "anomaly" ],
     "symbol": "C",
     "volume": "35 ml",
     "weight": "50 g",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -58,6 +58,20 @@
     "name": [ "Cornered Fighter Recently Spooked" ],
     "desc": [ "AI tag to allow CORNERED_FIGHTER monsters to turn and fight.  This is a bug if you have it." ]
   },
+  {
+    "type": "effect_type",
+    "id": "critter_well_fed",
+    "name": [ "Well Fed" ],
+    "show_in_info": true,
+    "desc": [ "AI tag for when critter has had enough to eat.  This is a bug if you have it." ]
+  },
+  {
+    "type": "effect_type",
+    "id": "critter_underfed",
+    "name": [ "Underfed" ],
+    "show_in_info": true,
+    "desc": [ "AI tag for when critter has not had enough to eat.  This is a bug if you have it." ]
+  },
   {
     "type": "effect_type",
     "id": "dragging",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2347,5 +2347,10 @@
     "id": "ROOTS3",
     "type": "json_flag",
     "info": "The character has extensive roots, which helps with the TREE_COMMUNION mutation."
+  },
+  {
+    "id": "UNDERFED",
+    "type": "json_flag",
+    "//": "This corpse is from a monster with the CRITTER_UNDERFED flag."
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
@@ -9,7 +9,7 @@
     "looks_like": "f_dandelion",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "flower_poppy",
     "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
   },
@@ -113,13 +113,13 @@
     "type": "furniture",
     "id": "f_flower_tulip",
     "name": "tulip",
-    "description": "A bright, colorful flower with petals forming a small cup at its top.",
+    "description": "A bright, colorful flower with petals forming a small cup at its top.  It can be poisonous to livestock.",
     "symbol": "f",
     "looks_like": "f_mutpoppy",
     "color": "light_blue",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn_nectar",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "generic_flower_harv" } ],
     "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
@@ -160,13 +160,13 @@
     "type": "furniture",
     "id": "f_black_eyed_susan",
     "name": "black eyed susan",
-    "description": "A yellow flower with a dark ball in the middle.  Sometimes known as an ox-eye daisy.",
+    "description": "A mildly poisonous yellow flower with a dark ball in the middle.  Sometimes known as an ox-eye daisy.",
     "looks_like": "f_dandelion",
     "symbol": "f",
     "color": "light_green",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn_nectar",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "generic_flower_harv" } ],
     "//": "Add flower and bud spawns once useful.",
@@ -182,7 +182,7 @@
     "color": "pink",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn_nectar",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "generic_flower_harv" } ],
     "//": "Add flower and bud spawns once useful.",
@@ -198,7 +198,7 @@
     "color": "yellow",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn_nectar",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "lotus_harv" } ],
     "//": "Add flower and bud spawns once useful.",
@@ -243,7 +243,7 @@
     "color": "green",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "generic_flower_harv" } ],
     "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
@@ -258,7 +258,7 @@
     "color": "blue",
     "move_cost_mod": 0,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn_nectar",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "bluebell_harv" } ],
     "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
@@ -302,7 +302,7 @@
     "looks_like": "f_dandelion",
     "move_cost_mod": 1,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC", "GRAZER_INEDIBLE" ],
     "examine_action": "harvest_furn_nectar",
     "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "datura_harv" } ],
     "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }

diff --git a/data/json/furniture_and_terrain/furniture-fungal.json b/data/json/furniture_and_terrain/furniture-fungal.json
@@ -21,7 +21,7 @@
     "color": "dark_gray",
     "move_cost_mod": 1,
     "required_str": -1,
-    "flags": [ "TRANSPARENT", "FLOWER", "FUNGUS", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE" ],
+    "flags": [ "TRANSPARENT", "FLOWER", "FUNGUS", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "GRAZER_INEDIBLE" ],
     "examine_action": "fungus",
     "bash": { "str_min": 2, "str_max": 6, "sound": "poof.", "sound_fail": "poof." }
   },