Merge pull request CleverRaven#76255 from Maleclypse/Gracken-Stomachs

[ Xedra Evolved ] Gracken Stomach Mutations
ZhilkinSerg · Dec 11, 2024 · ba096a2 · ba096a2
2 parents 653a131 + 88b2832
commit ba096a2
Show file tree

Hide file tree

Showing 10 changed files with 620 additions and 21 deletions.
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -7888,6 +7888,7 @@
     "types": [ "DIET" ],
     "cancels": [ "VEGAN" ],
     "category": [ "LIZARD", "SPIDER", "CHIMERA", "RAPTOR", "FELINE", "BATRACHIAN", "BEAST", "LUPINE" ],
+    "flags": [ "CARNIVORE_DIET" ],
     "vitamin_rates": [ [ "vitC", -1200 ] ]
   },
   {

diff --git a/data/mods/Xedra_Evolved/body_parts.json b/data/mods/Xedra_Evolved/body_parts.json
@@ -135,6 +135,49 @@
     "name": "stalker eye",
     "name_multiple": "stalker eyes"
   },
+  {
+    "id": "gracken_eyes",
+    "type": "body_part",
+    "name": "gracken's eyes",
+    "accusative": { "ctxt": "bodypart_accusative", "str": "gracken's eyes" },
+    "heading": "s. eyes",
+    "heading_multiple": "s. eyes",
+    "encumbrance_text": "Ranged combat is hampered.",
+    "encumbrance_limit": 60,
+    "main_part": "head",
+    "opposite_part": "gracken_eyes",
+    "hit_size": 0.5,
+    "hit_difficulty": 1.15,
+    "limb_type": "sensor",
+    "limb_scores": [ [ "vision", 1.0 ], [ "night_vis", 1.5 ], [ "reaction", 1 ] ],
+    "side": "both",
+    "base_hp": 60,
+    "drench_capacity": 0,
+    "flags": [ "IGNORE_TEMP", "LIMB_UPPER", "BIONIC_LIMB" ],
+    "smash_message": "You use your flippin' face to smash the %s.  EXTREME.",
+    "sub_parts": [ "stalker_eye", "stalker_eye" ],
+    "effects_on_hit": [
+      {
+        "id": "blind",
+        "dmg_threshold": 3,
+        "dmg_scale_increment": 3,
+        "chance": 50,
+        "chance_dmg_scaling": 5,
+        "duration": 1,
+        "duration_dmg_scaling": 0.5
+      }
+    ]
+  },
+  {
+    "id": "gracken_eye",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "bp_null",
+    "side": 2,
+    "opposite": "gracken_eye",
+    "name": "gracken eye",
+    "name_multiple": "gracken eyes"
+  },
   {
     "id": "devil_tail",
     "type": "body_part",

diff --git a/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json b/data/mods/Xedra_Evolved/harvest_monster_hunter_gracken.json
@@ -3,16 +3,166 @@
     "id": "zombie_grabber",
     "//": "zombie with long gangly arms",
     "type": "harvest",
-    "message": "<zombie_grabber_harvest>",
-    "entries": [
-      { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
-      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
-      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
-      { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 },
-      { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 },
-      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "drop": "grappler_sinew", "mass_ratio": 0.00035 }
-    ]
+    "copy-from": "zombie_grabber",
+    "delete": { "entries": [ { "drop": "sinew", "mass_ratio": 0.00035 } ] },
+    "extend": { "entries": [ { "drop": "grappler_sinew", "mass_ratio": 0.00035 } ] }
+  },
+  {
+    "id": "pig_with_skull",
+    "type": "harvest",
+    "copy-from": "pig_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "boar_with_skull",
+    "type": "harvest",
+    "copy-from": "boar_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "sheep_with_skull",
+    "type": "harvest",
+    "copy-from": "sheep_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "goat_with_skull",
+    "type": "harvest",
+    "copy-from": "goat_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "cow_with_skull",
+    "type": "harvest",
+    "copy-from": "cow_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "horse_with_skull",
+    "type": "harvest",
+    "copy-from": "horse_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "herbivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "deer_with_skull",
+    "type": "harvest",
+    "copy-from": "deer_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "moose_with_skull",
+    "type": "harvest",
+    "copy-from": "moose_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "tusked_moose_with_skull",
+    "type": "harvest",
+    "copy-from": "tusked_moose_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "dog_with_skull_fur",
+    "type": "harvest",
+    "copy-from": "dog_with_skull_fur",
+    "extend": { "entries": [ { "drop": "carnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "dog_with_skull_fur_mutant",
+    "type": "harvest",
+    "copy-from": "dog_with_skull_fur_mutant",
+    "extend": { "entries": [ { "drop": "carnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "dog_with_skull_leather",
+    "type": "harvest",
+    "copy-from": "dog_with_skull_leather",
+    "extend": { "entries": [ { "drop": "carnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "cougar_with_skull",
+    "type": "harvest",
+    "copy-from": "cougar_with_skull",
+    "extend": { "entries": [ { "drop": "carnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "raccoon_with_skull",
+    "type": "harvest",
+    "copy-from": "raccoon_with_skull",
+    "extend": { "entries": [ { "drop": "small_omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "raccoon_with_skull_mutant",
+    "type": "harvest",
+    "copy-from": "raccoon_with_skull_mutant",
+    "extend": { "entries": [ { "drop": "small_omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "bear_with_skull",
+    "type": "harvest",
+    "copy-from": "bear_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "opossum_with_skull",
+    "type": "harvest",
+    "copy-from": "opossum_with_skull",
+    "extend": { "entries": [ { "drop": "small_omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "skunk_with_skull",
+    "type": "harvest",
+    "copy-from": "skunk_with_skull",
+    "extend": { "entries": [ { "drop": "small_omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "beaver_with_skull",
+    "type": "harvest",
+    "copy-from": "beaver_with_skull",
+    "extend": { "entries": [ { "drop": "small_herbivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "dog_triclopean_with_skull",
+    "type": "harvest",
+    "copy-from": "dog_triclopean_with_skull",
+    "extend": { "entries": [ { "drop": "small_carnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "spideer_with_skull",
+    "type": "harvest",
+    "copy-from": "spideer_with_skull",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "ruminant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "cerbearus_with_skulls",
+    "type": "harvest",
+    "copy-from": "cerbearus_with_skulls",
+    "delete": { "entries": [ { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] },
+    "extend": { "entries": [ { "drop": "omnivore_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "giant_ant",
+    "type": "harvest",
+    "message": "<arachnid_harvest>",
+    "copy-from": "arachnid",
+    "extend": { "entries": [ { "drop": "ant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "giant_acid_ant",
+    "type": "harvest",
+    "message": "<arachnid_harvest>",
+    "copy-from": "arachnid_acid",
+    "extend": { "entries": [ { "drop": "ant_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/carnivore.json b/data/mods/Xedra_Evolved/items/carnivore.json
@@ -126,5 +126,66 @@
     "fun": 5,
     "flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
     "smoking_result": "dry_meat"
+  },
+  {
+    "id": "omnivore_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "omnivore stomach" },
+    "description": "The stomach of an omnivorous creature.  It is surprisingly durable."
+  },
+  {
+    "id": "ruminant_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "ruminant stomach" },
+    "description": "The four stomachs of a grazing creature.  It is surprisingly durable.",
+    "proportional": { "weight": 2.0, "volume": 2.0, "price": 1.5, "calories": 2.0 }
+  },
+  {
+    "id": "herbivore_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "herbivore stomach" },
+    "description": "The stomach of a herbivore.  It is surprisingly durable."
+  },
+  {
+    "id": "carnivore_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "carnivore stomach" },
+    "description": "The stomach of an carnivorous creature.  It is surprisingly durable."
+  },
+  {
+    "id": "small_carnivore_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "small carnivore stomach" },
+    "description": "The stomach of a small carnivorous creature.  It is surprisingly durable.",
+    "proportional": { "weight": 0.5, "volume": 0.5, "price": 0.5, "calories": 0.5 }
+  },
+  {
+    "id": "small_omnivore_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "small omnivore stomach" },
+    "description": "The stomach of a small omnivorous creature.  It is surprisingly durable.",
+    "proportional": { "weight": 0.5, "volume": 0.5, "price": 0.5, "calories": 0.5 }
+  },
+  {
+    "id": "small_herbivore_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "small herbivore stomach" },
+    "description": "The stomach of a small herbivore.  It is surprisingly durable.",
+    "proportional": { "weight": 0.5, "volume": 0.5, "price": 0.5, "calories": 0.5 }
+  },
+  {
+    "id": "ant_stomach",
+    "copy-from": "stomach",
+    "type": "COMESTIBLE",
+    "name": { "str": "ant stomach" },
+    "description": "The two stomachs of a giant ant.  One stomach is for digestion and one stomach is for storing food for the colony.",
+    "proportional": { "weight": 1.5, "volume": 1.5, "calories": 1.25 }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json b/data/mods/Xedra_Evolved/items/gracken_trait_improvements.json
@@ -120,5 +120,59 @@
         }
       ]
     }
+  },
+  {
+    "id": "gracken_herbivorous_stomach",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "Gracken Herbivorous Stomach" },
+    "looks_like": "offal",
+    "description": "An organ that allows a mature Gracken to convert their diet to an herbivorous one.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Changed your diet to eating only plants.",
+      "effect_on_conditions": [
+        {
+          "id": "herbivorous_stomach",
+          "effect": [ { "u_message": "You exchanged your previous stomach for this." }, { "u_add_trait": "SHADE_HERBIVORE" } ]
+        }
+      ]
+    }
+  },
+  {
+    "id": "gracken_omnivorous_stomach",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "Gracken Dextrous Hands" },
+    "looks_like": "offal",
+    "description": "An organ that allows a mature Gracken to convert their diet to an omnivorous one.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Changed your diet to eating most things.",
+      "effect_on_conditions": [
+        {
+          "id": "omnivorous_stomach",
+          "effect": [ { "u_message": "You exchanged your previous stomach for this." }, { "u_add_trait": "SHADE_OMNIVORE" } ]
+        }
+      ]
+    }
+  },
+  {
+    "id": "gracken_carnivorous_stomach",
+    "copy-from": "gracken_improvement_general",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "Gracken Dextrous Hands" },
+    "looks_like": "offal",
+    "description": "An organ that allows a mature Gracken to convert their diet to an carnivorous one.",
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Changed your diet to meat eating.",
+      "effect_on_conditions": [
+        {
+          "id": "carnivorous_stomach",
+          "effect": [ { "u_message": "You exchanged your previous stomach for this." }, { "u_add_trait": "SHADE_CARNIVORE" } ]
+        }
+      ]
+    }
   }
 ]