Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ Xedra Evolved ] Dream wounds: Shadows #74678

Merged
merged 40 commits into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2fe8262
Shadows
Maleclypse Jun 13, 2024
17dd9ab
Update monster_spells.json
Maleclypse Jun 14, 2024
09b21e2
more changes
Maleclypse Jun 14, 2024
7b18d58
Shadow enchantment
Maleclypse Jun 19, 2024
2820652
Map extra
Maleclypse Jun 19, 2024
467587b
Update data/mods/Xedra_Evolved/damage_types.json
Maleclypse Jun 19, 2024
5e7f100
Banishment effect applied to spells
Maleclypse Jun 22, 2024
bb60db2
Update monster_spells.json
Maleclypse Jun 22, 2024
477133e
fixes
Maleclypse Jun 22, 2024
5dd1036
Update dream_wound_monsters.json
Maleclypse Jun 22, 2024
50d9f8f
Update data/mods/Xedra_Evolved/field_type.json
Maleclypse Jun 22, 2024
99318e0
Update dream_wound_monsters.json
Maleclypse Jun 22, 2024
06ca934
Update dream_wound_monsters.json
Maleclypse Jun 22, 2024
5f8dc85
Lint effects
Maleclypse Jul 18, 2024
e7ff4b1
Lint map extras
Maleclypse Jul 18, 2024
b432dea
Update damage_types.json
Maleclypse Jul 18, 2024
a366278
Update species.json
Maleclypse Jul 18, 2024
39d7cfc
Fixes
Maleclypse Jul 23, 2024
b3de91f
Update data/mods/Xedra_Evolved/itemgroups/monster_drops.json
Maleclypse Jul 24, 2024
191f842
Fixes
Maleclypse Jul 24, 2024
9601bfc
Update resources.json
Maleclypse Jul 24, 2024
155ef31
Update data/mods/Xedra_Evolved/items/resources.json
Maleclypse Jul 24, 2024
2404768
Fixes
Maleclypse Jul 24, 2024
731eb8e
Update data/mods/Xedra_Evolved/items/resources.json
Maleclypse Jul 24, 2024
a294de8
Update map_extras.json
Maleclypse Jul 24, 2024
fbeb17d
Update data/mods/Xedra_Evolved/effects/goblin_fruit_effects.json
Maleclypse Jul 26, 2024
2ba5645
Fixes but remove dealth guilt duplicate
Maleclypse Jul 27, 2024
44966a5
Update data/mods/Xedra_Evolved/monsters/monster_spells.json
Maleclypse Jul 28, 2024
4cfb11d
Failed fix
Maleclypse Jul 30, 2024
c09c602
Renaming file to get around load error issues
Maleclypse Jul 31, 2024
9aca431
Revert "Renaming file to get around load error issues"
Maleclypse Jul 31, 2024
db84f39
Fixes
Maleclypse Jul 31, 2024
2be1a8f
More fixes need flags for damage, banishment fails
Maleclypse Jul 31, 2024
1d53960
rename spell file
Maleclypse Aug 3, 2024
48d172d
Update data/mods/Xedra_Evolved/field_type.json
Maleclypse Aug 3, 2024
14eccca
Create json_flags.json
Maleclypse Aug 6, 2024
0b8e822
Update json_flags.json
Maleclypse Aug 6, 2024
19e1aaa
Update map_extras.json
Maleclypse Aug 6, 2024
9b48f75
Update data/mods/Xedra_Evolved/json_flags.json
Maleclypse Aug 8, 2024
144a11e
Update dream_wound_monsters.json
Maleclypse Aug 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions data/mods/Xedra_Evolved/damage_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,58 @@
"pet_prot_info": { "order": 999999, "show_type": false },
"melee_combat_info": { "order": 999999, "show_type": false },
"ablative_info": { "order": 999999, "show_type": false }
},
{
"id": "xe_shadow_damage",
"type": "damage_type",
"physical": false,
"magic_color": "dark_gray",
"name": "sharp edged shadows",
"skill": "cutting",
"derived_from": [ "cut", 0.8 ],
"immune_flags": { "character": [ "SHADOW_CHAR_IMMUNE" ], "monster": [ "SHADOW_MONSTER_IMMUNE" ] },
"ondamage_eocs": [ "EOC_SHADOW_DAMAGE_BLIND_CHANCE", "EOC_SHADOW_DAMAGE_EXTRA_BLIND_CHANCE" ]
},
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
{
"type": "effect_on_condition",
"id": "EOC_SHADOW_DAMAGE_BLIND_CHANCE",
"condition": {
"and": [
{ "x_in_y_chance": { "x": 1, "y": 5 } },
{ "math": [ "_damage_taken", ">", "0" ] },
{ "not": { "npc_has_trait": "SHADOWED" } },
{ "not": { "npc_has_flag": "SHADOW_CHAR_IMMUNE" } },
{ "not": { "npc_has_flag": "SHADOW_MONSTER_IMMUNE" } }
]
},
"effect": [ { "npc_add_effect": "blind", "duration": "3 s" } ]
},
{
"type": "effect_on_condition",
"id": "EOC_SHADOW_DAMAGE_EXTRA_BLIND_CHANCE",
"condition": {
"and": [
{ "x_in_y_chance": { "x": 1, "y": 24 } },
{ "math": [ "_damage_taken", ">", "0" ] },
{ "not": { "npc_has_trait": "SHADOWED" } },
{ "not": { "npc_has_flag": "SHADOW_CHAR_IMMUNE" } },
{ "not": { "npc_has_flag": "SHADOW_MONSTER_IMMUNE" } }
]
},
"effect": [
{ "u_message": "A bit of shadowstuff settles over your eyes, blocking your vision!", "type": "bad" },
{ "npc_add_effect": "blind", "duration": "10 s" }
]
},
{
"id": "xe_shadow_damage",
"type": "damage_info_order",
"info_display": "detailed",
"verb": "umbrous",
"bionic_info": { "order": 999903, "show_type": false },
"protection_info": { "order": 999903, "show_type": false },
"pet_prot_info": { "order": 999903, "show_type": false },
"melee_combat_info": { "order": 999903, "show_type": false },
"ablative_info": { "order": 999903, "show_type": false }
}
]
8 changes: 8 additions & 0 deletions data/mods/Xedra_Evolved/effects/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,14 @@
"base_mods": { "int_mod": [ -2 ], "dex_mod": [ -1 ], "per_mod": [ -4 ] },
"blood_analysis_description": "Hallucinations"
},
{
"type": "effect_type",
"id": "effect_monster_shadow_damage_reduction",
"name": [ "Shadow Damage Reduction" ],
"desc": [ "You are flatter and less real in ways that makes you less susceptible to damage." ],
"show_in_info": true,
"enchantments": [ { "values": [ { "value": "ARMOR_BULLET", "multiply": -0.75 }, { "value": "ARMOR_BASH", "multiply": -0.75 } ] } ]
},
{
"type": "effect_type",
"id": "creativity",
Expand Down
10 changes: 10 additions & 0 deletions data/mods/Xedra_Evolved/effects/goblin_fruit_effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,16 @@
"limb_score_mods": [ { "limb_score": "night_vis", "modifier": 6 } ],
"flags": [ "EFFECT_LIMB_SCORE_MOD" ]
},
{
"type": "effect_type",
"id": "effect_goblin_fruit_shadow",
"name": [ "Muffled" ],
"desc": [ "Your movements are muffled." ],
"apply_message": "Your footsteps feel quieter.",
"remove_message": "Your steps are normal once again.",
"rating": "good",
"enchantments": [ { "values": [ { "value": "FOOTSTEP_NOISE", "multiply": -0.67 } ] } ]
},
{
"type": "effect_type",
"id": "effect_goblin_fruit_nobleed",
Expand Down
21 changes: 21 additions & 0 deletions data/mods/Xedra_Evolved/field_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,27 @@
"display_field": true,
"looks_like": "fd_smoke"
},
{
"id": "fd_dream_wound_shadow",
"type": "field_type",
"intensity_levels": [
{
"name": "oily sheen",
"color": "light_gray",
"sym": "*",
"dangerous": true,
"intensity_upgrade_chance": 10,
"intensity_upgrade_duration": "6 hours"
},
{ "name": "deep shadows", "color": "dark_gray" },
{ "name": "roiling shadows", "color": "black_green", "transparent": false }
],
"description_affix": "under",
"priority": 8,
"display_items": true,
"display_field": true,
"looks_like": "fd_smoke"
},
{
"id": "fd_blood_karma",
"type": "field_type",
Expand Down
50 changes: 50 additions & 0 deletions data/mods/Xedra_Evolved/itemgroups/monster_drops.json
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,56 @@
{ "item": "bio_ar", "prob": 1 }
]
},
{
"id": "mon_dream_shadow_death_drops",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "item": "scrap_dreamdross", "prob": 80, "count": [ 0, 3 ] },
{ "item": "scrap_shadowstuff", "prob": 60, "count": [ 0, 2 ] },
{ "item": "chunk_shadowstuff", "prob": 40, "count": [ 0, 1 ] }
]
},
{
"id": "mon_dream_shadowbeast_death_drops",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "item": "scrap_dreamdross", "prob": 60, "count": [ 0, 4 ] },
{ "item": "scrap_shadowstuff", "prob": 80, "count": [ 0, 4 ] },
{ "item": "chunk_shadowstuff", "prob": 70, "count": [ 0, 2 ] },
{ "item": "shadow_fruit", "prob": 30, "count": [ 0, 1 ] }
]
},
{
"id": "mon_dream_shadowman_death_drops",
"type": "item_group",
"subtype": "collection",
"entries": [
{ "item": "scrap_dreamdross", "prob": 100, "count": [ 0, 4 ] },
{ "item": "scrap_shadowstuff", "prob": 100, "count": [ 0, 4 ] },
{ "item": "chunk_shadowstuff", "prob": 100, "count": [ 0, 2 ] },
{ "group": "xe_shadowman_spell_drops", "prob": 100, "count": 1 }
]
},
{
"type": "item_group",
"id": "xe_shadowman_spell_drops",
"//": "Spell drops for shadow wounds",
"subtype": "distribution",
"entries": [
{ "group": "xe_dreamer_spell_group0", "prob": 6 },
{ "group": "xe_dreamer_spell_group1", "prob": 12 },
{ "group": "xe_dreamer_spell_group2", "prob": 25 },
{ "group": "xe_dreamer_spell_group3", "prob": 100 },
{ "group": "xe_dreamer_spell_group4", "prob": 50 },
{ "group": "xe_eater_spell_group0", "prob": 6 },
{ "group": "xe_eater_spell_group1", "prob": 12 },
{ "group": "xe_eater_spell_group2", "prob": 25 },
{ "group": "xe_eater_spell_group3", "prob": 100 },
{ "group": "xe_eater_spell_group4", "prob": 50 }
]
},
{
"id": "triffid_heart",
"type": "harvest",
Expand Down
6 changes: 6 additions & 0 deletions data/mods/Xedra_Evolved/items/ammo_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
"name": "scraps of dreamdross",
"default": "scrap_dreamdross"
},
{
"type": "ammunition_type",
"id": "scrap_shadowstuff",
"name": "scraps of shadowstuff",
"default": "scrap_shadowstuff"
},
{
"type": "ammunition_type",
"id": "glamour_charge",
Expand Down
21 changes: 21 additions & 0 deletions data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,27 @@
"id": "EOC_GOBLIN_WATER_BREATHING",
"effect": [ { "u_add_effect": "effect_goblin_fruit_water_breathing", "duration": { "math": [ "500 + rand(5000)" ] } } ]
},
{
"type": "COMESTIBLE",
"id": "shadow_fruit",
"name": { "str": "shadowy goblin fruit" },
"description": "This greyish goblin fruit is shaped like a pear, if pears had scales like a pinecone. There is a pulpy meat underneath the scales.",
"copy-from": "goblin_fruit_abstract",
"comestible_type": "FOOD",
"color": "dark_gray",
"weight": "118 g",
"volume": "151 ml",
"use_action": {
"type": "effect_on_conditions",
"description": "Eat the shadowy goblin fruit.",
"effect_on_conditions": [ "EOC_GOBLIN_FRUIT_SHADOW" ]
}
},
{
"type": "effect_on_condition",
"id": "EOC_GOBLIN_FRUIT_SHADOW",
"effect": [ { "u_add_effect": "effect_goblin_fruit_shadow", "duration": { "math": [ "500 + rand(5000)" ] } } ]
},
{
"type": "COMESTIBLE",
"id": "goblin_fruit_giant_growth",
Expand Down
36 changes: 36 additions & 0 deletions data/mods/Xedra_Evolved/items/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,42 @@
"calories": 0,
"extend": { "flags": [ "NUTRIENT_OVERRIDE" ] }
},
{
"id": "scrap_shadowstuff",
"type": "AMMO",
"category": "spare_parts",
"name": { "str": "scrap shadowstuff", "str_pl": "scraps of shadowstuff" },
"description": "A bulky assortment of small bits of scrap shadowstuff, possibly useful in ephemeral crafting.",
"weight": "5 g",
"volume": "25 ml",
"price": "5 USD",
"price_postapoc": "10 cent",
"count": 2,
"stack_size": 10,
"//": "Density .5g/ml.",
"material": [ "shadowstuff" ],
"ammo_type": "scrap_shadowstuff",
"symbol": ",",
"color": "light_gray"
},
{
"id": "chunk_shadowstuff",
"type": "AMMO",
"category": "spare_parts",
"name": { "str": "chunk shadowstuff", "str_pl": "scraps of shadowstuff" },
"description": "A bulky assortment of larger bits of scrap shadowstuff, possibly useful in ephemeral crafting.",
"weight": "5 g",
"volume": "25 ml",
"price": "5 USD",
"price_postapoc": "10 cent",
"count": 2,
"stack_size": 10,
"//": "Density .5g/ml.",
"material": [ "shadowstuff" ],
"ammo_type": "components",
"symbol": ",",
"color": "light_gray"
},
{
"id": "scrap_dreamdross",
"type": "AMMO",
Expand Down
12 changes: 12 additions & 0 deletions data/mods/Xedra_Evolved/json_flags.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"id": "SHADOW_CHAR_IMMUNE",
"type": "json_flag",
"//": "Immune to shadow damage"
},
{
"id": "SHADOW_MONSTER_IMMUNE",
"type": "monster_flag",
"//": "Immune to shadow damage"
}
]
54 changes: 54 additions & 0 deletions data/mods/Xedra_Evolved/mapgen/map_extras.json
Original file line number Diff line number Diff line change
Expand Up @@ -859,5 +859,59 @@
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"place_monster": [ { "group": "GROUP_CHANGELING_STRIKE_FORCE", "x": [ 0, 14 ], "y": [ 0, 14 ], "chance": 75, "repeat": [ 7, 15 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "dreamwound_shadow",
"object": {
"mapgensize": [ 6, 6 ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"terrain": { " ": "t_region_groundcover" },
"furniture": { " ": "f_rubble_rock" },
"place_fields": [
{ "field": "fd_dream_wound_shadow", "x": [ 2, 4 ], "y": [ 2, 4 ], "intensity": [ 1, 3 ], "repeat": 15 },
{ "field": "fd_gibs_flesh", "x": [ 0, 6 ], "y": [ 0, 6 ], "intensity": [ 0, 3 ] }
],
"place_monsters": [ { "monster": "GROUP_DREAM_WOUND_SHADOW", "x": [ 0, 6 ], "y": [ 0, 6 ], "density": 0.3 } ],
"place_monster": [ { "monster": "mon_dream_shadowman", "x": [ 0, 6 ], "y": [ 0, 6 ] } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "dreamwound_shadow_from_dreams",
"object": {
"mapgensize": [ 6, 6 ],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"terrain": { " ": "t_region_groundcover" },
"furniture": { " ": "f_rubble_rock" },
"place_fields": [
{ "field": "fd_dream_wound_shadow", "x": [ 2, 4 ], "y": [ 2, 4 ], "intensity": [ 1, 3 ], "repeat": 15 },
{ "field": "fd_gibs_flesh", "x": [ 0, 6 ], "y": [ 0, 6 ], "intensity": [ 0, 3 ] }
],
"place_monsters": [ { "monster": "GROUP_DREAM_WOUND_SHADOW", "x": [ 0, 6 ], "y": [ 0, 6 ], "density": 0.3 } ],
"place_monster": [ { "monster": "mon_dream_shadowman", "name": "Crowing Shadowman", "x": [ 0, 6 ], "y": [ 0, 6 ], "target": true } ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_dreamwound_shadow",
"object": {
"place_nested": [ { "chunks": [ "dreamwound_shadow" ], "x": [ 2, 17 ], "y": [ 2, 17 ] } ],
"monsters": { " ": { "monster": "GROUP_DREAM_WOUND_SHADOW", "chance": 1, "density": 0.0001 } }
}
},
{
"id": "mx_dreamwound_shadow",
"type": "map_extra",
"name": { "str": "a shadowy wound in reality" },
"description": "What you can only describe as a wound in reality appears to be leaking shadows.",
"generator": { "generator_method": "update_mapgen", "generator_id": "mx_dreamwound_shadow" },
"sym": "w",
"min_max_zlevel": [ 0, 0 ],
"color": "dark_gray_red",
"autonote": true
}
]
18 changes: 18 additions & 0 deletions data/mods/Xedra_Evolved/material.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,24 @@
"//2": "Resist ratios between gossamer and quilted gossamer are the same as between cotton and quilted cotton.",
"resist": { "bash": 4, "cut": 6, "acid": 6, "heat": 2, "bullet": 5 }
},
{
"type": "material",
"id": "shadowstuff",
"name": "shadowstuff",
"density": 0.5,
"specific_heat_liquid": 0.49,
"specific_heat_solid": 0.39,
"latent_heat": 205,
"conductive": true,
"chip_resist": 18,
"dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
"salvaged_into": "scrap_shadowstuff",
"bash_dmg_verb": "torn",
"cut_dmg_verb": "bleached",
"breathability": "SECOND_SKIN",
"resist": { "bash": 4, "cut": 1, "acid": 2, "heat": 7, "bullet": 5 },
"repair_difficulty": 7
},
{
"type": "material",
"id": "dreamstuff",
Expand Down
Loading
Loading