Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

SuddenEyePuncture · Jun 14, 2021 · 8ffdf63 · 8ffdf63
2 parents 10e8689 + 033a568
commit 8ffdf63
Show file tree

Hide file tree

Showing 22 changed files with 173 additions and 112 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,15 +73,15 @@ jobs:
             ext: zip
             content: application/zip
           - name: Linux Tiles x64
-            os: ubuntu-latest
+            os: ubuntu-18.04
             mxe: none
             android: none
             tiles: 1
             artifact: linux-tiles-x64
             ext: tar.gz
             content: application/gzip
           - name: linux-curses-x64
-            os: ubuntu-latest
+            os: ubuntu-18.04
             mxe: none
             android: none
             tiles: 0

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2593,6 +2593,7 @@
     "time": "60 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 20 ] ], [ [ "wood_panel", 3 ] ] ],
+    "pre_special": "check_nofloor_above",
     "pre_terrain": "t_wood_stairs_up_broken",
     "post_terrain": "t_wood_stairs_up",
     "post_special": "done_wood_stairs"
@@ -2620,6 +2621,7 @@
     "time": "360 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "wood_panel", 4 ] ], [ [ "nail", 30 ] ] ],
+    "pre_special": "check_nofloor_above",
     "pre_terrain": "t_wood_stairs_up_half",
     "post_terrain": "t_wood_stairs_up",
     "post_special": "done_wood_stairs"
@@ -2668,7 +2670,6 @@
     "tools": [ [ [ "con_mix", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ] ] ],
-    "pre_terrain": "t_pit_shallow",
     "pre_special": "check_ramp_low",
     "post_terrain": "t_ramp_up_low",
     "post_special": "done_ramp_low"
@@ -2685,7 +2686,6 @@
     "tools": [ [ [ "con_mix", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ] ] ],
-    "pre_terrain": "t_pit_shallow",
     "pre_special": "check_ramp_high",
     "post_terrain": "t_ramp_up_high",
     "post_special": "done_ramp_high"

diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json
@@ -177,7 +177,8 @@
             { "item": "sample_t_substrate" },
             { "item": "log_immersion27" },
             { "item": "HAADF_t_substrate" },
-            { "item": "report_t_substrate" }
+            { "item": "report_t_substrate" },
+            { "item": "id_science" }
           ]
         }
       },

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -681,7 +681,6 @@
     "difficulty": 1,
     "time": "2 h",
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 40 ] ]
   },

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -609,7 +609,6 @@
     "time": "50 m",
     "autolearn": true,
     "reversible": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 36 ] ]
   },

diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
@@ -428,7 +428,6 @@
     "time": "40 m",
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 120 ] ]
   },
@@ -1042,7 +1041,6 @@
     "time": "40 m",
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 100 ] ]
   },
@@ -1071,7 +1069,6 @@
     "time": "4 h",
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 190 ] ]
   },
@@ -1579,7 +1576,6 @@
     "time": "1 h",
     "autolearn": true,
     "reversible": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 80 ] ]
   },
@@ -1643,7 +1639,6 @@
     "difficulty": 3,
     "time": "1 h 20 m",
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 160 ] ]
   },

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -851,7 +851,6 @@
     "difficulty": 4,
     "time": "5 h",
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 910 ] ]
   },
@@ -1349,7 +1348,6 @@
     "time": "6 h",
     "autolearn": true,
     "reversible": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 550 ] ]
   },
@@ -1365,7 +1363,6 @@
     "autolearn": true,
     "reversible": true,
     "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ],
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 620 ] ]
   },

diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -861,22 +861,6 @@
     "tools": [ [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ], [ "forge", 100 ], [ "oxy_torch", 20 ] ] ],
     "components": [ [ [ "steel_lump", 8 ], [ "steel_plate", 1 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ], [ "spike", 4 ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "BRISK_EXERCISE",
-    "result": "hard_plate",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_PARTS",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "//": "hardened metal tools require high fabrication, so +1 diff here",
-    "time": "12 m",
-    "reversible": true,
-    "book_learn": [ [ "textbook_fabrication", 5 ], [ "adv_chemistry", 6 ], [ "welding_book", 5 ] ],
-    "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ], [ "forge", 100 ], [ "oxy_torch", 20 ] ] ],
-    "components": [ [ [ "steel_lump", 24 ] ] ]
-  },
   {
     "result": "fridgetank",
     "type": "recipe",

diff --git a/data/json/vehicleparts/battery.json b/data/json/vehicleparts/battery.json
@@ -22,7 +22,8 @@
       "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "600 s", "using": [ [ "welding_standard", 5 ] ] }
     },
-    "flags": [ "FOLDABLE" ]
+    "flags": [ "FOLDABLE" ],
+    "damage_reduction": { "bash": 10 }
   },
   {
     "id": "battery_motorbike",
@@ -133,7 +134,8 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "600 s", "using": [ [ "welding_standard", 5 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "300 s", "using": "vehicle_weld_removal" }
-    }
+    },
+    "damage_reduction": { "bash": 10 }
   },
   {
     "id": "storage_battery_removable",

diff --git a/data/json/vehicleparts/boards.json b/data/json/vehicleparts/boards.json
@@ -31,7 +31,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
-    "damage_reduction": { "all": 28 }
+    "damage_reduction": { "all": 7 }
   },
   {
     "id": "board",
@@ -63,7 +63,8 @@
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
-    }
+    },
+    "damage_reduction": { "all": 0, "bash": 3 }
   },
   {
     "id": "clothboard",
@@ -100,7 +101,7 @@
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
     "extend": { "categories": [ "cargo" ], "flags": [ "OPAQUE", "CARGO", "COVERED", "FULL_BOARD", "LOCKABLE_CARGO" ] },
-    "damage_reduction": { "all": 28 }
+    "damage_reduction": { "all": 7 }
   },
   {
     "id": "hdstowboard",
@@ -111,7 +112,7 @@
     "color": "brown",
     "broken_color": "dark_gray",
     "proportional": { "durability": 4.15, "size": 0.76 },
-    "damage_reduction": { "all": 72, "cut": 80, "stab": 80 }
+    "damage_reduction": { "all": 20 }
   },
   {
     "abstract": "hdboard_abstract",
@@ -127,7 +128,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
-    "damage_reduction": { "all": 75, "cut": 80, "stab": 80 }
+    "damage_reduction": { "all": 20 }
   },
   {
     "id": "hdboard",
@@ -160,7 +161,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "damage_reduction": { "all": 16, "cut": 8, "stab": 8 }
+    "damage_reduction": { "all": 5 }
   },
   {
     "id": "woodboard",
@@ -195,6 +196,6 @@
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
     "extend": { "flags": [ "HALF_BOARD" ] },
-    "damage_reduction": { "all": 8 }
+    "damage_reduction": { "all": 5 }
   }
 ]
diff --git a/data/json/vehicleparts/doors.json b/data/json/vehicleparts/doors.json
@@ -7,7 +7,7 @@
     "categories": [ "hull" ],
     "color": "cyan",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 21 },
+    "damage_reduction": { "all": 20 },
     "description": "A door.  Has a window so you can see out of it, even when closed.",
     "durability": 225,
     "flags": [ "CARGO", "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "DOOR" ],
@@ -33,7 +33,7 @@
     "categories": [ "hull" ],
     "color": "cyan",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 28 },
+    "damage_reduction": { "all": 20 },
     "description": "A door.  Solid construction means you can't see through it when closed.",
     "durability": 240,
     "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
@@ -59,7 +59,7 @@
     "categories": [ "hull" ],
     "color": "cyan",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 68 },
+    "damage_reduction": { "all": 30 },
     "description": "A strong door.  Has a window so you can see out of it, even when closed.",
     "durability": 600,
     "flags": [ "CARGO", "OBSTACLE", "OPENABLE", "BOARDABLE", "WINDOW", "DOOR" ],
@@ -85,7 +85,7 @@
     "categories": [ "hull" ],
     "color": "cyan",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 75 },
