Optimize blood ammunition into templates

2 files changed, 51 insertions, 69 deletions

diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ammo.json b/vamp_stuff/Modification_Files/Items/Weapons/ammo.json
index d394685..f66b49c 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ammo.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ammo.json
@@ -1,35 +1,13 @@
 [
   {
-    "id": "bloodyshaky",
-    "type": "AMMO",
-    "name": { "str": "shaken blood" },
-    "description": "Blood which has slightly thickened from intense shaking. Almost compatible with vampiric guns if you're desperately need to feed them.",
-    "weight": "5 g",
-    "volume": "250 ml",
-    "price_postapoc": 200,
-    "price": 1000,
-    "material": [ "hflesh" ],
-    "symbol": "=",
-    "color": "red",
-    "phase": "liquid",
-    "count": 1,
-    "stack_size": 40,
-    "ammo_type": "ammoblood",
-    "range": 15,
-    "damage": { "damage_type": "stab", "amount": 1, "armor_penetration": 5 },
-    "recoil": 100,
-    "loudness": 5,
-    "effects": [ "NO_DROP" ]
-  },
-  {
     "id": "bloodypressure",
     "type": "AMMO",
     "name": { "str": "pressurized blood" },
-    "description": "Cheap and renewable. This heavily compressed blood ammunition is used specifically with certain vampiric guns.",
+    "description": "This heavily compressed blood ammunition is used specifically with vampiric guns.",
     "weight": "5 g",
     "volume": "250 ml",
-    "price_postapoc": 300,
     "price": 2000,
+    "price_postapoc": 300,
     "material": [ "hflesh" ],
     "symbol": "=",
     "color": "red",
@@ -38,73 +16,65 @@
     "stack_size": 20,
     "ammo_type": "ammoblood",
     "range": 8,
-    "damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 25 },
+    "damage": 5,
+    "pierce": 25,
     "recoil": 450,
     "loudness": 10,
     "effects": [ "NO_DROP" ]
   },
   {
+    "id": "bloodyshaky",
+    "type": "AMMO",
+    "copy-from": "bloodypressure",
+    "name": { "str": "shaken blood" },
+    "description": "Blood which has slightly thickened from intense shaking. Almost compatible with vampiric guns if you desperately need to feed them.",
+    "count": 1,
+    "stack_size": 40,
+    "relative": { "range": 7, "damage": -4, "pierce": -20, "recoil": -350, "loudness": -5, },
+    "proportional": { "price": 0.5, "price_postapoc": 0.5 }
+  },
+  {
     "id": "bloodyinfect",
     "type": "AMMO",
+    "copy-from": "bloodypressure",
     "name": { "str": "traversed blood" },
-    "description": "Cheap and easy to collect. A combination of pure and infected blood and much more viscous than others.",
-    "weight": "5 g",
-    "volume": "250 ml",
-    "price_postapoc": 500,
-    "price": 3000,
+    "description": "A combination of pure and infected blood used specifically with vampiric guns. It us much more viscous than normal blood.",
     "material": [ "hflesh", "flesh" ],
-    "symbol": "=",
     "color": "green",
-    "phase": "liquid",
     "count": 10,
     "stack_size": 20,
-    "ammo_type": "ammoblood",
-    "range": 5,
-    "damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 10 },
-    "recoil": 625,
-    "loudness": 30,
-    "effects": [ "NO_DROP" ]
+    "relative": { "range": -3, "damage": 5, "pierce": -15, "recoil": 175, "loudness": 20, },
+    "proportional": { "price": 1.5, "price_postapoc": 1.5 }
   },
   {
     "id": "bloodshot_00",
     "type": "AMMO",
     "name": { "str": "00 bloodshot" },
-    "description": "Blood pellet-filled shot. Maximizes damage at very short range and will cause spread pellets to explode into sharp bits, dealing additional damage on impact. This is the only shotgun ammuminition developed and overused by vampires due to its overall balancing power.",
+    "description": "A shell filled with compacted blood pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by vampires.",
     "weight": "35 g",
     "volume": "250 ml",
     "price_postapoc": 6000,
     "price": 31500,
-    "material": [ "compactblood", "powder" ],
+    "material": [ "compactblood", "plastic", "powder" ],
     "symbol": "=",
     "color": "red",
+    "count": 20,
     "stack_size": 20,
     "ammo_type": "bloodshot",
     "casing": "shot_hull",
-    "range": 4,
-    "damage": { "damage_type": "stab", "amount": 65 },
+    "range": 6,
+    "damage": 65,
     "recoil": 2750,
-    "loudness": 180,
+    "loudness": 160,
     "effects": [ "COOKOFF", "SHOT" ]
   },
   {
     "id": "reloaded_bloodshot_00",
     "type": "AMMO",
-    "name": { "str": "reloaded 00 bloodshot" },
-    "description": "Blood pellet-filled shot. Maximizes damage at very short range and will cause spread pellets to explode into sharp bits, dealing additional damage on impact. This is the only shotgun ammuminition developed and overused by vampires due to its overall balancing power.",
-    "weight": "35 g",
-    "volume": "250 ml",
-    "price_postapoc": 2200,
-    "price": 20500,
-    "material": [ "compactblood", "powder" ],
-    "symbol": "=",
-    "color": "red",
-    "stack_size": 20,
-    "ammo_type": "bloodshot",
-    "casing": "shot_hull",
-    "range": 4,
-    "damage": { "damage_type": "stab", "amount": 57 },
-    "recoil": 2650,
-    "loudness": 180,
-    "effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
+    "copy-from": "bloodshot_00",
+    "name": { "str": "00 bloodshot, reloaded" },
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ammo_recipe.json b/vamp_stuff/Modification_Files/Items/Weapons/ammo_recipe.json
index 49fcf05..a51a2a8 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ammo_recipe.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ammo_recipe.json
@@ -4,8 +4,10 @@
     "type": "recipe",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "cooking",
+    "skills_required": [ "fabrication", 0 ],
     "difficulty": 0,
-    "time": 250,
+    "time": "45 s",
     "book_learn": [ [ "vamp_gunner1", 10 ] ],
     "components": [ [ [ "bloodpowder", 1 ] ] ]
   },
@@ -13,16 +15,20 @@
     "result": "bloodyshaky",
     "type": "recipe",
     "category": "CC_AMMO",
+    "skill_used": "cooking",
+    "skills_required": [ "fabrication", 0 ],
     "difficulty": 0,
-    "time": 75,
+    "time": "45 s",
     "components": [ [ [ "blood", 1 ] ] ]
   },
   {
     "result": "bloodypressure",
     "type": "recipe",
     "category": "CC_AMMO",
+    "skill_used": "cooking",
+    "skills_required": [ "fabrication", 0 ],
     "difficulty": 0,
-    "time": 4500,
+    "time": "45 s",
     "book_learn": [ [ "vamp_gunner1", 10 ] ],
     "qualities": [ { "id": "BCHEMISTRY", "level": 1 } ],
     "components": [ [ [ "bloodpowder", 10 ] ], [ [ "water", 2 ] ] ]
@@ -31,11 +37,13 @@
     "result": "bloodyinfect",
     "type": "recipe",
     "category": "CC_AMMO",
+    "skill_used": "cooking",
+    "skills_required": [ "fabrication", 0 ],
     "difficulty": 0,
-    "time": 4500,
+    "time": "45 s",
     "book_learn": [ [ "vamp_gunner1", 10 ] ],
     "qualities": [ { "id": "BCHEMISTRY", "level": 1 } ],
-    "components": [ [ [ "bloodpowder", 6 ] ], [ [ "meat_tainted", 1 ] ], [ [ "water", 2 ] ] ]
+    "components": [ [ [ "bloodpowder", 6 ] ], [ [ "meat_tainted", 1 ], [ "dry_meat_tainted", 1 ] ], [ [ "water", 2 ] ] ]
   },
   {
     "result": "reloaded_bloodshot_00",
@@ -44,11 +52,15 @@
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "gun",
     "difficulty": 2,
-    "time": 2200,
-    "batch_time_factors": [ 55, 10 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "vamp_gunner1", 10 ] ],
     "charges": 1,
-    "using": [ [ "bullet_forming", 1 ], [ "ammo_shot", 1 ] ],
-    "components": [ [ [ "gunpowder", 6 ], [ "chem_black_powder", 6 ] ], [ [ "pelletblood", 10 ] ] ]
+    "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ],
+    "tools": [ [ [ "press", -1 ] ] ],
+    "components": [
+      [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ],
+      [ [ "pelletblood", 10 ] ]
+    ]
   }
 ]