From b574868549bec5a9e4abe9263e0cfdc83606ec7a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 25 Jan 2025 23:13:18 -0600 Subject: [PATCH 01/11] Casings from dreamsmith Update dreamforged_casings.json Casings --- data/mods/Xedra_Evolved/eocs/dreamsmith.json | 90 +++ data/mods/Xedra_Evolved/monsters/exodii.json | 1 + .../recipes/dreamforged_casings.json | 684 ++++++++++++++++++ 3 files changed, 775 insertions(+) create mode 100644 data/mods/Xedra_Evolved/recipes/dreamforged_casings.json diff --git a/data/mods/Xedra_Evolved/eocs/dreamsmith.json b/data/mods/Xedra_Evolved/eocs/dreamsmith.json index fcc68c54a498a..98b8cb28a60a8 100644 --- a/data/mods/Xedra_Evolved/eocs/dreamsmith.json +++ b/data/mods/Xedra_Evolved/eocs/dreamsmith.json @@ -162,5 +162,95 @@ { "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_LC_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/monsters/exodii.json b/data/mods/Xedra_Evolved/monsters/exodii.json index d362fa18bb744..7440324733396 100644 --- 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": "combat_cyborg_harvest", "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/dreamforged_casings.json b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json new file mode 100644 index 0000000000000..8cb7b6d0a0949 --- /dev/null +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json @@ -0,0 +1,684 @@ +[ + { + "result": "223_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "22_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 3, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ], + "//": "Scrap dreamdross is 5 grams. Charges is based on the difference between that 5 grams and the weight of a given casing. Note for later, all casings should be learned from a single Dreamsmith encounter or there should be a research project and after completion all are learned." + }, + { + "result": "3006_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "70 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "123ln_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "70 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "33_naval_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "70 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 16 ] ] ] + }, + { + "result": "270win_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "70 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "303_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "70 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "300_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "60 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "308_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "60 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "762_51_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "60 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "32_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 2 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "38_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "38super_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "40_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "10mm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + + { + "result": "44_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "454_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 45, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "45_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "40 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "45colt_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "4570_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "50beowulf_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "55 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "450_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "55 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "46mm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "500_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 4, + "skills_required": [ "gun", 5 ], + "time": "1 h", + "batch_time_factors": [ 30, 5 ], + "charges": 50, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "forged_dreamstuff_ingot", 1 ] ], [ [ "500_casing", 1 ] ] ] + }, + { + "result": "50_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 4, + "skills_required": [ "gun", 5 ], + "time": "1 h", + "batch_time_factors": [ 30, 5 ], + "charges": 50, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "forged_dreamstuff_ingot", 1 ] ], [ [ "50_casing", 1 ] ] ] + }, + { + "result": "338lapua_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 4, + "skills_required": [ "gun", 5 ], + "time": "1 h", + "batch_time_factors": [ 30, 5 ], + "charges": 50, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "forged_dreamstuff_ingot", 1 ] ], [ [ "338lapua_casing", 1 ] ] ] + }, + { + "result": "545_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "57mm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 2, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "458wm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 4, + "skills_required": [ "gun", 5 ], + "time": "1 h", + "batch_time_factors": [ 30, 5 ], + "charges": 60, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "forged_dreamstuff_ingot", 1 ] ], [ [ "458wm_casing", 1 ] ] ] + }, + { + "result": "762R_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "762_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "762_25_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "45 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 1 ] ] ] + }, + { + "result": "9mm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 9, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "357sig_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 9, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "357mag_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 9, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "9x18mm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 9, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "id": "9x21mm_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 9, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + } + { + "result": "380_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 9, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "300blk_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "result": "30carbine_casing", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_CASINGS", + "skill_used": "deduction", + "difficulty": 3, + "skills_required": [ "gun", 1 ], + "time": "75 s", + "batch_time_factors": [ 30, 5 ], + "charges": 1, + "reversible": { "time": "5 s" }, + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + } +] \ No newline at end of file From 14f2467d4784f6b36f486fe7119ccd760f326a31 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:30:47 -0600 Subject: [PATCH 02/11] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Xedra_Evolved/eocs/dreamsmith.json | 28 +++---------------- .../recipes/dreamforged_casings.json | 2 +- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/data/mods/Xedra_Evolved/eocs/dreamsmith.json b/data/mods/Xedra_Evolved/eocs/dreamsmith.json index 98b8cb28a60a8..2a681859dade6 100644 --- a/data/mods/Xedra_Evolved/eocs/dreamsmith.json +++ b/data/mods/Xedra_Evolved/eocs/dreamsmith.json @@ -167,12 +167,7 @@ "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"] } - ] - }, + "condition": { "and": [ { "u_has_trait": "DREAMSMITH" }, { "math": [ "u_skill('pistols') >= 2" ] } ] }, "effect": [ { "u_roll_remainder": [ @@ -192,12 +187,7 @@ "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" - } - ] + "effect": [ { "u_message": "You realize you know suddenly how to make a low caliber bullet casing.", "type": "good" } ] } } ] @@ -206,12 +196,7 @@ "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"] } - ] - }, + "condition": { "and": [ { "u_has_trait": "DREAMSMITH" }, { "math": [ "u_skill('rifles') >= 3" ] } ] }, "effect": [ { "u_roll_remainder": [ @@ -243,12 +228,7 @@ "type": "recipe", "true_eocs": { "id": "EOC_DREAMSMITH_CASINGS_LC_MESSAGE_POSITIVE", - "effect": [ - { - "u_message": "You realize you know suddenly how to make a larger caliber bullet casing.", - "type": "good" - } - ] + "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/recipes/dreamforged_casings.json b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json index 8cb7b6d0a0949..0c323a0895ad3 100644 --- a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json @@ -681,4 +681,4 @@ "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], "components": [ [ [ "scrap_dreamdross", 2 ] ] ] } -] \ No newline at end of file +] From d1be5215a29bdf9863e91ae7251b2fab58e00d5d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:42:05 -0600 Subject: [PATCH 03/11] Update data/mods/Xedra_Evolved/recipes/dreamforged_casings.json --- data/mods/Xedra_Evolved/recipes/dreamforged_casings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json index 0c323a0895ad3..c8606d717dad2 100644 --- a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json @@ -629,7 +629,7 @@ "flags": [ "SECRET" ], "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], "components": [ [ [ "scrap_dreamdross", 2 ] ] ] - } + }, { "result": "380_casing", "type": "recipe", From d90b5411c97c0874d6550f8194a7ad7238db7951 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Mon, 27 Jan 2025 10:06:10 +0100 Subject: [PATCH 04/11] Lint Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Xedra_Evolved/recipes/dreamforged_casings.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json index c8606d717dad2..5c8efcb355c4d 100644 --- a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json @@ -1,5 +1,5 @@ [ - { + { "result": "223_casing", "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -255,7 +255,6 @@ "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], "components": [ [ [ "scrap_dreamdross", 2 ] ] ] }, - { "result": "44_casing", "type": "recipe", @@ -613,7 +612,7 @@ "proficiencies": [ { "proficiency": "prof_handloading" }, { "proficiency": "prof_dreamsmithing" } ], "components": [ [ [ "scrap_dreamdross", 2 ] ] ] }, - { + { "id": "9x21mm_casing", "type": "recipe", "activity_level": "LIGHT_EXERCISE", From 5fcc756b17502e6c9ba83c71a26702c1fc149f0f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 27 Jan 2025 19:56:32 -0600 Subject: [PATCH 05/11] Update data/mods/Xedra_Evolved/eocs/dreamsmith.json --- data/mods/Xedra_Evolved/eocs/dreamsmith.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/eocs/dreamsmith.json b/data/mods/Xedra_Evolved/eocs/dreamsmith.json index 2a681859dade6..4c36b6fa235dd 100644 --- a/data/mods/Xedra_Evolved/eocs/dreamsmith.json +++ b/data/mods/Xedra_Evolved/eocs/dreamsmith.json @@ -227,7 +227,7 @@ ], "type": "recipe", "true_eocs": { - "id": "EOC_DREAMSMITH_CASINGS_LC_MESSAGE_POSITIVE", + "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" } ] } } From 026d28ec3968d12b335372cde18f0b8cae00e54c Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Tue, 28 Jan 2025 08:09:06 +0100 Subject: [PATCH 06/11] fix missing result --- data/mods/Xedra_Evolved/recipes/dreamforged_casings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json index 5c8efcb355c4d..62064239b48bc 100644 --- a/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json +++ b/data/mods/Xedra_Evolved/recipes/dreamforged_casings.json @@ -613,7 +613,7 @@ "components": [ [ [ "scrap_dreamdross", 2 ] ] ] }, { - "id": "9x21mm_casing", + "result": "9x21mm_casing", "type": "recipe", "activity_level": "LIGHT_EXERCISE", "category": "CC_XEDRA", From da623b0a231a88ea35bb9df173f305d0ea0dec24 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jan 2025 21:11:34 -0600 Subject: [PATCH 07/11] Update category.json --- data/mods/Xedra_Evolved/recipes/category.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Xedra_Evolved/recipes/category.json b/data/mods/Xedra_Evolved/recipes/category.json index c399ea11a4881..3ddc7d545b5e8 100644 --- 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", From 1d9a59292d54311d167536e7257f0dc1ab44be99 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jan 2025 21:25:01 -0600 Subject: [PATCH 08/11] Update data/mods/Xedra_Evolved/recipes/category.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Xedra_Evolved/recipes/category.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/recipes/category.json b/data/mods/Xedra_Evolved/recipes/category.json index 3ddc7d545b5e8..2c09dbffa6b25 100644 --- a/data/mods/Xedra_Evolved/recipes/category.json +++ b/data/mods/Xedra_Evolved/recipes/category.json @@ -6,7 +6,7 @@ "CSC_ALL", "CSC_XEDRA_RESEARCH", "CSC_XEDRA_WEAPONS", - "CSC_XEDRA_CASINGS", + "CSC_XEDRA_CASINGS", "CSC_XEDRA_ARMOR", "CSC_XEDRA_TOOLS", "CSC_XEDRA_CONSUMABLES", From 61f27f37d2c6f3c1e7bc8028b71c5ba058f6a7b1 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jan 2025 23:00:29 -0600 Subject: [PATCH 09/11] Dissection fix --- data/mods/Xedra_Evolved/dissect.json | 19 +++++ .../itemgroups/monster_drops.json | 82 +++++++++---------- 2 files changed, 60 insertions(+), 41 deletions(-) diff --git a/data/mods/Xedra_Evolved/dissect.json b/data/mods/Xedra_Evolved/dissect.json index 83fe816e11a7c..5733d04345b41 100644 --- a/data/mods/Xedra_Evolved/dissect.json +++ b/data/mods/Xedra_Evolved/dissect.json @@ -17,6 +17,25 @@ "faults": [ "fault_bionic_salvaged" ] } ] + }, + { + "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", diff --git a/data/mods/Xedra_Evolved/itemgroups/monster_drops.json b/data/mods/Xedra_Evolved/itemgroups/monster_drops.json index 17fef381f8676..83f5f4ff7fe0c 100644 --- 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", From adde79ae5fa1ac547ccae0f7c304c8069594435c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jan 2025 23:44:55 -0600 Subject: [PATCH 10/11] Update data/mods/Xedra_Evolved/dissect.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Xedra_Evolved/dissect.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/dissect.json b/data/mods/Xedra_Evolved/dissect.json index 5733d04345b41..34ca596a136a1 100644 --- a/data/mods/Xedra_Evolved/dissect.json +++ b/data/mods/Xedra_Evolved/dissect.json @@ -18,7 +18,7 @@ } ] }, - { + { "id": "dissect_combat_cyborg", "type": "harvest", "message": "You search for any salvageable hardware in what's left of this monstrous ghoul.", From cc1217e7b4f1cb870981358ca636e6a529e58d7c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:33:39 -0600 Subject: [PATCH 11/11] Update exodii.json --- data/mods/Xedra_Evolved/monsters/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/monsters/exodii.json b/data/mods/Xedra_Evolved/monsters/exodii.json index 7440324733396..ce3cf0d7fc65f 100644 --- a/data/mods/Xedra_Evolved/monsters/exodii.json +++ b/data/mods/Xedra_Evolved/monsters/exodii.json @@ -56,7 +56,7 @@ ], "death_drops": { "subtype": "collection", "groups": [ [ "robots", 80 ] ] }, "death_function": { "corpse_type": "BROKEN" }, - "dissect": "combat_cyborg_harvest", + "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 } }