Convert blood weapons to use vanilla martial arts instead of custom techniques.

4 files changed, 116 insertions, 16 deletions

diff --git a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
index a0a6716..d321e7f 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
@@ -15,7 +15,7 @@
     "cutting": 33,
     "material": [ "steel" ],
     "color": "red",
-    "techniques": [ "WBLOCK_2", "UPRIGHT_SLASH", "DOWNWARD_SLASH" ],
+    "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ]
   },
@@ -34,7 +34,7 @@
     "cutting": 35,
     "material": [ "steel", "compactblood" ],
     "color": "red",
-    "techniques": [ "WBLOCK_2", "UPRIGHT_SLASH", "DOWNWARD_SLASH" ],
+    "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   },
@@ -53,7 +53,7 @@
     "bashing": 2,
     "material": [ "steel" ],
     "color": "red",
-    "techniques": [ "VAMP_WRATH", "WEAK_HITCRIT", "VAMP_TRICK" ],
+    "techniques": [ "RAPID" ],
     "flags": [ "SHEATH_KNIFE", "DURABLE_MELEE", "STAB" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 35 ] ]
   },
@@ -72,7 +72,7 @@
     "bashing": 3,
     "material": [ "steel", "compactblood" ],
     "color": "red",
-    "techniques": [ "VAMP_WRATH", "WEAK_HITCRIT", "STRONG_HITCRIT", "VAMP_TRICK" ],
+    "techniques": [ "RAPID" ],
     "flags": [ "SHEATH_KNIFE", "DURABLE_MELEE", "STAB" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 37 ] ]
   },
@@ -91,8 +91,7 @@
     "bashing": 4,
     "material": [ "steel" ],
     "color": "red",
-    "techniques": [ "VAMP_WRATH" ],
-    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ]
+    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "STAB" ]
   },
   {
     "id": "punchie_bitieplus",
@@ -109,8 +108,7 @@
     "bashing": 5,
     "material": [ "steel", "compactblood" ],
     "color": "red",
-    "techniques": [ "VAMP_WRATH" ],
-    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE" ]
+    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "STAB" ]
   },
   {
     "id": "hammerius",
@@ -127,7 +125,7 @@
     "cutting": 12,
     "material": [ "steel" ],
     "color": "red",
-    "techniques": [ "WBLOCK_1", "UPRIGHT_BASH", "DOWNWARD_BASH" ],
+    "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "flags": [ "STAB", "DURABLE_MELEE" ]
   },
   {
@@ -145,7 +143,7 @@
     "cutting": 14,
     "material": [ "steel", "compactblood" ],
     "color": "red",
-    "techniques": [ "WBLOCK_1", "UPRIGHT_BASH", "DOWNWARD_BASH" ],
+    "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
     "flags": [ "STAB", "DURABLE_MELEE" ]
   },
   {
@@ -163,7 +161,7 @@
     "cutting": 24,
     "material": [ "steel" ],
     "color": "red",
-    "techniques": [ "WBLOCK_2", "UPRIGHT_SLASH", "DOWNWARD_SLASH" ],
+    "techniques": [ "WBLOCK_2" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ]
   },
@@ -182,7 +180,7 @@
     "cutting": 26,
     "material": [ "steel" ],
     "color": "red",
-    "techniques": [ "WBLOCK_2", "UPRIGHT_SLASH", "DOWNWARD_SLASH" ],
+    "techniques": [ "WBLOCK_2" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   }
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
index 05d2a8c..0b32ae7 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
@@ -9,7 +9,6 @@
     "name": { "str": "Invynel's bow" },
     "description": "A heavy, steel bow. Its serrated, blade handle makes it available for melee, but unwieldy. Well trained archers find this useful for long to mid range combats greatly.",
     "material": [ "steel" ],
-    "techniques": [ "BOW_VAMP_SWEEP", "BOW_VAMP_THRUST" ],
     "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON" ],
     "skill": "archery",
     "min_strength": 10,
