Port to DDA.

3 files changed, 41 insertions, 47 deletions

diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_currency.json b/vamp_stuff/Modification_Files/Items/Misc/v_currency.json
index af7c4b1..f739cd7 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_currency.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_currency.json
@@ -1,11 +1,12 @@
 [
   {
     "type": "GENERIC",
+    "category": "currency",
     "id": "bloodcoin",
     "name": { "str": "Velvet Token" },
     "description": "A well-made, handcrafted crimson coin produced from the blood of an unknown creature. Its one side is adorned in impressive etched decorations, and the other shows the image of a man, with undecipherable text below it.",
-    "price": "50 cent",
-    "price_postapoc": "1000 cent",
+    "price": 50,
+    "price_postapoc": 1000,
     "weight": "2 g",
     "volume": "2 ml",
     "to_hit": -3,
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
index 125490f..2e3e236 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
@@ -1,63 +1,55 @@
 [
   {
     "type": "material",
-    "ident": "compactblood",
+    "//": "Loosely based on leather.",
+    "id": "compactblood",
     "name": "Compacted Blood",
     "density": 4,
+    "specific_heat_liquid": 1.5,
+    "specific_heat_solid": 1.5,
+    "latent_heat": 273,
     "soft": true,
+    "reinforces": true,
     "bash_resist": 8,
     "cut_resist": 5,
+    "bullet_resist": 8,
     "acid_resist": 1,
     "fire_resist": 1,
     "elec_resist": 2,
     "chip_resist": 12,
-    "bullet_resist": 8,
+    "breathability": "POOR",
+    "wind_resist": 90,
     "repaired_with": "compactsheet",
     "salvaged_into": "compactsheet",
     "dmg_adj": [ "scratched", "cut", "shredded", "tattered" ],
     "bash_dmg_verb": "ripped",
-    "cut_dmg_verb": "sliced"
+    "cut_dmg_verb": "sliced",
+    "burn_data": [
+      { "fuel": 0, "smoke": 0, "burn": 0 },
+      { "fuel": 1, "smoke": 3, "burn": 2, "volume_per_turn": "500 ml" },
+      { "fuel": 1, "smoke": 3, "burn": 2 }
+    ],
+    "burn_products": [ [ "corpse_ash", 0.035 ] ]
   },
   {
     "type": "material",
-    "ident": "ethereal",
+    "id": "ethereal",
     "name": "Ethereal",
     "density": 0,
+    "specific_heat_liquid": 0.82,
+    "specific_heat_solid": 0.45,
+    "latent_heat": 273,
     "soft": true,
     "bash_resist": 1000,
     "cut_resist": 1000,
+    "bullet_resist": 800,
     "acid_resist": 0,
     "fire_resist": 0,
     "elec_resist": 0,
     "chip_resist": 100,
-    "bullet_resist": 800,
     "dmg_adj": [ "invincible", "invincible", "invincible", "invincible" ],
     "bash_dmg_verb": "invincible",
-    "cut_dmg_verb": "invincible"
-  },
-  {
-    "type": "material",
-    "id": "blood",
-    "name": "Blood",
-    "density": 1,
-    "specific_heat_liquid": 4.186,
-    "specific_heat_solid": 2.108,
-    "latent_heat": 333,
-    "edible": true,
-    "bash_resist": 0,
-    "cut_resist": 0,
-    "acid_resist": 0,
-    "fire_resist": 1,
-    "elec_resist": 0,
-    "chip_resist": 0,
-    "bullet_resist": 0,
-    "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
-    "bash_dmg_verb": "damaged",
-    "cut_dmg_verb": "damaged",
-    "burn_data": [
-      { "fuel": -100, "smoke": 1, "burn": 1 },
-      { "fuel": -50, "smoke": 2, "burn": 1 },
-      { "fuel": -10, "smoke": 2, "burn": 2 }
-    ]
+    "cut_dmg_verb": "invincible",
+    "burn_products": [ [ "pebble", 1 ] ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
index ee0dbd1..eb21ccc 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
@@ -6,10 +6,10 @@
     "copy-from": "blood",
     "name": { "str": "blood", "str_pl": "blood" },
     "description": "Blood, possibly that of a human.  Disgusting!",
-    "weight": "265 g",
+    "weight": "262 g",
     "volume": "250 ml",
-    "price": "0 cent",
-    "material": [ "blood" ],
+    "price": 0,
+    "material": [ "hblood" ],
     "phase": "liquid",
     "symbol": "~",
     "color": "red",
@@ -19,7 +19,8 @@
     "healthy": 4,
     "fun": 15,
     "spoils_in": "1 days",
-    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "VAMPIRISM" ]
+    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "VAMPIRISM" ],
+    "vitamins": [ [ "blood", 15 ] ]
   },
   {
     "id": "blood_reconstituted",
@@ -61,8 +62,8 @@
     "description": "Dehydrated blood powder. Mix with water to make drinkable blood.",
     "weight": "3 g",
     "volume": "3 ml",
-    "price": "0 cent",
-    "material": [ "powder", "blood" ],
+    "price": 0,
+    "material": [ "powder", "hblood" ],
     "primary_material": "powder",
     "symbol": "'",
     "color": "red",
@@ -90,7 +91,7 @@
     "description": "A patch of fabric made from powdered blood. While initially known for its aesthetic qualities, blood leather has proven comparable to kevlar for use in body armor.",
     "weight": "250 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "#",
     "color": "red"
@@ -103,7 +104,7 @@
     "description": "A sticky glob of concentrated blood.",
     "weight": "250 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "o",
     "color": "red"
@@ -116,7 +117,7 @@
     "description": "A tiny blood pellet, sparkling like a sanguine ruby.",
     "weight": "10 g",
     "volume": "3 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": ".",
     "color": "red"
@@ -129,7 +130,7 @@
     "description": "Fine powder made from heating and refining a bloodrune. It generates a stable faint glow.",
     "weight": "750 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "~",
     "color": "red"
@@ -142,7 +143,7 @@
     "description": "A stone similar to a fist-sized ruby, the final remains of a slain vampire. It mimics a heartbeat with unreadable markings on the interior that appear and disappear like clockwork.",
     "weight": "750 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": ".",
     "color": "red"
@@ -155,7 +156,7 @@
     "description": "A stone similar to a head-sized ruby, the final remains of a powerful vampire. It trembles of its own volition, as if the power inside is eager to escape.",
     "weight": "3000 g",
     "volume": "1750 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": ".",
     "color": "red"
@@ -169,9 +170,9 @@
     "description": "This is a sealed IV bag containing blood.  Use to open.",
     "weight": "540 g",
     "volume": "550 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
-    "material": [ "plastic", "blood" ],
+    "material": [ "plastic", "hblood" ],
     "symbol": ")",
     "color": "red",
     "use_action": {