[Xedra Evolved] Fix Oneiric Hammer Segfault (CleverRaven#65113)

* Update ethereal_items.json * Update data/mods/Xedra_Evolved/items/ethereal_items.json * Update data/mods/Xedra_Evolved/items/ethereal_items.json * Update ethereal_items.json * Update data/mods/Xedra_Evolved/items/ethereal_items.json * Create blacksmithing.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fixes * Update data/mods/Xedra_Evolved/items/ammo_type.json * Update data/mods/Xedra_Evolved/items/ammo.json * Update data/mods/Xedra_Evolved/items/ammo.json * Fixes * Update data/mods/Xedra_Evolved/recipes/blacksmithing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/items/resources.json * Update ammo.json * Update blacksmithing.json * Update data/mods/Xedra_Evolved/items/ethereal_items.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Cyrano7 · Apr 23, 2023 · 2b55182 · 2b55182
1 parent ce7781e
commit 2b55182
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 1 deletion.
diff --git a/data/mods/Xedra_Evolved/items/ammo.json b/data/mods/Xedra_Evolved/items/ammo.json
@@ -23,6 +23,28 @@
     "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80" ],
     "qualities": [ [ "CUT", 1 ] ]
   },
+  {
+    "id": "moon_tears_fasteners",
+    "type": "AMMO",
+    "category": "spare_parts",
+    "name": { "str_sp": "moon tears fasteners" },
+    "description": "A pin-shaped piece of moon tears and dreamdross.  It can be used to repair items made of moon tears.",
+    "weight": "4 g",
+    "volume": "250 ml",
+    "price": 1000,
+    "price_postapoc": 250,
+    "material": [ "moon_tears" ],
+    "symbol": "=",
+    "color": "cyan",
+    "count": 100,
+    "stack_size": 100,
+    "ammo_type": "moon_tears_fasteners",
+    "loudness": 0,
+    "range": 3,
+    "damage": { "damage_type": "bullet", "amount": 1, "armor_penetration": 1 },
+    "dispersion": 180,
+    "effects": [ "NON_FOULING", "HURT_WHEN_WIELDED" ]
+  },
   {
     "type": "AMMO",
     "id": "moon_tear_chain_link",

diff --git a/data/mods/Xedra_Evolved/items/ammo_type.json b/data/mods/Xedra_Evolved/items/ammo_type.json
@@ -11,6 +11,12 @@
     "name": "fae blood",
     "default": "fae_blood"
   },
+  {
+    "type": "ammunition_type",
+    "id": "moon_tears_fasteners",
+    "name": "moon tears fasteners",
+    "default": "moon_tears_fasteners"
+  },
   {
     "type": "ammunition_type",
     "id": "9x21mm",

diff --git a/data/mods/Xedra_Evolved/items/ethereal_items.json b/data/mods/Xedra_Evolved/items/ethereal_items.json
@@ -117,7 +117,7 @@
     ]
   },
   {
-    "type": "GENERIC",
+    "type": "TOOL",
     "id": "xe_oneiric_hammer",
     "name": { "str": "Oneiric Hammer" },
     "description": "The platonic embodiment of a blacksmiths hammer.  This hammer is necessary to forge or repair items made of forged dreamstuff.",
@@ -143,6 +143,8 @@
     "relic_data": {
       "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "multiply": -1 } ] } ]
     },
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "moon_tears_fasteners": 100 } } ],
+    "charges_per_use": 1,
     "use_action": [
       {
         "type": "repair_item",

diff --git a/data/mods/Xedra_Evolved/items/resources.json b/data/mods/Xedra_Evolved/items/resources.json
@@ -15,6 +15,21 @@
     "symbol": "=",
     "color": "light_blue"
   },
+  {
+    "type": "GENERIC",
+    "id": "moon_tear_wire",
+    "symbol": ";",
+    "color": "light_gray",
+    "name": { "str": "moon tear wire" },
+    "description": "A length of thin, relatively stiff moon tear wire.",
+    "category": "spare_parts",
+    "price": 20000,
+    "price_postapoc": 100,
+    "material": [ "moon_tears" ],
+    "weight": "151 g",
+    "volume": "100 ml",
+    "to_hit": -2
+  },
   {
     "id": "scrap_dreamdross",
     "type": "AMMO",

diff --git a/data/mods/Xedra_Evolved/recipes/blacksmithing.json b/data/mods/Xedra_Evolved/recipes/blacksmithing.json
@@ -0,0 +1,69 @@
+[
+  {
+    "type": "recipe",
+    "activity_level": "BRISK_EXERCISE",
+    "result": "moon_tear_chain_link",
+    "id_suffix": "fabrication",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "5 m",
+    "book_learn": [ [ "textbook_armwest", 1 ], [ "textbook_fabrication", 1 ], [ "recipe_melee", 1 ] ],
+    "qualities": [ { "id": "WRENCH", "level": 1 } ],
+    "tools": [ [ [ "boltcutters", -1 ], [ "toolset", -1 ] ], [ [ "cu_pipe", -1 ] ] ],
+    "components": [ [ [ "moon_tear_wire", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "moon_tears_fasteners",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ] ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
+    "components": [ [ [ "moon_tear_ingot", 1 ] ], [ [ "scrap_dreamdross", 1 ] ] ],
+    "tools": [ [ [ "hotcut", -1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "moon_tear_wire",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "3 h",
+    "result_mult": 6,
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
+    "components": [ [ [ "moon_tear_ingot", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "moon_tear_wire",
+    "id_suffix": "wire_draw_machine",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "1 h 30 m",
+    "result_mult": 6,
+    "autolearn": true,
+    "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 } ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
+    "tools": [
+      [ [ "tongs", -1 ] ],
+      [ [ "hotcut", -1 ] ],
+      [ [ "forge", 40 ], [ "oxy_torch", 40 ] ],
+      [ [ "wire_draw_machine", 100 ] ]
+    ],
+    "components": [ [ [ "moon_tear_ingot", 1 ] ] ]
+  }
+]