diff --git a/vamp_stuff/Modification_Files/Others/martialarts.json b/vamp_stuff/Modification_Files/Others/martialarts.json
new file mode 100644
index 0000000..2cc8207
--- /dev/null
+++ b/vamp_stuff/Modification_Files/Others/martialarts.json
@@ -0,0 +1,103 @@
+[
+  {
+    "id": "style_aikido",
+    "copy-from": "style_aikido",
+    "type": "martial_art",
+    "name": { "str": "Aikido" },
+    "extend": {
+      "weapons": [
+        "punchie_bitie",
+        "punchie_bitieplus"
+      ]
+    }
+  },
+  {
+    "id": "style_eskrima",
+    "copy-from": "style_eskrima",
+    "type": "martial_art",
+    "name": { "str": "Eskrima" },
+    "extend": {
+      "weapons": [
+        "sword_dive",
+        "sword_diveplus"
+      ]
+    }
+  },
+  {
+    "id": "style_fencing",
+    "copy-from": "style_fencing",
+    "type": "martial_art",
+    "name": { "str": "Fencing" },
+    "extend": {
+      "weapons": [
+        "v_hemo_whip"
+      ]
+    }
+  },
+  {
+    "id": "style_judo",
+    "copy-from": "style_judo",
+    "type": "martial_art",
+    "name": { "str": "Judo" },
+    "extend": {
+      "weapons": [
+        "punchie_bitie",
+        "punchie_bitieplus"
+      ]
+    }
+  },
+  {
+    "id": "style_krav_maga",
+    "copy-from": "style_krav_maga",
+    "type": "martial_art",
+    "name": { "str": "Krav Maga" },
+    "extend": {
+      "weapons": [
+        "sword_dive",
+        "sword_diveplus"
+      ]
+    }
+  },
+  {
+    "id": "style_swordsmanship",
+    "copy-from": "style_swordsmanship",
+    "type": "martial_art",
+    "name": { "str": "Medieval Swordsmanship" },
+    "extend": {
+      "weapons": [
+        "v_hemo_whip",
+        "falc_crimsword"
+        "falc_crimswordplus",
+        "sword_sip"
+        "sword_sipplus",
+        "sword_dive",
+        "sword_diveplus"
+      ]
+    }
+  },
+  {
+    "id": "style_ninjutsu",
+    "copy-from": "style_ninjutsu",
+    "type": "martial_art",
+    "name": { "str": "Ninjutsu" },
+    "extend": {
+      "weapons": [
+        "v_hemo_whip",
+        "falc_crimsword"
+        "falc_crimswordplus"
+      ]
+    }
+  },
+  {
+    "id": "style_silat",
+    "copy-from": "style_silat",
+    "type": "martial_art",
+    "name": { "str": "Silat" },
+    "extend": {
+      "weapons": [
+        "sword_dive",
+        "sword_diveplus"
+      ]
+    }
+  }
+]
diff --git a/vamp_stuff/readme b/vamp_stuff/readme
index 27ee11f..9f255e8 100644
--- a/vamp_stuff/readme
+++ b/vamp_stuff/readme
@@ -47,6 +47,7 @@ Added a background story to recruited isolated vampires.
 
 ---Weapons
 Reduce the OP nature of the blood weapons.
+Add the blood weapons to appropriate vanilla martial arts.
 Optimize blood ammunition into templates.
 
 ---Armor
@@ -75,9 +76,9 @@ Can drink blood from npcs via conversation menu.
 Can ghoul wary/scared npcs via conversation menu.
 
 ---Terrain
-Change overmap names and icons of vampire lairs to match to base terrain they spawn to, so they cannot just be seached on the world map.
+Change overmap names and icons of vampire lairs to match to base terrain they spawn to, so they cannot just be searched on the world map.
 Change underground vampire lair icons to not be black. Afaik there isn't any way to see the underground sections in advance of going there anyway.
-Change ancient graveyard name to field, so they cannot just be seached on the world map.
+Change ancient graveyard name to field, so they cannot just be searched on the world map.
 
 ---Tileset
 Use the UndeadPeople-Base tileset instead of the original.
@@ -129,7 +130,6 @@ Figure out why certain foods are still edible despite being invalid food materia
 
 Add a way to actually obtain the vampire crafting books. (It appears that SD cards can randomly provide the recipes.)
 Fix or remove the vampire equipment. (Convert battery powered kits into static tools?)
-Add a vampire martial art based on the vampire weapon skills.
 
 Fix spell sounds being described as "an explosion"