Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Muay Thai changes #68347

Merged
merged 3 commits into from
Sep 30, 2023
Merged

Muay Thai changes #68347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
210cd5e
add new techniques, rename power kick to roundhouse, some tweaks.
Sep 26, 2023
e7b9c75
Fix style
waxcatape Sep 26, 2023
ef1dc67
Revert knee strike conditions
waxcatape Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
82 changes: 72 additions & 10 deletions data/json/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1938,6 +1938,34 @@
"defensive": true,
"miss_recovery": true
},
{
"type": "technique",
"id": "tec_muay_thai_rapid",
"name": "Jab",
"messages": [ "You quickly jab %s!", "<npcname> 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!", "<npcname> 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",
Expand All @@ -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!", "<npcname> deals a powerful kick to %s!" ],
"id": "tec_muay_thai_roundhouse",
"name": "Roundhouse Kick",
"messages": [ "You roundhouse kick %s!", "<npcname> 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!", "<npcname> 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 <info>similar or smaller</info> 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!", "<npcname> leaps and delivers a flying knees to %s!" ],
"name": "Knee Strike",
"messages": [ "You drive your knee into %s!", "<npcname> drives their knee into %s!" ],
"skill_requirements": [ { "name": "unarmed", "level": 5 } ],
"unarmed_allowed": true,
"crit_tec": true,
Expand Down Expand Up @@ -1997,7 +2059,7 @@
]
},
"condition_desc": "* Only works on a <info>non-stunned mundane</info> target of <info>similar or smaller</info> size",
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.4 } ],
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.35 } ],
"attack_vectors": [ "KNEE" ]
},
{
Expand Down
Loading