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 Aikido #32423

Merged
merged 5 commits into from
Jul 21, 2019
Merged

Martial Arts Rebalance for Aikido #32423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7df0372
Martial Arts Rebalance: Aikido
Hymore246 Jul 15, 2019
ed465cd
Astyle fix
Hymore246 Jul 16, 2019
7343e35
Removed duplicate field that was breaking astyle
Hymore246 Jul 16, 2019
71854f1
fixed another astyle issue
Hymore246 Jul 16, 2019
2356daf
balance check 1
Hymore246 Jul 18, 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
67 changes: 45 additions & 22 deletions data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,51 @@
"leg_block": 99,
"force_unarmed": true
},
{
"type": "martial_art",
"id": "style_aikido",
"name": "Aikido",
"description": "Aikido is a Japanese martial art focused on self-defense, while minimizing injury to the attacker. It uses defensive throws and disarms but lacks offensive tehcniques.",
"initiate": [ "You enter the hamni stance.", "%s changes into a relaxed combat posture." ],
"learn_difficulty": 5,
"arm_block": 0,
"static_buffs": [
{
"id": "buff_aikido_static1",
"name": "Aikido Stance",
"description": "By disregarding offensive in favor of self-defense, you are better at protecting. Blocked damage reduced by 100%% of Dexterity.",
"unarmed_allowed": true,
"min_unarmed": 0,
"flat_bonuses": [ [ "block", "dex", 1.0 ] ]
},
{
"id": "buff_aikido_static2",
"name": "Intermediate Aikido",
"description": "An intermediate aikido practitioner can protect themselves against multiple opponents.\n\n+1 Block attempts, +1 Dodge attempts.",
"unarmed_allowed": true,
"min_unarmed": 3,
"bonus_dodges": 1,
"bonus_blocks": 1,
"flat_bonuses": [ [ "block", "dex", 1.0 ] ]
},
{
"id": "buff_aikido_static3",
"name": "Advanced Aikido",
"description": "An advanced aikido practitioner can protect themselves against even more opponents than normal.\n\n+1 Block attempts, +1 Dodge attempts.",
"unarmed_allowed": true,
"min_unarmed": 5,
"bonus_dodges": 1,
"bonus_blocks": 1
}
],
"techniques": [
"tec_aikido_break",
"tec_aikido_dodgedisarm",
"tec_aikido_blockdisarm",
"tec_aikido_dodgethrow",
"tec_aikido_blockthrow"
]
},
{
"type": "martial_art",
"id": "style_brawling",
Expand Down Expand Up @@ -54,28 +99,6 @@
],
"techniques": [ "tec_karate_rapid", "tec_karate_precise" ]
},
{
"type": "martial_art",
"id": "style_aikido",
"name": "Aikido",
"description": "Aikido is a Japanese martial art focused on self-defense, while minimizing injury to the attacker. It uses defensive throws and disarms. Damage done while using this technique is halved, but pain inflicted is doubled.",
"initiate": [ "You enter the hamni stance.", "%s changes into a combat posture." ],
"learn_difficulty": 5,
"arm_block": 99,
"leg_block": 99,
"static_buffs": [
{
"id": "aikido_half_damage",
"name": "Aikido",
"unarmed_allowed": true,
"mult_bonuses": [ [ "damage", "bash", 0.5 ] ],
"min_unarmed": 0,
"buff_duration": 2,
"description": "Half damage to enemies."
}
],
"techniques": [ "tec_aikido_feint", "tec_aikido_disarm", "tec_aikido_throw", "tec_aikido_dodgethrow" ]
},
{
"type": "martial_art",
"id": "style_boxing",
Expand Down
112 changes: 67 additions & 45 deletions data/json/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,73 @@
"messages": [ "You jab deftly at %s", "<npcname> jabs deftly at %s" ],
"stun_dur": 2
},
{
"type": "technique",
"id": "tec_aikido_blockdisarm",
"name": "Block Counter Disarm",
"messages": [ "You block and smoothly disarm %s", "<npcname> blocks and smoothly disarms %s" ],
"min_unarmed": 4,
"unarmed_allowed": true,
"block_counter": true,
"crit_ok": true,
"disarms": true,
"down_dur": 1,
"knockback_dist": 1,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_aikido_blockthrow",
"name": "Block Counter Throw",
"messages": [ "You block and smoothly throw %s", "<npcname> blocks and smoothly throws %s" ],
"min_unarmed": 0,
"unarmed_allowed": true,
"block_counter": true,
"crit_ok": true,
"down_dur": 1,
"knockback_dist": 1,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_aikido_dodgethrow",
"name": "Dodge Counter Throw",
"messages": [ "You dodge and smoothly throw %s", "<npcname> dodges and smoothly throws %s" ],
"min_unarmed": 2,
"unarmed_allowed": true,
"dodge_counter": true,
"crit_ok": true,
"down_dur": 1,
"knockback_dist": 1,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_aikido_dodgedisarm",
"name": "Dodge Counter Disarm",
"messages": [ "You dodge and smoothly disarm %s", "<npcname> dodges and smoothly disarms %s" ],
"min_unarmed": 4,
"unarmed_allowed": true,
"dodge_counter": true,
"crit_ok": true,
"disarms": true,
"down_dur": 1,
"knockback_dist": 1,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_aikido_break",
"name": "Grab Break",
"messages": [
"The %s tries to grab you, but you smoothly break free!",
"The %s tries to grab <npcname>, but they smoothly break free!"
],
"min_unarmed": 3,
"unarmed_allowed": true,
"defensive": true,
"grab_break": true
},
{
"type": "technique",
"id": "tec_boxing_cross",
Expand Down Expand Up @@ -270,50 +337,6 @@
"messages": [ "You karate chop %s", "<npcname> karate chops %s" ],
"stun_dur": 2
},
{
"type": "technique",
"id": "tec_aikido_throw",
"name": "throw",
"min_unarmed": 2,
"unarmed_allowed": true,
"down_dur": 1,
"knockback_dist": 1,
"knockback_spread": 1,
"messages": [ "You throw %s", "<npcname> throws %s" ]
},
{
"type": "technique",
"id": "tec_aikido_dodgethrow",
"name": "dodge throw",
"min_unarmed": 6,
"unarmed_allowed": true,
"dodge_counter": true,
"crit_ok": true,
"down_dur": 1,
"knockback_dist": 1,
"knockback_spread": 1,
"mult_bonuses": [ [ "movecost", 0.0 ] ],
"messages": [ "You smoothly throw %s", "<npcname> smoothly throws %s" ]
},
{
"type": "technique",
"id": "tec_aikido_feint",
"name": "feint at",
"min_unarmed": 2,
"unarmed_allowed": true,
"defensive": true,
"miss_recovery": true,
"messages": [ "You feint at %s", "<npcname> feints at %s" ]
},
{
"type": "technique",
"id": "tec_aikido_disarm",
"name": "disarm",
"min_unarmed": 3,
"unarmed_allowed": true,
"disarms": true,
"messages": [ "You disarm %s", "<npcname> disarms %s" ]
},
{
"type": "technique",
"id": "tec_pankration_kick",
Expand Down Expand Up @@ -1031,7 +1054,6 @@
"messages": [ "You strike at %s's weaknesses", "<npcname> strikes %s's weaknesses" ],
"//": "Damage bonus plus Quick is severely powerful--generi-Quick takes a damage nerf.",
"mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 1.5 ], [ "damage", "cut", 1.5 ] ],
"//": "Minimum effective time for a status in combat is two turns, as you have one deducted on the same turn its applied.",
"stun_dur": 2
},
{
Expand Down