diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 420ca75723fc8..15d9d0d405033 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -1013,72 +1013,70 @@ "wakizashi_fake" ] }, - { - "type": "martial_art", - "id": "style_tai_chi", - "name": "Tai Chi", - "description": "Though Tai Chi is often seen as a form of mental and physical exercise, it is a legitimate martial art, focused on self-defense. Its ability to absorb the force of an attack makes your Perception decrease damage further on a block.", - "initiate": [ "You settle into a gentle stance and prepare to defend yourself.", "%s settles into a gentle stance." ], - "learn_difficulty": 4, - "arm_block": 1, - "leg_block": 99, - "static_buffs": [ - { - "id": "tai_chi_block", - "name": "Tai Chi", - "unarmed_allowed": true, - "min_unarmed": 0, - "buff_duration": 2, - "flat_bonuses": [ [ "block", "per", 1.0 ] ], - "description": "+1 Block. Perception decreases damage when blocking.", - "bonus_blocks": 1 - } - ], - "techniques": [ "tec_taichi_disarm", "tec_taichi_precise" ] - }, { "type": "martial_art", "id": "style_pankration", "name": "Pankration", - "description": "An ancient Greek martial art, combining boxing and wrestling techniques to create a brutal sport, though modern revival of the art is less of no-holds-barred in nature.", + "description": "An ancient Greek martial art once used by the Spartans. It combines boxing and wrestling techniques to create a brutal sport, though modern revival of the art is less of no-holds-barred in nature.", "initiate": [ "You crouch slightly and prepare to rush forward.", "%s crouches slightly, ready to rush forward." ], "learn_difficulty": 3, "arm_block": 2, "leg_block": 4, "ondodge_buffs": [ { - "id": "pankration_counter", + "id": "buff_pankration_ondodge", "name": "Counter Chance", - "description": "The enemy has presented an opening in their defense.", - "min_unarmed": 4, + "description": "The enemy has presented an opening in their defense.\n+10%% bash damage. Enables \"Close Combat\" buff.\nLasts 1 turn.", + "min_unarmed": 1, "unarmed_allowed": true, - "max_stacks": 1, - "buff_duration": 2, + "buff_duration": 1, "mult_bonuses": [ [ "damage", "bash", 1.1 ] ] } ], "onhit_buffs": [ { - "id": "pankration_grappling", - "name": "Grappling", - "description": "I have you now!", + "id": "buff_pankration_oncrit", + "name": "Close Combat", + "description": "You got your opponent right where you want them!\n\n+20%% bash damage.\nLasts 1 turn.", + "min_unarmed": 4, "unarmed_allowed": true, - "min_unarmed": 5, - "req_buffs": [ "pankration_counter" ], - "buff_duration": 2, - "max_stacks": 1, + "req_buffs": [ "buff_pankration_ondodge" ], + "buff_duration": 1, "mult_bonuses": [ [ "damage", "bash", 1.2 ] ] } ], "techniques": [ + "tec_pankration_cross", "tec_pankration_kick", "tec_pankration_break", - "tec_pankration_counter", - "tec_pankration_disarm", - "tec_pankration_throw", - "tec_pankration_chokehold" + "tec_pankration_grabknee", + "tec_pankration_grabdisarm", + "tec_pankration_grabthrow" ] }, + { + "type": "martial_art", + "id": "style_tai_chi", + "name": "Tai Chi", + "description": "Though Tai Chi is often seen as a form of mental and physical exercise, it is a legitimate martial art, focused on self-defense. Its ability to absorb the force of an attack makes your Perception decrease damage further on a block.", + "initiate": [ "You settle into a gentle stance and prepare to defend yourself.", "%s settles into a gentle stance." ], + "learn_difficulty": 4, + "arm_block": 1, + "leg_block": 99, + "static_buffs": [ + { + "id": "tai_chi_block", + "name": "Tai Chi", + "unarmed_allowed": true, + "min_unarmed": 0, + "buff_duration": 2, + "flat_bonuses": [ [ "block", "per", 1.0 ] ], + "description": "+1 Block. Perception decreases damage when blocking.", + "bonus_blocks": 1 + } + ], + "techniques": [ "tec_taichi_disarm", "tec_taichi_precise" ] + }, { "type": "martial_art", "id": "style_taekwondo", diff --git a/data/json/techniques.json b/data/json/techniques.json index 2a8efae7b6d11..8506e83741cc6 100644 --- a/data/json/techniques.json +++ b/data/json/techniques.json @@ -1167,75 +1167,73 @@ "miss_recovery": true, "mult_bonuses": [ [ "movecost", 0.8 ] ] }, + { + "type": "technique", + "id": "tec_pankration_cross", + "name": "Cross", + "messages": [ "You throw a heavy cross at %s", " throws a cross at %s" ], + "unarmed_allowed": true, + "mult_bonuses": [ [ "damage", "bash", 1.2 ] ] + }, { "type": "technique", "id": "tec_pankration_kick", - "name": "kick", - "min_unarmed": 3, + "name": "Kick", + "messages": [ "You kick %s hard", " kicks %s hard" ], + "min_unarmed": 2, "unarmed_allowed": true, "crit_tec": true, - "messages": [ "You kick %s", " kicks %s" ], - "stun_dur": 1 + "stun_dur": 2 }, { "type": "technique", "id": "tec_pankration_break", - "name": "grab break", + "name": "Grab Break", + "messages": [ "The %s tries to grab you, but you wrestle free!", "The %s tries to grab , but they wrestle free!" ], "min_unarmed": 3, "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 , but they break its grab!" ] + "grab_break": true }, { "type": "technique", - "id": "tec_pankration_counter", - "name": "counter-grab", - "min_unarmed": 4, + "id": "tec_pankration_grabknee", + "name": "Grab and Knee", + "messages": [ "You grab and knee %s", " grabs and knees %s" ], + "min_unarmed": 3, "unarmed_allowed": true, - "req_buffs": [ "pankration_counter" ], - "messages": [ "You counter and grab %s", " counters and grabs %s" ], - "mult_bonuses": [ [ "movecost", 0.5 ] ], - "stun_dur": 2, - "down_dur": 1 + "stunned_target": true, + "weighting": 3, + "mult_bonuses": [ [ "movecost", 0.5 ] ] }, { "type": "technique", - "id": "tec_pankration_disarm", - "name": "arm lock", - "min_unarmed": 5, + "id": "tec_pankration_grabdisarm", + "name": "Arm Lock", + "messages": [ "You disarm %s with an arm lock", " disarms %s with an arm lock" ], + "min_unarmed": 4, "unarmed_allowed": true, - "crit_tec": true, + "stunned_target": true, + "crit_ok": true, + "weighting": 3, "disarms": true, - "down_dur": 1, - "req_buffs": [ "pankration_grappling" ], - "messages": [ "You put %s in an arm lock", " puts %s in an arm lock" ] + "stun_dur": 1, + "mult_bonuses": [ [ "damage", "bash", 1.25 ] ] }, { "type": "technique", - "id": "tec_pankration_throw", - "name": "throw", - "min_unarmed": 6, + "id": "tec_pankration_grabthrow", + "name": "Grab and Throw", + "messages": [ "You grab and throw %s", " grabs and throws %s" ], + "min_unarmed": 5, "unarmed_allowed": true, + "weighting": 3, "crit_tec": true, - "down_dur": 1, + "down_dur": 2, "knockback_dist": 2, "knockback_spread": 2, - "req_buffs": [ "pankration_grappling" ], - "messages": [ "You throw %s", " throws %s" ] - }, - { - "type": "technique", - "id": "tec_pankration_chokehold", - "name": "chokehold", - "min_unarmed": 7, - "unarmed_allowed": true, - "crit_tec": true, - "stun_dur": 3, - "mult_bonuses": [ [ "damage", "bash", 1.35 ] ], - "req_buffs": [ "pankration_grappling" ], - "messages": [ "You put %s in a chokehold", " puts %s in a chokehold" ] + "stunned_target": true, + "mult_bonuses": [ [ "damage", "bash", 2.0 ] ] }, { "type": "technique",