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

Jump to bottom

Martial Arts Rebalance for Krav Maga #33602

Merged
merged 1 commit into from
Sep 4, 2019
Merged

Martial Arts Rebalance for Krav Maga #33602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
129 changes: 92 additions & 37 deletions data/json/martialarts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,98 @@
],
"techniques": [ "tec_karate_rapid", "tec_karate_precise", "tec_karate_roundhouse", "tec_karate_counter" ]
},
{
"type": "martial_art",
"id": "style_krav_maga",
"name": "Krav Maga",
"description": "Originating in Israel, Krav Maga is based on taking down an enemy quickly and effectively. It focuses on applicable attacks rather than showy or complex moves. Popular among police and armed forces everywhere.",
"initiate": [ "You assume a practical combat stance.", "%s assumes a practical combat stance." ],
"learn_difficulty": 6,
"arm_block": 2,
"leg_block": 4,
"static_buffs": [
{
"id": "buff_krav_maga_static1",
"name": "Krav Maga Stance",
"description": "Your training makes it easier to land hits and fight multiple opponents.\n\n+1 Accuracy, +1 Block attempts.",
"min_unarmed": 0,
"melee_allowed": true,
"unarmed_allowed": true,
"bonus_blocks": 1,
"flat_bonuses": [ [ "hit", 1.0 ] ]
}
],
"techniques": [
"tec_krav_maga_rapid",
"tec_krav_maga_crit",
"tec_krav_maga_takedown",
"tec_krav_maga_disarm",
"tec_krav_maga_break",
"tec_krav_maga_counter"
],
"weapons": [
"baton-extended",
"copper_knife",
"cudgel",
"diveknife",
"honey_scraper",
"knife_combat",
"knife_hunting",
"knife_rambo",
"knife_rm42",
"knife_trench",
"makeshift_knife",
"PR24-extended",
"shocktonfa_off",
"shocktonfa_on",
"switchblade",
"tonfa",
"tonfa_wood",
"fn1910",
"fn57",
"glock_17",
"glock_18c",
"glock_19",
"glock_22",
"glock_31",
"l_lookout_9mm",
"l_mp_9mm",
"l_sp_9mm",
"m17",
"m1911",
"m1911a1_38super",
"needlepistol",
"sw_22",
"p226_357sig",
"p320_357sig",
"sig_40",
"sig_p230",
"sig_mosquito",
"tokarev",
"usp_45",
"usp_9mm",
"walther_ppk",
"ar10",
"ar15",
"ar15_retool_300blk",
"fn_fal",
"scar_l",
"hk_g3",
"hk_g36",
"l_car_223",
"l_dsr_223",
"l_lmg_223",
"l_mbr_223",
"m14ebr",
"M24",
"m27iar",
"rm51_assault_rifle",
"rm88_battle_rifle",
"sig552",
"sks",
"steyr_aug"
]
},
{
"type": "martial_art",
"id": "style_tai_chi",
Expand All @@ -570,43 +662,6 @@
],
"techniques": [ "tec_taichi_disarm", "tec_taichi_precise" ]
},
{
"type": "martial_art",
"id": "style_krav_maga",
"name": "Krav Maga",
"description": "Originating in Israel, Krav Maga is based on taking down an enemy quickly and effectively. It focuses on applicable attacks rather than showy or complex moves. Popular among police and armed forces everywhere.",
"initiate": [ "You prepare for simultaneous attack and defense.", "%s prepares for simultaneous attack and defense." ],
"learn_difficulty": 6,
"arm_block": 2,
"leg_block": 4,
"static_buffs": [
{
"id": "krav_maga_static",
"name": "Krav Maga Hand-to-Hand",
"unarmed_allowed": true,
"min_unarmed": 0,
"flat_bonuses": [ [ "damage", "bash", "str", 0.2 ] ],
"description": "Increased unarmed power."
},
{
"id": "krav_maga_static_edged",
"name": "Krav Maga Edged",
"melee_allowed": true,
"min_unarmed": 0,
"mult_bonuses": [ [ "damage", "stab", 1.2 ] ],
"description": "Increased stabbing damage."
}
],
"techniques": [
"tec_krav_maga_rapid",
"tec_krav_maga_feint",
"tec_krav_maga_precise",
"tec_krav_maga_disarm",
"tec_krav_maga_grab",
"tec_krav_maga_break"
],
"weapons": [ "PR24-extended", "tonfa", "tonfa_wood", "shocktonfa_off", "shocktonfa_on" ]
},
{
"type": "martial_art",
"id": "style_muay_thai",
Expand Down
129 changes: 71 additions & 58 deletions data/json/techniques.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,77 @@
"unarmed_allowed": true,
"mult_bonuses": [ [ "damage", "bash", 1.2 ] ]
},
{
"type": "technique",
"id": "tec_krav_maga_rapid",
"messages": [ "You jab at %s", "<npcname> jabs at %s" ],
"name": "Jab",
"min_unarmed": 1,
"melee_allowed": true,
"unarmed_allowed": true,
"mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]
},
{
"type": "technique",
"id": "tec_krav_maga_crit",
"name": "Cheapshot",
"messages": [ "You hit %s where it hurts", "<npcname> hits %s with a cheapshot" ],
"min_unarmed": 2,
"melee_allowed": true,
"unarmed_allowed": true,
"crit_tec": true,
"stun_dur": 1
},
{
"type": "technique",
"id": "tec_krav_maga_takedown",
"name": "Takedown",
"messages": [ "You force %s to the ground", "<npcname> forces %s to the ground" ],
"min_unarmed": 3,
"melee_allowed": true,
"unarmed_allowed": true,
"crit_ok": true,
"down_dur": 1
},
{
"type": "technique",
"id": "tec_krav_maga_disarm",
"name": "Bone Breaker",
"messages": [ "*CRACK!* You brutally maim %s's arm", "*CRACK!* <npcname> brutally maims %s's arm" ],
"min_unarmed": 5,
"unarmed_allowed": true,
"weighting": 3,
"crit_ok": true,
"downed_target": true,
"stunned_target": true,
"disarms": true,
"stun_dur": 3,
"flat_bonuses": [ [ "arpen", "bash", "str", 1.0 ] ],
"mult_bonuses": [ [ "damage", "bash", 3.0 ] ]
},
{
"type": "technique",
"id": "tec_krav_maga_break",
"name": "Grab Break",
"messages": [ "The %s tries to grab you, but you wrestle free!", "The %s tries to grab <npcname>, but they wrestle free!" ],
"min_unarmed": 3,
"melee_allowed": true,
"unarmed_allowed": true,
"defensive": true,
"grab_break": true
},
{
"type": "technique",
"id": "tec_krav_maga_counter",
"name": "Counter",
"messages": [ "You block and counter %s", "<npcname> blocks and counters %s" ],
"min_unarmed": 4,
"melee_allowed": true,
"unarmed_allowed": true,
"crit_ok": true,
"block_counter": true,
"mult_bonuses": [ [ "movecost", 0.0 ] ]
},
{
"type": "technique",
"id": "tec_pankration_kick",
Expand Down Expand Up @@ -973,64 +1044,6 @@
"messages": [ "You flying knee %s", "<npcname> flying knees %s" ],
"stun_dur": 2
},
{
"type": "technique",
"id": "tec_krav_maga_rapid",
"name": "quick punch",
"min_unarmed": 2,
"unarmed_allowed": true,
"messages": [ "You quickly punch %s", "<npcname> quickly punches %s" ],
"mult_bonuses": [ [ "movecost", 0.5 ], [ "damage", "bash", 0.66 ], [ "damage", "cut", 0.66 ], [ "damage", "stab", 0.66 ] ]
},
{
"type": "technique",
"id": "tec_krav_maga_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_krav_maga_precise",
"name": "precise strike",
"min_unarmed": 3,
"unarmed_allowed": true,
"crit_tec": true,
"messages": [ "You jab %s", "<npcname> jabs %s" ],
"stun_dur": 2
},
{
"type": "technique",
"id": "tec_krav_maga_disarm",
"name": "disarm",
"min_unarmed": 3,
"unarmed_allowed": true,
"disarms": true,
"messages": [ "You disarm %s", "<npcname> disarms %s" ]
},
{
"type": "technique",
"id": "tec_krav_maga_grab",
"name": "grab",
"min_unarmed": 4,
"unarmed_allowed": true,
"down_dur": 1,
"messages": [ "You grab %s", "<npcname> grabs %s" ]
},
{
"type": "technique",
"id": "tec_krav_maga_break",
"name": "grab break",
"min_unarmed": 4,
"unarmed_allowed": true,
"melee_allowed": true,
"defensive": true,
"grab_break": true,
"messages": [ "The %s tries to grab you, but you break its grab!", "The %s tries to grab <npcname>, but they break its grab!" ]
},
{
"type": "technique",
"id": "tec_ninjutsu_precise",
Expand Down