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

.github/workflows/astyle.yml

@@ -1,15 +1,23 @@
 name: astyle
 
-on:
-  pull_request:
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
+on: pull_request
 
 jobs:
+  skip-duplicates:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          paths: '["**.cpp", "**.h", "**.c"]'
   astyle-code:
     name: astyle check
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
 
     runs-on: ubuntu-latest
 

.github/workflows/basic-build.yml

@@ -0,0 +1,71 @@
+name: Basic Build
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  skip-duplicates:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          paths-ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
+  basic-build:
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
+
+    name: Basic Build and Test (GCC 9, Curses, LTO)
+    runs-on: ubuntu-latest
+    env:
+        COMPILER: g++-9
+        TEST_STAGE: 1
+        EXTRA_TEST_OPTS: --error-format=github-action
+        NATIVE: linux64
+        GOLD: 1
+        LTO: 1
+        RELEASE: 1
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: install dependencies (ubuntu)
+      if: runner.os == 'Linux'
+      run: |
+          sudo apt-get update
+          sudo apt-get install libncursesw5-dev ccache gettext parallel
+    - name: prepare
+      run: bash ./build-scripts/requirements.sh
+    - name: Get Date
+      id: get-date
+      run: |
+        echo "::set-output name=date::$(/bin/date -u "+%Y%m%d%H%M")"
+      shell: bash
+    - name: ccache cache files (ubuntu)
+      if: runner.os == 'Linux'
+      uses: actions/cache@v2
+      with:
+        path: ~/.ccache
+        key: ccache-linux-g++-9-${{ steps.get-date.outputs.date }}
+        restore-keys: |
+          ccache-linux-g++-9-
+    - uses: ammaraskar/gcc-problem-matcher@master
+    - name: build and test
+      run: bash ./build-scripts/build.sh
+    - name: upload artifacts if failed
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: cata_test
+        path: tests/cata_test
+        if-no-files-found: ignore

.github/workflows/json.yml

@@ -1,15 +1,25 @@
 name: JSON Validation
 
-on:
-  pull_request:
-    paths:
-    - '**.json'
+on: pull_request
 
 jobs:
+  skip-duplicates:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          paths: '["**.json"]'
   style-json:
     name: JSON style check
 
     runs-on: ubuntu-latest
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
 
     steps:
     - uses: actions/checkout@v1

.github/workflows/matrix.yml

@@ -4,49 +4,28 @@ on:
   push:
     branches:
     - master
-    - 0.F-dev
-    paths-ignore:
-    - 'android/**'
-    - 'build-data/osx/**'
-    - 'doc/**'
-    - 'doxygen_doc/**'
-    - 'lgtm/**'
-    - 'msvc-full-features/**'
-    - 'msvc-object_creator/**'
-    - 'object_creator/**'
-    - 'tools/**'
-    - 'utilities/**'
   pull_request:
     branches:
     - master
-    - 0.F-dev
-    paths-ignore:
-    - 'android/**'
-    - 'build-data/osx/**'
-    - 'doc/**'
-    - 'doxygen_doc/**'
-    - 'lgtm/**'
-    - 'msvc-full-features/**'
-    - 'msvc-object_creator/**'
-    - 'object_creator/**'
-    - 'tools/**'
-    - 'utilities/**'
-
 
 jobs:
+  skip-duplicates:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          paths-ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
   varied_builds:
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
     strategy:
       matrix:
         include:
-          - compiler: g++-9
-            os: ubuntu-latest
-            cmake: 0
-            tiles: 0
-            test-stage: 1
-            native: linux64
-            gold: 1
-            lto: 1
-            title: GCC 9, Ubuntu, Curses, LTO
           - compiler: g++-7
             os: ubuntu-latest
             cmake: 1

data/json/effect_on_condition.json

@@ -269,5 +269,14 @@
         ]
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "bio_leaky",
+    "recurrence_min": "3 minutes",
+    "recurrence_max": "9 minutes",
+    "condition": { "u_has_bionics": "bio_leaky" },
+    "deactivate_condition": { "not": { "u_has_bionics": "bio_leaky" } },
+    "effect": [ { "u_mod_healthy": -1, "cap": -200 } ]
   }
 ]

data/json/flags.json

@@ -827,6 +827,24 @@
     "//": "Prevents the item from making the body part count as unfriendly to water and thus causing negative morale from being wet.",
     "info": "This clothing <good>performs well</good> even when <info>soaking wet</info>.  This can feel good."
   },
