feat(content): Carbon fiber vehicle frames, swords, advanced 3d lab p…

…rinter (#5276) * Carbon fiber vehicle frames, swords Added in carbon fiber and plastic vehicle frames, carbon fiber and plastic bicycle vehicles, and some more carbon fiber swords to fill out the roster. Renamed carbon fiber sword to carbon fiber katana. * Crafting Time Tweaks Made the carbon fiber and plastic frames line up better with the suggested crafting times for 3D printers. Gave advanced 3D printers a small chance to spawn in the science itemgroup. * Replaced basic 3d printer with advanced * style(autofix.ci): automated formatting * Repair fix * style(autofix.ci): automated formatting * Chip resist, blade recipes Reduced carbon fiber chip resist to make it less sturdy, so it's less of a direct upgrade. Added recipes for carbon fiber swords that just use a blade from a lawnmower. Added new swords to level lists. * Update data/json/vehicleparts/frames.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/vehicle_groups.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/requirements/materials.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/other/vehicles.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/requirements/materials.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> * style(autofix.ci): automated formatting * Nodachi recipe * Plastic, carbon fiber frames weight * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/items/vehicle/frames.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/other/vehicles.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/other/vehicles.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/other/vehicles.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/other/vehicles.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> * Update data/json/recipes/weapon/cutting.json Co-authored-by: Chaosvolt <[email protected]> --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <[email protected]>
cataclysmbnteam · Aug 29, 2024 · 15a8246 · 15a8246
1 parent f875f68
commit 15a8246
Show file tree

Hide file tree

Showing 13 changed files with 405 additions and 3 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json b/data/json/itemgroups/Weapons_Mods_Ammo/weapons_misc.json
@@ -43,6 +43,9 @@
       [ "nodachi", 1 ],
       [ "katana", 2 ],
       [ "sword_carbon", 2 ],
+      [ "broadsword_carbon", 2 ],
+      [ "nodachi_carbon", 2 ],
+      [ "greatsword_carbon", 2 ],
       [ "survnote", 1 ]
     ]
   },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1058,6 +1058,9 @@
       [ "cavalry_sabre_fake", 20 ],
       [ "katana", 1 ],
       [ "sword_carbon", 20 ],
+      [ "broadsword_carbon", 20 ],
+      [ "nodachi_carbon", 20 ],
+      [ "greatsword_carbon", 20 ],
       [ "katana_fake", 20 ],
       [ "katana_inferior", 2 ],
       [ "cutlass", 1 ],

diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -427,7 +427,7 @@
       [ "hygrometer", 3 ],
       [ "barometer", 3 ],
       [ "camera", 3 ],
-      [ "3d_printer_basic", 3 ],
+      [ "3d_printer_advanced", 3 ],
       [ "flask_glass", 10 ],
       [ "bottle_glass", 10 ],
       [ "thermos", 5 ],

diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
@@ -1799,9 +1799,36 @@
     "id": "sword_carbon",
     "type": "GENERIC",
     "copy-from": "katana",
-    "name": { "str": "carbon fiber sword" },
+    "name": { "str": "carbon fiber katana" },
     "description": "A custom 3D-printed single-bladed sword made out of carbon fiber.  It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
     "material": [ "carbon_fiber" ],
     "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
+  },
+  {
+    "id": "broadsword_carbon",
+    "type": "GENERIC",
+    "copy-from": "broadsword",
+    "name": { "str": "carbon fiber sword" },
+    "description": "A custom 3D-printed double-bladed sword made out of carbon fiber.  It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
+    "material": [ "carbon_fiber" ],
+    "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
+  },
+  {
+    "id": "nodachi_carbon",
+    "type": "GENERIC",
+    "copy-from": "nodachi",
+    "name": { "str": "carbon fiber nodachi" },
+    "description": "A custom 3D-printed single-bladed two-handed sword made out of carbon fiber.  It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
+    "material": [ "carbon_fiber" ],
+    "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
+  },
+  {
+    "id": "greatsword_carbon",
+    "type": "GENERIC",
+    "copy-from": "zweihander",
+    "name": { "str": "carbon fiber greatsword" },
+    "description": "A custom 3D-printed two-handed sword made out of carbon fiber.  It is more lightweight than a normal sword thanks to its method of manufacturing, but it can only be repaired using a 3D printer.",
+    "material": [ "carbon_fiber" ],
+    "proportional": { "weight": 0.6, "price": 2, "price_postapoc": 2 }
   }
 ]
diff --git a/data/json/items/vehicle/frames.json b/data/json/items/vehicle/frames.json
@@ -96,5 +96,29 @@
     "price": "10 USD",
     "price_postapoc": "50 cent",
     "copy-from": "foldframe"
+  },
+  {
+    "type": "GENERIC",
+    "id": "frame_plastic",
+    "name": { "str": "plastic frame" },
+    "description": "A large frame made of plastic.  Useful for cheap and lightweight vehicles.",
+    "weight": "2500 g",
+    "color": "brown",
+    "material": [ "plastic" ],
+    "price": "35 USD",
+    "price_postapoc": "1 USD",
+    "copy-from": "foldframe"
+  },
+  {
+    "type": "GENERIC",
+    "id": "frame_carbon",
+    "name": { "str": "carbon fiber frame" },
+    "description": "A large frame made of plastic.  Useful for lightweight yet sturdy vehicles.",
+    "weight": "1500 g",
+    "color": "brown",
+    "material": [ "carbon_fiber" ],
+    "price": "35 USD",
+    "price_postapoc": "1 USD",
+    "copy-from": "foldframe"
   }
 ]
diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1865,7 +1865,7 @@
     "acid_resist": 5,
     "fire_resist": 3,
     "elec_resist": 2,
-    "chip_resist": 20,
+    "chip_resist": 14,
     "repaired_with": "carbon_fiber_filament",
     "salvaged_into": "carbon_fiber_filament",
     "dmg_adj": [ "dented", "bent", "smashed", "shattered" ],

diff --git a/data/json/recipes/other/vehicles.json b/data/json/recipes/other/vehicles.json
@@ -1505,5 +1505,42 @@
     "book_learn": [ [ "textbook_computer", 1 ], [ "advanced_electronics", 1 ], [ "reference_fabrication1", 1 ] ],
     "using": [ [ "3d_printing_standard", 10 ] ],
     "components": [ [ [ "carbon_fiber_filament", 100 ] ] ]
+  },
+  {
+    "result": "frame_plastic",
+    "type": "recipe",
+    "id_suffix": "printed",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "computer",
+    "difficulty": 1,
+    "autolearn": true,
+    "time": "50 m",
+    "using": [ [ "3d_printing_standard", 50 ] ],
+    "components": [ [ [ "plastic_chunk", 50 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "frame_plastic",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "time": "75 m",
+    "autolearn": true,
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 75, "LIST" ] ] ],
+    "components": [ [ [ "plastic_chunk", 50 ] ] ]
+  },
+  {
+    "result": "frame_carbon",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "computer",
+    "difficulty": 2,
+    "autolearn": true,
+    "time": "30 m",
+    "using": [ [ "3d_printing_standard", 30 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 300 ] ] ]
   }
 ]
diff --git a/data/json/recipes/weapon/cutting.json b/data/json/recipes/weapon/cutting.json
@@ -705,6 +705,104 @@
     "using": [ [ "3d_printing_standard", 10 ], [ "steel_standard", 1 ], [ "blacksmithing_standard", 4 ] ],
     "components": [ [ [ "carbon_fiber_filament", 100 ] ] ]
   },
+  {
+    "result": "sword_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "id_suffix": "blade",
+    "skill_used": "computer",
+    "difficulty": 3,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "time": "10 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 10 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 100 ] ], [ [ "blade", 1 ] ] ]
+  },
+  {
+    "result": "broadsword_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "computer",
+    "difficulty": 3,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "//": "Increased time since some forging incorporated into material for the edge",
+    "time": "60 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 10 ], [ "steel_standard", 2 ], [ "blacksmithing_standard", 8 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 100 ] ] ]
+  },
+  {
+    "result": "broadsword_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "id_suffix": "blade",
+    "skill_used": "computer",
+    "difficulty": 3,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "time": "10 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 10 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 100 ] ], [ [ "blade", 1 ] ] ]
+  },
+  {
+    "result": "greatsword_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "computer",
+    "difficulty": 4,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "//": "Increased time since some forging incorporated into material for the edge",
+    "time": "90 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 20 ], [ "steel_standard", 3 ], [ "blacksmithing_standard", 12 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 200 ] ] ]
+  },
+  {
+    "result": "greatsword_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "id_suffix": "blade",
+    "skill_used": "computer",
+    "difficulty": 4,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "time": "20 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 20 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 200 ] ], [ [ "blade", 1 ] ] ]
+  },
+  {
+    "result": "nodachi_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "skill_used": "computer",
+    "difficulty": 4,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "//": "Increased time since some forging incorporated into material for the edge",
+    "time": "90 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 20 ], [ "steel_standard", 3 ], [ "blacksmithing_standard", 12 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 200 ] ] ]
+  },
+  {
+    "result": "nodachi_carbon",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_CUTTING",
+    "id_suffix": "blade",
+    "skill_used": "computer",
+    "difficulty": 4,
+    "skills_required": [ [ "fabrication", 2 ] ],
+    "time": "20 m",
+    "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
+    "using": [ [ "3d_printing_standard", 20 ] ],
+    "components": [ [ [ "carbon_fiber_filament", 200 ] ], [ [ "blade", 1 ] ] ]
+  },
   {
     "result": "katar_carbon",
     "type": "recipe",

diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json
@@ -282,6 +282,12 @@
     "//": "Materials used for repairing superalloy parts",
     "components": [ [ [ "alloy_sheet", 1 ] ] ]
   },
+  {
+    "id": "vehicle_repair_carbon",
+    "type": "requirement",
+    "//": "Materials used for repairing carbon fiber parts",
+    "components": [ [ [ "carbon_fiber_filament", 1 ] ] ]
+  },
   {
     "id": "wood_structural",
     "type": "requirement",

diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
@@ -16,7 +16,9 @@
       [ "beetle", 500 ],
       [ "bicycle", 800 ],
       [ "bicycle_dirt", 200 ],
+      [ "bicycle_plastic", 100 ],
       [ "bicycle_electric", 100 ],
+      [ "bicycle_carbon", 100 ],
       [ "motorcycle", 200 ],
       [ "motorcycle_cross", 20 ],
       [ "motorcycle_enduro", 50 ],