forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
XE Alchemy Perks (CleverRaven#65311)
* 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
1 parent
b7ff804
commit 37ce55a
Showing
28 changed files
with
1,938 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 } | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>." | ||
} | ||
] |
17 changes: 17 additions & 0 deletions
17
data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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." } | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.