Merge remote-tracking branch 'CleverRaven/master' into debug-edit-pre…

…view

# Conflicts:
#	src/cata_tiles.cpp

.github/stale.yml

@@ -54,7 +54,7 @@ closeComment: >
   re-opened if you are going to actively work on it
 
 # Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 1
+limitPerRun: 2
 
 # Limit to only `issues` or `pulls`
 # only: issues

.github/workflows/json.yml

@@ -1,9 +1,7 @@
 name: JSON Validation
 
 on:
-  push:
-    paths:
-    - "*.json"
+  pull_request
 
 jobs:
   style-json:
@@ -17,3 +15,6 @@ jobs:
         fetch-depth: 10
     - name: JSON style check
       run: make style-json
+    - name: Display Corrections
+      if: failure()
+      run: git diff

ISSUES.md

@@ -44,7 +44,7 @@ Remember to take part in the discussion of your suggestions.
 
 ### Questions
 
-You should direct your questions to the forum or ask on IRC. You should also read the included documentation and additional text files, e.g. `COMPILING.md` if you have problems building.
+You should direct your questions to the forum or ask on IRC. You should also read the included documentation and additional text files, e.g. [COMPILING.md](doc/COMPILING/COMPILING.md) if you have problems building.
 
 ## Bounties
 

README.md

@@ -16,12 +16,12 @@ The source can either be downloaded as [an archive](https://github.com/CleverRav
 
 ## Compile
 
-Please read [COMPILING.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING.md) - it covers general information and more specific recipes for Linux, OS X, Windows and BSD. See [doc/COMPILER_SUPPORT.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/COMPILER_SUPPORT.md) for details on which compilers we support. And you can always dig for more information in [doc/](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc).
+Please read [COMPILING.md](doc/COMPILING/COMPILING.md) - it covers general information and more specific recipes for Linux, OS X, Windows and BSD. See [COMPILER_SUPPORT.md](doc/COMPILING/COMPILER_SUPPORT.md) for details on which compilers we support. And you can always dig for more information in [doc/](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc).
 
 We also have the following build guides:
-* Building on Windows with `MSYS2` at [COMPILING-MSYS.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING-MSYS.md)
-* Building on Windows with `vcpkg` at [COMPILING-VS-VCPKG.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING-VS-VCPKG.md)
-* Building with `cmake` at [COMPILING-CMAKE.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING-CMAKE.md)  (*unofficial guide*)
+* Building on Windows with `MSYS2` at [COMPILING-MSYS.md](doc/COMPILING/COMPILING-MSYS.md)
+* Building on Windows with `vcpkg` at [COMPILING-VS-VCPKG.md](doc/COMPILING/COMPILING-VS-VCPKG.md)
+* Building with `cmake` at [COMPILING-CMAKE.md](doc/COMPILING/COMPILING-CMAKE.md)  (*unofficial guide*)
 
 ## Contribute
 

data/json/bionics.json

@@ -1072,6 +1072,19 @@
     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ],
     "act_cost": 50
   },
