Skip to content

Commit

Permalink
XE Alchemy Perks (CleverRaven#65311)
Browse files Browse the repository at this point in the history
* XE Perks

lint

* Alchemy1 stuff

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update ethereal_items.json

* Update alchemy.json

* Apply suggestions from code review

* Update ethereal_items.json

* Update ethereal_items.json

* Update perk_menu.json

* Fixes

* OK let's see if alchemy 1 works

* Update data/mods/Xedra_Evolved/perks/perk_data/Alchemy1.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update effects.json

Update effects.json

Update alchemy.json

* Update Alchemy1.json

* Update alchemy.json

* Fixes

* Further Alchemy perks

Lint

Update effects.json

* Cold Iron Damage and flags

lint

* Ironwrought

* Moar

* Update data/mods/Xedra_Evolved/recipes/category.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Dictionary and sixdust

spawns

Update itemgroups.json

dust and charm

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Xedra_Evolved/items/alchemy.json

* alchemy 3

alchemy 3

lint

* fixes

fix

Update alchemy.json

* Update data/mods/Xedra_Evolved/items/alchemy.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* lint

* Update cold_iron.json

* lint

* Update cold_iron.json

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Xedra_Evolved/items/comestibles/med.json

* Create mutation_type.json

* Update mutations.json

* Revert "Update mutations.json"

This reverts commit c703166.

* Revert "Create mutation_type.json"

This reverts commit 8a8681a.

* Saints blood

* Update effects.json

* Life extension potion

* Update effects.json

* Extended life

* potions

* Update item_spells.json

* Level 4

* Fix

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix

* Work on level 5

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Xedra_Evolved/recipes/alchemy.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Remove level 5 Alchemy work

* Update data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json

* Apply suggestions from code review

* Update data/mods/Xedra_Evolved/items/alchemy.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update alchemy.json

* cold iron fixes

* fixes

Lint

fixes

* Last fixes

Update damage_types.json

Update Alchemy1.json

* Update README.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
Maleclypse and github-actions[bot] authored May 31, 2023
1 parent b7ff804 commit 37ce55a
Show file tree
Hide file tree
Showing 28 changed files with 1,938 additions and 21 deletions.
7 changes: 2 additions & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"LOCALIZE": "True",
"TILES": "True",
"SOUND": "True",
"TESTS": "False"
"TESTS": "False"
}
},
{
Expand All @@ -47,9 +47,6 @@
}
],
"buildPresets": [
{
"name": "linux-tiles-sounds-x64",
"configurePreset": "linux-tiles-sounds-x64"
}
{ "name": "linux-tiles-sounds-x64", "configurePreset": "linux-tiles-sounds-x64" }
]
}
2 changes: 2 additions & 0 deletions data/mods/Xedra_Evolved/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ Several new CBMs
Dozens of new spells
1 Vehicle
1 new skill
Perks for Bombastic Perks and Xedra Evolved.
Alchemy requires that you also be running bombastic perks. The level five alchemy recipes are taking their time and this PR has gotten too large as it is, for other people to review. There are four levels of Alchemy, level one is slightly buffed versions of common materials and medicines. Level two are more advanced versions of what is available already with on. Some of these substances might allow the imbiber to exceed his normal physical limits or to gain access to more mystical senses. Level three you can make substances that enhance their target to superhuman levels or create materials that exceed normal limitations (supernaturally strong alloys, etc). Level four should have single mutations and attribute increases. Level 5 should have character defining post thresh mutations and effects that transform the PC. Cold Iron is an example of a branching Alchemy specialty that focuses on building gear that targets fae.
And a plethora of other effects, furniture/terrain, missions, lore and other things necessary to support the above.


