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

.github/CONTRIBUTING.md

@@ -111,12 +111,13 @@ Helpful pages:
 
 3. Set commit message template.
 
+        $ cd Cataclysm-DDA
+        # Changes the active directory in the prompt to the newly cloned "Cataclysm-DDA" directory
         $ git config --local commit.template .gitmessage
+        # Set commit message template to the custom one in the repo
 
 4. Add this repository as a remote.
 
-        $ cd Cataclysm-DDA
-        # Changes the active directory in the prompt to the newly cloned "Cataclysm-DDA" directory
         $ git remote add -f upstream https://github.com/CleverRaven/Cataclysm-DDA.git
         # Assigns the original repository to a remote called "upstream"
 

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,73 @@
+name: Bug Report
+description: Create a report to help us improve
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please take the time to fill out all the fields below.
+  - type: textarea
+    id: description-of-bug
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: There is no way for aim level to increase.
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Make a player with a gun, magazine, and some ammo.
+        2. Try to aim at a wall.
+        3. There's no way to increase aim level.
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: |
+        A clear and concise description of what you expected to happen.
+        Ideally also describe *why* you expect it to happen.
+      placeholder: |
+        I expected that aim level would increase, because all other skills can increase in level.
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: |
+        **If applicable**, add screenshots to help explain your problem.
+        Do not take a screenshot of the crashing window. Please provide the crash logs in the "Additional context"
+    validations:
+      required: false
+  - type: textarea
+    id: versions-and-config
+    attributes:
+      label: Versions and configuration
+      description: |
+        Please complete the following information; you can now go to:
+        - "Main menu (ESC) > Debug Menu > Info > Generate game report" to generate this report.
+        - Please update your OS version with a more precise version.
+      value: |
+        - OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
+        - Game Version: [from the main menu, e.g. 0.C-29938-g90f5268437]
+        - Graphics version: [Tiles or Terminal]
+        - Ingame language: [Arabic or Bulgarian or Chinese (Simplified) or Chinese (Traditional) or Dutch or Esperanto or French or German or Italian (Italy) or Japanese or Korean or Polish or Portuguese (Brazil) or Russian or Serbian or Spanish (Argentina) or Spanish (Spain) or Turkish]
+        - Mods loaded: [e.g.dda, boats, hacktheplanet, StatsThroughSkills]
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context about the problem here.
+      placeholder: |
+        Crash: if your problem refers to a crash, please add the following files to the "Additional Context" paragraph:
+          - From the /config folder (you can zip them both together):
+            - crash.log file.
+            - debug.log file.
+          - Your save file (zipped)
+
+        - note #1: you can drag and drop files in this issue post!
+        - note #2: it is very important for us that you provide a save file in case of a crash. It really helps the developers
+        to reproduce the bug and fix it. If possible, try to provide a save file that occurs in the right conditions, just
+        before the crash happens.
+    

.github/workflows/release.yml

@@ -178,16 +178,14 @@ jobs:
           mv cataclysmdda-0.F.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
-        env:
-          USE_HOME_DIR: 1
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
           build number: ${{ needs.release.outputs.timestamp }}
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
-          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 dmgdist
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 USE_HOME_DIR=1 OSX_MIN=10.12 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'

data/json/bionics.json

@@ -16,6 +16,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": 10,
     "react_cost": 10,