+  {
+    "id": "bio_fuel_cell_gasoline",
+    "type": "bionic",
+    "name": "Gasoline Fuel Cell CBM",
+    "description": "A small gasoline fuel cell fixed to your scapula. Despite its limited energy output compared to other fuel cells, this device still produces a significant amount of heat dissipated through a heat exhaust protruding from your back.  A diffuse network of bio-plastic bladders has been meshed with your circulatory system and serves as a fuel tank.",
+    "occupied_bodyparts": [ [ "TORSO", 8 ] ],
+    "encumbrance": [ [ "TORSO", 5 ] ],
+    "fuel_options": [ "gasoline" ],
+    "fuel_capacity": 500,
+    "fuel_efficiency": 0.25,
+    "time": 1,
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
+  },
   {
     "id": "bio_syringe",
     "type": "bionic",

data/json/construction.json

@@ -38,7 +38,7 @@
     "description": "Spike Pit",
     "category": "DIG",
     "required_skills": [ [ "survival", 1 ] ],
-    "time": "30 m",
+    "time": "5 m",
     "components": [ [ [ "spear_wood", 4 ], [ "pointy_stick", 4 ] ] ],
     "pre_terrain": "t_pit",
     "post_terrain": "t_pit_spiked"
@@ -48,7 +48,7 @@
     "description": "Glass Pit",
     "category": "DIG",
     "required_skills": [ [ "survival", 1 ] ],
-    "time": "30 m",
+    "time": "5 m",
     "components": [ [ [ "glass_shard", 168 ] ] ],
     "pre_terrain": "t_pit",
     "post_terrain": "t_pit_glass"
@@ -70,7 +70,7 @@
     "description": "Build Improvised Shelter",
     "category": "CONSTRUCT",
     "required_skills": [ [ "survival", 2 ] ],
-    "time": "120 m",
+    "time": "60 m",
     "qualities": [ [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ] ],
     "components": [ [ [ "stick", 12 ], [ "2x4", 6 ], [ "wood_panel", 1 ] ], [ [ "pine_bough", 24 ], [ "willowbark", 24 ] ] ],
     "pre_terrain": "t_pit_shallow",
@@ -196,7 +196,7 @@
     "//": "regular door",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "20 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
     "pre_flags": "BARRICADABLE_DOOR",
@@ -208,7 +208,7 @@
     "//": "peephole door",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "20 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
     "pre_terrain": "t_door_c_peep",
@@ -220,7 +220,7 @@
     "//": "boarded damaged door",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "20 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
     "pre_flags": "BARRICADABLE_DOOR_DAMAGED",
@@ -232,7 +232,7 @@
     "//": "boarded damaged peephole door",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "20 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
     "pre_terrain": "t_door_b_peep",
@@ -244,7 +244,7 @@
     "//": "the reinforced doors",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "20 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
     "pre_flags": "BARRICADABLE_DOOR_REINFORCED",
@@ -256,7 +256,7 @@
     "//": "damaged reinforced doors",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "20 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 4 ], [ "wood_panel", 1 ] ], [ [ "nail", 8 ] ] ],
     "pre_flags": "BARRICADABLE_DOOR_REINFORCED_DAMAGED",
@@ -267,7 +267,7 @@
     "description": "Reinforce Wood Door",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 3 ] ],
-    "time": "90 m",
+    "time": "45 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ], [ "wood_panel", 1 ] ], [ [ "2x4", 6 ] ], [ [ "nail", 48 ] ], [ [ "hinge", 1 ] ] ],
     "pre_flags": "BARRICADABLE_DOOR",
@@ -525,7 +525,7 @@
     "//": "Armo up regular reinforced window",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 6 ] ],
-    "time": "60 m",
+    "time": "30 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "spike", 4 ] ], [ [ "steel_plate", 1 ], [ "sheet_metal", 4 ] ] ],
     "pre_terrain": "t_window_reinforced",
@@ -537,7 +537,7 @@
     "//": "When underlying window has no glass",
     "category": "REINFORCE",
     "required_skills": [ [ "fabrication", 6 ] ],
-    "time": "60 m",
+    "time": "30 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "spike", 4 ] ], [ [ "steel_plate", 1 ], [ "sheet_metal", 4 ] ] ],
     "pre_terrain": "t_window_reinforced_noglass",
@@ -1894,7 +1894,7 @@
     "description": "Paint Grass White",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "w_paint", 25 ] ] ],
     "pre_terrain": "t_grass",
@@ -1905,7 +1905,7 @@
     "description": "Paint Grass White",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "w_paint", 25 ] ] ],
     "pre_terrain": "t_grass_dead",
@@ -1916,7 +1916,7 @@
     "description": "Paint Grass White",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "w_paint", 25 ] ] ],
     "pre_terrain": "t_grass_golf",
@@ -1927,7 +1927,7 @@
     "description": "Paint Pavement Yellow",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "y_paint", 25 ] ] ],
     "pre_terrain": "t_pavement",
@@ -1938,7 +1938,7 @@
     "description": "Paint Pavement Yellow",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "y_paint", 25 ] ] ],
     "pre_terrain": "t_pavement_bg_dp",
@@ -1949,7 +1949,7 @@
     "description": "Take Paint Off Pavement",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "80 m",
+    "time": "10 m",
     "tools": [ [ "chipper" ] ],
     "pre_terrain": "t_pavement_y",
     "post_terrain": "t_pavement"
