From b967e4ad624f55b6272ba33fae24a275abb20f39 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 20 Jan 2024 22:22:39 -0600 Subject: [PATCH 1/9] Magic Kantele Update item_spells.json Update data/mods/Xedra_Evolved/items/artifact_grade_items.json --- data/mods/Xedra_Evolved/items/alchemy.json | 32 +++++++++++++++++ .../items/artifact_grade_items.json | 35 +++++++++++++++++++ .../Xedra_Evolved/spells/item_spells.json | 30 ++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 data/mods/Xedra_Evolved/items/artifact_grade_items.json diff --git a/data/mods/Xedra_Evolved/items/alchemy.json b/data/mods/Xedra_Evolved/items/alchemy.json index cf3a66fadad2a..d8c3a2ea9db94 100644 --- a/data/mods/Xedra_Evolved/items/alchemy.json +++ b/data/mods/Xedra_Evolved/items/alchemy.json @@ -218,6 +218,38 @@ "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_spider" } ] } }, + { + "id": "väinämöinens_kantele_imitation", + "looks_like": "kantele", + "type": "TOOL", + "category": "tools", + "name": { "str": "Väinämöinen's Kantele, imitation" }, + "description": "A traditional Finnish string instrument. According to myth the first one was fashioned from a great pike's bone. Does it glimmer in the light? Do it's notes echo and linger more than normal?", + "weight": "550 g", + "volume": "3000 ml", + "longest_side": "46 cm", + "price": 5500, + "price_postapoc": 250, + "to_hit": 1, + "material": [ "wood" ], + "symbol": "(", + "color": "brown", + "use_action": [ { "type": "cast_spell", "spell_id": "kantele_spell", "no_fail": true, "level": 3 }, { "type": "play_instrument" } ], + "tick_action": { + "type": "musical_instrument", + "volume": 10, + "fun": -5, + "fun_bonus": 2, + "speed_penalty": 13, + "description_frequency": 20, + "player_descriptions": [ + "You play a haunting melody on your kantele, you sing tragic poetry while you play.", + "You play an enchanting composition on your kantele, the words you sing along speak of the mysteries of the forest and sea.", + "You play a somber piece on your kantele, you sing of a land you can never return to, the past." + ] + }, + "melee_damage": { "bash": 4 } + }, { "id": "life_extension_potion", "type": "COMESTIBLE", diff --git a/data/mods/Xedra_Evolved/items/artifact_grade_items.json b/data/mods/Xedra_Evolved/items/artifact_grade_items.json new file mode 100644 index 0000000000000..fef025860b78c --- /dev/null +++ b/data/mods/Xedra_Evolved/items/artifact_grade_items.json @@ -0,0 +1,35 @@ +[ + { + "id": "väinämöinens_kantele", + "looks_like": "kantele", + "type": "TOOL", + "category": "tools", + "name": { "str": "Väinämöinen's Kantele" }, + "description": "An original kantele made by Väinämöinen himself. Fashioned from a great pike's bone, the material is unlike anything you saw before the end of the world. Every note from this instrument thrums with power.", + "weight": "550 g", + "volume": "3000 ml", + "longest_side": "46 cm", + "price": 5500, + "price_postapoc": 250, + "to_hit": 1, + "material": [ "monolith" ], + "symbol": "(", + "color": "brown", + "use_action": [ { "type": "cast_spell", "spell_id": "kantele_spell", "no_fail": true, "level": 15 }, { "type": "play_instrument" } ], + "tick_action": { + "type": "musical_instrument", + "volume": 10, + "fun": -25, + "fun_bonus": 4, + "speed_penalty": 5, + "description_frequency": 20, + "player_descriptions": [ + "You play a haunting melody and sing words you don't understand, but they fill you with a strong sense of longing.", + "You play an enchanting composition on your kantele, while you play a chorus of children echo along the wind accompanying you in a language you don't recognize.", + "You play a somber dirge on your kantele, keening wailing women's voices sing a mournful song along with you. The language is like none you are familiar with.", + "You play a song of courage and battle, of Jarls and Jotunn. The language is your own and all the words known to you, but it is an extemperaneous piece of music." + ] + }, + "melee_damage": { "xe_cold_iron_bash_damage": 14 } + } +] diff --git a/data/mods/Xedra_Evolved/spells/item_spells.json b/data/mods/Xedra_Evolved/spells/item_spells.json index c51b5f10c98a3..47bb7f456172e 100644 --- a/data/mods/Xedra_Evolved/spells/item_spells.json +++ b/data/mods/Xedra_Evolved/spells/item_spells.json @@ -14,6 +14,36 @@ "shape": "blast", "effect": "attack" }, + { + "id": "kantele_spell", + "type": "SPELL", + "name": "Väinämöinen's Kantele Song", + "description": "You play and sing songs written by or about a Finnish wizard/deity. It summons forest mammals to your presence.", + "valid_targets": [ "ground" ], + "skill": "deduction", + "min_damage": 1, + "max_damage": 8, + "damage_increment": 0.5, + "min_range": 3, + "max_range": 18, + "range_increment": 1, + "max_level": 15, + "difficulty": 3, + "effect": "summon", + "effect_str": "GROUP_WILDERNESS_FOREST_MAMMAL", + "shape": "blast", + "energy_source": "MANA", + "base_energy_cost": 500, + "energy_increment": 20, + "final_energy_cost": 300, + "min_aoe": 3, + "max_aoe": 18, + "aoe_increment": 1, + "base_casting_time": 30000, + "casting_time_increment": 500, + "final_casting_time": 22500, + "flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "PERMANENT_ALL_LEVELS", ] + }, { "id": "potion_recover_mana_xe", "type": "SPELL", From f898ee0f3a819f2f7b6213e870d1ea3367dfa727 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 20 Jan 2024 22:31:01 -0600 Subject: [PATCH 2/9] Update item_spells.json --- data/mods/Xedra_Evolved/spells/item_spells.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/spells/item_spells.json b/data/mods/Xedra_Evolved/spells/item_spells.json index 47bb7f456172e..d8b812b84b19f 100644 --- a/data/mods/Xedra_Evolved/spells/item_spells.json +++ b/data/mods/Xedra_Evolved/spells/item_spells.json @@ -42,7 +42,7 @@ "base_casting_time": 30000, "casting_time_increment": 500, "final_casting_time": 22500, - "flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "PERMANENT_ALL_LEVELS", ] + "flags": [ "SOMATIC", "VERBAL", "SPAWN_GROUP", "PERMANENT_ALL_LEVELS" ] }, { "id": "potion_recover_mana_xe", From 1a519473fc25ef07584bd6aa04310a387164af30 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jan 2024 01:33:11 -0600 Subject: [PATCH 3/9] Apply suggestions from code review Co-authored-by: Antti Riikonen --- data/mods/Xedra_Evolved/items/alchemy.json | 2 +- data/mods/Xedra_Evolved/items/artifact_grade_items.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/items/alchemy.json b/data/mods/Xedra_Evolved/items/alchemy.json index d8c3a2ea9db94..05ac28a74611d 100644 --- a/data/mods/Xedra_Evolved/items/alchemy.json +++ b/data/mods/Xedra_Evolved/items/alchemy.json @@ -224,7 +224,7 @@ "type": "TOOL", "category": "tools", "name": { "str": "Väinämöinen's Kantele, imitation" }, - "description": "A traditional Finnish string instrument. According to myth the first one was fashioned from a great pike's bone. Does it glimmer in the light? Do it's notes echo and linger more than normal?", + "description": "A traditional Finnish string instrument. According to myth the first one was fashioned from a great pike's jawbone. Does it glimmer in the light? Do its notes echo and linger more than normal?", "weight": "550 g", "volume": "3000 ml", "longest_side": "46 cm", diff --git a/data/mods/Xedra_Evolved/items/artifact_grade_items.json b/data/mods/Xedra_Evolved/items/artifact_grade_items.json index fef025860b78c..f6c1755006ff5 100644 --- a/data/mods/Xedra_Evolved/items/artifact_grade_items.json +++ b/data/mods/Xedra_Evolved/items/artifact_grade_items.json @@ -5,7 +5,7 @@ "type": "TOOL", "category": "tools", "name": { "str": "Väinämöinen's Kantele" }, - "description": "An original kantele made by Väinämöinen himself. Fashioned from a great pike's bone, the material is unlike anything you saw before the end of the world. Every note from this instrument thrums with power.", + "description": "An original kantele made by Väinämöinen himself. Fashioned from a great pike's jawbone, the material is unlike anything you saw before the end of the world. Every note from this instrument thrums with power.", "weight": "550 g", "volume": "3000 ml", "longest_side": "46 cm", From 493ce2b031efa1b042673b5ec7d7c21be6f292fe Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jan 2024 02:20:15 -0600 Subject: [PATCH 4/9] Update data/mods/Xedra_Evolved/items/artifact_grade_items.json --- data/mods/Xedra_Evolved/items/artifact_grade_items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/items/artifact_grade_items.json b/data/mods/Xedra_Evolved/items/artifact_grade_items.json index f6c1755006ff5..42f1d65e636e0 100644 --- a/data/mods/Xedra_Evolved/items/artifact_grade_items.json +++ b/data/mods/Xedra_Evolved/items/artifact_grade_items.json @@ -27,7 +27,7 @@ "You play a haunting melody and sing words you don't understand, but they fill you with a strong sense of longing.", "You play an enchanting composition on your kantele, while you play a chorus of children echo along the wind accompanying you in a language you don't recognize.", "You play a somber dirge on your kantele, keening wailing women's voices sing a mournful song along with you. The language is like none you are familiar with.", - "You play a song of courage and battle, of Jarls and Jotunn. The language is your own and all the words known to you, but it is an extemperaneous piece of music." + "You play a song of courage and battle, of Jarls and Jötnar. The language is your own and all the words known to you, but it is an extemperaneous piece of music." ] }, "melee_damage": { "xe_cold_iron_bash_damage": 14 } From a592465c87973c66891a2f7f9e9c2c6ce5a49255 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jan 2024 02:30:27 -0600 Subject: [PATCH 5/9] Update data/mods/Xedra_Evolved/items/artifact_grade_items.json --- data/mods/Xedra_Evolved/items/artifact_grade_items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/items/artifact_grade_items.json b/data/mods/Xedra_Evolved/items/artifact_grade_items.json index 42f1d65e636e0..079ca0634141c 100644 --- a/data/mods/Xedra_Evolved/items/artifact_grade_items.json +++ b/data/mods/Xedra_Evolved/items/artifact_grade_items.json @@ -27,7 +27,7 @@ "You play a haunting melody and sing words you don't understand, but they fill you with a strong sense of longing.", "You play an enchanting composition on your kantele, while you play a chorus of children echo along the wind accompanying you in a language you don't recognize.", "You play a somber dirge on your kantele, keening wailing women's voices sing a mournful song along with you. The language is like none you are familiar with.", - "You play a song of courage and battle, of Jarls and Jötnar. The language is your own and all the words known to you, but it is an extemperaneous piece of music." + "You play a song of courage and battle, of heroes and mythical beasts. The language is your own and all the words known to you, but it is an extemperaneous piece of music." ] }, "melee_damage": { "xe_cold_iron_bash_damage": 14 } From 86f7aca13c27d52ff9fb30d2ebd9357e7e44f62d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:11:55 -0500 Subject: [PATCH 6/9] Update data/mods/Xedra_Evolved/items/alchemy.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jianxiang Wang (王健翔) --- data/mods/Xedra_Evolved/items/alchemy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/items/alchemy.json b/data/mods/Xedra_Evolved/items/alchemy.json index 05ac28a74611d..c73b6a71741a1 100644 --- a/data/mods/Xedra_Evolved/items/alchemy.json +++ b/data/mods/Xedra_Evolved/items/alchemy.json @@ -223,7 +223,7 @@ "looks_like": "kantele", "type": "TOOL", "category": "tools", - "name": { "str": "Väinämöinen's Kantele, imitation" }, + "name": { "str": "Väinämöinen's Kantele, imitation", "str_pl": "Väinämöinen's Kanteles, imitation" }, "description": "A traditional Finnish string instrument. According to myth the first one was fashioned from a great pike's jawbone. Does it glimmer in the light? Do its notes echo and linger more than normal?", "weight": "550 g", "volume": "3000 ml", From 03f7ea6b2d6c2b78ece2c2607b0a7af576b9c850 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 30 Mar 2024 23:05:03 -0500 Subject: [PATCH 7/9] Alchemy Kantele --- data/mods/Xedra_Evolved/recipes/alchemy.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/mods/Xedra_Evolved/recipes/alchemy.json b/data/mods/Xedra_Evolved/recipes/alchemy.json index dca25f7080a70..ff6a659ab0046 100644 --- a/data/mods/Xedra_Evolved/recipes/alchemy.json +++ b/data/mods/Xedra_Evolved/recipes/alchemy.json @@ -186,6 +186,21 @@ "tools": [ [ [ "metal_file", -1 ] ] ], "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "lupine_sample", 1 ] ], [ [ "diamond", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "väinämöinens_kantele_imitation", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 3 ], + "difficulty": 3, + "time": "67 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_luthier_basic", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "luthier_toolset", -1 ] ] ], + "components": [ [ [ "kantele", 1 ] ], [ [ "scrap_dreamdross", 5 ] ], [ [ "fish_sample", 3 ] ] ] + }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", From 0015d8fe56a0d45aa1c6f1b0ee3949bbf03102e8 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:57:05 -0500 Subject: [PATCH 8/9] Make recipe learnable --- .../BombasticPerks/perks/perk_data/Alchemy1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json b/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json index 0262f80e8ef94..d1b03773788ee 100644 --- a/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json +++ b/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json @@ -30,7 +30,7 @@ "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY2" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] }, "effect": [ { - "u_roll_remainder": [ "prophets_lsd", "truckers_stamina_pills", "spiritshow_dust", "charm_of_marzanna" ], + "u_roll_remainder": [ "prophets_lsd", "truckers_stamina_pills", "spiritshow_dust", "charm_of_marzanna", "väinämöinens_kantele_imitation" ], "type": "recipe", "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER_ALCHEMY" ], "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_ALCHEMY" ] From 6082f1da4468aa105d0893ac0ef0b8fba2ad95b3 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 9 Apr 2024 19:29:45 -0500 Subject: [PATCH 9/9] Update data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../BombasticPerks/perks/perk_data/Alchemy1.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json b/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json index d1b03773788ee..b691d2c2a99f1 100644 --- a/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json +++ b/data/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json @@ -30,7 +30,13 @@ "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY2" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] }, "effect": [ { - "u_roll_remainder": [ "prophets_lsd", "truckers_stamina_pills", "spiritshow_dust", "charm_of_marzanna", "väinämöinens_kantele_imitation" ], + "u_roll_remainder": [ + "prophets_lsd", + "truckers_stamina_pills", + "spiritshow_dust", + "charm_of_marzanna", + "väinämöinens_kantele_imitation" + ], "type": "recipe", "true_eocs": [ "EOC_SUCCESFUL_ROLL_REMAINDER_ALCHEMY" ], "false_eocs": [ "EOC_COMPLETED_ROLL_REMAINDER_ALCHEMY" ]