Skip to content

Commit

Permalink
Misc fixes for martial arts techniques (CleverRaven#69111)
Browse files Browse the repository at this point in the history
* Correct double "the" in martial arts techniques

* Linting

* Takedown working for Ninjutsu

* Messages rewrite

* Linting

* Missing documentation
  • Loading branch information
Termineitor244 authored Nov 5, 2023
1 parent cbe4fb8 commit e21fcd9
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 44 deletions.
1 change: 1 addition & 0 deletions data/json/martialarts.json
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
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

0 comments on commit e21fcd9

Please sign in to comment.