+    "damage_reduction": { "all": 30 },
     "description": "A strong door.  Solid construction means you can't see through it when closed.",
     "durability": 660,
     "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
@@ -111,7 +111,7 @@
     "categories": [ "hull" ],
     "color": "cyan",
     "damage_modifier": 75,
-    "damage_reduction": { "all": 28 },
+    "damage_reduction": { "all": 20 },
     "description": "An interior door.  Solid construction means you can't see through it when closed.",
     "durability": 240,
     "flags": [ "OBSTACLE", "OPAQUE", "OPENABLE", "ROOF", "BOARDABLE", "DOOR" ],
@@ -136,7 +136,7 @@
     "categories": [ "hull" ],
     "color": "light_gray",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 30 },
+    "damage_reduction": { "all": 20 },
     "description": "A strong door.  A window lets you see through it when closed.",
     "durability": 420,
     "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW" ],
@@ -162,7 +162,7 @@
     "categories": [ "hull" ],
     "color": "light_gray",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 34 },
+    "damage_reduction": { "all": 20 },
     "description": "A strong door.  Solid construction means you can't see through it when closed.",
     "durability": 450,
     "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
@@ -188,7 +188,7 @@
     "categories": [ "hull" ],
     "color": "dark_gray",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 78 },
+    "damage_reduction": { "all": 30 },
     "description": "A very strong door.  A window lets you see through it when closed.",
     "durability": 900,
     "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW" ],
@@ -214,7 +214,7 @@
     "categories": [ "hull" ],
     "color": "dark_gray",
     "damage_modifier": 80,
-    "damage_reduction": { "all": 80 },
+    "damage_reduction": { "all": 30 },
     "description": "A very strong door.  Solid construction means you can't see through it when closed.",
     "durability": 1000,
     "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],

diff --git a/data/json/vehicleparts/frames.json b/data/json/vehicleparts/frames.json
@@ -17,7 +17,7 @@
     },
     "flags": [ "INITIAL_PART", "MOUNTABLE", "FOLDABLE" ],
     "categories": [ "hull" ],
-    "damage_reduction": { "all": 8 }
+    "damage_reduction": { "all": 10 }
   },
   {
     "id": "folding_wooden_frame",
@@ -39,7 +39,7 @@
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
     "flags": [ "INITIAL_PART", "MOUNTABLE", "FOLDABLE" ],
-    "damage_reduction": { "all": 12 }
+    "damage_reduction": { "all": 3 }
   },
   {
     "id": "frame",
@@ -58,7 +58,7 @@
     },
     "flags": [ "MOUNTABLE", "INITIAL_PART" ],
     "categories": [ "hull" ],
-    "damage_reduction": { "all": 52 }
+    "damage_reduction": { "all": 20 }
   },
   {
     "id": "frame_wood",
@@ -79,7 +79,7 @@
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
     "flags": [ "MOUNTABLE", "INITIAL_PART" ],
-    "damage_reduction": { "all": 52 }
+    "damage_reduction": { "all": 5 }
   },
   {
     "id": "frame_wood_light",
@@ -99,7 +99,7 @@
       "repair": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "adhesive", 1 ] ] }
     },
     "flags": [ "MOUNTABLE", "INITIAL_PART" ],
-    "damage_reduction": { "all": 46 }
+    "damage_reduction": { "all": 4 }
   },
   {
     "id": "hdframe",
@@ -119,7 +119,7 @@
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "10 m", "using": [ [ "welding_standard", 10 ] ] }
     },
     "flags": [ "MOUNTABLE", "INITIAL_PART" ],
-    "damage_reduction": { "all": 112 }
+    "damage_reduction": { "all": 30 }
   },
   {
     "id": "xlframe",
@@ -139,6 +139,6 @@
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 10 ] ] }
     },
     "flags": [ "MOUNTABLE", "INITIAL_PART" ],
-    "damage_reduction": { "all": 28 }
+    "damage_reduction": { "all": 7 }
   }
 ]