From 3bab76c9c7d7bda4f3ae16a58444a6e947327cf1 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 20 Jan 2022 14:11:35 -0800 Subject: Typos --- martialarts/aikido.json | 9 +++- martialarts/barbaran-montante.json | 105 ------------------------------------- martialarts/barbaran.json | 105 +++++++++++++++++++++++++++++++++++++ martialarts/brawling.json | 2 +- martialarts/taichi.json | 4 +- techniques/barbaran-montante.json | 33 ------------ techniques/barbaran.json | 33 ++++++++++++ 7 files changed, 149 insertions(+), 142 deletions(-) delete mode 100644 martialarts/barbaran-montante.json create mode 100644 martialarts/barbaran.json delete mode 100644 techniques/barbaran-montante.json create mode 100644 techniques/barbaran.json diff --git a/martialarts/aikido.json b/martialarts/aikido.json index f428c76..555cedb 100644 --- a/martialarts/aikido.json +++ b/martialarts/aikido.json @@ -81,6 +81,13 @@ "tec_aikido_dodgethrow", "tec_aikido_blockthrow" ], - "weapons": [ "bagh_nakha", "bio_claws_weapon", "cestus", "knuckle_brass", "knuckle_nail", "knuckle_steel", "knuckle_steel_forged" ] + "weapons": [ + "bagh_nakha", + "bio_claws_weapon", + "cestus", + "knuckle_brass", + "knuckle_nail", + "knuckle_steel" + ] } ] diff --git a/martialarts/barbaran-montante.json b/martialarts/barbaran-montante.json deleted file mode 100644 index b9d58e1..0000000 --- a/martialarts/barbaran-montante.json +++ /dev/null @@ -1,105 +0,0 @@ -[ - { - "type": "martial_art", - "id": "style_barbaran", - "name": { "str": "Barbaran Montante" }, - "description": "The Barbaran Montante originated in 16th century Spain and focuses on overcoming thick armor with heavy weaponry and sweeping blows, transferring kinetic energy through armor and into vulnerable organs and bones.", - "initiate": [ - "You heft your weapon, stretch your shoulders, and slide into the Represa.", - "%s rolls their shoulders and prepares to duel." - ], - "learn_difficulty": 8, - "primary_skill": "bashing", - "strictly_melee": true, - "static_buffs": [ - { - "id": "buff_barbaran_static", - "name": "Barbaran Represa", - "description": "Sliding footwork enhances the crushing continuity of your attacks.\n\nArmor penetration increased by 75% of Strength.", - "melee_allowed": true, - "flat_bonuses": [ - { "stat": "arpen", "type": "bash", "scaling-stat": "str", "scale": 0.75 }, - { "stat": "arpen", "type": "cut", "scaling-stat": "str", "scale": 0.75 }, - { "stat": "arpen", "type": "stab", "scaling-stat": "str", "scale": 0.75 } - ] - } - ], - "onblock_buffs": [ - { - "id": "buff_barbaran_onblock", - "name": "Reversing Destreza", - "description": "Blocking a key strike will turn the battle around.\n\n-5% movecost\nLasts 3 turns. Stacks 2 times.", - "skill_requirements": [ { "name": "melee", "level": 1 } ], - "melee_allowed": true, - "max_stacks": 2, - "mult_bonuses": [ { "stat": "movecost", "scale": 0.95 } ], - "buff_duration": 3 - } - ], - "onkill_buffs": [ - { - "id": "buff_barbaran_onkill", - "name": "Movimiento Natural", - "description": "Formal victory is attained, and your mind is cleared to focus on your next moves.\n\n+1 Block attempts.\nLasts 5 turns.", - "skill_requirements": [ { "name": "melee", "level": 5 } ], - "melee_allowed": true, - "buff_duration": 5, - "bonus_blocks": 1 - } - ], - "onmove_buffs": [ - { - "id": "buff_barbaran_onmove", - "name": "Ricasso Step", - "description": "You switch or sturdy your grip mid-step to aid your blocking.\n\nBlocked damage reduced by 40% of Strength.\nLasts 3 turns. Stacks 3 times.", - "skill_requirements": [ { "name": "melee", "level": 3 } ], - "melee_allowed": true, - "max_stacks": 3, - "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.4 } ], - "buff_duration": 3 - } - ], - "onpause_buffs": [ - { - "id": "buff_barbaran_onpause", - "name": "Vulgar Preparation", - "description": "You prepare for the final crushing strike.\n\nAccuracy increased by 15% of Strength, Armor penetration increased by 225% of Strength.\nLasts 1 turn.", - "skill_requirements": [ { "name": "melee", "level": 4 } ], - "melee_allowed": true, - "flat_bonuses": [ - { "stat": "hit", "scaling-stat": "str", "scale": 0.15 }, - { "stat": "arpen", "type": "bash", "scaling-stat": "str", "scale": 2.25 }, - { "stat": "arpen", "type": "cut", "scaling-stat": "str", "scale": 2.25 }, - { "stat": "arpen", "type": "stab", "scaling-stat": "str", "scale": 2.25 } - ], - "buff_duration": 1 - } - ], - "techniques": [ "tec_barbaran_impale", "tec_barbaran_disarm" ], - "weapons": [ - "2h_flail_steel", - "2h_flail_wood", - "battleaxe", - "battleaxe_inferior", - "battleaxe_fake", - "hammer_sledge", - "hammer_sledge_heavy", - "longsword", - "longsword_inferior", - "longsword_fake", - "mace", - "mace_inferior", - "mace_fake", - "morningstar", - "morningstar_inferior", - "morningstar_fake", - "sword_nail", - "sword_crude", - "sword_wood", - "warhammer", - "zweihander", - "zweihander_inferior", - "zweihander_fake" - ] - } -] diff --git a/martialarts/barbaran.json b/martialarts/barbaran.json new file mode 100644 index 0000000..b9d58e1 --- /dev/null +++ b/martialarts/barbaran.json @@ -0,0 +1,105 @@ +[ + { + "type": "martial_art", + "id": "style_barbaran", + "name": { "str": "Barbaran Montante" }, + "description": "The Barbaran Montante originated in 16th century Spain and focuses on overcoming thick armor with heavy weaponry and sweeping blows, transferring kinetic energy through armor and into vulnerable organs and bones.", + "initiate": [ + "You heft your weapon, stretch your shoulders, and slide into the Represa.", + "%s rolls their shoulders and prepares to duel." + ], + "learn_difficulty": 8, + "primary_skill": "bashing", + "strictly_melee": true, + "static_buffs": [ + { + "id": "buff_barbaran_static", + "name": "Barbaran Represa", + "description": "Sliding footwork enhances the crushing continuity of your attacks.\n\nArmor penetration increased by 75% of Strength.", + "melee_allowed": true, + "flat_bonuses": [ + { "stat": "arpen", "type": "bash", "scaling-stat": "str", "scale": 0.75 }, + { "stat": "arpen", "type": "cut", "scaling-stat": "str", "scale": 0.75 }, + { "stat": "arpen", "type": "stab", "scaling-stat": "str", "scale": 0.75 } + ] + } + ], + "onblock_buffs": [ + { + "id": "buff_barbaran_onblock", + "name": "Reversing Destreza", + "description": "Blocking a key strike will turn the battle around.\n\n-5% movecost\nLasts 3 turns. Stacks 2 times.", + "skill_requirements": [ { "name": "melee", "level": 1 } ], + "melee_allowed": true, + "max_stacks": 2, + "mult_bonuses": [ { "stat": "movecost", "scale": 0.95 } ], + "buff_duration": 3 + } + ], + "onkill_buffs": [ + { + "id": "buff_barbaran_onkill", + "name": "Movimiento Natural", + "description": "Formal victory is attained, and your mind is cleared to focus on your next moves.\n\n+1 Block attempts.\nLasts 5 turns.", + "skill_requirements": [ { "name": "melee", "level": 5 } ], + "melee_allowed": true, + "buff_duration": 5, + "bonus_blocks": 1 + } + ], + "onmove_buffs": [ + { + "id": "buff_barbaran_onmove", + "name": "Ricasso Step", + "description": "You switch or sturdy your grip mid-step to aid your blocking.\n\nBlocked damage reduced by 40% of Strength.\nLasts 3 turns. Stacks 3 times.", + "skill_requirements": [ { "name": "melee", "level": 3 } ], + "melee_allowed": true, + "max_stacks": 3, + "flat_bonuses": [ { "stat": "block", "scaling-stat": "str", "scale": 0.4 } ], + "buff_duration": 3 + } + ], + "onpause_buffs": [ + { + "id": "buff_barbaran_onpause", + "name": "Vulgar Preparation", + "description": "You prepare for the final crushing strike.\n\nAccuracy increased by 15% of Strength, Armor penetration increased by 225% of Strength.\nLasts 1 turn.", + "skill_requirements": [ { "name": "melee", "level": 4 } ], + "melee_allowed": true, + "flat_bonuses": [ + { "stat": "hit", "scaling-stat": "str", "scale": 0.15 }, + { "stat": "arpen", "type": "bash", "scaling-stat": "str", "scale": 2.25 }, + { "stat": "arpen", "type": "cut", "scaling-stat": "str", "scale": 2.25 }, + { "stat": "arpen", "type": "stab", "scaling-stat": "str", "scale": 2.25 } + ], + "buff_duration": 1 + } + ], + "techniques": [ "tec_barbaran_impale", "tec_barbaran_disarm" ], + "weapons": [ + "2h_flail_steel", + "2h_flail_wood", + "battleaxe", + "battleaxe_inferior", + "battleaxe_fake", + "hammer_sledge", + "hammer_sledge_heavy", + "longsword", + "longsword_inferior", + "longsword_fake", + "mace", + "mace_inferior", + "mace_fake", + "morningstar", + "morningstar_inferior", + "morningstar_fake", + "sword_nail", + "sword_crude", + "sword_wood", + "warhammer", + "zweihander", + "zweihander_inferior", + "zweihander_fake" + ] + } +] diff --git a/martialarts/brawling.json b/martialarts/brawling.json index 8a9c28d..78ef1e6 100644 --- a/martialarts/brawling.json +++ b/martialarts/brawling.json @@ -5,7 +5,7 @@ "name": { "str": "Brawling" }, "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": [ [ "melee", 1 ] ], + "autolearn": [ [ "melee", "1" ] ], "arm_block": 1, "nonstandard_block": 5, "static_buffs": [ diff --git a/martialarts/taichi.json b/martialarts/taichi.json index 0321c50..5d18e2a 100644 --- a/martialarts/taichi.json +++ b/martialarts/taichi.json @@ -37,11 +37,11 @@ { "id": "buff_tai_chi_onpause", "name": "Cross Hands", - "description": "By taking a moment to prepare yourself, you are able to use your entire body fully for attacking and defending.\n\n+2 Block Effectiveness, blocked damage reduced by 50% of Perception.\nEnables \"Palm Strike\" and \"Double Palm Strike\" techniques.\nLasts 3 turns.", + "description": "By taking a moment to prepare yourself, you are able to use your entire body fully for attacking and defending.\n\nBlocked damage reduced by 250% of Perception.\nEnables \"Palm Strike\" and \"Double Palm Strike\" techniques.\nLasts 3 turns.", "unarmed_allowed": true, "skill_requirements": [ { "name": "unarmed", "level": 1 } ], "buff_duration": 3, - "flat_bonuses": [ { "stat": "block_effectiveness", "scale": 2.0 }, { "stat": "block", "scaling-stat": "per", "scale": 0.5 } ] + "flat_bonuses": [ { "stat": "block", "scaling-stat": "per", "scale": 2.5 } ] } ], "techniques": [ "tec_taichi_disarm", "tec_taichi_palm", "tec_taichi_counter", "tec_taichi_precise" ] diff --git a/techniques/barbaran-montante.json b/techniques/barbaran-montante.json deleted file mode 100644 index bf25356..0000000 --- a/techniques/barbaran-montante.json +++ /dev/null @@ -1,33 +0,0 @@ -[ - { - "type": "technique", - "id": "tec_barbaran_impale", - "name": "Impaling Estocada", - "messages": [ "You thrust your weapon through %s", " thrusts their weapon through %s" ], - "skill_requirements": [ { "name": "melee", "level": 2 } ], - "weapon_damage_requirements": [ { "type": "cut", "min": 8 } ], - "melee_allowed": true, - "aoe": "impale", - "mult_bonuses": [ - { "stat": "damage", "type": "bash", "scale": 1.1 }, - { "stat": "damage", "type": "cut", "scale": 1.1 }, - { "stat": "damage", "type": "stab", "scale": 1.1 }, - { "stat": "movecost", "scale": 1.2 } - ] - }, - { - "type": "technique", - "id": "tec_barbaran_disarm", - "name": "Swift Atajo", - "messages": [ "You jab a quick blow at %s's grip", " jabs a quick blow at %s's grip" ], - "skill_requirements": [ { "name": "melee", "level": 2 } ], - "melee_allowed": true, - "disarms": true, - "mult_bonuses": [ - { "stat": "movecost", "scale": 0.5 }, - { "stat": "damage", "type": "bash", "scale": 0.66 }, - { "stat": "damage", "type": "cut", "scale": 0.66 }, - { "stat": "damage", "type": "stab", "scale": 0.66 } - ] - }, -] diff --git a/techniques/barbaran.json b/techniques/barbaran.json new file mode 100644 index 0000000..6528928 --- /dev/null +++ b/techniques/barbaran.json @@ -0,0 +1,33 @@ +[ + { + "type": "technique", + "id": "tec_barbaran_impale", + "name": "Impaling Estocada", + "messages": [ "You thrust your weapon through %s", " thrusts their weapon through %s" ], + "skill_requirements": [ { "name": "melee", "level": 2 } ], + "weapon_damage_requirements": [ { "type": "cut", "min": 8 } ], + "melee_allowed": true, + "aoe": "impale", + "mult_bonuses": [ + { "stat": "damage", "type": "bash", "scale": 1.1 }, + { "stat": "damage", "type": "cut", "scale": 1.1 }, + { "stat": "damage", "type": "stab", "scale": 1.1 }, + { "stat": "movecost", "scale": 1.2 } + ] + }, + { + "type": "technique", + "id": "tec_barbaran_disarm", + "name": "Swift Atajo", + "messages": [ "You jab a quick blow at %s's grip", " jabs a quick blow at %s's grip" ], + "skill_requirements": [ { "name": "melee", "level": 2 } ], + "melee_allowed": true, + "disarms": true, + "mult_bonuses": [ + { "stat": "movecost", "scale": 0.5 }, + { "stat": "damage", "type": "bash", "scale": 0.66 }, + { "stat": "damage", "type": "cut", "scale": 0.66 }, + { "stat": "damage", "type": "stab", "scale": 0.66 } + ] + } +] -- cgit v1.2.1