+  {
+    "id": "ITEM_BROKEN",
+    "type": "json_flag",
+    "context": [  ],
+    "info": "This item was broken and <bad>won't activate anymore</bad>."
+  },
+  {
+    "id": "WATER_BREAK",
+    "type": "json_flag",
+    "context": [  ],
+    "info": "This item <bad>will get broken</bad> by water."
+  },
+  {
+    "id": "WATER_DISSOLVE",
+    "type": "json_flag",
+    "context": [  ],
+    "info": "This item <bad>will get dissolved</bad> in water."
+  },
   {
     "id": "WET",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-appliances.json

@@ -355,7 +355,7 @@
     "id": "f_oven",
     "name": "oven",
     "symbol": "#",
-    "description": "A standard convection-based oven, commonly used for heating and cooking food.  Despite it no longer working, you could safely light a fire inside.",
+    "description": "A standard convection-based oven, commonly used for heating and cooking food.  You could safely light a fire inside or power it with UPS.",
     "color": "dark_gray",
     "move_cost_mod": 2,
     "coverage": 60,

data/json/furniture_and_terrain/furniture-medical.json

@@ -230,7 +230,7 @@
         { "item": "pipe", "count": [ 6, 12 ] },
         { "item": "cu_pipe", "count": [ 1, 4 ] },
         { "item": "cable", "charges": [ 1, 4 ] },
-        { "item": "plastic_chunk", "count": [ 50, 75 ] },
+        { "item": "epoxy_chunk", "count": [ 50, 75 ] },
         { "item": "sheet_metal", "count": [ 1, 2 ] },
         { "item": "sheet_metal_small", "count": [ 0, 4 ] }
       ]
@@ -245,7 +245,7 @@
         { "item": "scrap", "count": [ 2, 8 ] },
         { "item": "steel_chunk", "count": [ 2, 4 ] },
         { "item": "sheet_metal_small", "count": [ 6, 10 ] },
-        { "item": "plastic_chunk", "count": [ 30, 50 ] },
+        { "item": "epoxy_chunk", "count": [ 30, 50 ] },
         { "item": "pipe", "count": 1 },
         { "item": "cable", "charges": [ 1, 3 ] },
         { "item": "cu_pipe", "count": 1 }

data/json/furniture_and_terrain/furniture-plumbing.json

@@ -150,7 +150,7 @@
     "id": "f_water_purifier",
     "looks_like": "f_water_heater",
     "name": "water purifier",
-    "description": "This devices effectively sterilizes water, though without a lot of power and proper plumbing, it's only good for parts now.",
+    "description": "This device effectively sterilizes water, though without power source, like UPS, it's only good for parts.",
     "symbol": "W",
     "bgcolor": "blue",
     "move_cost_mod": -1,

data/json/furniture_and_terrain/furniture-tools.json

@@ -470,7 +470,7 @@
     "id": "f_arc_furnace",
     "name": "electric arc furnace",
     "looks_like": "f_machinery_heavy",
-    "description": "Not the kind of furnace you'd heat your house with, this is a device for heating things to extreme temperatures as part of industrial fabrication processes.",
+    "description": "Not the kind of furnace you'd heat your house with, this is a device for heating things to extreme temperatures as part of industrial fabrication processes.  Can be used in recipes instead of forge, when supplied with power from UPS.",
     "symbol": "0",
     "color": "white_red",
     "move_cost_mod": -1,
@@ -505,7 +505,7 @@
     "id": "f_drill_press",
     "name": "drill press",
     "looks_like": "f_machinery_light",
-    "description": "A powerful drill mounted on a slide that lets it drop precisely down.  Useful in all kinds of projects from industrial fabrication to home woodworking.",
+    "description": "A powerful drill mounted on a slide that lets it drop precisely down.  Useful in all kinds of projects from industrial fabrication to home woodworking, if supplied with power from UPS.",
     "symbol": "7",
     "color": "yellow_red",
     "move_cost_mod": -1,
@@ -543,7 +543,7 @@
     "id": "f_tablesaw",
     "name": "tablesaw",
     "looks_like": "f_machinery_light",
