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

Jump to bottom

Misc fixes for martial arts techniques #69111

Merged
merged 6 commits into from
Nov 5, 2023
Merged

Misc fixes for martial arts techniques #69111

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f07934
Correct double "the" in martial arts techniques
Termineitor244 Nov 4, 2023
7a4d03b
Linting
Termineitor244 Nov 4, 2023
10a7edc
Takedown working for Ninjutsu
Termineitor244 Nov 4, 2023
692c8d6
Messages rewrite
Termineitor244 Nov 4, 2023
35334af
Linting
Termineitor244 Nov 4, 2023
8797bf4
Missing documentation
Termineitor244 Nov 5, 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
8 changes: 4 additions & 4 deletions data/json/martialarts_fictional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
"unarmed_allowed": true,
"weighting": 2,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"stun_dur": 1,
"attack_vectors": [ "HAND" ]
},
Expand Down Expand Up @@ -465,7 +465,7 @@
"type": "technique",
"id": "tec_lizard_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you outmaneuver it!", "The %s tries to grab <npcname>, but they outmaneuver it!" ],
"messages": [ "%s tries to grab you, but you outmaneuver it!", "%s tries to grab <npcname>, but they outmaneuver it!" ],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"melee_allowed": true,
Expand Down Expand Up @@ -627,7 +627,7 @@
"type": "technique",
"id": "tec_centipede_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you skitter free!", "The %s tries to grab <npcname>, but they skitter free!" ],
"messages": [ "%s tries to grab you, but you skitter free!", "%s tries to grab <npcname>, but they skitter free!" ],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -669,7 +669,7 @@
"skill_requirements": [ { "name": "unarmed", "level": 4 } ],
"unarmed_allowed": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "HAND" ]
}
]
66 changes: 33 additions & 33 deletions data/json/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"disarms": true,
"skill_requirements": [ { "name": "melee", "level": 4 } ],
"description": "Unwield target's weapon, min 4 melee",
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "HAND" ]
},
{
Expand Down Expand Up @@ -266,7 +266,7 @@
"disarms": true,
"messages": [ "You disarm %s using your whip!", "<npcname> disarms %s using their whip!" ],
"description": "Unwield target's weapon",
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "WEAPON" ]
},
{
Expand All @@ -285,7 +285,7 @@
"melee_allowed": true,
"defensive": true,
"grab_break": true,
"messages": [ "The %s tries to grab you, but you break its grab!", "The %s tries to grab <npcname>, but they break its grab!" ]
"messages": [ "%s tries to grab you, but you break its grab!", "%s tries to grab <npcname>, but they break its grab!" ]
},
{
"type": "technique",
Expand Down Expand Up @@ -403,7 +403,7 @@
"required_buffs_all": [ "buff_aikido_onblock" ],
"crit_ok": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"//condition": "Humanoids of similar size and no flying",
"condition": {
"and": [
Expand Down Expand Up @@ -448,7 +448,7 @@
"required_buffs_all": [ "buff_aikido_ondodge" ],
"crit_ok": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"//condition": "Humanoids of similar size and no flying",
"condition": {
"and": [
Expand Down Expand Up @@ -486,8 +486,8 @@
"id": "tec_aikido_break",
"name": "Grab Break",
"messages": [
"The %s tries to grab you, but you smoothly break free!",
"The %s tries to grab <npcname>, but they smoothly break free!"
"%s tries to grab you, but you smoothly break free!",
"%s tries to grab <npcname>, but they smoothly break free!"
],
Termineitor244 marked this conversation as resolved.
Show resolved Hide resolved
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
Expand All @@ -500,7 +500,7 @@
"type": "technique",
"id": "tec_bojutsu_thrust",
"name": "Front Thrust",
"messages": [ "You thrust at the %s!", "<npcname> thrusts at %s!" ],
"messages": [ "You thrust at %s!", "<npcname> thrusts at %s!" ],
"skill_requirements": [ { "name": "melee", "level": 1 } ],
"melee_allowed": true,
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.2 } ],
Expand Down Expand Up @@ -592,7 +592,7 @@
"melee_allowed": true,
"crit_ok": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "WEAPON" ]
},
{
Expand Down Expand Up @@ -620,7 +620,7 @@
"skill_requirements": [ { "name": "melee", "level": 2 } ],
"melee_allowed": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s's hand is forced open!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s's hand is forced open!" } ],
"mult_bonuses": [
{ "stat": "movecost", "scale": 0.5 },
{ "stat": "damage", "type": "bash", "scale": 0.66 },
Expand Down Expand Up @@ -715,7 +715,7 @@
"type": "technique",
"id": "tec_brawl_break_melee",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you force yourself free!", "The %s tries to grab <npcname>, but they break free!" ],
"messages": [ "%s tries to grab you, but you force yourself free!", "%s tries to grab <npcname>, but they break free!" ],
"skill_requirements": [ { "name": "melee", "level": 6 } ],
"melee_allowed": true,
"defensive": true,
Expand All @@ -725,7 +725,7 @@
"type": "technique",
"id": "tec_brawl_break_unarmed",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you force yourself free!", "The %s tries to grab <npcname>, but they break free!" ],
"messages": [ "%s tries to grab you, but you force yourself free!", "%s tries to grab <npcname>, but they break free!" ],
"skill_requirements": [ { "name": "unarmed", "level": 6 } ],
"unarmed_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -759,7 +759,7 @@
"skill_requirements": [ { "name": "melee", "level": 6 } ],
"melee_allowed": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "WEAPON" ]
},
{
Expand All @@ -770,7 +770,7 @@
"skill_requirements": [ { "name": "unarmed", "level": 6 } ],
"unarmed_allowed": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "HAND" ]
},
{
Expand Down Expand Up @@ -942,8 +942,8 @@
"id": "tec_crane_break",
"name": "Crane Flap",
"messages": [
"The %s tries to grab you, but you swing your arms and break free!",
"The %s tries to grab <npcname>, but they flap free!"
"%s tries to grab you, but you swing your arms and break free!",
"%s tries to grab <npcname>, but they flap free!"
],
Termineitor244 marked this conversation as resolved.
Show resolved Hide resolved
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
Expand Down Expand Up @@ -1308,7 +1308,7 @@
"type": "technique",
"id": "tec_medievalpole_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you push away!", "The %s tries to grab <npcname>, but they push away!" ],
"messages": [ "%s tries to grab you, but you push away!", "%s tries to grab <npcname>, but they push away!" ],
"skill_requirements": [ { "name": "melee", "level": 4 } ],
"melee_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -1393,7 +1393,7 @@
"melee_allowed": true,
"unarmed_weapons_allowed": false,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"condition": {
"and": [
{ "math": [ "u_val('size')", "<=", "n_val('size')" ] },
Expand Down Expand Up @@ -1439,8 +1439,8 @@
"id": "tec_judo_break",
"name": "Grab Break",
"messages": [
"The %s tries to grab you, but you break their feeble grapple!",
"The %s tries to grab <npcname>, but they break its feeble grapple!"
"%s tries to grab you, but you break their feeble grapple!",
"%s tries to grab <npcname>, but they break its feeble grapple!"
],
"skill_requirements": [ { "name": "unarmed", "level": 1 } ],
"unarmed_allowed": true,
Expand Down Expand Up @@ -1700,14 +1700,14 @@
{
"type": "technique",
"id": "tec_krav_maga_disarm_simple",
"messages": [ "You quickly slap and disarm the %s!", "<npcname> quickly slaps and disarms the %s!" ],
"messages": [ "You quickly slap and disarm %s!", "<npcname> quickly slaps and disarms %s!" ],
"name": "Disarming Slap",
"skill_requirements": [ { "name": "unarmed", "level": 2 } ],
"melee_allowed": true,
"unarmed_allowed": true,
"mult_bonuses": [ { "stat": "movecost", "scale": 0.9 } ],
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "WEAPON", "HAND" ]
},
{
Expand Down Expand Up @@ -1796,7 +1796,7 @@
"chance": 100,
"duration": 44000,
"on_damage": true,
"message": "The %s's arm is mangled beyond recognition!"
"message": "%s's arm is mangled beyond recognition!"
}
],
"flat_bonuses": [ { "stat": "arpen", "type": "bash", "scaling-stat": "str", "scale": 1.0 } ],
Expand All @@ -1807,7 +1807,7 @@
"type": "technique",
"id": "tec_krav_maga_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you wrestle free!", "The %s tries to grab <npcname>, but they wrestle free!" ],
"messages": [ "%s tries to grab you, but you wrestle free!", "%s tries to grab <npcname>, but they wrestle free!" ],
"skill_requirements": [ { "name": "melee", "level": 3 } ],
"melee_allowed": true,
"unarmed_allowed": true,
Expand Down Expand Up @@ -2090,7 +2090,7 @@
"type": "technique",
"id": "tec_muay_thai_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you break the clinch!", "The %s tries to grab <npcname>, but they break the clinch!" ],
"messages": [ "%s tries to grab you, but you break the clinch!", "%s tries to grab <npcname>, but they break the clinch!" ],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"melee_allowed": true,
Expand Down Expand Up @@ -2228,7 +2228,7 @@
"weighting": 2,
"stun_dur": 2,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s's hand is forced open!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s's hand is forced open!" } ],
"attack_vectors": [ "WEAPON" ],
"attack_vectors_random": [ "HAND", "ELBOW", "LOWER_LEG", "FOOT" ]
},
Expand Down Expand Up @@ -2398,7 +2398,7 @@
"type": "technique",
"id": "tec_pankration_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you wrestle free!", "The %s tries to grab <npcname>, but they wrestle free!" ],
"messages": [ "%s tries to grab you, but you wrestle free!", "%s tries to grab <npcname>, but they wrestle free!" ],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -2429,7 +2429,7 @@
"crit_ok": true,
"weighting": 3,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s's hand is forced open!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s's hand is forced open!" } ],
"flat_bonuses": [ { "stat": "arpen", "type": "bash", "scaling-stat": "str", "scale": 1.0 } ],
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.25 } ],
"attack_vectors": [ "GRAPPLE" ]
Expand Down Expand Up @@ -2597,7 +2597,7 @@
"type": "technique",
"id": "tec_snake_break",
"name": "Snake Slither",
"messages": [ "The %s tries to grab you, but you slither free!", "The %s tries to grab <npcname>, but they slither free!" ],
"messages": [ "%s tries to grab you, but you slither free!", "%s tries to grab <npcname>, but they slither free!" ],
"skill_requirements": [ { "name": "unarmed", "level": 4 } ],
"unarmed_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -2863,7 +2863,7 @@
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "HAND" ]
},
{
Expand Down Expand Up @@ -2995,8 +2995,8 @@
"id": "tec_tiger_break",
"name": "Grab Break",
"messages": [
"The %s tries to grab you, but you are too powerful to be caged!",
"The %s tries to grab <npcname>, but they are too powerful to be caged!"
"%s tries to grab you, but you are too powerful to be caged!",
"%s tries to grab <npcname>, but they are too powerful to be caged!"
],
"unarmed_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -3261,7 +3261,7 @@
"type": "technique",
"id": "tec_zuiquan_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you stumble away!", "The %s tries to grab <npcname>, but they stumble away!" ],
"messages": [ "%s tries to grab you, but you stumble away!", "%s tries to grab <npcname>, but they stumble away!" ],
"skill_requirements": [ { "name": "unarmed", "level": 4 } ],
"unarmed_allowed": true,
"melee_allowed": true,
Expand Down
8 changes: 4 additions & 4 deletions data/mods/MMA/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"messages": [ "You skillfully disarm %s!", "<npcname> skillfully disarms %s!" ],
"unarmed_allowed": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "WEAPON" ]
},
{
Expand Down Expand Up @@ -511,7 +511,7 @@
"melee_allowed": true,
"crit_ok": true,
"disarms": true,
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "The %s is disarmed!" } ],
"tech_effects": [ { "id": "disarmed", "chance": 100, "duration": 400, "on_damage": true, "message": "%s is disarmed!" } ],
"attack_vectors": [ "WEAPON" ]
},
{
Expand Down Expand Up @@ -605,8 +605,8 @@
"id": "mma_tec_tiger_claw_break",
"name": "Wolverine Stance",
"messages": [
"The %s tries to grab you, but you thrash your way to freedom!",
"The %s tries to grab <npcname>, but they thrash their way to freedom!"
"%s tries to grab you, but you thrash your way to freedom!",
"%s tries to grab <npcname>, but they thrash their way to freedom!"
],
"melee_allowed": true,
"unarmed_allowed": true,
Expand Down
Loading