[Xedra Evolved ] Casings from dreamsmith (#79366)

* Casings from dreamsmith Update dreamforged_casings.json Casings * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/recipes/dreamforged_casings.json * Lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/eocs/dreamsmith.json * fix missing result * Update category.json * Update data/mods/Xedra_Evolved/recipes/category.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Dissection fix * Update data/mods/Xedra_Evolved/dissect.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update exodii.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Anton Simakov <[email protected]>
CleverRaven · Jan 30, 2025 · 5c6ee96 · 5c6ee96
1 parent 46edd65
commit 5c6ee96
Show file tree

Hide file tree

Showing 6 changed files with 815 additions and 41 deletions.
diff --git a/data/mods/Xedra_Evolved/dissect.json b/data/mods/Xedra_Evolved/dissect.json
@@ -18,6 +18,25 @@
       }
     ]
   },
+  {
+    "id": "dissect_combat_cyborg",
+    "type": "harvest",
+    "message": "You search for any salvageable hardware in what's left of this monstrous ghoul.",
+    "entries": [
+      {
+        "drop": "bio_power_storage",
+        "type": "bionic",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ]
+      },
+      {
+        "drop": "combat_cyborg_harvest",
+        "type": "bionic_group",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ]
+      }
+    ]
+  },
   {
     "id": "dissect_ierde_single",
     "type": "harvest",

diff --git a/data/mods/Xedra_Evolved/eocs/dreamsmith.json b/data/mods/Xedra_Evolved/eocs/dreamsmith.json
@@ -162,5 +162,75 @@
       { "math": [ "DREAMSMITH_RECIPE_SCORE_SUPER = 0" ] },
       { "math": [ "DREAMSMITH_RECIPE_SCORE_SUPER_TARGET", "+=", "200" ] }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "DREAMSMITH_CASINGS_LOW_CALIBER_RECIPE",
+    "recurrence": [ "140 hours", "192 hours" ],
+    "condition": { "and": [ { "u_has_trait": "DREAMSMITH" }, { "math": [ "u_skill('pistols') >= 2" ] } ] },
+    "effect": [
+      {
+        "u_roll_remainder": [
+          "223_casing",
+          "22_casing",
+          "32_casing",
+          "38_casing",
+          "38super_casing",
+          "9mm_casing",
+          "10mm_casing",
+          "9x18mm_casing",
+          "9x21mm_casing",
+          "380_casing",
+          "40_casing",
+          "357mag_casing"
+        ],
+        "type": "recipe",
+        "true_eocs": {
+          "id": "EOC_DREAMSMITH_CASINGS_LC_MESSAGE_POSITIVE",
+          "effect": [ { "u_message": "You realize you know suddenly how to make a low caliber bullet casing.", "type": "good" } ]
+        }
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "DREAMSMITH_CASINGS_LARGE_CALIBER_RECIPE",
+    "recurrence": [ "140 hours", "192 hours" ],
+    "condition": { "and": [ { "u_has_trait": "DREAMSMITH" }, { "math": [ "u_skill('rifles') >= 3" ] } ] },
+    "effect": [
+      {
+        "u_roll_remainder": [
+          "3006_casing",
+          "270win_casing",
+          "303_casing",
+          "300_casing",
+          "308_casing",
+          "762_51_casing",
+          "44_casing",
+          "454_casing",
+          "45_casing",
+          "45colt_casing",
+          "4570_casing",
+          "50beowulf_casing",
+          "450_casing",
+          "500_casing",
+          "50_casing",
+          "338lapua_casing",
+          "545_casing",
+          "57mm_casing",
+          "458wm_casing",
+          "762R_casing",
+          "762_casing",
+          "762_25_casing",
+          "300blk_casing",
+          "30carbine_casing"
+        ],
+        "type": "recipe",
+        "true_eocs": {
+          "id": "EOC_DREAMSMITH_CASINGS_HC_MESSAGE_POSITIVE",
+          "effect": [ { "u_message": "You realize you know suddenly how to make a larger caliber bullet casing.", "type": "good" } ]
+        }
+      }
+    ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/itemgroups/monster_drops.json b/data/mods/Xedra_Evolved/itemgroups/monster_drops.json
@@ -410,6 +410,47 @@
       { "item": "bio_ar", "prob": 1 }
     ]
   },
+  {
+    "id": "combat_cyborg_harvest",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "bio_dis_shock", "prob": 1 },
+      { "item": "bio_dis_acid", "prob": 1 },
+      { "item": "bio_drain", "prob": 1 },
+      { "item": "bio_noise", "prob": 1 },
+      { "item": "bio_power_weakness", "prob": 1 },
+      { "item": "bio_itchy", "prob": 1 },
+      { "item": "bio_nostril", "prob": 1 },
+      { "item": "bio_thumbs", "prob": 1 },
+      { "item": "bio_spasm", "prob": 1 },
+      { "item": "bio_shakes", "prob": 1 },
+      { "item": "bio_leaky", "prob": 1 },
+      { "item": "bio_sleepy", "prob": 1 },
+      { "item": "bio_deformity", "prob": 1 },
+      { "item": "bio_voice", "prob": 1 },
+      { "item": "bio_pokedeye", "prob": 1 },
+      { "item": "bio_ankles", "prob": 1 },
+      { "item": "bio_trip", "prob": 1 },
+      { "item": "bio_stiff", "prob": 1 },
+      { "item": "bio_armor_torso", "prob": 3 },
+      { "item": "bio_armor_arms", "prob": 6 },
+      { "item": "bio_armor_legs", "prob": 6 },
+      { "item": "bio_armor_eyes", "prob": 3 },
+      { "item": "bio_alarm", "prob": 3 },
+      { "item": "bio_power_storage", "prob": 2 },
+      { "item": "bio_glowy", "prob": 1 },
+      { "item": "bio_chain_lightning", "prob": 1 },
+      { "item": "bio_hydraulics", "prob": 1 },
+      { "item": "bio_sleep_shutdown", "prob": 1 },
+      { "item": "bio_targeting", "prob": 1 },
+      { "item": "bio_weight", "prob": 1 },
+      { "item": "bio_faulty_electromagnetic_leak", "prob": 1 },
+      { "item": "bio_faulty_grossfood", "prob": 1 },
+      { "item": "bio_radleak", "prob": 1 },
+      { "item": "bio_ar", "prob": 1 }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "collection",
@@ -477,47 +518,6 @@
       { "item": "fnp90mag", "prob": 50, "ammo-item": "57mm", "charges": [ 0, 50 ] }
     ]
   },
