Skip to content

Commit

Permalink
Merge pull request #37680 from Hymore246/TKD-specific-techs
Browse files Browse the repository at this point in the history
Updated new Taekwondo techniques to be style specific
  • Loading branch information
ZhilkinSerg authored Feb 4, 2020
2 parents 94b5d83 + 81a102c commit c132958
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
4 changes: 2 additions & 2 deletions data/json/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -1266,8 +1266,8 @@
"techniques": [
"tec_taekwondo_disarm",
"tec_taekwondo_strong",
"tec_karate_roundhouse",
"tec_capoeira_feint",
"tec_taekwondo_roundhouse",
"tec_taekwondo_feint",
"tec_taekwondo_push",
"tec_taekwondo_sweep"
]
Expand Down
18 changes: 18 additions & 0 deletions data/json/techniques.json
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,24 @@
"crit_ok": true,
"down_dur": 1
},
{
"type": "technique",
"id": "tec_taekwondo_roundhouse",
"name": "Roundhouse Kick",
"messages": [ "You roundhouse kick %s", "<npcname> roundhouse kicks %s" ],
"unarmed_allowed": true,
"mult_bonuses": [ [ "damage", "bash", 1.2 ] ]
},
{
"type": "technique",
"id": "tec_taekwondo_feint",
"name": "Feint",
"messages": [ "You fake a kick at %s", "<npcname> fakes a kick at %s" ],
"skill_requirements": [ { "name": "unarmed", "level": 3 } ],
"unarmed_allowed": true,
"defensive": true,
"miss_recovery": true
},
{
"type": "technique",
"id": "tec_taichi_disarm",
Expand Down

0 comments on commit c132958

Please sign in to comment.