Expand Down
65 changes: 65 additions & 0 deletions data/mods/Xedra_Evolved/damage_types.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"id": "xe_cold_iron_cut_damage",
"type": "damage_type",
"physical": true,
"magic_color": "light_gray",
"name": "cold iron cut",
"skill": "cutting",
"derived_from": [ "cut", 1 ],
"immune_flags": { "character": [ "IRONSWORN" ], "monster": [ "IRONWROUGHT" ] }
},
{
"id": "xe_cold_iron_cut_damage",
"type": "damage_info_order",
"info_display": "detailed",
"verb": "cutting",
"bionic_info": { "order": 999999, "show_type": false },
"protection_info": { "order": 999999, "show_type": false },
"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_cold_iron_bash_damage",
"type": "damage_type",
"physical": true,
"magic_color": "light_gray",
"name": "cold iron bash",
"skill": "bashing",
"derived_from": [ "bash", 1 ],
"immune_flags": { "character": [ "IRONSWORN" ], "monster": [ "IRONWROUGHT" ] }
},
{
"id": "xe_cold_iron_bash_damage",
"type": "damage_info_order",
"info_display": "detailed",
"verb": "bashing",
"bionic_info": { "order": 999999, "show_type": false },
"protection_info": { "order": 999999, "show_type": false },
"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_cold_iron_stab_damage",
"type": "damage_type",
"physical": true,
"magic_color": "light_gray",
"name": "cold iron stab",
"skill": "stabbing",
"derived_from": [ "stab", 1 ],
"immune_flags": { "character": [ "IRONSWORN" ], "monster": [ "IRONWROUGHT" ] }
},
{
"id": "xe_cold_iron_stab_damage",
"type": "damage_info_order",
"info_display": "detailed",
"verb": "piercing",
"bionic_info": { "order": 999999, "show_type": false },
"protection_info": { "order": 999999, "show_type": false },
"pet_prot_info": { "order": 999999, "show_type": false },
"melee_combat_info": { "order": 999999, "show_type": false },
"ablative_info": { "order": 999999, "show_type": false }
}
]
96 changes: 95 additions & 1 deletion data/mods/Xedra_Evolved/effects/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
"rating": "good",
"base_mods": { "dex_mod": [ 4 ], "speed_mod": [ 250 ] }
},
{
"type": "effect_type",
"id": "xtr_str_aspirin",
"max_duration": "4 m",
"base_mods": {
"pkill_tick": [ 42 ],
"pkill_min": [ 1 ],
"pkill_max_val": [ 15 ],
"hurt_tick": [ 42 ],
"hurt_min": [ -1 ],
"hurt_max": [ -5 ]
},
"rating": "good",
"blood_analysis_description": "Strange Painkiller"
},
{
"type": "effect_type",
"id": "blood_spiders",
Expand Down Expand Up @@ -36,6 +51,12 @@
},
"blood_analysis_description": "Unknown Hemolytic Parasite"
},
{
"type": "effect_type",
"id": "curesome",
"removes_effects": [ "common_cold", "flu" ],
"base_mods": { "pkill_min": [ 5 ] }
},
{
"type": "effect_type",
"id": "faewild",
Expand Down Expand Up @@ -117,6 +138,16 @@
"max_intensity": 3,
"rating": "good"
},
{
"type": "effect_type",
"id": "mental_exhaustion",
"//": "Prevents you from learning new alchemy recipes.",
"name": [ "Mental Exhaustion" ],
"desc": [ "You have recently realized a new alchemical recipe and your thoughts are scattered." ],
"remove_message": "Your mind feels normal enough that you could focus on new alchemy ideas once again.",
"max_intensity": 1,
"rating": "bad"
},
{
"type": "effect_type",
"id": "dreamer_eff",
Expand Down Expand Up @@ -182,6 +213,47 @@
"base_mods": { "speed_mod": [ -10 ], "dex_mod": [ -1 ], "dodge_mod": [ -1 ] },
"scaling_mods": { "speed_mod": [ -20 ], "dex_mod": [ -1 ], "dodge_mod": [ -1 ] }
},
{
"type": "effect_type",
"id": "cheval_overdose",
"//": "Intensity 1 is a standard dosage of the drug. Further intensities reflect taking pills while the first dose hasn't worn off. It is not wise to do so.",
"name": [ "Energized", "Enflamed", "Arythmic", "Tachycardiac" ],
"apply_message": "These magickal trucker pills have kicked in and you feel great!",
"decay_messages": [
[
"These magickal trucker pills have worn off and you feel rough. It might be best to go ahead and sleep through the hangover as best you can.",
"bad"
],
[
"Aside from any leftover pain and damage that was done to your body by overdosing your feeling pretty good now.",
"good"
],
[ "Your heartbeat slows into a somewhat normal rhythm but your skin is still on fire.", "good" ],
[ "The pain in your chest subsides but your heart is still beating in a concerning fashion.", "good" ]
],
"rating": "mixed",
"max_intensity": 4,
"blood_analysis_description": "Patient has dangerous levels of multiple chemicals in their blood. Sedation and restraint suggested.",
"base_mods": { "speed_mod": [ 10 ], "str_mod": [ 1 ], "stim_amount": [ 1 ], "stim_tick": [ 500 ], "stim_max_val": [ 50 ] },
"scaling_mods": {
"perspiration_amount": [ 6 ],
"perspiration_min": [ 1 ],
"perspiration_chance": [ 2 ],
"perspiration_tick": [ 1500 ],
"pain_amount": [ 10 ],
"pain_min": [ 1 ],
"pain_chance": [ 2 ],
"pain_tick": [ 6000 ],
"stim_max_val": [ 100 ]
}
},
{
"type": "effect_type",
"id": "cheval_withdrawal",
"rating": "bad",
"blood_analysis_description": "Heightened levels of organosulfur compounds, mercury, and silver.",
"base_mods": { "speed_mod": [ -15 ], "str_mod": [ -1 ], "stim_amount": [ -1 ], "stim_tick": [ 500 ], "stim_max_val": [ -50 ] }
},
{
"type": "effect_type",
"id": "poisoned_blood",
Expand Down Expand Up @@ -230,7 +302,7 @@
"death_msg": "You succumb to your deadly necrotic condition.",
"apply_memorial_log": "Contracted a bloodborne pathogen out of legend.",
"remove_memorial_log": "Rid themselves of a horrific curse of the blood.",
"resist_traits": [ "ACIDBLOOD" ],
"resist_traits": [ "ACIDBLOOD", "BLOOD_OF_SAINTS" ],
"resist_effects": [ "blood_treatment" ],
"blocks_effects": [ "cold", "flu" ],
"max_intensity": 3,
Expand Down Expand Up @@ -501,5 +573,27 @@
"description": "Nothing can slow you down, and your pain sensations are dull.",
"enchantments": [ { "values": [ { "value": "PAIN", "multiply": -1 } ] } ],
"flags": [ "STEADY" ]
},
{
"type": "effect_type",
"id": "wicked_quick_hands",
"name": [ "Wicked Quick Hands" ],
"desc": [ "Your hands move wicked quick!" ],
"apply_message": "Your reflexes are heightened!",
"remove_message": "Your reflexes return to normal.",
"rating": "good",
"removes_effects": [ "terrible_strength" ],
"base_mods": { "dex_mod": [ 4 ] }
},
{
"type": "effect_type",
"id": "terrible_strength",
"name": [ "terrible strength" ],
"desc": [ "You have a terrible strength!" ],
"apply_message": "You feel strong!",
"remove_message": "Your strength deflates.",
"rating": "good",
"removes_effects": [ "wicked_quick_hands" ],
"base_mods": { "str_mod": [ 4 ] }
}
]
58 changes: 58 additions & 0 deletions data/mods/Xedra_Evolved/enchantments/armor.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,62 @@
[
{
"id": "ench_climate_control_marzanna",
"name": { "str": "Charm of Spring" },
"description": "You are wearing equipment that helps handle harsh climates and protects from damaging cold.",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 20 }, { "value": "ARMOR_COLD", "add": -15 } ]
},
{
"id": "ench_climate_periapta_feline",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "CLAWS_RETRACT" ]
},
{
"id": "ench_climate_periapta_lupine",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "FANGS" ]
},
{
"id": "ench_climate_periapta_cephalopod",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "INK_GLANDS" ]
},
{
"id": "ench_climate_periapta_butterfly",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "WINGS_BUTTERFLY" ]
},
{
"id": "ench_climate_periapta_plant",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "BARK" ]
},
{
"id": "ench_climate_periapta_scorpion",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "TAIL_STING" ]
},
{
"id": "ench_climate_periapta_spider",
"type": "enchantment",
"has": "WORN",
"condition": "ALWAYS",
"mutations": [ "WEB_WALKER" ]
},
{
"type": "enchantment",
"id": "DEDUCTION_REGEN_MANA",
Expand Down
7 changes: 7 additions & 0 deletions data/mods/Xedra_Evolved/flags.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"id": "IRONSWORN",
"type": "json_flag",
"info": "This gear <good>completely protects</good> you from <info>cold iron damage</info>."
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"type": "furniture",
"id": "f_elder_ginseng",
"name": "hundred year old ginseng",
"description": "The ginseng plant has leaves that grow in a circle around a straight stem. Yellowish-green, umbrella-shaped flowers grow in the center and produce red berries. Wrinkles around the neck of the root tell how old the plant is. This plant is over a hundred years old and if you decide to harvest it, you will need the roots.",
"symbol": "*",
"color": "cyan",
"looks_like": "f_burdock",
"move_cost_mod": 0,
"required_str": -1,
"flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
"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." }
}
]
5 changes: 5 additions & 0 deletions data/mods/Xedra_Evolved/harvest.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,10 @@
"id": "pomegranate_harv",
"type": "harvest",
"entries": [ { "drop": "pomegranate", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ]
},
{
"id": "elder_ginseng_harv",
"type": "harvest",
"entries": [ { "drop": "xe_elder_ginseng", "base_num": [ 1, 1 ] } ]
}
]
7 changes: 7 additions & 0 deletions data/mods/Xedra_Evolved/itemgroups/itemgroups.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@
{ "item": "wyld_candy", "prob": 15, "container-item": "wrapper_wyld", "sealed": false }
]
},
{
"type": "item_group",
"id": "softdrugs",
"subtype": "distribution",
"copy-from": "softdrugs",
"extend": { "entries": [ { "item": "truckstop_viagra", "prob": 15 } ] }
},
{
"type": "item_group",
"subtype": "distribution",
Expand Down
Loading

0 comments on commit 37ce55a

Please sign in to comment.