Added new martial art: Bayonet Drill

data/json/martialarts.json

@@ -1346,6 +1346,93 @@
       "spear_wood"
     ]
   },
+  {
+    "type": "martial_art",
+    "id": "style_bayonet_drill",
+    "name": { "str": "Bayonet Drill" },
+    "description": "Bayonet charge was a common tactic used during the early modern wars.  It focuses on move one's body to keep or regain his own balance, and exploits weaknesses in his opponent's balance.",
+    "initiate": [ "You take a step forward and flex your knees.", "%s enters a bayonet attack position." ],
+    "learn_difficulty": 5,
+    "arm_block": 0,
+    "primary_skill": "stabbing",
+    "strictly_melee": true,
+    "onblock_buffs": [
+      {
+        "id": "buff_bayonet_drill_onblock",
+        "name": "Parry",
+        "description": "You make an opening by initiating a block movement.\n\n+1 Accuracy.\nLasts 1 turn.",
+        "melee_allowed": true,
+        "skill_requirements": [ { "name": "melee", "level": 1 } ],
+        "buff_duration": 1,
+        "flat_bonuses": [ { "stat": "hit", "scale": 1.0 } ]
+      }
+    ],
+    "onmove_buffs": [
+      {
+        "id": "buff_bayonet_drill_onmove",
+        "name": "Thrust movements",
+        "description": "You lunge forward on your leading foot without losing your balance.\n\n+10% damage.\nLasts 2 turns.  Stacks 2 times.",
+        "melee_allowed": true,
+        "buff_duration": 2,
+        "max_stacks": 2,
+        "mult_bonuses": [
+          { "stat": "damage", "type": "bash", "scale": 1.1 },
+          { "stat": "damage", "type": "cut", "scale": 1.1 },
+          { "stat": "damage", "type": "stab", "scale": 1.1 }
+        ]
+      }
+    ],
+    "onpause_buffs": [
+      {
+        "id": "buff_bayonet_drill_onpause",
+        "name": "Attack position",
+        "description": "You hold your rifle diagonally across your body at a sufficient distance from the body to add balance and protect you from enemy blows.\n\nBlocked damage reduced by 50% of Perception, +1 Block attempts.",
+        "melee_allowed": true,
+        "buff_duration": 1,
+        "bonus_blocks": 2,
+        "flat_bonuses": [ { "stat": "block", "scaling-stat": "per", "scale": 0.5 } ]
+      }
+    ],
+    "techniques": [
+      "tec_bayonet_drill_butt_strike",
+      "tec_bayonet_drill_lunge",
+      "tec_bayonet_drill_rapid_strike",
+      "tec_bayonet_drill_charge",
+      "tec_bayonet_drill_smash"
+    ],
+    "weapons": [
+      "acr",
+      "aksemi",
+      "ar10",
+      "ar15",
+      "ar15_retool_300blk",
+      "colt_lightning",
+      "fn_fal",
+      "garand",
+      "h&k416a5",
+      "hk417_13",
+      "hk_g3",
+      "hk_g36",
+      "m1a",
+      "m110a1",
+      "m14ebr",
+      "m16a4",
+      "m1903",
+      "m27iar",
+      "m38dmr",
+      "m4a1",
+      "mosin44_ebr",
+      "mosin91_30_ebr",
+      "ruger_1022",
+      "ruger_mini",
+      "scar_l",
+      "scar_h",
+      "sharps",
+      "sig552",
+      "sks",
+      "steyr_aug"
+    ]
+  },
   {
     "type": "martial_art",
     "id": "style_taekwondo",

data/json/mutations/mutations.json

@@ -798,6 +798,16 @@
     ],
     "valid": false
   },
+  {
+    "type": "mutation",
+    "id": "MARTIAL_BAYONET",
+    "name": { "str": "Bayonet Melee Training" },
+    "points": 0,
+    "description": "You are a soldier with complete military training, including elective course of bayonet drill.",
+    "starting_trait": false,
+    "initial_ma_styles": [ "style_bayonet_drill" ],
+    "valid": false
+  },
   {
     "type": "mutation",
     "id": "MARTIAL_FENCING",

data/json/professions.json

@@ -914,6 +914,7 @@
       { "level": 3, "name": "firstaid" },
       { "level": 3, "name": "survival" }
     ],
