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

fix: martial arts damage buffs apply to all damage types #3728

Merged
merged 4 commits into from
Nov 26, 2023
Merged

fix: martial arts damage buffs apply to all damage types #3728

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f339ba
Gave stab and cut damage to all unarmed martial arts
yay855 Nov 20, 2023
661437b
style(autofix.ci): automated formatting
autofix-ci[bot] Nov 20, 2023
9d7bacb
Update data/json/martialarts.json
chaosvolt Nov 21, 2023
461dedd
Edited descriptions
yay855 Nov 26, 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
72 changes: 61 additions & 11 deletions data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,14 @@
"name": "Boxing Stance",
"description": "A solid stance allows you block more damage than normal and deliver better punches.\n\n+2 Bash damage, Blocked damge reduced by 50% of Strength.",
"unarmed_allowed": true,
"flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.5 }, { "stat": "damage", "type": "bash", "scale": 2.0 } ]
"flat_bonuses": [
{ "stat": "block", "scaling-stat": "str", "scale": 0.5 },
{ "stat": "damage", "type": "bash", "scale": 2.0 },
{ "stat": "block", "scaling-stat": "str", "scale": 0.5 },
{ "stat": "damage", "type": "cut", "scale": 2.0 },
{ "stat": "block", "scaling-stat": "str", "scale": 0.5 },
{ "stat": "damage", "type": "stab", "scale": 2.0 }
scarf005 marked this conversation as resolved.
Show resolved Hide resolved
chaosvolt marked this conversation as resolved.
Show resolved Hide resolved
]
}
],
"onmove_buffs": [
Expand All @@ -180,7 +187,11 @@
"skill_requirements": [ { "name": "unarmed", "level": 5 } ],
"unarmed_allowed": true,
"buff_duration": 1,
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.25 } ]
"mult_bonuses": [
{ "stat": "damage", "type": "bash", "scale": 1.25 },
{ "stat": "damage", "type": "cut", "scale": 1.25 },
{ "stat": "damage", "type": "stab", "scale": 1.25 }
]
}
],
"techniques": [ "tec_boxing_rapid", "tec_boxing_cross", "tec_boxing_upper", "tec_boxing_counter" ]
Expand Down Expand Up @@ -234,7 +245,11 @@
"skill_requirements": [ { "name": "unarmed", "level": 1 } ],
"buff_duration": 2,
"max_stacks": 3,
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.15 } ]
"mult_bonuses": [
{ "stat": "damage", "type": "bash", "scale": 1.15 },
{ "stat": "damage", "type": "cut", "scale": 1.15 },
{ "stat": "damage", "type": "stab", "scale": 1.15 }
]
}
],
"onmove_buffs": [
Expand Down Expand Up @@ -272,7 +287,11 @@
"unarmed_allowed": true,
"flat_bonuses": [
{ "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 },
{ "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 }
{ "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 },
{ "stat": "damage", "type": "cut", "scaling-stat": "dex", "scale": 0.75 },
{ "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": -0.75 },
{ "stat": "damage", "type": "stab", "scaling-stat": "dex", "scale": 0.75 },
{ "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": -0.75 }
]
}
],
Expand Down Expand Up @@ -326,7 +345,12 @@
"unarmed_allowed": true,
"skill_requirements": [ { "name": "unarmed", "level": 1 } ],
"buff_duration": 1,
"flat_bonuses": [ { "stat": "hit", "scale": 1.0 }, { "stat": "damage", "type": "bash", "scale": 2.0 } ]
"flat_bonuses": [
{ "stat": "hit", "scale": 1.0 },
{ "stat": "damage", "type": "bash", "scale": 2.0 },
{ "stat": "damage", "type": "cut", "scale": 2.0 },
{ "stat": "damage", "type": "stab", "scale": 2.0 }
]
}
],
"techniques": [ "tec_dragon_claw", "tec_dragon_blockcounter", "tec_dragon_dodgecounter", "tec_dragon_tail", "tec_dragon_strike" ]
Expand Down Expand Up @@ -606,7 +630,11 @@
"unarmed_allowed": true,
"flat_bonuses": [
{ "stat": "damage", "type": "bash", "scaling-stat": "dex", "scale": 0.75 },
{ "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 }
{ "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": -0.75 },
{ "stat": "damage", "type": "cut", "scaling-stat": "dex", "scale": 0.75 },
{ "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": -0.75 },
{ "stat": "damage", "type": "stab", "scaling-stat": "dex", "scale": 0.75 },
{ "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": -0.75 }
]
},
{
Expand Down Expand Up @@ -722,6 +750,8 @@
"buff_duration": 5,
"flat_bonuses": [
{ "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": 0.25 },
{ "stat": "damage", "type": "cut", "scaling-stat": "str", "scale": 0.25 },
{ "stat": "damage", "type": "stab", "scaling-stat": "str", "scale": 0.25 },
{ "stat": "block", "scaling-stat": "str", "scale": 0.5 }
]
}
Expand Down Expand Up @@ -821,6 +851,7 @@
"flat_bonuses": [
{ "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 },
{ "stat": "arpen", "type": "bash", "scaling-stat": "per", "scale": 0.5 },
{ "stat": "arpen", "type": "stab", "scaling-stat": "per", "scale": 0.5 },
{ "stat": "block", "scaling-stat": "per", "scale": 1.0 }
]
}
Expand All @@ -846,7 +877,8 @@
"flat_bonuses": [
{ "stat": "dodge", "scale": -1.0 },
{ "stat": "damage", "type": "cut", "scale": -1.0 },
{ "stat": "damage", "type": "bash", "scale": -1.0 }
{ "stat": "damage", "type": "bash", "scale": -1.0 },
{ "stat": "damage", "type": "stab", "scale": -1.0 }
]
}
],
Expand Down Expand Up @@ -890,7 +922,11 @@
"skill_requirements": [ { "name": "unarmed", "level": 1 } ],
"unarmed_allowed": true,
"buff_duration": 1,
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.1 } ]
"mult_bonuses": [
{ "stat": "damage", "type": "bash", "scale": 1.1 },
{ "stat": "damage", "type": "cut", "scale": 1.1 },
{ "stat": "damage", "type": "stab", "scale": 1.1 }
]
}
],
"onhit_buffs": [
Expand All @@ -902,7 +938,11 @@
"unarmed_allowed": true,
"req_buffs": [ "buff_pankration_ondodge" ],
"buff_duration": 1,
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.2 } ]
"mult_bonuses": [
{ "stat": "damage", "type": "bash", "scale": 1.2 },
{ "stat": "damage", "type": "cut", "scale": 1.2 },
{ "stat": "damage", "type": "stab", "scale": 1.2 }
]
}
],
"techniques": [
Expand Down Expand Up @@ -1054,7 +1094,11 @@
"name": "Unhindered",
"description": "Your attacks are stronger if you are not holding anything in your hands.\n\n+33% bash damage when not using a weapon.",
"unarmed_allowed": true,
"mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.33 } ]
"mult_bonuses": [
{ "stat": "damage", "type": "bash", "scale": 1.33 },
{ "stat": "damage", "type": "cut", "scale": 1.33 },
{ "stat": "damage", "type": "stab", "scale": 1.33 }
]
}
],
"techniques": [
Expand Down Expand Up @@ -1094,6 +1138,8 @@
"buff_duration": 2,
"flat_bonuses": [
{ "stat": "arpen", "type": "bash", "scaling-stat": "per", "scale": 0.5 },
{ "stat": "arpen", "type": "cut", "scaling-stat": "per", "scale": 0.5 },
{ "stat": "arpen", "type": "stab", "scaling-stat": "per", "scale": 0.5 },
{ "stat": "hit", "scaling-stat": "per", "scale": 0.2 }
]
}
Expand Down Expand Up @@ -1309,7 +1355,11 @@
"unarmed_allowed": true,
"buff_duration": 2,
"max_stacks": 5,
"flat_bonuses": [ { "stat": "damage", "type": "bash", "scale": 2.0 } ]
"flat_bonuses": [
{ "stat": "damage", "type": "bash", "scale": 2.0 },
{ "stat": "damage", "type": "cut", "scale": 2.0 },
{ "stat": "damage", "type": "stab", "scale": 2.0 }
]
}
],
"onkill_buffs": [
Expand Down
Loading