+    "trigger_cost": "25kJ",
     "time": 1
   },
   {
@@ -27,6 +28,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "act_cost": "1 J",
     "react_cost": "1 J",
+    "trigger_cost": "25 kJ",
     "time": 1
   },
   {
@@ -620,7 +622,8 @@
     "name": { "str": "Electrical Discharge" },
     "description": "A malfunctioning bionic which occasionally discharges electricity through your body, causing pain and brief paralysis but no damage.",
     "occupied_bodyparts": [ [ "torso", 6 ] ],
-    "flags": [ "BIONIC_FAULTY" ]
+    "flags": [ "BIONIC_FAULTY" ],
+    "trigger_cost": "10 kJ"
   },
   {
     "id": "bio_drain",
@@ -787,7 +790,8 @@
     "act_cost": "3 J",
     "react_cost": "3 J",
     "time": 1,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "LUMINATION", "add": 60 } ] } ]
   },
   {
     "id": "bio_tattoo_led",
@@ -797,14 +801,16 @@
     "act_cost": "1 J",
     "react_cost": "1 J",
     "time": 1,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "LUMINATION", "add": 5 } ] } ]
   },
   {
     "id": "bio_glowy",
     "type": "bionic",
     "name": { "str": "Glowy Thing" },
     "description": "You don't think that capacitor is *meant* to glow, but it does, and usually at bad times.  A malfunctioning bionic randomly turns on and off, causing you to glow and making you visible in the dark without improving how much you can see in the slightest.",
-    "flags": [ "BIONIC_FAULTY" ]
+    "flags": [ "BIONIC_FAULTY" ],
+    "trigger_cost": "1 kJ"
   },
   {
     "id": "bio_geiger",
@@ -820,7 +826,8 @@
     "name": { "str": "Respirator" },
     "description": "A complex respiration augmentation system.  Improves respiration ability in air and allows breathing water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
     "occupied_bodyparts": [ [ "torso", 8 ], [ "head", 2 ], [ "mouth", 2 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "trigger_cost": "25 kJ"
   },
   {
     "id": "bio_ground_sonar",
@@ -850,7 +857,8 @@
       [ "foot_l", 2 ],
       [ "foot_r", 2 ]
     ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "trigger_cost": "3 kJ"
   },
   {
     "id": "bio_heatsink",
@@ -942,7 +950,17 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
     "act_cost": "5 J",
     "react_cost": "5 J",
-    "time": 1
+    "time": 1,
+    "enchantments": [
+      {
+        "condition": "ACTIVE",
+        "values": [
+          { "value": "EFFECTIVE_HEALTH_MOD", "add": 100 },
+          { "value": "MOD_HEALTH", "add": -50 },
+          { "value": "MOD_HEALTH_CAP", "add": -200 }
+        ]
+      }
+    ]
   },
   {
     "id": "bio_lighter",
@@ -984,9 +1002,22 @@
     "description": "Your memory has been enhanced with small quantum storage drives.  While active, you learn - both through reading and practice - more quickly.  Additionally, you can't forget skills you've already learned, and the layout of terrain you've explored will remain in your memory for an incredibly long time.",
     "occupied_bodyparts": [ [ "head", 3 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
+    "active_flags": [ "CBQ_LEARN_BONUS" ],
     "act_cost": "2 J",
     "react_cost": "2 J",
-    "time": 1
+    "trigger_cost": "25 J",
+    "time": 1,
+    "enchantments": [
+      {
+        "condition": "ACTIVE",
+        "values": [
+          { "value": "MAP_MEMORY", "add": 49 },
+          { "value": "READING_EXP", "add": 2 },
+          { "value": "SKILL_RUST_RESIST", "add": 20 },
+          { "value": "LEARNING_FOCUS", "add": 10 }
+        ]
+      }
+    ]
   },
   {
     "id": "bio_metabolics",
@@ -1005,7 +1036,8 @@
     "name": { "str": "Weather Reader" },
     "description": "A multitude of scientific instruments and sensors collect environmental data.  The data is compiled and presented as a simple readout of the current weather.  It also passively tells you the local air temperature.",
     "occupied_bodyparts": [ [ "torso", 1 ], [ "head", 1 ] ],
-    "act_cost": "10 J"
+    "act_cost": "10 J",
+    "flags": [ "THERMOMETER" ]
   },
   {
     "id": "bio_nanobots",
@@ -1074,6 +1106,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": "10 kJ",
     "react_cost": "10 kJ",
+    "trigger_cost": "1 kJ",
     "time": 1
   },
   {
@@ -1082,7 +1115,8 @@
     "name": { "str": "Sensory Dulling" },
     "description": "Your nervous system is wired to allow you to inhibit the signals of pain, allowing you to dull your senses at will.  However, the use of this system may cause delayed reaction time and drowsiness.",
     "occupied_bodyparts": [ [ "head", 2 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "trigger_cost": "2 kJ"
   },
   {
     "id": "bio_pokedeye",
@@ -1118,6 +1152,7 @@
     "type": "bionic",
     "name": { "str": "Power Storage" },
     "capacity": "100 kJ",
+    "dupes_allowed": true,
     "description": "A Compact Bionics Module that increases your power capacity by 100 kJ.  Having at least one of these is a prerequisite to using powered bionics.  You will also need a power supply, found in various CBMs.",
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
@@ -1126,6 +1161,7 @@
     "type": "bionic",
     "name": { "str": "Power Storage Mk. II" },
     "capacity": "250 kJ",
+    "dupes_allowed": true,
     "description": "A Compact Bionics Module that increases your power capacity by 250 kJ.",
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
@@ -1146,6 +1182,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": "3 J",
     "react_cost": "3 J",
+    "trigger_cost": "250 kJ",
     "time": 1
   },
   {
@@ -1240,7 +1277,8 @@
     "name": { "str": "Bionic Short Circuit" },
     "description": "A poorly-wired bionic which fails to serve its intended purpose, this malfunctioning device periodically short-circuits, causing systemic muscle tremors.",
     "occupied_bodyparts": [ [ "torso", 1 ], [ "arm_l", 2 ], [ "arm_r", 2 ], [ "leg_l", 3 ], [ "leg_r", 3 ] ],
-    "flags": [ "BIONIC_FAULTY" ]
+    "flags": [ "BIONIC_FAULTY" ],
+    "trigger_cost": "25 kJ"
   },
   {
     "id": "bio_synaptic_regen",
@@ -1260,7 +1298,8 @@
     "name": { "str": "Electroshock Unit" },
     "description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock your opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
     "occupied_bodyparts": [ [ "torso", 8 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "trigger_cost": "2 kJ"
   },
   {
     "id": "bio_shockwave",
@@ -1302,6 +1341,7 @@
       [ "foot_l", 2 ],
       [ "foot_r", 2 ]
     ],
+    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "SPEED", "multiply": 0.1 } ] } ],
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
   {
@@ -1355,7 +1395,8 @@
     "name": { "str": "Targeting System" },
     "description": "Your eyes are surgically equipped with range finders, and their movement is synced with that of your arms, to a degree.  Shots you fire will be much more accurate, particularly at long range.",
     "occupied_bodyparts": [ [ "eyes", 1 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "flags": [ "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_NPC_USABLE" ],
+    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "WEAPON_DISPERSION", "multiply": -0.25 } ] } ]
   },
   {
     "id": "bio_teleport",
@@ -1427,10 +1468,15 @@
     "id": "bio_jointservo",
     "type": "bionic",
     "name": { "str": "Joint Servo" },
-    "description": "Your leg joints have been equipped with servomotors that provide power-assisted movement.  They are optimized for running, but walking also requires less effort when this bionic is online.  However, when it's offline it will hamper your movement, as you struggle against its moving parts.",
+    "description": "Your leg joints have been equipped with servomotors that provide power-assisted movement.  Movement takes less effort when this bionic is online.  However, when it's offline it will hamper your movement, as you struggle against its moving parts.",
     "occupied_bodyparts": [ [ "leg_l", 12 ], [ "leg_r", 12 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "mutation_conflicts": [ "LEG_TENTACLES", "LEG_TENT_BRACE" ]
+    "mutation_conflicts": [ "LEG_TENTACLES", "LEG_TENT_BRACE" ],
+    "enchantments": [
+      { "condition": "ACTIVE", "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ] },
+      { "condition": "INACTIVE", "values": [ { "value": "MOVE_COST", "multiply": 0.1 } ] }
+    ],
+    "trigger_cost": "35 J"
   },
   {
     "id": "bio_trip",
@@ -1449,6 +1495,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": "6 J",
     "react_cost": "6 J",
+    "trigger_cost": "75 kJ",
     "time": 1
   },
   {