[FEATURE] add barbaran montante MA (#1852)

data/json/itemgroups/books.json

@@ -495,6 +495,7 @@
       { "item": "dairy_book", "prob": 20 },
       { "item": "winemaking_beginner", "prob": 60 },
       { "item": "manual_canning", "prob": 80 },
+      { "item": "manual_barbaran", "prob": 10 },
       { "item": "manual_sealing", "prob": 190 },
       { "item": "baking_book", "prob": 190 }
     ]
@@ -543,6 +544,7 @@
       { "item": "manual_wingchun", "prob": 3 },
       { "item": "manual_medievalpole", "prob": 3 },
       { "item": "manual_swordsmanship", "prob": 3 },
+      { "item": "manual_barbaran", "prob": 1 },
       { "item": "book_lockpick", "prob": 1 },
       { "group": "rare_martial_arts_books", "prob": 6 }
     ]

data/json/items/book/martial.json

@@ -8,6 +8,21 @@
     "description": "A complete guide to Aikido.",
     "book_data": { "martial_art": "style_aikido" }
   },
+  {
+    "id": "manual_barbaran",
+    "copy-from": "book_martial",
+    "type": "BOOK",
+    "name": {
+      "str": "Las Nueve Reglas de la Montante",
+      "str_pl": "copies of Las Nueve Reglas de la Montante",
+      "//~": "Don't translate name, this book is in archaic Spanish with translations in the margins."
+    },
+    "price": 11000,
+    "price_postapoc": 3000,
+    "//~": "Spanish description should change to say that this is archaic text and should mention explanations of archaic words instead of translations.",
+    "description": "Thankfully, someone has scrawled translations in the margins of this guide to Barbaran Montante.  Judging by the notation, this greatsword and war hammer training manual is also a form of poem.",
+    "martial_art": "style_barbaran"
+  },
   {
     "id": "manual_boxing",
     "copy-from": "book_martial",

data/json/items/melee/bludgeons.json

@@ -471,7 +471,7 @@
     "material": [ "wood", "steel" ],
     "looks_like": "hammer_sledge",
     "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
-    "techniques": [ "BRUTAL", "WIDE" ],
+    "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE" ],
     "volume": "1700 ml",
     "bashing": 80,
     "to_hit": -4,

data/json/martialarts.json

@@ -64,6 +64,109 @@
     ],
     "weapons": [ "bagh_nakha", "bio_claws_weapon", "cestus", "knuckle_brass", "knuckle_nail", "knuckle_steel" ]
   },
+  {
+    "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"
+    ]
+  },
   {
     "type": "martial_art",
     "id": "style_boxing",

data/json/mutations/mutations.json

@@ -620,9 +620,10 @@
     "id": "MARTIAL_ARTS5",
     "name": { "str": "Melee Weapon Training" },
     "points": 3,
-    "description": "You have practiced fighting with weapons.  You start with your choice of Eskrima, Fencing, Fior Di Battaglia, Medieval Swordsmanship, Niten Ichi-Ryu, Pentjak Silat, or Sōjutsu.",
+    "description": "You have practiced fighting with weapons.  You start with your choice of Barbaran Montante, Eskrima, Fencing, Fior Di Battaglia, Medieval Swordsmanship, Niten Ichi-Ryu, Pentjak Silat, or Sōjutsu.",
     "starting_trait": true,
     "initial_ma_styles": [
+      "style_barbaran",
       "style_eskrima",
       "style_fencing",
       "style_silat",

data/json/techniques.json

@@ -273,6 +273,36 @@
     "defensive": true,
     "grab_break": true
   },
+  {
+    "type": "technique",
+    "id": "tec_barbaran_impale",
+    "name": "Impaling Estocada",
+    "messages": [ "You thrust your weapon through %s", "<npcname> 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": "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", "<npcname> 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 }
+    ]
+  },
   {
     "type": "technique",
     "id": "tec_boxing_cross",