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

Maleclypse · Feb 22, 2022 · 1363fe2 · 1363fe2
2 parents 6a3dae3 + 30df995
commit 1363fe2
Show file tree

Hide file tree

Showing 590 changed files with 58,468 additions and 48,061 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -30,5 +30,5 @@ magic*.h @KorGgenT
 /gfx/ @I-am-Erk
 /tools/ @int-ua
 /lang/ @BrettDong
-widget.cpp @wapcaplet
-wiget.h @wapcaplet
+widget.cpp @wapcaplet @dseguin
+widget.h @wapcaplet @dseguin
diff --git a/.github/workflows/pull-translations.yml b/.github/workflows/pull-translations.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: "Install Transifex CLI"
         run: |
-          curl -s https://github.com/transifex/cli/releases/download/v1.0.0/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx
+          curl -sL https://github.com/transifex/cli/releases/download/v1.0.0/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx
       - name: "Checkout"
         uses: actions/checkout@v2
       - name: "Get current date"
@@ -22,7 +22,7 @@ jobs:
       - name: "Pull translations"
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
-        run: tx pull
+        run: tx pull --force
       - name: Create Pull Request
         uses: peter-evans/[email protected]
         with:

diff --git a/.github/workflows/push-translation-template.yml b/.github/workflows/push-translation-template.yml
@@ -15,13 +15,18 @@ jobs:
     if: >
       ${{ github.event.workflow_run.event == 'push' &&
       github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.status == 'success' &&
       github.repository == 'CleverRaven/Cataclysm-DDA' }}
     steps:
       - name: "Install gettext tools"
         run: sudo apt install gettext
       - name: "Install Transifex CLI"
         run: |
           curl -sL https://github.com/transifex/cli/releases/download/v1.0.0/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx
+      - name: "Install Python3"
+        run: |
+          sudo apt install python3-pip
+          sudo pip3 install polib
       - name: "Checkout"
         uses: actions/checkout@v2
       - name: "Generate translation template"

diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -94,7 +94,7 @@ then
         cmake_extra_opts+=("-DCMAKE_CXX_FLAGS=-isystem /usr/include/clang/12.0.0/include")
     fi
 
-    mkdir build
+    mkdir -p build
     cd build
     cmake \
         -DBACKTRACE=ON \
@@ -136,7 +136,7 @@ then
         compiledb -n make
 
         cd ..
-        ln -s build/compile_commands.json
+        rm -f compile_commands.json && ln -s build/compile_commands.json
 
         ./build-scripts/files_changed || echo 'Unable to determine changed files'
 

diff --git a/data/help/texts.json b/data/help/texts.json
@@ -161,7 +161,7 @@
       "To wield an item as a weapon, press <press_wield>, then the appropriate letter.  Wielding the item you are currently wielding will unwield it, leaving your hands empty.  A wielded weapon will not contribute to your volume carried, so holding a large item in your hands may be a good option for travel.  When unwielding your weapon, you will be given a choice of what to do with it.",
       "To wear a piece of clothing, press <press_wear>, then the appropriate letter.  Armor reduces damage, and can help you resist things like smoke.  To take off an item, press <press_take_off>, then the appropriate letter.  Clothing and armor are worn in distinct layers, and provide different coverage, protection and warmth.  Each piece has its own encumbrance, and wearing too much on any given layer can significantly hamper your movement and other abilities, especially during combat.  You can view and sort worn items by pressing <press_sort_armor>.",
       "Your clothing can sit in one of five layers on your body: next-to-skin, standard, waist, over, and belted.  You can wear one item from each layer on a body part without incurring an encumbrance penalty for too many worn items.  Any items beyond the first on each layer add the encumbrance of the additional article(s) of clothing to the body part's encumbrance.  The layering penalty applies a minimum of 2 and a maximum of 10 encumbrance per article of clothing.",
-      "For example, on her torso, a character might wear a leather corset (next-to-skin), a leather touring suit (standard), a trenchcoat (over), and a survivor's runner pack (belted).  Her encumbrance penalty is 0.  If she put on a tank top it would conflict with the leather touring suit and add the minimum encumbrance penalty of 2.",
+      "For example, on her torso, a character might wear a leather corset (next-to-skin), a track touring suit (standard), a trenchcoat (over), and a survivor's runner pack (belted).  Her encumbrance penalty is 0.  If she put on a tank top it would conflict with the leather touring suit and add the minimum encumbrance penalty of 2.",
       "Items can be damaged through various means, whether intentional or not.  Indicators such as <color_yellow>|\\</color> show the item's current state.  You may be able to repair the item using specific tools, which are listed in the item's information screen.",
       "Items are also subject to degradation, which represents the item's structural integrity over its lifetime.  Items that suffer serious damage can become more degraded, which limits how well the item can be repaired.  The higher the degradation, the less you'll be able to repair it.",
       "In the View Nearby Items menu (press <press_listitems> to open), you can filter or prioritize items.  You can enter item names, or use various advanced filter strings: {<token>:<search param>}",

diff --git a/data/json/artifact/relic_procgen_data.json b/data/json/artifact/relic_procgen_data.json
@@ -779,6 +779,88 @@
       { "weight": 100, "item": "art_crescent" }
     ]
   },
