From 89296679cfd470351309790e60c90f421e4c33f1 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 11 Mar 2024 21:47:48 -0500 Subject: [PATCH 1/3] Armor and harvest changes --- data/mods/Xedra_Evolved/harvest.json | 24 ++++ .../Xedra_Evolved/monsters/changeling.json | 10 +- .../Xedra_Evolved/monsters/elementals.json | 134 ++++++++++++++++-- 3 files changed, 148 insertions(+), 20 deletions(-) diff --git a/data/mods/Xedra_Evolved/harvest.json b/data/mods/Xedra_Evolved/harvest.json index 3090515749e05..4b1c3e46a1593 100644 --- a/data/mods/Xedra_Evolved/harvest.json +++ b/data/mods/Xedra_Evolved/harvest.json @@ -14,11 +14,35 @@ { "drop": "fat", "type": "flesh", "mass_ratio": 0.04 } ] }, + { + "id": "fae_changeling", + "//": "nether organs could be in base game.", + "type": "harvest", + "entries": [ + { "drop": "fae_meat", "type": "flesh", "mass_ratio": 0.3 }, + { "drop": "fae_meat_scrap", "type": "flesh", "mass_ratio": 0.03 }, + { "drop": "fae_organs", "type": "flesh", "mass_ratio": 0.1 }, + { "drop": "fae_blood", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "bone", "type": "bone", "mass_ratio": 0.15 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, + { "drop": "fat", "type": "flesh", "mass_ratio": 0.04 } + ] + }, { "id": "stoneling", "type": "harvest", "entries": [ { "drop": "pebble", "type": "blood", "mass_ratio": 0.1 }, { "drop": "rock", "type": "flesh", "mass_ratio": 0.4 } ] }, + { + "id": "fetch", + "type": "harvest", + "entries": [ + { "drop": "sand", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "ash", "type": "flesh", "mass_ratio": 0.4 }, + { "drop": "birchbark", "type": "skin", "mass_ratio": 0.04 }, + { "drop": "stick", "type": "bone", "mass_ratio": 0.15 } + ] + }, { "id": "water_elemental", "type": "harvest", diff --git a/data/mods/Xedra_Evolved/monsters/changeling.json b/data/mods/Xedra_Evolved/monsters/changeling.json index 4b4e1f20917f9..ea843e7a21f1d 100644 --- a/data/mods/Xedra_Evolved/monsters/changeling.json +++ b/data/mods/Xedra_Evolved/monsters/changeling.json @@ -24,7 +24,7 @@ "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "families": [ "prof_wp_demihuman" ], "dodge": 2, - "harvest": "demihuman", + "harvest": "fae_changeling", "vision_day": 30, "vision_night": 3, "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, @@ -181,7 +181,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 12 } ], "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "dodge": 5, - "harvest": "demihuman", + "harvest": "fae_changeling", "families": [ "prof_wp_demihuman" ], "vision_day": 50, "vision_night": 6, @@ -332,7 +332,7 @@ "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big" ], "vision_day": 30, "vision_night": 3, - "harvest": "demihuman", + "harvest": "fetch", "special_attacks": [ { "type": "melee", "id": "sharp_objects", "attack_upper": false, "cooldown": 15 }, [ "PARROT_AT_DANGER", 800 ] ], "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_children_clothes", 100 ], [ "child_items", 65 ] ] }, "death_function": { "effect": { "id": "death_guilt", "min_level": 9 } }, @@ -428,7 +428,7 @@ "dodge": 2, "vision_day": 5, "vision_night": 5, - "harvest": "demihuman", + "harvest": "fae_changeling", "weakpoint_sets": [ "wps_humanoid_head_small", "wps_arthropod_spider" ], "families": [ "prof_wp_demihuman", "prof_wp_spider" ], "flags": [ @@ -572,7 +572,7 @@ "grab_strength": 100, "dodge": 5, "luminance": 0, - "harvest": "demihuman", + "harvest": "fae_changeling", "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_wp_demihuman" ], "special_attacks": [ { "id": "ranged_pull", "cooldown": 10 }, { "id": "grab_drag" }, { "id": "drag_followup" } ], diff --git a/data/mods/Xedra_Evolved/monsters/elementals.json b/data/mods/Xedra_Evolved/monsters/elementals.json index 3933add8f6b38..69c406014e5c7 100644 --- a/data/mods/Xedra_Evolved/monsters/elementals.json +++ b/data/mods/Xedra_Evolved/monsters/elementals.json @@ -21,7 +21,15 @@ "melee_dice": 2, "melee_dice_sides": 3, "melee_damage": [ { "damage_type": "bash", "amount": 5 } ], - "armor": { "bash": 5, "cut": 5, "heat": 8, "bullet": 3 }, + "armor": { + "bash": 5, + "cut": 5, + "heat": 8, + "bullet": 3, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "vision_night": 3, "weakpoint_sets": [ "wps_alien_biology" ], "families": [ "prof_alien_biology" ], @@ -52,7 +60,14 @@ "melee_dice": 4, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], - "armor": { "bash": 2, "cut": 5, "cold": 12 }, + "armor": { + "bash": 2, + "cut": 5, + "cold": 12, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "anger_triggers": [ "FRIEND_ATTACKED" ], "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ], "harvest": "fae_furred", @@ -98,7 +113,10 @@ "heat": 500, "biological": 500, "electric": 500, - "cold": 500 + "cold": 500, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 }, "anger_triggers": [ "FRIEND_ATTACKED" ], "dissect": "dissect_ierde_small", @@ -140,7 +158,14 @@ "melee_dice": 1, "melee_dice_sides": 1, "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "armor": { "bash": 3, "cut": 2, "acid": 8 }, + "armor": { + "bash": 3, + "cut": 2, + "acid": 8, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "dodge": 3, "weakpoint_sets": [ "wps_alien_biology" ], "families": [ "prof_alien_biology" ], @@ -183,7 +208,15 @@ "melee_dice": 1, "melee_dice_sides": 3, "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "armor": { "bash": 4, "cut": 4, "acid": 8, "bullet": 3 }, + "armor": { + "bash": 4, + "cut": 4, + "acid": 8, + "bullet": 3, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "vision_day": 14, "vision_night": 4, "weakpoint_sets": [ "wps_alien_biology" ], @@ -283,7 +316,17 @@ } ], "//": "The idea here is that the shabriri doesn't really have a body, so they're basically immune to physical damage, but heat, cold, or electricity will harm them.", - "armor": { "bash": 50, "cut": 120, "acid": 150, "stab": 500, "bullet": 500, "biological": 500 }, + "armor": { + "bash": 50, + "cut": 120, + "acid": 150, + "stab": 500, + "bullet": 500, + "biological": 500, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "flags": [ "SEES", "HEARS", "FAE_CREATURE", "SWIMS", "PLASTIC", "NO_BREATHE", "CAMOUFLAGE", "WATER_CAMOUFLAGE" ] }, { @@ -307,7 +350,15 @@ "melee_dice": 2, "melee_dice_sides": 3, "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], - "armor": { "bash": 5, "cut": 5, "cold": 8, "bullet": 3 }, + "armor": { + "bash": 5, + "cut": 5, + "cold": 8, + "bullet": 3, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "dodge": 5, "harvest": "rat_with_skull_arvore", "weakpoint_sets": [ "wps_alien_biology" ], @@ -339,7 +390,15 @@ "melee_dice_sides": 6, "grab_strength": 50, "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "grab_2", "cooldown": 12 } ], - "armor": { "bash": 5, "cut": 5, "cold": 8, "bullet": 3 }, + "armor": { + "bash": 5, + "cut": 5, + "cold": 8, + "bullet": 3, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "dodge": 5, "bleed_rate": 10, "harvest": "triffid_small", @@ -358,7 +417,7 @@ "material": [ "fae_flesh", "veggy" ], "proportional": { "hp": 1.8, "morale": 2 }, "melee_skill": 7, - "armor": { "bash": 10, "cut": 8 }, + "armor": { "bash": 10, "cut": 8, "xe_cold_iron_cut_damage": 0, "xe_cold_iron_bash_damage": 0, "xe_cold_iron_stab_damage": 0 }, "aggression": -10, "aggro_character": false, "harvest": "harvest_thornbear", @@ -401,7 +460,15 @@ "dodge": 3, "regenerates": 3, "regen_morale": true, - "armor": { "bash": 8, "cut": 12, "bullet": 10, "electric": 5 }, + "armor": { + "bash": 8, + "cut": 12, + "bullet": 10, + "electric": 5, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "weakpoint_sets": [ "wps_humanoid_body" ], "families": [ "prof_alien_biology", "prof_wp_hulk" ], "vision_day": 40, @@ -460,7 +527,14 @@ "melee_dice": 1, "melee_dice_sides": 1, "melee_damage": [ { "damage_type": "heat", "amount": 1 } ], - "armor": { "bash": 3, "cut": 2, "heat": 8 }, + "armor": { + "bash": 3, + "cut": 2, + "heat": 8, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "dodge": 3, "weakpoint_sets": [ "wps_alien_biology" ], "families": [ "prof_alien_biology" ], @@ -501,7 +575,15 @@ "melee_dice": 1, "melee_dice_sides": 3, "melee_damage": [ { "damage_type": "heat", "amount": 5 } ], - "armor": { "bash": 4, "cut": 4, "heat": 8, "bullet": 3 }, + "armor": { + "bash": 4, + "cut": 4, + "heat": 8, + "bullet": 3, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "vision_day": 14, "vision_night": 4, "weakpoint_sets": [ "wps_alien_biology" ], @@ -614,7 +696,15 @@ "ANIMAL", "FLIES" ], - "armor": { "bash": 2, "cut": 4, "bullet": 3, "electric": 1 } + "armor": { + "bash": 2, + "cut": 4, + "bullet": 3, + "electric": 1, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_venus_doll", @@ -770,7 +860,14 @@ "harvest": "fae_flying", "dissect": "dissect_sylph_single", "flags": [ "SEES", "HEARS", "NOHEAD", "FAE_CREATURE", "HARDTOSHOOT", "FLIES", "NO_BREATHE", "NOGIB", "HIT_AND_RUN", "SWARMS" ], - "armor": { "bash": 0, "cut": 0, "bullet": 0 } + "armor": { + "bash": 0, + "cut": 0, + "bullet": 0, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_sheyd", @@ -794,7 +891,14 @@ "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "pure", "amount": 1 } ], "dodge": 5, - "armor": { "cut": 10, "stab": 10, "bullet": 10 }, + "armor": { + "cut": 10, + "stab": 10, + "bullet": 10, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + }, "vision_day": 45, "vision_night": 6, "special_attacks": [ From d1de086fc1f0af26be5d517c24735320a250ac08 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:51:29 -0500 Subject: [PATCH 2/3] sand -> material_sand --- data/mods/Xedra_Evolved/harvest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/harvest.json b/data/mods/Xedra_Evolved/harvest.json index 4b1c3e46a1593..441f829b021d8 100644 --- a/data/mods/Xedra_Evolved/harvest.json +++ b/data/mods/Xedra_Evolved/harvest.json @@ -37,7 +37,7 @@ "id": "fetch", "type": "harvest", "entries": [ - { "drop": "sand", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "material_ sand", "type": "blood", "mass_ratio": 0.1 }, { "drop": "ash", "type": "flesh", "mass_ratio": 0.4 }, { "drop": "birchbark", "type": "skin", "mass_ratio": 0.04 }, { "drop": "stick", "type": "bone", "mass_ratio": 0.15 } From 3566bffe9cf9c67bd569e46d776fdffd8dc9ddaa Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:51:43 -0500 Subject: [PATCH 3/3] Remove extra space --- data/mods/Xedra_Evolved/harvest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/harvest.json b/data/mods/Xedra_Evolved/harvest.json index 441f829b021d8..a84612a51abd0 100644 --- a/data/mods/Xedra_Evolved/harvest.json +++ b/data/mods/Xedra_Evolved/harvest.json @@ -37,7 +37,7 @@ "id": "fetch", "type": "harvest", "entries": [ - { "drop": "material_ sand", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "material_sand", "type": "blood", "mass_ratio": 0.1 }, { "drop": "ash", "type": "flesh", "mass_ratio": 0.4 }, { "drop": "birchbark", "type": "skin", "mass_ratio": 0.04 }, { "drop": "stick", "type": "bone", "mass_ratio": 0.15 }