@@ -1959,7 +1959,7 @@
     "description": "Take Paint Off Pavement",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "80 m",
+    "time": "10 m",
     "tools": [ [ "chipper" ] ],
     "pre_terrain": "t_pavement_y_bg_dp",
     "post_terrain": "t_pavement_bg_dp"
@@ -1990,7 +1990,7 @@
     "description": "Remove Wax From Floor",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "80 m",
+    "time": "10 m",
     "tools": [ [ "chipper" ] ],
     "pre_terrain": "t_floor_waxed_y",
     "post_terrain": "t_floor"
@@ -2000,7 +2000,7 @@
     "description": "Paint Wall Red",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "r_paint", 25 ] ] ],
     "pre_terrain": "t_wall",
@@ -2011,7 +2011,7 @@
     "description": "Paint Wall Blue",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "b_paint", 25 ] ] ],
     "pre_terrain": "t_wall",
@@ -2022,7 +2022,7 @@
     "description": "Paint Wall White",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "w_paint", 25 ] ] ],
     "pre_terrain": "t_wall",
@@ -2033,7 +2033,7 @@
     "description": "Paint Wall Green",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "g_paint", 25 ] ] ],
     "pre_terrain": "t_wall",
@@ -2044,7 +2044,7 @@
     "description": "Paint Wall Purple",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "p_paint", 25 ] ] ],
     "pre_terrain": "t_wall",
@@ -2055,7 +2055,7 @@
     "description": "Paint Wall Yellow",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "40 m",
+    "time": "4 m",
     "tools": [ [ "paint_brush" ] ],
     "components": [ [ [ "y_paint", 25 ] ] ],
     "pre_terrain": "t_wall",
@@ -2067,7 +2067,7 @@
     "//": "For vertical walls",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "80 m",
+    "time": "10 m",
     "tools": [ [ "chipper" ] ],
     "pre_flags": "CHIP",
     "post_terrain": "t_wall"
@@ -2077,7 +2077,7 @@
     "description": "Remove Carpet",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "30 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "pre_flags": "RUG",
     "post_terrain": "t_floor"
@@ -2131,7 +2131,7 @@
     "description": "Wax Floor",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": "30 m",
+    "time": "10 m",
     "tools": [ [ [ "mop", -1 ], [ "paint_brush", -1 ] ], [ [ "surface_heat", 2, "LIST" ] ] ],
     "components": [ [ [ "wax", 5 ] ] ],
     "pre_terrain": "t_floor",
@@ -2142,7 +2142,7 @@
     "description": "Remove Wax From Floor",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "80 m",
+    "time": "10 m",
     "tools": [ [ "chipper" ] ],
     "pre_terrain": "t_floor_waxed",
     "post_terrain": "t_floor"
@@ -2186,7 +2186,7 @@
     "//": "Fix the broken back to normal",
     "category": "REPAIR",
     "required_skills": [ [ "fabrication", 4 ] ],
-    "time": "120 m",
+    "time": "60 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 20 ] ], [ [ "wood_panel", 3 ] ] ],
     "pre_terrain": "t_wood_stairs_up_broken",
@@ -2269,7 +2269,7 @@
     "description": "Build Road Barricade",
     "category": "OTHER",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": "30 m",
+    "time": "20 m",
     "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 12 ] ] ],
     "pre_special": "check_empty",
@@ -2281,7 +2281,7 @@
     "//": "Set up pontoon bridge",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
-    "time": "80 m",
+    "time": "40 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
     "components": [
       [ [ "2x4", 8 ] ],
@@ -2297,7 +2297,7 @@
     "//": "Set up River bridge",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
-    "time": "80 m",
+    "time": "40 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
     "components": [
       [ [ "2x4", 4 ] ],
@@ -2314,7 +2314,7 @@
     "//": "Set up dock",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
-    "time": "80 m",
+    "time": "40 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
     "pre_terrain": "t_water_moving_sh",
@@ -2350,7 +2350,7 @@
     "//": "Set up shallow bridge",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
-    "time": "80 m",
+    "time": "30 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "log", 1 ] ], [ [ "nail", 12 ] ] ],
     "pre_terrain": "t_water_sh",