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

.github/workflows/matrix.yml

@@ -199,28 +199,28 @@ jobs:
     - name: prepare
       if: ${{ env.SKIP == 'false' }}
       run: bash ./build-scripts/requirements.sh
-    - name: Get Date
-      id: get-date
+    - name: Get ccache vars
+      id: get-vars
       if: ${{ env.SKIP == 'false' }}
       run: |
-        echo "::set-output name=date::$(/bin/date -u "+%Y%m%d%H%M")"
+        echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
+        echo "::set-output name=ccache-path::$([ "$RUNNER_OS" = "macOS" ] && echo '/Users/runner/Library/Caches/ccache' || echo '~/.ccache')"
       shell: bash
-    - name: ccache cache files (ubuntu)
-      if: ${{ env.SKIP == 'false' && runner.os == 'Linux' }}
+    - name: ccache cache files (master)
+      if: ${{ github.event_name == 'push' && env.SKIP == 'false' && ( runner.os == 'Linux' || runner.os == 'macOS' ) }}
       uses: actions/cache@v2
       with:
-        path: ~/.ccache
-        key: ccache-linux-${{ matrix.compiler }}-${{ steps.get-date.outputs.date }}
+        path: ${{ steps.get-vars.outputs.ccache-path }}
+        # double-dash after compiler is not a typo, it is to disambiguate between g++-<date> and g++-11-<date> for restore key prefix matching
+        key: ccache-${{ runner.os }}-${{ matrix.compiler }}--${{ steps.get-vars.outputs.date }}
         restore-keys: |
-          ccache-linux-${{ matrix.compiler }}-
-    - name: ccache cache files (mac)
-      if: ${{ env.SKIP == 'false' && runner.os == 'macOS' }}
+          ccache-${{ runner.os }}-${{ matrix.compiler }}--
+    - name: ccache cache files (PR)
+      if: ${{ github.event_name == 'pull_request' && env.SKIP == 'false' && ( runner.os == 'Linux' || runner.os == 'macOS' ) }}
       uses: actions/cache@v2
       with:
-        path: /Users/runner/Library/Caches/ccache
-        key: ccache-mac-${{ matrix.compiler }}-${{ steps.get-date.outputs.date }}
-        restore-keys: |
-          ccache-mac-${{ matrix.compiler }}-
+        path: ${{ steps.get-vars.outputs.ccache-path }}
+        key: ccache-${{ runner.os }}-${{ matrix.compiler }}--${{ steps.get-vars.outputs.date }}
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: build and test
       if: ${{ env.SKIP == 'false' }}

data/core/tips.json

