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 all commits
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
1 change: 1 addition & 0 deletions data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@
"tec_ninjutsu_swift",
"tec_ninjutsu_swift_crit",
"tec_ninjutsu_takedown",
"tec_ninjutsu_takedown_melee",
"tec_ninjutsu_precise",
"tec_ninjutsu_staffdown",
"tec_ninjutsu_downkill"
Expand Down
27 changes: 23 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,15 @@
"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": "The weapon of %s has been forced out ot their hands!"
}
],
"stun_dur": 1,
"attack_vectors": [ "HAND" ]
},
Expand Down Expand Up @@ -465,7 +473,10 @@
"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": [
"You were almost grabbed by %s, but you outmaneuver it!",
"<npcname> was almost grabbed by %s, but they outmaneuver it!"
],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"melee_allowed": true,
Expand Down Expand Up @@ -627,7 +638,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": [ "You were almost grabbed by %s, but you skitter free!", "<npcname> was almost grabbed by %s, but they skitter free!" ],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"defensive": true,
Expand Down Expand Up @@ -669,7 +680,15 @@
"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": "The weapon of %s has been forced out ot their hands!"
}
],
"attack_vectors": [ "HAND" ]
}
]
Loading
Loading