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.

Sign up for GitHub

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 ] Make Level 5 Alchemy recipes #69278

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[ Xedra Evolved ] Make Level 5 Alchemy recipes #69278

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
01030d0
Update alchemy.json
Maleclypse Nov 11, 2023
69b7b55
Update alchemy.json
Maleclypse Nov 11, 2023
151e687
Ginseng effects need map extra
Maleclypse Nov 11, 2023
9f52c04
Update data/mods/Xedra_Evolved/field_type.json
Maleclypse Dec 12, 2023
f4b010b
Update data/mods/Xedra_Evolved/field_type.json
Maleclypse Dec 12, 2023
22d05ce
Update data/mods/Xedra_Evolved/field_type.json
Maleclypse Dec 12, 2023
48ca72a
Merge branch 'master' into Increase-price-of-life-extension-solve-no-…
Maleclypse May 7, 2024
51687e6
Update data/mods/Xedra_Evolved/field_type.json
Maleclypse Jul 4, 2024
12d08f5
ginseng patch
Maleclypse Aug 17, 2024
e3ffc4e
Update data/mods/Xedra_Evolved/regional_overlay.json
Maleclypse Aug 17, 2024
1d1f2c1
Apply suggestions from code review
Maleclypse Aug 17, 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
22 changes: 22 additions & 0 deletions data/mods/Xedra_Evolved/effects/effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,28 @@
"scaling_mods": { "hurt_chance": [ 1 ], "pain_chance": [ 1 ] },
"show_in_info": true
},
{
"type": "effect_type",
"id": "ginseng_scream",
"name": [ "ginseng scream" ],
"desc": [ "The sound pushes through you!" ],
"apply_message": "The sounds is pummeling your mind and body",
"rating": "bad",
"max_duration": "30 s",
"max_intensity": 5,
"int_dur_factor": "5 s",
"base_mods": {
"hurt_min": [ 4, 2 ],
"hurt_chance": [ 2, 6 ],
"hurt_chance_bot": [ 10, 5 ],
"pain_min": [ 10, 5 ],
"pain_chance": [ 1, 5 ],
"pain_chance_bot": [ 10, 5 ]
},
"resist_traits": [ "PARTIAL_DEAF" ],
"scaling_mods": { "hurt_chance": [ 1 ], "pain_chance": [ 1 ] },
"show_in_info": true
},
{
"type": "effect_type",
"id": "vamp_blood_weave",
Expand Down
7 changes: 7 additions & 0 deletions data/mods/Xedra_Evolved/emitters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
"intensity": 3,
"qty": 50
},
{
"id": "emit_ginseng_scream",
"type": "emit",
"field": "fd_ginseng_scream",
"intensity": 1,
"qty": 5
},
{
"id": "emit_arvore_poison_pollen",
"type": "emit",
Expand Down
36 changes: 36 additions & 0 deletions data/mods/Xedra_Evolved/field_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,42 @@
"half_life": "20 minutes",
"phase": "gas"
},
{
"type": "field_type",
"id": "fd_ginseng_scream",
"immune_mtypes": [ "mon_ginseng_protector" ],
"priority": 2,
"intensity_levels":
[
{ "name": "ginseng_scream",
Comment on lines +145 to +147
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"intensity_levels":
[
{ "name": "ginseng_scream",
"intensity_levels": [
{
"name": "ginseng_scream",

"sym": "^",
"color": "brown",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"color": "brown",
"color": "brown",

"dangerous": true,
"move_cost": 120,
"effects":
[
Comment on lines +152 to +153
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"effects":
[
"effects": [

{
"effect_id": "warbled",
"min_duration": "1 minutes",
"max_duration": "72 hours",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"max_duration": "72 hours",
"max_duration": "72 hours",

"intensity": 1,
"body_part": "head",
"immune_inside_vehicle": true,
"message": "Your vision shakes as the air warbles!",
"message_npc": "<npcname> is sonically battered!",
"message_type": "bad",
"immunity_data": {
"flags": [ "DEAF" ]
}
Comment on lines +164 to +166
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"immunity_data": {
"flags": [ "DEAF" ]
}
"immunity_data": { "flags": [ "DEAF" ] }

}
]
}
],
"half_life": "3 minutes",
"percent_spread": 90,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
"percent_spread": 90,
"percent_spread": 90,

"phase": "gas",
"display_items": true,
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
},
{
"id": "fd_pollen_arvore_weaken",
"type": "field_type",
Expand Down
1 change: 1 addition & 0 deletions data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"move_cost_mod": 0,
"required_str": -1,
"flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
"emissions": [ "emit_glimmer", "emit_shock_burst", "emit_ginseng_scream" ],
"examine_action": "harvest_furn",
"harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "elder_ginseng_harv" } ],
"bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Xedra_Evolved/items/alchemy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@
"description": "The primary means by which alchemists gain wealthy patrons these potions will add decades of healthy life to their users span. But the ingredients are rare and even this won't prolong life forever. You'll have to resort to other means of achieving immortality, if that's even a goal you are seeking.",
"weight": "50 g",
"volume": "2 ml",
"price": "150 cent",
"price_postapoc": "5 USD",
"price": "150000 USD",
"price_postapoc": "500 USD",
"material": [ "water" ],
"symbol": "!",
"color": "light_cyan",
Expand Down
52 changes: 51 additions & 1 deletion data/mods/Xedra_Evolved/mapgen/map_extras.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,56 @@
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"furniture": { "x": "f_golden_monolith" }
}
},
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JSON & C++ formatters] reported by reviewdog 🐶

Suggested change
{
{

"type": "mapgen",
"method": "json",
"nested_mapgen_id": "elder_ginseng_nest",
"object": {
"mapgensize": [ 24, 24 ],
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"terrain": { " ": "t_region_groundcover_forest" },
"furniture": { "x": "f_elder_ginseng" },
"place_monster": [ { "monster": "mon_ginseng_protector", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.3 } ],

Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
"id": "mx_elder_ginseng",
"type": "map_extra",
"name": { "str": "forest" },
"description": "This section of forest seems older than the rest.",
"generator": { "generator_method": "update_mapgen", "generator_id": "elder_ginseng_nest" },
"min_max_zlevel": [ 0, 0 ],
"sym": "F",
"color": "green",
"autonote": true
},
{
"id": "mx_spider_shimmering",
Expand Down Expand Up @@ -150,7 +200,7 @@
"description": "A copse of trees.",
"generator": { "generator_method": "update_mapgen", "generator_id": "mx_trees_map_sylph" },
"min_max_zlevel": [ 0, 0 ],
"sym": "E",
"sym": "F",
"color": "green",
"autonote": true
},
Expand Down
126 changes: 126 additions & 0 deletions data/mods/Xedra_Evolved/recipes/alchemy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,5 +410,131 @@
[ [ "batrachian_sample", 1 ], [ "rabbit_sample", 1 ] ],
[ [ "water", 2 ] ]
]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "plant_imbuement",
"category": "CC_XEDRA",
"subcategory": "CSC_XEDRA_ALCHEMY",
"skill_used": "deduction",
"skills_required": [ "chemistry", 4 ],
"difficulty": 5,
"time": "6 h",
"flags": [ "SECRET" ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_sulphur", 1 ] ], [ [ "arvore_sample", 5 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "fire_imbuement",
"category": "CC_XEDRA",
"subcategory": "CSC_XEDRA_ALCHEMY",
"skill_used": "deduction",
"skills_required": [ "chemistry", 4 ],
"difficulty": 5,
"time": "6 h",
"flags": [ "SECRET" ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_sulphur", 1 ] ], [ [ "salamander_sample", 5 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "water_imbuement",
"category": "CC_XEDRA",
"subcategory": "CSC_XEDRA_ALCHEMY",
"skill_used": "deduction",
"skills_required": [ "chemistry", 4 ],
"difficulty": 5,
"time": "6 h",
"flags": [ "SECRET" ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_sulphur", 1 ] ], [ [ "undine_sample", 5 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "air_imbuement",
"category": "CC_XEDRA",
"subcategory": "CSC_XEDRA_ALCHEMY",
"skill_used": "deduction",
"skills_required": [ "chemistry", 4 ],
"difficulty": 5,
"time": "6 h",
"flags": [ "SECRET" ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_sulphur", 1 ] ], [ [ "sylph_sample", 5 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "earth_imbuement",
"category": "CC_XEDRA",
"subcategory": "CSC_XEDRA_ALCHEMY",
"skill_used": "deduction",
"skills_required": [ "chemistry", 4 ],
"difficulty": 5,
"time": "6 h",
"flags": [ "SECRET" ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_sulphur", 1 ] ], [ [ "ierde_sample", 5 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "doll_imbuement",
"category": "CC_XEDRA",
"subcategory": "CSC_XEDRA_ALCHEMY",
"skill_used": "deduction",
"skills_required": [ "chemistry", 4 ],
"difficulty": 5,
"time": "6 h",
"flags": [ "SECRET" ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_sulphur", 1 ] ], [ [ "homullus_sample", 5 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ]
}
]
13 changes: 10 additions & 3 deletions data/mods/Xedra_Evolved/regional_overlay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,19 @@
"mx_prison_bus": 150
}
},
"forest": { "chance": 40, "extras": { "mx_goblin_fruits": 25, "mx_ring_of_mushrooms": 15 } },
"forest_thick": { "chance": 30, "extras": { "mx_goblin_fruits": 30, "mx_ring_of_mushrooms": 20 } },
"forest_water": { "chance": 20, "extras": { "mx_goblin_fruits": 15 } },
"forest": {
"chance": 40,
"extras": { "mx_goblin_fruits": 25, "mx_ring_of_mushrooms": 15, "mx_elder_ginseng": 1, "mx_goblin_spider": 7 }
},
"forest_thick": {
"chance": 30,
"extras": { "mx_goblin_fruits": 30, "mx_ring_of_mushrooms": 20, "mx_elder_ginseng": 5, "mx_goblin_spider": 7 }
},
"forest_water": { "chance": 20, "extras": { "mx_goblin_fruits": 15, "mx_goblin_spider": 7 } },
"field": {
"chance": 75,
"extras": {
"mx_golden_monolith": 5,
"mx_trees_map_salamander": 75,
"mx_trees_map_sylph": 75,
"mx_trees_map_ierde": 75,
Expand Down
Loading