Updates 1/2

* Fixed energy density of crystallized essence in BN version.
* Added variations of essence surge generator for different essence types, recipes and uncrafts to come after I switch from laptop to desktop.
* Implemented weapon categories for DDA version, removing old martial art injections.

Arcana/items/classes.json

@@ -49,5 +49,21 @@
     "volume": "50 ml",
     "stack_size": 1,
     "flags": [ "NO_SALVAGE", "UNBREAKABLE_MELEE", "NO_INGEST", "NUTRIENT_OVERRIDE" ]
+  },
+  {
+    "type": "TOOL",
+    "abstract": "essence_surge_generator_item_abstract",
+    "looks_like": "alternator_truck",
+    "name": { "str": "essence surge part abstract" },
+    "weight": "10 kg",
+    "color": "light_cyan",
+    "symbol": ":",
+    "material": [ "steel" ],
+    "volume": "6 L",
+    "melee_damage": { "bash": 4 },
+    "category": "veh_parts",
+    "price": "8000 USD",
+    "price_postapoc": "70 USD",
+    "flags": [ "TARDIS" ]
   }
 ]

Arcana/items/melee.json

@@ -41,6 +41,7 @@
     "type": "GENERIC",
     "id": "graboid_fang",
     "category": "other",
+    "weapon_category": [ "KNIVES" ],
     "//": "Obtained from graboids, rarely from dark wyrms.",
     "name": { "str": "crystalline fang" },
     "description": "A short spike of grainy, dark ivory broken off from the maw of a massive wormlike creature.  Makes a poor melee weapon, or could be made into a trophy of some sort.",
@@ -88,6 +89,7 @@
     "type": "GENERIC",
     "id": "iron_thorn",
     "category": "other",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "iron thorn" },
     "description": "A curved, seven-inch spike resembling some sort of thorn or talon, with an otherworldly metallic shimmer to it.  Makes a mediocre melee weapon, or could be made into a trophy of some sort.",
     "weight": "860 g",
@@ -105,6 +107,7 @@
     "type": "GENERIC",
     "id": "dermatik_sting",
     "category": "other",
+    "weapon_category": [ "KNIVES" ],
     "//": "ID retained for compatibility reasons",
     "name": { "str": "barbed stinger" },
     "description": "An eight-inch barbed stinger, from some manner of monstrous creature.  Makes a mediocre melee weapon, or could be made into a trophy of some sort.",
@@ -184,6 +187,7 @@
     "type": "GENERIC",
     "id": "bone_twisted",
     "category": "other",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "twisted bones", "str_pl": "twisted bones" },
     "weight": "225 g",
     "color": "white",
@@ -236,6 +240,7 @@
     "type": "GENERIC",
     "id": "monster_fang",
     "category": "other",
+    "weapon_category": [ "KNIVES" ],
     "//": "Obtained from hunting horrors, flying polyps.  Rarely from krecks.",
     "name": { "str": "monstrous fang" },
     "description": "A long, curved spike of unnatural ivory, that feels lighter in the hand than it should.  Makes a poor melee weapon, or could be made into a trophy of some sort.",

Arcana/items/ranged.json

@@ -49,6 +49,7 @@
     "id": "bloodscourge",
     "type": "GUN",
     "category": "weapons",
+    "weapon_category": [ "QUARTERSTAVES" ],
     "name": { "str": "hellfire staff", "str_pl": "hellfire staves" },
     "description": "A staff decorated with silver and a skull motif, capped with a strange red gem.  The metal parts feel uncomfortably warm to the touch.  Firing it projects a gout of wicked flame.  It can also be used to spark magical flames, but this will drain fatigue to use.",
     "weight": "2800 g",
@@ -312,6 +313,7 @@
     "id": "scourge_staff",
     "type": "GUN",
     "category": "weapons",
+    "weapon_category": [ "QUARTERSTAVES" ],
     "name": { "str": "bane staff", "str_pl": "bane staves" },
     "description": "A wooden staff decorated with gold, capped with a dark blue gem.  The wood gives off a faintly acrid smell.  Firing it will produce pools of acid and toxic fumes.",
     "weight": "2800 g",

Arcana/items/tools.json

@@ -159,6 +159,7 @@
     "type": "TOOL",
     "//": "By necessity can't yet define this to use copy-from, as qualities will break it.",
     "category": "weapons",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "silver athame" },
     "description": "An ornate silver dagger, seemingly made for ritual purposes.  It seems sharper than silver has any right to be.  It can be used to perform a ritual converting your life force into blood essence.  Doing so will take 5 minutes, inflicting blood loss and damage at the end, as well as potential consequences if overused…",
     "weight": "1302 g",
@@ -190,6 +191,7 @@
     "type": "TOOL",
     "category": "weapons",
     "copy-from": "qt_arming_sword",