-  {
-    "id": "combat_cyborg_harvest",
-    "type": "item_group",
-    "subtype": "distribution",
-    "entries": [
-      { "item": "bio_dis_shock", "prob": 1 },
-      { "item": "bio_dis_acid", "prob": 1 },
-      { "item": "bio_drain", "prob": 1 },
-      { "item": "bio_noise", "prob": 1 },
-      { "item": "bio_power_weakness", "prob": 1 },
-      { "item": "bio_itchy", "prob": 1 },
-      { "item": "bio_nostril", "prob": 1 },
-      { "item": "bio_thumbs", "prob": 1 },
-      { "item": "bio_spasm", "prob": 1 },
-      { "item": "bio_shakes", "prob": 1 },
-      { "item": "bio_leaky", "prob": 1 },
-      { "item": "bio_sleepy", "prob": 1 },
-      { "item": "bio_deformity", "prob": 1 },
-      { "item": "bio_voice", "prob": 1 },
-      { "item": "bio_pokedeye", "prob": 1 },
-      { "item": "bio_ankles", "prob": 1 },
-      { "item": "bio_trip", "prob": 1 },
-      { "item": "bio_stiff", "prob": 1 },
-      { "item": "bio_armor_torso", "prob": 3 },
-      { "item": "bio_armor_arms", "prob": 6 },
-      { "item": "bio_armor_legs", "prob": 6 },
-      { "item": "bio_armor_eyes", "prob": 3 },
-      { "item": "bio_alarm", "prob": 3 },
-      { "item": "bio_power_storage", "prob": 2 },
-      { "item": "bio_glowy", "prob": 1 },
-      { "item": "bio_chain_lightning", "prob": 1 },
-      { "item": "bio_hydraulics", "prob": 1 },
-      { "item": "bio_sleep_shutdown", "prob": 1 },
-      { "item": "bio_targeting", "prob": 1 },
-      { "item": "bio_weight", "prob": 1 },
-      { "item": "bio_faulty_electromagnetic_leak", "prob": 1 },
-      { "item": "bio_faulty_grossfood", "prob": 1 },
-      { "item": "bio_radleak", "prob": 1 },
-      { "item": "bio_ar", "prob": 1 }
-    ]
-  },
   {
     "id": "mon_dream_shadow_death_drops",
     "type": "item_group",

diff --git a/data/mods/Xedra_Evolved/monsters/exodii.json b/data/mods/Xedra_Evolved/monsters/exodii.json
@@ -56,6 +56,7 @@
     ],
     "death_drops": { "subtype": "collection", "groups": [ [ "robots", 80 ] ] },
     "death_function": { "corpse_type": "BROKEN" },
+    "dissect": "dissect_combat_cyborg",
     "flags": [ "SEES", "HEARS", "GOODHEARING", "HAS_MIND", "NOHEAD", "NO_BREATHE", "PATH_AVOID_DANGER", "PRIORITIZE_TARGETS" ],
     "armor": { "bash": 65, "cut": 62, "acid": 12, "heat": 8, "bullet": 72 }
   }

diff --git a/data/mods/Xedra_Evolved/recipes/category.json b/data/mods/Xedra_Evolved/recipes/category.json
@@ -6,6 +6,7 @@
       "CSC_ALL",
       "CSC_XEDRA_RESEARCH",
       "CSC_XEDRA_WEAPONS",
+      "CSC_XEDRA_CASINGS",
       "CSC_XEDRA_ARMOR",
       "CSC_XEDRA_TOOLS",
       "CSC_XEDRA_CONSUMABLES",