From f6d4661d9d18992730e6ad848de81f8d90f6e1d6 Mon Sep 17 00:00:00 2001 From: Hymore246 Date: Thu, 28 May 2020 15:29:40 -0500 Subject: [PATCH 1/2] [Mythical Martial Arts] Adds new martial art: Desert Wind --- data/mods/MMA/martial.json | 9 +++++ data/mods/MMA/martialarts.json | 63 ++++++++++++++++++++++++++++++++++ data/mods/MMA/mutations.json | 10 ++++++ data/mods/MMA/techniques.json | 52 ++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+) diff --git a/data/mods/MMA/martial.json b/data/mods/MMA/martial.json index c1ad4c2843159..62dc6a65a2e10 100644 --- a/data/mods/MMA/martial.json +++ b/data/mods/MMA/martial.json @@ -1,4 +1,13 @@ [ + { + "id": "manual_mma_desert_wind", + "copy-from": "book_martial", + "looks_like": "manual_karate", + "type": "GENERIC", + "name": { "str": "Scorching Sirocco", "str_pl": "Scorching Sirocco" }, + "description": "This book contains the teaching of the Desert Wind discipline.", + "book_data": { "martial_art": "style_mma_desert_wind" } + }, { "id": "manual_mma_panzer", "copy-from": "book_martial", diff --git a/data/mods/MMA/martialarts.json b/data/mods/MMA/martialarts.json index 19b69608bdb8a..719e7a35d7e44 100644 --- a/data/mods/MMA/martialarts.json +++ b/data/mods/MMA/martialarts.json @@ -1,4 +1,67 @@ [ + { + "type": "martial_art", + "id": "style_mma_desert_wind", + "name": { "str": "Desert Wind" }, + "description": "Desert Wind maneuvers focus on quick movement and swirling, flaming strikes. The complex spinning and slashing of the curved blade incorporated into many Desert Wind maneuvers are in fact carefully honed gestures that evoke the power of fire, if performed correctly and with the proper focus.", + "initiate": [ + "You feel a wave of heat wash over you as you assume a running combat stance.", + "%s assumes into a running combat stance." + ], + "learn_difficulty": 10, + "primary_skill": "cutting", + "strictly_melee": true, + "ondodge_buffs": [ + { + "id": "mma_buff_desert_wind_ondodge", + "name": "Zephyr Dance", + "description": "You spin gracefully away from attacks, whirling like the dersert zephyr racing across the sands.\n\n+1.0 Dodging skill, +1 Dodge attempt\nLasts 1 turn.", + "skill_requirements": [ { "name": "melee", "level": 3 } ], + "melee_allowed": true, + "buff_duration": 2, + "bonus_dodges": 1, + "flat_bonuses": [ { "stat": "dodge", "scale": 1.0 } ] + } + ], + "onmove_buffs": [ + { + "id": "mma_buff_desert_wind_onmove", + "name": "Wind Stride", + "description": "A warm breeze swirls about you as you move speedily away.\n\n+1.0 Dodging skill.\nLasts 1 turn.", + "skill_requirements": [ { "name": "melee", "level": 3 } ], + "melee_allowed": true, + "buff_duration": 1, + "max_stacks": 2, + "flat_bonuses": [ { "stat": "dodge", "scale": 1.0 } ] + } + ], + "techniques": [ + "mma_tec_desert_wind_strike", + "mma_tec_desert_wind_crit", + "mma_tec_desert_wind_impale", + "mma_tec_desert_wind_spin", + "mma_tec_desert_wind_wide" + ], + "weapons": [ + "mace", + "mace_inferior", + "mace_fake", + "scimitar", + "scimitar_inferior", + "scimitar_fake", + "spear_knife", + "spear_knife_superior", + "spear_spike", + "spear_rebar", + "spear_pipe", + "spear_forked", + "spear_steel", + "spear_wood", + "spear_copper", + "spear_homemade_halfpike", + "sword_wood" + ] + }, { "type": "martial_art", "id": "style_mma_panzer", diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json index bcbb4bd9b76cf..d312d8495afe4 100644 --- a/data/mods/MMA/mutations.json +++ b/data/mods/MMA/mutations.json @@ -43,5 +43,15 @@ "id": "LIGHTWEIGHT", "copy-from": "LIGHTWEIGHT", "extend": { "cancels": [ "DRUNKEN" ] } + }, + { + "type": "mutation", + "id": "MMA_MARTIAL_ARTS_SUBLIME", + "name": { "str": "Martial Adept" }, + "points": 2, + "description": "You are a martial adept and learned one of the martial disciplines of the Sublime Way.", + "starting_trait": true, + "initial_ma_styles": [ "style_mma_desert_wind" ], + "valid": false } ] diff --git a/data/mods/MMA/techniques.json b/data/mods/MMA/techniques.json index a6010240bed30..af69852c379de 100644 --- a/data/mods/MMA/techniques.json +++ b/data/mods/MMA/techniques.json @@ -1,4 +1,56 @@ [ + { + "type": "technique", + "id": "mma_tec_desert_wind_strike", + "name": "Burning Blade", + "messages": [ "You unleash a fiery attack against %s", " unleash a fiery attack against %s" ], + "melee_allowed": true, + "flat_bonuses": [ { "stat": "damage", "type": "heat", "scale": 3.0 } ] + }, + { + "type": "technique", + "id": "mma_tec_desert_wind_crit", + "name": "Inferno Blade", + "messages": [ "You strike %s with powerful inferno", " strikes %s with powerful inferno" ], + "skill_requirements": [ { "name": "melee", "level": 1 } ], + "melee_allowed": true, + "crit_tec": true, + "flat_bonuses": [ { "stat": "damage", "type": "heat", "scale": 7.0 } ] + }, + { + "type": "technique", + "id": "mma_tec_desert_wind_impale", + "name": "Firesnake", + "messages": [ "You strike through %s with a snaking flame", " strikes through %s with a snaking flame" ], + "skill_requirements": [ { "name": "melee", "level": 4 } ], + "melee_allowed": true, + "crit_ok": true, + "aoe": "impale", + "flat_bonuses": [ { "stat": "damage", "type": "heat", "scale": 7.0 } ] + }, + { + "type": "technique", + "id": "mma_tec_desert_wind_spin", + "name": "Ring of Fire", + "messages": [ + "You become a flaming blur as you strike %s and those around you", + " becomes a flaming blur as they strike %s and those around them" + ], + "skill_requirements": [ { "name": "melee", "level": 5 } ], + "melee_allowed": true, + "crit_tec": true, + "aoe": "spin", + "flat_bonuses": [ { "stat": "damage", "type": "heat", "scale": 10.0 } ] + }, + { + "type": "technique", + "id": "mma_tec_desert_wind_wide", + "name": "Flashing Sun", + "messages": [ "You carve an arc through %s and those nearby", " carve an arc through %s and those nearby" ], + "skill_requirements": [ { "name": "melee", "level": 2 } ], + "melee_allowed": true, + "aoe": "wide" + }, { "type": "technique", "id": "mma_tec_panzer_counter", From 8209bb8f7df9b3ecf175a4a6f36cfbd42f6cb226 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Fri, 29 May 2020 09:47:35 +0300 Subject: [PATCH 2/2] Apply suggestions from code review --- data/mods/MMA/martial.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/MMA/martial.json b/data/mods/MMA/martial.json index 62dc6a65a2e10..3e65bcdef57dd 100644 --- a/data/mods/MMA/martial.json +++ b/data/mods/MMA/martial.json @@ -4,7 +4,7 @@ "copy-from": "book_martial", "looks_like": "manual_karate", "type": "GENERIC", - "name": { "str": "Scorching Sirocco", "str_pl": "Scorching Sirocco" }, + "name": { "str_sp": "Scorching Sirocco" }, "description": "This book contains the teaching of the Desert Wind discipline.", "book_data": { "martial_art": "style_mma_desert_wind" } },