@@ -12,7 +12,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Light itself doesn't draw zombies, it's sight, noise or smell." ]
+    "text": [ "Light itself doesn't draw zombies, it's sight, noise, or smell." ]
   },
   {
     "type": "snippet",
@@ -287,7 +287,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Different characters, professions, hobbies and scenarios can spice up your game.  Roleplay!" ]
+    "text": [ "Different characters, professions, hobbies, and scenarios can spice up your game.  Roleplay!" ]
   },
   {
     "type": "snippet",
@@ -372,7 +372,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Major blood loss?  Drink plenty, supplement iron and rest to regenerate your red blood cells." ]
+    "text": [ "Major blood loss?  Drink plenty, supplement iron, and rest to regenerate your red blood cells." ]
   },
   {
     "type": "snippet",
@@ -432,7 +432,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "You can automate repetitive tasks such as foraging, mining or mopping for your convenience." ]
+    "text": [ "You can automate repetitive tasks such as foraging, mining, or mopping for your convenience." ]
   },
   {
     "type": "snippet",
@@ -517,7 +517,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Fight on your conditions whenever you can.  Use terrain, traps and fire to your advantage." ]
+    "text": [ "Fight on your conditions whenever you can.  Use terrain, traps, and fire to your advantage." ]
   },
   {
     "type": "snippet",
@@ -552,7 +552,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Where applicable, use blacklists, whitelists and filters for a better quality of life." ]
+    "text": [ "Where applicable, use blacklists, whitelists, and filters for a better quality of life." ]
   },
   {
     "type": "snippet",
@@ -582,7 +582,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Be mindful of what, when and how much you eat.  A balanced diet is crucial in the long run." ]
+    "text": [ "Be mindful of what, when, and how much you eat.  A balanced diet is crucial in the long run." ]
   },
   {
     "type": "snippet",
@@ -592,7 +592,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "For free in the construction menu: a crafting spot, a firewood source and a practice target." ]
+    "text": [ "For free in the construction menu: a crafting spot, a firewood source, and a practice target." ]
   },
   {
     "type": "snippet",

data/core/weather.json

@@ -14,6 +14,7 @@
     "precip": "none",
     "rains": false,
     "acidic": false,
+    "sound_category": "clear",
     "sun_intensity": "normal"
   },
   {

data/help/texts.json

@@ -308,8 +308,8 @@
     "name": "<3>: Description of gun types",
     "messages": [
       "<color_light_gray>( Handguns</color>\nHandguns are small weapons held in one or both hands.  They are much more difficult to aim and control than larger firearms, and this is reflected in their poor accuracy.  However, their small size makes them appropriate for short-range combat.  They are also relatively quick to reload and use a very wide variety of ammunition.  Their small size and low weight make it possible to carry several loaded handguns, switching from one to the next as their ammo is spent.",
-      "<color_green>( Crossbows</color>\nThe best feature of crossbows is their silence.  The bolts they fire are only rarely destroyed; if you pick up the bolts after firing them, your ammunition supply will last much longer.  Crossbows suffer from a short range and a very long reload time (modified by your strength); plus, most only hold a single round.\nFor this reason, it is advisable to carry a few loaded crossbows.  Crossbows can be very difficult to find; however, it is possible to craft one given a high enough Mechanics skill.  Likewise, it is possible to make wooden bolts from any number of wooden objects, though these are much less effective than steel bolts.  Crossbows use the handgun skill.",
-      "<color_yellow>( Bows</color>\nSilent, deadly, relatively easy to make, and the arrows are reusable.  Bows have been used forever.  Bows are two-handed, and require the user to have a certain strength level.  If you do not have enough strength to draw the string back, you will fire at a reduced effectiveness.  This reduces the reload and fire speeds and decreases the range of the arrows fired.\nMost normal bows require strength of at least 8, others require an above average strength of 10, or a significant strength of 12.  Bows use the archery skill.",
+      "<color_green>( Crossbows</color>\nThe best feature of crossbows is low noise they produce.  The bolts they fire are only rarely destroyed; if you pick up the bolts after firing them, your ammunition supply will last much longer.  Crossbows suffer from a short range and a very long reload time (modified by your strength); plus, most only hold a single round.\nFor this reason, it is advisable to carry a few loaded crossbows.  Crossbows can be very difficult to find; however, it is possible to craft one given a high enough Fabrication skill.  Likewise, it is possible to make wooden bolts from any number of wooden objects, though these are much less effective than steel bolts.  Crossbows use the rifles skill.",
+      "<color_yellow>( Bows</color>\nSilent, deadly, relatively easy to make, and the arrows are reusable.  Bows have been used forever.  Bows are two-handed, and require the user to have a certain strength level.  If you do not have enough strength to draw the string back, you won't be able to use the bow.\nMost normal bows require strength of at least 8, others require an above average strength of 10, or a significant strength of 12.  Bows use the archery skill.",
       "<color_red>( Shotguns</color>\nShotguns are some of the most powerful weapons in the game, capable of taking out almost any enemy with a single hit.  Birdshot and 00 shot spread out after leaving the barrel, making it very easy to hit nearby monsters.  However, they are very ineffective against armor, and some armored monsters might shrug off 00 shot completely.  Shotgun slugs are the answer to this problem; they also offer much better range than shot.\nThe biggest drawback to shotguns is their noisiness.  They are very loud, and impossible to silence.  A shot that kills one zombie might attract three more!  Beware of that.",
       "<color_cyan>( Submachine Guns</color>\nSubmachine guns are small weapons (some are barely larger than a handgun), designed for relatively close combat and the ability to spray large numbers of bullets.  However, they are more effective when firing single shots, so use discretion.  They mainly use 9mm and .45 ammunition; however, other SMGs exist.  They reload moderately quickly, and are suitable for close or medium-long range combat.",
       "<color_brown>( Sniper and Marksman Rifles</color>\nSniper and marksman rifles are popular for their superior range and accuracy.  What's more, their scopes or sights make shots fired at targets at very long range as accurate as those fired at shorter range.  Unlike assault rifles, sniper and marksman rifles usually have no automatic fire.  They also may be slow to reload and fire, so when facing a large group of nearby enemies, they are not the best pick.",
@@ -328,7 +328,7 @@
       "Q: How can I remove boards from boarded-up windows and doors?\nA: Use a hammer and choose the direction of the boarded-up window or door to remove the boards.",
       "Q: The game just told me to quit, and other weird stuff is happening.\nA: You have the \"Kaluptic Psychosis\" trait, which might make the game seem buggy.",
       "Q: How can I prevent monsters from attacking me while I sleep?\nA: Find a safe place to sleep; for example, in a cleared building far from the front door.  Set traps if you have them, or build a fire to scare off wild animals.",
-      "Q: Why do I always sink when I try to swim?\nA: Your swimming ability is reduced greatly by the weight you are carrying, and is also adversely affected by most clothing you wear.  Until you reach a high level of the swimming skill, you'll need to drop your equipment and remove your clothing to swim, making it a last-ditch escape plan.  Diving gear may significantly help you in swimming and diving.",
+      "Q: Why do I always sink when I try to swim?\nA: Your swimming ability is reduced greatly by the weight you are carrying, and is also adversely affected by most clothing you wear.  Until you reach a high level of the athletics skill, you'll need to drop your equipment and remove your clothing to swim, making it a last-ditch escape plan.  Diving gear may significantly help you in swimming and diving.",
       "Q: How can I cure a fungal infection?\nA: The Blood Filter bionic and some antifungal chemicals can cure fungal infection.  Antifungal chemicals to cure the fungal infection can either be found as random loot or made from other ingredients.",
       "Q: How do I get into science labs?\nA: You can enter the front door if you have an appropriate ID card by examining (<press_examine>) the keypad.  If you are skilled in computers and have an electrohack, it is possible to hack the keypad.  An EMP blast has a chance to force the doors open, but it's more likely to break them.  You can also sneak in through the sewers sometimes, or try to smash through the walls with explosions.",
       "Q: Why does my crafting fail so often?\nA: Check the difficulty of the recipe, and the primary skill used; your skill level should be around one and a half times the difficulty to be confident that it will succeed.  Also, note any proficiencies or other skills that may influence your chances of success.",

data/json/construction.json

@@ -3001,6 +3001,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance"
   },
+  {
+    "type": "construction",
+    "id": "app_oven",
+    "group": "place_oven",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "oven", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
   {
     "type": "construction",
     "id": "app_standing_lamp",
@@ -3450,6 +3461,18 @@
     "pre_special": "check_empty",
     "post_terrain": "f_butcher_rack"
   },
+  {
+    "type": "construction",
+    "id": "constr_spin_wheel",
+    "group": "build_spinwheel",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 3 ], [ "mechanics", 2 ], [ "tailor", 1 ] ],
+    "time": "3 h",
+    "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "SAW_W", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ],
+    "components": [ [ [ "2x4", 20 ] ], [ [ "string_36", 15 ] ], [ [ "nail", 25 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_spinwheel"
+  },
   {
     "type": "construction",
     "id": "constr_junk_palisade",

data/json/construction_group.json

@@ -724,6 +724,11 @@
     "id": "build_sofa",
     "name": "Build Sofa"
   },
+  {
+    "type": "construction_group",
+    "id": "build_spinwheel",
+    "name": "Build Spinwheel"
+  },
   {
     "type": "construction_group",
     "id": "build_split_rail_fence",
@@ -1089,6 +1094,11 @@
     "id": "place_fridge",
     "name": "Place Fridge"
   },
+  {
+    "type": "construction_group",
+    "id": "place_oven",
+    "name": "Place Oven"
+  },
   {
     "type": "construction_group",
     "id": "place_standing_lamp",

data/json/flags.json

@@ -568,6 +568,10 @@
     "type": "json_flag",
     "info": "This item used to be legal tender before the Cataclysm."
   },
+  {
+    "id": "NO_AUTO_CONSUME",
+    "type": "json_flag"
+  },
   {
     "id": "PALS_SMALL",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-appliances.json

@@ -342,26 +342,15 @@
     "id": "f_oven",
     "name": "oven",
     "symbol": "#",
-    "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.",
+    "description": "A standard convection-based oven, commonly used for heating and cooking food.  It can safely contain a fire, although it's not adequately ventilated.  You could disconnect it and plug it in to a working power grid, or power it with UPS.",
     "color": "dark_gray",
     "move_cost_mod": 2,
     "coverage": 60,
     "required_str": 10,
-    "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "CONTAINER", "BLOCKSDOOR", "MOUNTABLE" ],
+    "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "FIRE_CONTAINER", "CONTAINER", "BLOCKSDOOR", "MOUNTABLE" ],
+    "deconstruct": { "items": [ { "item": "oven", "count": 1 } ] },
     "examine_action": "fireplace",
-    "deconstruct": {
-      "items": [
-        { "item": "sheet_metal", "count": [ 2, 6 ] },
-        { "item": "sheet_metal_small", "count": [ 0, 4 ] },
-        { "item": "steel_chunk", "count": [ 2, 3 ] },
-        { "item": "scrap", "count": [ 2, 6 ] },
-        { "item": "element", "count": [ 1, 4 ] },
-        { "item": "cable", "charges": [ 1, 3 ] },
-        { "item": "pipe_fittings", "count": [ 1, 3 ] },
-        { "item": "pilot_light", "count": 1 }
-      ]
-    },
-    "max_volume": "40 L",
+    "max_volume": "120 L",
     "bash": {
       "str_min": 8,
       "str_max": 30,

data/json/furniture_and_terrain/furniture-decorative.json

@@ -235,9 +235,20 @@
     "description": "A decorative wreath for the winter holidays.",
     "symbol": "o",
     "color": "light_green",
-    "move_cost_mod": -1,
-    "required_str": 10,
-    "flags": [ "PLACE_ITEM" ]
+    "move_cost_mod": 2,
+    "required_str": 5,
+    "bash": {
+      "str_min": 20,
+      "str_max": 40,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [
+        { "item": "pine_bough", "count": [ 4, 6 ] },
+        { "item": "nail", "count": [ 5, 14 ] },
+        { "item": "stick", "count": [ 1, 3 ] }
+      ]
+    },
+    "flags": [ "PERMEABLE", "THIN_OBSTACLE", "PLACE_ITEM", "EASY_DECONSTRUCT" ]
   },
   {
     "type": "furniture",

data/json/furniture_and_terrain/furniture-roof.json

@@ -8,7 +8,7 @@
     "color": "white",
     "move_cost_mod": -2,
     "required_str": 10,
-    "flags": [ "TRANSPARENT", "PLACE_ITEM" ],
+    "flags": [ "TRANSPARENT", "PLACE_ITEM", "ALLOW_ON_OPEN_AIR" ],
     "bash": {
       "str_min": 6,
       "str_max": 10,

data/json/furniture_and_terrain/furniture-tools.json

@@ -327,6 +327,32 @@
       "items": [ { "item": "rock", "count": 8 }, { "item": "stick", "count": [ 8, 12 ] } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_spinwheel",
+    "name": "spinning wheel",
+    "looks_like": "f_table",
+    "description": "Large wooden device with a mechanical wheel used to combine fibers together into a stronger material.",
+    "symbol": "=",
+    "bgcolor": "brown",
+    "move_cost_mod": 2,
+    "required_str": 11,
+    "coverage": 40,
+    "flags": [ "TRANSPARENT", "NOITEM" ],
+    "crafting_pseudo_item": "spinwheelitem",
+    "deconstruct": { "items": [ { "item": "string_36", "count": 15 }, { "item": "2x4", "count": 20 }, { "item": "nail", "charges": 25 } ] },
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "crunch!",
+      "sound_fail": "whump!",
+      "items": [
+        { "item": "string_36", "count": [ 12, 15 ] },
+        { "item": "2x4", "count": [ 10, 20 ] },
+        { "item": "nail", "charges": [ 15, 25 ] }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_smoking_rack_active",

data/json/furniture_and_terrain/terrain-manufactured.json

@@ -550,7 +550,7 @@
     "id": "t_nanofab_body",
     "name": "nanofabricator",
     "symbol": "%",
-    "description": "A great column of advanced machinery.  Within this self-contained, miniaturized factory, several 3d printers work in tandem with a robotic assembler to manufacture nearly any inorganic object.",
+    "description": "A great column of advanced machinery.  Within this self-contained, miniaturized factory, several 3D printers work in tandem with a robotic assembler to manufacture nearly any inorganic object.",
     "color": "dark_gray",
     "move_cost": 0,
     "coverage": 65,

data/json/itemgroups/SUS/mre_packages.json

@@ -92,11 +92,11 @@
       { "item": "heatpack" },
       {
         "distribution": [
-          { "item": "can_cheese", "charges": 1, "container-item": "mre_bag_small", "sealed": true },
+          { "item": "can_cheese", "charges": 8, "container-item": "mre_bag_small", "sealed": true },
           { "item": "spread_peanutbutter", "charges": 1, "container-item": "mre_bag_small", "sealed": true }
         ]
       },
-      { "item": "crackers", "charges": 1, "container-item": "mre_bag_small", "sealed": true },
+      { "item": "crackers", "charges": 2, "container-item": "mre_bag_small", "sealed": true },
       { "group": "mre_accessory_pack" },
       { "item": "mre_bag", "contents-group": "mre_dessert_pack", "sealed": true }
     ]

data/json/items/ammo_types.json

@@ -730,47 +730,5 @@
     "id": "green_pen_ink",
     "name": "green pen ink",
     "default": "green_pen_ink"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "currency",
-    "name": "currency",
-    "default": "coin_penny"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "coin_penny",
-    "name": "pennies",
-    "default": "coin_penny"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "coin_nickel",
-    "name": "nickels",
-    "default": "coin_nickel"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "coin_dime",
-    "name": "dimes",
-    "default": "coin_dime"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "coin_quarter",
-    "name": "quarters",
-    "default": "coin_quarter"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "coin_half_dollar",
-    "name": "half-dollars",
-    "default": "coin_half_dollar"
-  },
-  {
-    "type": "ammunition_type",
-    "id": "coin_dollar",
-    "name": "dollar coins",
-    "default": "coin_dollar"
   }
 ]