+    "weapon_category": [ "MEDIEVAL_SWORDS", "MEDIUM_SWORDS", "FENCING_WEAPONRY" ],
     "name": { "str": "incorruptible sword" },
     "//": "Stats are a blend of the available swords you can use to make it, same deal as the mantle of shadows.",
     "description": "This is some manner of sword, decorated with a golden cross motif worked into the blade.  When powered by consecrated magical essence, it has the power to cut through darkness itself.",
@@ -887,6 +889,7 @@
     "copy-from": "hatchet",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "HAND_AXES" ],
     "name": { "str": "veinreaver" },
     "description": "A hatchet with its axehead lightened a bit, stained the dull color of dried blood.  Using it will channel blood essence into a nasty explosion, with a considerable blast radius.",
     "price": "400 USD",
@@ -919,6 +922,7 @@
     "//": "Can't use copy-from because qualities refuse to be deleted, causing it to try and chop wood instead of exploding.",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "HAND_AXES" ],
     "name": { "str": "glowing veinreaver" },
     "description": "A modified hatchet, the axehead giving off a wicked red glow.  Throwing it might be a smart idea, as you'll have little time to evade its blast.",
     "weight": "707 g",
@@ -954,6 +958,7 @@
     "looks_like": "rapier",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "FENCING_WEAPONRY" ],
     "name": { "str": "shrike's misericorde" },
     "description": "An ornate silver weapon featuring a thin blade and two flintlock barrels built into the guard.  Its strikes inflict victims with a deathly chill.  Activating it will transform it into a more compact form, allowing its user to load and fire it.  Its pistol form will impart a freezing effect on shots fired from it, including otherworldly damage that can bypass mundane armor, though robots and certain supernatural monsters will only suffer the bullet's normal damage.",
     "weight": "2 kg",
@@ -1150,6 +1155,7 @@
   {
     "id": "staff_druidic",
     "type": "TOOL",
+    "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ],
     "name": { "str": "druidic staff", "str_pl": "druidic staves" },
     "description": "A short wooden staff decorated with engraved silver, depicting a mixture of exotic natural scenes and various holy symbols.  It is said to represent the instincts deep within the heart, tempered by restraint and reason.  Using it can repair and fortify items made of various plant or animal products and stone, but not more refined materials like metal or glass.",
     "weight": "1310 g",
@@ -1364,6 +1370,7 @@
     "id": "verge_meteoric",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ],
     "name": { "str": "meteoric verge" },
     "description": "A short wooden staff, entirely covered in decorative motifs worked from a symbol of judgment.  The symbol's otherworldly presence is still evident in the twisted, flame-like prongs now entwined around a charm of dark, iridescent metal.  Using it will allow you to smite enemies with lightning, protecting you from electrical harm briefly as well.",
     "weight": "1585 g",
@@ -1467,6 +1474,7 @@
     "id": "moonstone_fang",
     "type": "TOOL",
     "category": "weapons",
+    "weapon_category": [ "KNIVES" ],
     "name": { "str": "moonstone fang" },
     "description": "A short, curved spike made of a white opalescent gemstone, richly engraved with swirling serpentine imagery.  Wielding it grant a minor life-draining touch and potentially blind attackers with magic, but it can sicken body and mind.  Activating it will additionally harden the body against cold, draining essence over time.",
     "weight": "160 g",

Arcana/items/vehiclepart_items.json

