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

Martial Arts Rebalance for Brawling #32773

Merged
merged 2 commits into from
Aug 2, 2019
Merged

Martial Arts Rebalance for Brawling #32773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f01dc
Martial Arts Rebalance for Brawling
Hymore246 Jul 30, 2019
5062cc4
Astyle fix
Hymore246 Jul 30, 2019
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
19 changes: 15 additions & 4 deletions data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,24 @@
"type": "martial_art",
"id": "style_brawling",
"name": "Brawling",
"description": "You're used to hand-to-creature fighting. Not stylish or sporting, but it gets the job done.",
"description": "You're used to hand-to-creature fighting. You know how to fight when unarmed or with any weapon to a certain extent. It's not stylish or sporting, but it gets the job done.",
"initiate": [ "You grit your teeth and prepare for a good fight.", "%s gets ready to brawl." ],
"autolearn": [ [ "unarmed", "2" ] ],
"arm_block": -1,
"autolearn": [ [ "melee", "1" ] ],
"arm_block": 1,
"leg_block": 7,
"allow_melee": true,
"techniques": [ "tec_brawl_feint", "tec_brawl_power", "tec_brawl_trip", "tec_brawl_counter" ]
"techniques": [
"tec_brawl_disarm_unarmed",
"tec_brawl_feint_unarmed",
"tec_brawl_counter_unarmed",
"tec_brawl_break_unarmed",
"tec_brawl_power",
"tec_brawl_trip",
"tec_brawl_disarm_melee",
"tec_brawl_counter_melee",
"tec_brawl_feint_melee",
"tec_brawl_break_melee"
]
},
{
"type": "martial_art",
Expand Down
147 changes: 102 additions & 45 deletions data/json/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,108 @@
"stun_dur": 1,
"mult_bonuses": [ [ "damage", "bash", 1.4 ] ]
},
{
"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!" ],
"min_melee": 6,
"melee_allowed": true,
"defensive": true,
"grab_break": true
},
{
"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!" ],
"min_unarmed": 6,
"unarmed_allowed": true,
"defensive": true,
"grab_break": true
},
{
"type": "technique",
"id": "tec_brawl_counter_melee",
"name": "Hit Them Back",
"messages": [ "You catch %s's attack, and hit back", "<npcname> catches %s, and counters" ],
"min_melee": 5,
"melee_allowed": true,
"block_counter": true,
"crit_ok": true,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_brawl_counter_unarmed",
"name": "Hit Them Back",
"messages": [ "You catch %s's attack, and hit back", "<npcname> catches %s, and counters" ],
"min_unarmed": 5,
"unarmed_allowed": true,
"block_counter": true,
"crit_ok": true,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_brawl_feint_melee",
"name": "Feint",
"messages": [ "You fake a strike at %s", "<npcname> fakes a strike at %s" ],
"min_melee": 3,
"melee_allowed": true,
"defensive": true,
"miss_recovery": true
},
{
"type": "technique",
"id": "tec_brawl_feint_unarmed",
"name": "Feint",
"messages": [ "You fake a strike at %s", "<npcname> fakes a strike at %s" ],
"min_unarmed": 3,
"unarmed_allowed": true,
"defensive": true,
"miss_recovery": true
},
{
"type": "technique",
"id": "tec_brawl_disarm_melee",
"name": "Disarm",
"messages": [ "You knock %s's weapon away", "<npcname> knock %s's weapon away" ],
"min_melee": 8,
"melee_allowed": true,
"disarms": true,
"crit_ok": true
},
{
"type": "technique",
"id": "tec_brawl_disarm_unarmed",
"name": "Disarm",
"messages": [ "You knock %s's weapon away", "<npcname> knock %s's weapon away" ],
"min_unarmed": 8,
"unarmed_allowed": true,
"disarms": true,
"crit_ok": true
},
{
"type": "technique",
"id": "tec_brawl_power",
"name": "Power Hit",
"messages": [ "You send %s reeling", "<npcname> sends %s reeling" ],
"min_unarmed": 4,
"unarmed_allowed": true,
"crit_tec": true,
"knockback_dist": 1,
"stun_dur": 1
},
{
"type": "technique",
"id": "tec_brawl_trip",
"name": "Trip",
"messages": [ "You trip %s", "<npcname> trip %s" ],
"min_unarmed": 5,
"unarmed_allowed": true,
"down_dur": 1
},
{
"type": "technique",
"id": "tec_karate_rapid",
Expand Down Expand Up @@ -914,51 +1016,6 @@
"messages": [ "You strike out at %s", "<npcname> strikes out at %s" ],
"stun_dur": 2
},
{
"type": "technique",
"id": "tec_brawl_feint",
"name": "Feint",
"min_unarmed": 3,
"unarmed_allowed": true,
"melee_allowed": true,
"defensive": true,
"miss_recovery": true,
"messages": [ "You fake a strike at %s", "<npcname> feints at %s" ]
},
{
"type": "technique",
"id": "tec_brawl_power",
"name": "Power Hit",
"min_unarmed": 4,
"unarmed_allowed": true,
"melee_allowed": true,
"crit_tec": true,
"stun_dur": 1,
"knockback_dist": 1,
"messages": [ "You send %s reeling", "<npcname> sends %s reeling" ]
},
{
"type": "technique",
"id": "tec_brawl_counter",
"name": "Hit Them Back",
"min_unarmed": 5,
"unarmed_allowed": true,
"block_counter": true,
"melee_allowed": true,
"crit_ok": true,
"mult_bonuses": [ [ "movecost", 0.0 ] ],
"messages": [ "You catch %s's attack, and hit back", "<npcname> catches %s, and counters" ]
},
{
"type": "technique",
"id": "tec_brawl_trip",
"name": "Trip",
"min_unarmed": 5,
"unarmed_allowed": true,
"melee_allowed": true,
"down_dur": 2,
"messages": [ "You trip %s", "<npcname> trips %s" ]
},
{
"type": "technique",
"id": "niten_water_cut",
Expand Down