-    "description": "A rotating saw blade set into a large flat table, for making straight measured cuts.  One of the key tools in a carpenter's arsenal.",
+    "description": "A rotating saw blade set into a large flat table, for making straight measured cuts, if supplied with power from UPS.  One of the key tools in a carpenter's arsenal.",
     "symbol": "7",
     "color": "yellow_red",
     "move_cost_mod": 8,
@@ -582,7 +582,7 @@
     "id": "f_mitresaw",
     "name": "mitre saw",
     "looks_like": "f_machinery_light",
-    "description": "A circular saw blade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry.",
+    "description": "A circular saw blade on an arm that can slide and rotate in several directions, this is a staple tool for nearly any carpentry, if supplied with power from UPS.",
     "symbol": "7",
     "color": "yellow_cyan",
     "move_cost_mod": -1,
@@ -621,7 +621,7 @@
     "id": "f_bandsaw",
     "name": "bandsaw",
     "looks_like": "f_machinery_light",
-    "description": "A ribbonlike sawblade runs in a single direction in this tool, allowing precise cuts at almost any angle.",
+    "description": "A ribbonlike sawblade runs in a single direction in this tool, allowing precise cuts at almost any angle, if supplied with power from UPS.",
     "symbol": "7",
     "color": "yellow_cyan",
     "move_cost_mod": -1,
@@ -659,7 +659,7 @@
     "id": "f_router",
     "name": "router table",
     "looks_like": "f_machinery_light",
-    "description": "This table has an inset router, a rotating motor with an exchangeable blade head for cutting specific profiles and grooves and stuff.",
+    "description": "This table has an inset router, a rotating motor with an exchangeable blade head for cutting specific profiles and grooves and stuff, if supplied with power from UPS.",
     "symbol": "7",
     "color": "yellow_green",
     "move_cost_mod": 8,
@@ -697,7 +697,7 @@
     "id": "f_planer",
     "name": "planer",
     "looks_like": "f_machinery_light",
-    "description": "A hefty tool that will take in a board and cut it smooth and flat to a specific width.  Particularly great if working with raw lumber stock, but also good just for shaving wood down to size.",
+    "description": "A hefty tool that will take in a board and cut it smooth and flat to a specific width, if supplied with power from UPS.  Particularly great if working with raw lumber stock, but also good just for shaving wood down to size.",
     "symbol": "7",
     "color": "yellow_white",
     "move_cost_mod": -1,
@@ -735,7 +735,7 @@
     "id": "f_jointer",
     "name": "jointer",
     "looks_like": "f_machinery_light",
-    "description": "A table-shaped tool with a rotating blade that will cut down, smooth out, and square off a board to make it very smooth and nice indeed.",
+    "description": "A table-shaped tool with a rotating blade that will cut down, smooth out, and square off a board to make it very smooth and nice indeed, if supplied with power from UPS.",
     "symbol": "7",
     "color": "yellow_magenta",
     "move_cost_mod": 8,
@@ -773,7 +773,7 @@
     "id": "f_hydraulic_press",
     "name": "hydraulic press",
     "looks_like": "f_machinery_light",
-    "description": "If you really want to squash something a lot, this would be exactly the right industrial tool for you.  If, you know, it had power.",
+    "description": "If you really want to squash something a lot, this would be exactly the right industrial tool for you, if supplied with power from UPS.",
     "symbol": "9",
     "color": "black_red",
     "move_cost_mod": -1,
@@ -811,7 +811,7 @@
     "id": "f_heavy_lathe",
     "name": "power lathe",
     "looks_like": "f_machinery_light",
-    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.",
+    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things, if supplied with power from UPS.",
     "symbol": "4",
     "color": "cyan_red",
     "move_cost_mod": -1,
@@ -846,7 +846,7 @@
     "id": "f_air_compressor",
     "name": "air compressor",
     "looks_like": "f_standing_tank",
-    "description": "This durable tank is topped with a motor that will cram as much air into the tank as possible.",
+    "description": "This durable tank is topped with a motor that will cram as much air into the tank as possible, if supplied with power from UPS.",
     "symbol": "8",
     "color": "black_yellow",
     "move_cost_mod": -1,

data/json/items/armor/coats.json

@@ -1299,7 +1299,7 @@
   {
     "id": "kimono",
     "type": "ARMOR",
-    "name": { "str": "kimono" },
+    "name": { "str_sp": "kimono" },
     "description": "A traditional, ankle-length Japanese robe, wrapped around the body with a sash.",
     "weight": "1200 g",
     "volume": "5 L",