From 210cd5e84aebbf07e8bbcb0be675ae16d24c46f2 Mon Sep 17 00:00:00 2001 From: waxcatape Date: Tue, 26 Sep 2023 19:04:18 +0300 Subject: [PATCH 1/3] add new techniques, rename power kick to roundhouse, some tweaks. * data/json/techniques.json: --- data/json/martialarts.json | 10 ++++- data/json/techniques.json | 86 ++++++++++++++++++++++++++++++++------ 2 files changed, 82 insertions(+), 14 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index cd23f1ce4a601..228f049fef9a2 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -909,7 +909,15 @@ ] } ], - "techniques": [ "tec_muay_thai_elbow", "tec_muay_thai_kick", "tec_muay_thai_knee", "tec_muay_thai_break" ] + "techniques": [ + "tec_muay_thai_rapid", + "tec_muay_thai_cross", + "tec_muay_thai_elbow", + "tec_muay_thai_push", + "tec_muay_thai_roundhouse", + "tec_muay_thai_knee", + "tec_muay_thai_break" + ] }, { "type": "martial_art", diff --git a/data/json/techniques.json b/data/json/techniques.json index 91ed071ed9806..fb3c31b2a8d1e 100644 --- a/data/json/techniques.json +++ b/data/json/techniques.json @@ -1938,6 +1938,34 @@ "defensive": true, "miss_recovery": true }, + { + "type": "technique", + "id": "tec_muay_thai_rapid", + "name": "Jab", + "messages": [ "You quickly jab %s!", " quickly jabs at %s!" ], + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], + "unarmed_allowed": true, + "mult_bonuses": [ + { "stat": "movecost", "scale": 0.5 }, + { "stat": "damage", "type": "bash", "scale": 0.66 }, + { "stat": "damage", "type": "cut", "scale": 0.66 }, + { "stat": "damage", "type": "stab", "scale": 0.66 } + ], + "attack_vectors": [ "HAND" ] + }, + { + "type": "technique", + "id": "tec_muay_thai_cross", + "name": "Cross", + "messages": [ "You throw a heavy cross at %s!", " throws a cross at %s!" ], + "unarmed_allowed": true, + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.2 }, + { "stat": "damage", "type": "cut", "scale": 1.2 }, + { "stat": "damage", "type": "stab", "scale": 1.2 } + ], + "attack_vectors": [ "HAND" ] + }, { "type": "technique", "id": "tec_muay_thai_elbow", @@ -1946,28 +1974,62 @@ "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "unarmed_allowed": true, "crit_tec": true, - "mult_bonuses": [ { "stat": "movecost", "scale": 0.5 } ], + "flat_bonuses": [ { "stat": "damage", "type": "cut", "scale": 2 } ], + "mult_bonuses": [ { "stat": "movecost", "scale": 0.66 } ], "attack_vectors": [ "ELBOW" ] }, { "type": "technique", - "id": "tec_muay_thai_kick", - "name": "Power Kick", - "messages": [ "You deal a powerful kick to %s!", " deals a powerful kick to %s!" ], + "id": "tec_muay_thai_roundhouse", + "name": "Roundhouse Kick", + "messages": [ "You roundhouse kick %s!", " roundhouse kicks %s!" ], + "skill_requirements": [ { "name": "unarmed", "level": 2 } ], "unarmed_allowed": true, "crit_ok": true, "mult_bonuses": [ - { "stat": "damage", "type": "bash", "scale": 1.3 }, - { "stat": "damage", "type": "cut", "scale": 1.3 }, - { "stat": "damage", "type": "stab", "scale": 1.3 } + { "stat": "damage", "type": "bash", "scale": 1.4 }, + { "stat": "damage", "type": "cut", "scale": 1.4 }, + { "stat": "damage", "type": "stab", "scale": 1.4 } ], "attack_vectors_random": [ "LOWER_LEG", "FOOT" ] }, + { + "type": "technique", + "id": "tec_muay_thai_push", + "name": "Push Kick", + "messages": [ "You shove %s back with a front kick!", " shoves %s back with a front kick!" ], + "skill_requirements": [ { "name": "unarmed", "level": 1 } ], + "unarmed_allowed": true, + "condition": { + "and": [ + { "math": [ "u_val('size')", ">=", "n_val('size')" ] }, + { + "or": [ + { + "and": [ + { "npc_has_flag": "GRAB_FILTER" }, + { "u_has_flag": "GRAB" }, + { + "roll_contested": { "math": [ "u_val('strength')" ] }, + "die_size": 20, + "difficulty": { "math": [ "n_val('grab_strength')" ] } + } + ] + }, + { "not": { "and": [ { "npc_has_flag": "GRAB_FILTER" }, { "u_has_flag": "GRAB" } ] } } + ] + } + ] + }, + "condition_desc": "* Only works on a target of similar or smaller size, may fail on enemies grabbing you", + "knockback_dist": 1, + "attack_vectors": [ "FOOT" ] + }, { "type": "technique", "id": "tec_muay_thai_knee", - "name": "Flying Knee", - "messages": [ "You leap and deliver a flying knee to %s!", " leaps and delivers a flying knees to %s!" ], + "name": "Knee Strike", + "messages": [ "You drive your knee into %s!", " drives their knee into %s!" ], "skill_requirements": [ { "name": "unarmed", "level": 5 } ], "unarmed_allowed": true, "crit_tec": true, @@ -1975,10 +2037,8 @@ "condition": { "and": [ { "math": [ "u_val('size') + 1", ">=", "n_val('size')" ] }, - { "not": { "npc_has_effect": "stunned" } }, { "and": [ - { "not": { "npc_has_species": "ZOMBIE" } }, { "not": { "npc_has_species": "NETHER" } }, { "not": { "npc_has_species": "NETHER_EMENATION" } }, { "not": { "npc_has_species": "LEECH_PLANT" } }, @@ -1996,8 +2056,8 @@ } ] }, - "condition_desc": "* Only works on a non-stunned mundane target of similar or smaller size", - "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.4 } ], + "condition_desc": "* Only works on a humanoid target of similar or smaller size", + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.35 } ], "attack_vectors": [ "KNEE" ] }, { From e7b9c759fcb4a15b2e13ea568454ce1ae48bdddc Mon Sep 17 00:00:00 2001 From: waxcatape <89343493+waxcatape@users.noreply.github.com> Date: Tue, 26 Sep 2023 19:19:44 +0300 Subject: [PATCH 2/3] Fix style Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/martialarts.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 228f049fef9a2..07a4691f3df73 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -909,15 +909,15 @@ ] } ], - "techniques": [ - "tec_muay_thai_rapid", - "tec_muay_thai_cross", - "tec_muay_thai_elbow", - "tec_muay_thai_push", - "tec_muay_thai_roundhouse", - "tec_muay_thai_knee", - "tec_muay_thai_break" - ] + "techniques": [ + "tec_muay_thai_rapid", + "tec_muay_thai_cross", + "tec_muay_thai_elbow", + "tec_muay_thai_push", + "tec_muay_thai_roundhouse", + "tec_muay_thai_knee", + "tec_muay_thai_break" + ] }, { "type": "martial_art", From ef1dc674e6e8025e21be5ce246e60592209ade96 Mon Sep 17 00:00:00 2001 From: waxcatape <89343493+waxcatape@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:51:48 +0300 Subject: [PATCH 3/3] Revert knee strike conditions --- data/json/techniques.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/json/techniques.json b/data/json/techniques.json index fb3c31b2a8d1e..b4cec5318d8e6 100644 --- a/data/json/techniques.json +++ b/data/json/techniques.json @@ -2037,8 +2037,10 @@ "condition": { "and": [ { "math": [ "u_val('size') + 1", ">=", "n_val('size')" ] }, + { "not": { "npc_has_effect": "stunned" } }, { "and": [ + { "not": { "npc_has_species": "ZOMBIE" } }, { "not": { "npc_has_species": "NETHER" } }, { "not": { "npc_has_species": "NETHER_EMENATION" } }, { "not": { "npc_has_species": "LEECH_PLANT" } }, @@ -2056,7 +2058,7 @@ } ] }, - "condition_desc": "* Only works on a humanoid target of similar or smaller size", + "condition_desc": "* Only works on a non-stunned mundane target of similar or smaller size", "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.35 } ], "attack_vectors": [ "KNEE" ] },