+  {
+    "type": "relic_procgen_data",
+    "id": "held_passive_bad",
+    "passive_add_procgen_values": [
+      {
+        "weight": 100,
+        "min_value": 1,
+        "max_value": 2,
+        "type": "STRENGTH",
+        "increment": 1,
+        "power_per_increment": 250,
+        "ench_has": "HELD"
+      },
+      {
+        "weight": 100,
+        "min_value": 1,
+        "max_value": 2,
+        "type": "DEXTERITY",
+        "increment": 1,
+        "power_per_increment": 250,
+        "ench_has": "HELD"
+      },
+      {
+        "weight": 100,
+        "min_value": 1,
+        "max_value": 2,
+        "type": "PERCEPTION",
+        "increment": 1,
+        "power_per_increment": 250,
+        "ench_has": "HELD"
+      },
+      {
+        "weight": 100,
+        "min_value": 1,
+        "max_value": 2,
+        "type": "INTELLIGENCE",
+        "increment": 1,
+        "power_per_increment": 250,
+        "ench_has": "HELD"
+      }
+    ],
+    "passive_mult_procgen_values": [
+      {
+        "weight": 100,
+        "min_value": 0.4,
+        "max_value": 1,
+        "type": "THIRST",
+        "increment": 0.1,
+        "power_per_increment": -50,
+        "ench_has": "HELD"
+      },
+      {
+        "weight": 100,
+        "min_value": 0.5,
+        "max_value": 1,
+        "type": "HUNGER",
+        "increment": 0.1,
+        "power_per_increment": -100,
+        "ench_has": "HELD"
+      },
+      {
+        "weight": 100,
+        "min_value": -0.8,
+        "max_value": -0.3,
+        "type": "REGEN_HP",
+        "increment": 0.1,
+        "power_per_increment": 100,
+        "ench_has": "HELD"
+      },
+      {
+        "weight": 100,
+        "min_value": 0.3,
+        "max_value": 0.8,
+        "type": "FATIGUE",
+        "increment": 0.1,
+        "power_per_increment": -100,
+        "ench_has": "HELD"
+      }
+    ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_mult" }, { "weight": 50, "value": "passive_enchantment_add" } ],
+    "items": [ { "weight": 100, "item": "monolith_disc" }, { "weight": 100, "item": "monolith_brick" } ]
+  },
   {
     "type": "relic_procgen_data",
     "id": "altered_object",

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -1323,11 +1323,12 @@
     "id": "bio_railgun",
     "type": "bionic",
     "name": { "str": "Railgun" },
-    "description": "EM field generators in your arms double the range and damage of thrown iron and steel objects at a cost of 1 power per throw, causing them to leave a trail of electricity that can cause additional damage.",
+    "description": "EM field generators in your arms double the range and damage of thrown iron and steel objects at a cost of 10 power per throw, causing them to leave a trail of electricity that can cause additional damage.",
     "occupied_bodyparts": [ [ "arm_l", 5 ], [ "arm_r", 5 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "act_cost": 1,
-    "react_cost": 1,
+    "act_cost": "1 kJ",
+    "react_cost": "100 J",
+    "trigger_cost": "10 kJ",
     "time": 1
   },
   {

diff --git a/data/json/body_parts.json b/data/json/body_parts.json
@@ -207,7 +207,8 @@
     "base_hp": 60,
     "drench_capacity": 3,
     "smash_message": "You smash the %s with your fist.",
-    "bionic_slots": 5
+    "bionic_slots": 5,
+    "sub_parts": [ "hand_wrist_l", "hand_palm_l", "hand_back_l", "hand_fingers_l" ]
   },
   {
     "id": "hand_r",
@@ -235,7 +236,8 @@
     "base_hp": 60,
     "drench_capacity": 3,
     "smash_message": "You smash the %s with your fist.",
-    "bionic_slots": 5
+    "bionic_slots": 5,
+    "sub_parts": [ "hand_wrist_r", "hand_palm_r", "hand_back_r", "hand_fingers_r" ]
   },
   {
     "id": "leg_l",
@@ -615,5 +617,85 @@
     "opposite": "leg_lower_r",
     "name_multiple": "lower legs",
     "name": "left lower leg"
+  },
+  {
+    "id": "hand_wrist_r",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "hand_r",
+    "side": 1,
+    "opposite": "hand_wrist_l",
+    "name_multiple": "wrists",
+    "name": "right wrist"
+  },
+  {
+    "id": "hand_palm_r",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "hand_r",
+    "side": 1,
+    "opposite": "hand_palm_l",
+    "name_multiple": "palms",
+    "name": "right palm"
+  },
+  {
+    "id": "hand_back_r",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "hand_r",
+    "side": 1,
+    "opposite": "hand_back_l",
+    "name_multiple": "back of hands",
+    "name": "right back of hand"
+  },
+  {
+    "id": "hand_fingers_r",
+    "type": "sub_body_part",
+    "max_coverage": 50,
+    "parent": "hand_r",
+    "side": 1,
+    "opposite": "hand_fingers_l",
+    "name_multiple": "wrists",
+    "name": "right fingers"
+  },
+  {
+    "id": "hand_wrist_l",
+    "type": "sub_body_part",
+    "max_coverage": 10,
+    "parent": "hand_l",
+    "side": 1,
+    "opposite": "hand_wrist_r",
+    "name_multiple": "wrists",
+    "name": "left wrist"
+  },
+  {
+    "id": "hand_palm_l",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "hand_l",
+    "side": 1,
+    "opposite": "hand_palm_r",
+    "name_multiple": "palms",
+    "name": "left palm"
+  },
+  {
+    "id": "hand_back_l",
+    "type": "sub_body_part",
+    "max_coverage": 20,
+    "parent": "hand_l",
+    "side": 1,
+    "opposite": "hand_back_r",
+    "name_multiple": "back of hands",
+    "name": "left back of hand"
+  },
+  {
+    "id": "hand_fingers_l",
+    "type": "sub_body_part",
+    "max_coverage": 50,
+    "parent": "hand_l",
+    "side": 1,
+    "opposite": "hand_fingers_r",
+    "name_multiple": "fingers",
+    "name": "left fingers"
   }
 ]