@@ -18,20 +18,38 @@
   {
     "type": "TOOL",
     "id": "essence_surge_generator_item",
-    "looks_like": "alternator_truck",
+    "copy-from": "essence_surge_generator_item_abstract",
     "name": { "str": "essence surge generator" },
-    "description": "A compact device built using otherworldly mechanisms to convert essence into electricity, providing considerable power if integrated into a vehicle.  Unnaturally efficient yet safe to use, though using magic essence might be prohibitively expensive for most purposes.",
-    "weight": "10 kg",
-    "color": "light_cyan",
-    "symbol": ":",
-    "material": [ "steel" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "essence_type": 1000 }, "rigid": true } ],
-    "volume": "6 L",
-    "melee_damage": { "bash": 4 },
-    "category": "veh_parts",
-    "price": "8000 USD",
-    "price_postapoc": "70 USD",
-    "ammo": [ "essence_type" ]
+    "description": "A compact device built using otherworldly mechanisms to convert different types essence into electricity, yielding double the energy each essence holds if integrated into a vehicle.  Safe to use, but using magic essence might be prohibitively expensive for most purposes.",
+    "ammo": [ "essence_type" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "essence_type": 1000 }, "rigid": true } ]
+  },
+  {
+    "type": "TOOL",
+    "id": "essence_blood_surge_generator_item",
+    "copy-from": "essence_surge_generator_item_abstract",
+    "name": { "str": "blood essence surge generator" },
+    "description": "A compact device built using otherworldly mechanisms to convert blood essence into electricity, providing a good source of power if integrated into a vehicle.  Safe to use despite its nature and unnaturally efficient, assuming one can afford the cost of obtaining essence fron life force in such quantities.",
+    "ammo": [ "essence_blood_type" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "essence_blood_type": 3000 }, "rigid": true } ]
+  },
+  {
+    "type": "TOOL",
+    "id": "essence_dull_surge_generator_item",
+    "copy-from": "essence_surge_generator_item_abstract",
+    "name": { "str": "dull essence surge generator" },
+    "description": "A compact device built using otherworldly mechanisms to turn dull essence into a reliable source of power, if integrated into a vehicle.  Unnaturally efficient yet safe to use, assuming one can obtain large quantities of consecrated essence.",
+    "ammo": [ "essence_dull_type" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "essence_dull_type": 30000 }, "rigid": true } ]
+  },
+  {
+    "type": "TOOL",
+    "id": "essence_pure_surge_generator_item",
+    "copy-from": "essence_surge_generator_item_abstract",
+    "name": { "str": "crystallized essence surge generator" },
+    "description": "A compact device built using otherworldly mechanisms to burn crystalized essence for power, if integrated into a vehicle.  Somehow not a bomb despite the immense energy density and unnatural efficiency, but surely highly-concentrated magic energy would be complete overkill for all but the hungriest of rolling bunkers?",
+    "ammo": [ "essence_pure_type" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "essence_pure_type": 100 }, "rigid": true } ]
   },
   {
     "type": "TOOL",

Arcana/martialarts.json

@@ -1,115 +1,4 @@
 [
-  {
-    "id": "style_aikido",
-    "copy-from": "style_aikido",
-    "type": "martial_art",
-    "name": { "str": "Aikido" },
-    "extend": { "weapons": [ "hand_of_armok" ] }
-  },
-  {
-    "id": "style_judo",
-    "copy-from": "style_judo",
-    "type": "martial_art",
-    "name": { "str": "Judo" },
-    "extend": { "weapons": [ "hand_of_armok" ] }
-  },
-  {
-    "id": "style_silat",
-    "copy-from": "style_silat",
-    "type": "martial_art",
-    "name": { "str": "Silat" },
-    "extend": {
-      "weapons": [
-        "blood_athame",
-        "moonstone_fang",
-        "moonstone_fang_on",
-        "staff_druidic",
-        "verge_meteoric",
-        "bloodscourge",
-        "scourge_staff",
-        "spear_pestilence"
-      ]
-    }
-  },
-  {
-    "id": "style_krav_maga",
-    "copy-from": "style_krav_maga",
-    "type": "martial_art",
-    "name": { "str": "Krav Maga" },
-    "extend": { "weapons": [ "blood_athame", "moonstone_fang", "moonstone_fang_on", "staff_druidic", "verge_meteoric" ] }
-  },
-  {
-    "id": "style_fencing",
-    "copy-from": "style_fencing",
-    "type": "martial_art",
-    "name": { "str": "Fencing" },
-    "extend": { "weapons": [ "sun_sword", "sun_sword_on", "shrike_misericorde", "staff_druidic", "verge_meteoric" ] }
-  },
-  {
-    "id": "style_swordsmanship",
-    "copy-from": "style_swordsmanship",
-    "type": "martial_art",
-    "name": { "str": "Medieval Swordsmanship" },
-    "extend": { "weapons": [ "sun_sword", "sun_sword_on", "veilblade", "stormbringer", "stormbringer_on" ] }
-  },
-  {
-    "id": "style_medievalpole",
-    "copy-from": "style_medievalpole",
-    "type": "martial_art",
-    "name": { "str": "Fior Di Battaglia" },
-    "extend": { "weapons": [ "lucern_hexenhammer" ] }
-  },
-  {
-    "id": "style_ninjutsu",
-    "copy-from": "style_ninjutsu",
-    "type": "martial_art",
-    "name": { "str": "Ninjutsu" },
-    "extend": {
-      "weapons": [
-        "hand_of_armok",
-        "sun_sword",
-        "sun_sword_on",
-        "blood_athame",
-        "lichhook",
-        "moonstone_fang",
-        "moonstone_fang_on",
-        "bloodscourge",
-        "scourge_staff"
-      ]
-    }
-  },
-  {
-    "id": "style_eskrima",
-    "copy-from": "style_eskrima",
-    "type": "martial_art",
-    "name": { "str": "Eskrima" },
-    "extend": {
-      "weapons": [
-        "graboid_fang",
-        "dermatik_sting",
-        "monster_fang",
-        "blood_athame",
-        "moonstone_fang",
-        "moonstone_fang_on",
-        "staff_druidic",
-        "verge_meteoric"
-      ]
-    }
-  },
-  {
-    "id": "style_sojutsu",
-    "copy-from": "style_sojutsu",
-    "type": "martial_art",
-    "name": { "str": "Sōjutsu" },
-    "extend": { "weapons": [ "spear_pestilence" ] }
-  },
-  {
-    "id": "style_barbaran",
-    "copy-from": "style_barbaran",
-    "type": "martial_art",
-    "name": { "str": "Barbaran Montante" },
-    "extend": { "weapons": [ "stormbringer", "stormbringer_on", "veilblade", "hexenhammer", "lucern_hexenhammer" ] }
-  },
   {
     "type": "martial_art",
     "id": "style_cleansingflame",

Arcana/vehicleparts.json

@@ -46,21 +46,15 @@
     "description": "A powerful electric motor relying on spatial distortion.  Outputs more energy than it consumes, but unusable as a source of free energy.  Multiple can be installed without penalty, but alternators cannot be installed on it."
   },
   {
+    "abstract": "essence_surge_generator_abstract",
     "type": "vehicle_part",
-    "id": "essence_surge_generator_part",
-    "name": { "str": "essence surge generator" },
     "symbol": "O",
     "color": "light_blue",
     "broken_symbol": "#",
     "broken_color": "dark_gray",
     "damage_modifier": 60,
     "durability": 200,
-    "description": "An exotic reactor designed to be charged with essence, broken down in a reaction that increases its potential output.  Unnaturally efficient and reliable, though limited by how precious a fuel source such otherworldly energies are.",
-    "//": "Doubles effective energy output of each essence put into it.",
-    "power": "200 W",
-    "epower": "300 kW",
-    "fuel_type": "essence",
-    "item": "essence_surge_generator_item",
+    "description": "An abstract part that essence surge generators inherit from.",
     "location": "fuel_source",
     "requirements": {
       "install": {
@@ -88,6 +82,51 @@
     ],
     "damage_reduction": { "all": 10 }
   },
+  {
+    "type": "vehicle_part",
+    "id": "essence_surge_generator_part",
+    "copy-from": "essence_surge_generator_abstract",
+    "name": { "str": "essence surge generator" },
+    "description": "An exotic reactor that breaks down essence, in a reaction that doubles power output.  Unnaturally efficient and reliable, though limited by how precious a fuel source such otherworldly energies are.",
+    "//": "Doubles effective energy output of each essence put into it.",
+    "power": "300 W",
+    "epower": "300 kW",
+    "fuel_type": "essence",
+    "item": "essence_surge_generator_item"
+  },
+  {
+    "type": "vehicle_part",
+    "id": "essence_blood_surge_generator_part",
+    "copy-from": "essence_surge_generator_abstract",
+    "name": { "str": "blood essence surge generator" },
+    "description": "An exotic reactor that breaks down blood essence, in a reaction that doubles power output.  Unnaturally efficient and reliable, though sustaining it with magical energy made from life force may be difficult.",
+    "power": "100 W",
+    "epower": "100 kW",
+    "fuel_type": "essence_blood",
+    "item": "essence_blood_surge_generator_item"
+  },
+  {
+    "type": "vehicle_part",
+    "id": "essence_dull_surge_generator_part",
+    "copy-from": "essence_surge_generator_abstract",
+    "name": { "str": "dull essence surge generator" },
+    "description": "An exotic reactor that breaks down dull essence, in a reaction that doubles power output.  Unnaturally efficient and reliable, though it may be prohibitive to sustain it with large amounts of consecrated energy.",
+    "power": "10 W",
+    "epower": "10 kW",
+    "fuel_type": "essence_dull",
+    "item": "essence_dull_surge_generator_item"
+  },
+  {
+    "type": "vehicle_part",
+    "id": "essence_pure_surge_generator_part",
+    "copy-from": "essence_surge_generator_abstract",
+    "name": { "str": "crystallized essence surge generator" },
+    "description": "An exotic reactor that breaks down crystallized essence, in a reaction that doubles power output.  Unnaturally efficient and reliable, though surely such enormous energy density is overkill for all but the hungriest of rolling bunkers?",
+    "power": "3 kW",
+    "epower": "3000 kW",
+    "fuel_type": "essence_pure",
+    "item": "essence_pure_surge_generator_item"
+  },
   {
     "type": "vehicle_part",
     "id": "surge_generator_part",

Arcana_BN/items/ammo.json

@@ -63,7 +63,7 @@
     "count": 1,
     "ammo_type": "essence_pure_type",
     "effects": [ "NEVER_MISFIRES", "NON-FOULING" ],
-    "fuel": { "energy": 1200 }
+    "fuel": { "energy": 1500 }
   },
   {
     "id": "essence_fake",