+    "traits": [ "MARTIAL_BAYONET" ],
     "items": {
       "both": {
         "items": [
@@ -964,6 +965,7 @@
       { "level": 2, "name": "survival" },
       { "level": 2, "name": "firstaid" }
     ],
+    "traits": [ "MARTIAL_BAYONET" ],
     "items": {
       "both": {
         "items": [
@@ -1012,6 +1014,7 @@
       { "level": 3, "name": "swimming" },
       { "level": 4, "name": "survival" }
     ],
+    "traits": [ "MARTIAL_BAYONET" ],
     "items": {
       "both": {
         "items": [
@@ -3877,6 +3880,7 @@
       { "level": 2, "name": "firstaid" },
       { "level": 2, "name": "stabbing" }
     ],
+    "traits": [ "MARTIAL_BAYONET" ],
     "items": {
       "both": {
         "items": [

data/json/techniques.json

@@ -1425,6 +1425,84 @@
       { "stat": "damage", "type": "stab", "scale": 0.5 }
     ]
   },
+  {
+    "type": "technique",
+    "id": "tec_bayonet_drill_butt_strike",
+    "name": "Butt strike",
+    "messages": [ "You strike %s with the buttstock", "<npcname> strikes %s with the buttstock" ],
+    "skill_requirements": [ { "name": "melee", "level": 1 } ],
+    "melee_allowed": true,
+    "block_counter": true,
+    "crit_ok": true,
+    "stun_dur": 1,
+    "mult_bonuses": [ { "stat": "damage", "type": "cut", "scale": 0 }, { "stat": "damage", "type": "stab", "scale": 0 } ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_bayonet_drill_lunge",
+    "name": "Bayonet lunge",
+    "messages": [ "You lunge into %s", "<npcname> lunges into %s" ],
+    "skill_requirements": [ { "name": "melee", "level": 1 } ],
+    "melee_allowed": true,
+    "weighting": 2,
+    "crit_ok": true,
+    "mult_bonuses": [
+      { "stat": "movecost", "scale": 0.75 },
+      { "stat": "damage", "type": "bash", "scale": 0.5 },
+      { "stat": "damage", "type": "cut", "scale": 0 },
+      { "stat": "damage", "type": "stab", "scale": 1.2 }
+    ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_bayonet_drill_rapid_strike",
+    "name": "Bayonet strike",
+    "messages": [ "You quickly strike %s", "<npcname> quickly strikes %s" ],
+    "melee_allowed": true,
+    "mult_bonuses": [
+      { "stat": "movecost", "scale": 0.5 },
+      { "stat": "damage", "type": "bash", "scale": 0.66 },
+      { "stat": "damage", "type": "cut", "scale": 0 },
+      { "stat": "damage", "type": "stab", "scale": 0.66 }
+    ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_bayonet_drill_charge",
+    "name": "Bayonet charge",
+    "messages": [ "You charge and force %s back", "<npcname> charges and forces %s back" ],
+    "skill_requirements": [ { "name": "melee", "level": 2 } ],
+    "req_buffs": [ "buff_bayonet_drill_onmove" ],
+    "melee_allowed": true,
+    "weighting": 4,
+    "crit_tec": true,
+    "knockback_dist": 1,
+    "flat_bonuses": [ { "stat": "arpen", "type": "stab", "scaling-stat": "str", "scale": 0.25 } ],
+    "mult_bonuses": [
+      { "stat": "damage", "type": "bash", "scale": 0.5 },
+      { "stat": "damage", "type": "cut", "scale": 0 },
+      { "stat": "damage", "type": "stab", "scale": 2 }
+    ]
+  },
+  {
+    "type": "technique",
+    "id": "tec_bayonet_drill_smash",
+    "name": "Butt smash",
+    "messages": [ "You smash %s with the buttstock brutally", "<npcname> smashes %s with the buttstock brutally" ],
+    "skill_requirements": [ { "name": "melee", "level": 2 } ],
+    "req_buffs": [ "buff_bayonet_drill_onblock" ],
+    "melee_allowed": true,
+    "weighting": 4,
+    "crit_ok": true,
+    "stun_dur": 1,
+    "down_dur": 1,
+    "mult_bonuses": [
+      { "stat": "movecost", "scale": 0.75 },
+      { "stat": "damage", "type": "bash", "scale": 1.4 },
+      { "stat": "damage", "type": "cut", "scale": 0 },
+      { "stat": "damage", "type": "stab", "scale": 0 }
+    ]
+  },
   {
     "type": "technique",
     "id": "tec_taekwondo_disarm",