Merge remote-tracking branch 'upstream/master'

.github/labeler.yml

@@ -260,6 +260,9 @@
 "Mods: Mind Over Matter":
   - data/mods/MindOverMatter/**/*
 
+"Mods: Sky Island":
+  - data/mods/Sky_Island/**/*
+
 "Mods":
   - any: [ 'data/mods/**' ]
     all: [ '!data/mods/TEST_DATA/**' ]

.github/pull_request_template.md

@@ -33,7 +33,7 @@ If there is no related issue, explain here what issue, feature, or other concern
 
 #### Testing
 
-<!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.  Also include testing suggestions for reviewers and maintainers. -->
+<!-- Describe what steps you took to test that this PR resolved the bug or added the feature, and what tests you performed to make sure it didn't cause any regressions.  Also include testing suggestions for reviewers and maintainers. See TESTING_YOUR_CHANGES.md -->
 
 #### Additional context
 
@@ -43,4 +43,4 @@ If there is no related issue, explain here what issue, feature, or other concern
 <!--README: Cataclysm: Dark Days Ahead is released under the Creative Commons Attribution ShareAlike 3.0 license.
 The code and content of the game is free to use, modify, and redistribute for any purpose whatsoever.
 By contributing to the project you agree to the term of the license and that any contribution you make will also be covered by the same license.
-See http://creativecommons.org/licenses/by-sa/3.0/ for details. -->
+See http://creativecommons.org/licenses/by-sa/3.0/ for details. -->

.github/reviewers.yml

@@ -51,3 +51,5 @@ files:
     - dseguin
   'src/ui_manager.*':
     - Qrox
+  'data/raw/keybindings{.json,/**}':
+    - Qrox

.github/workflows/stale.yml

@@ -2,7 +2,7 @@ name: 'Stale issue handler'
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 * * * *'
+    - cron: '30 * * * *'
 permissions:
   issues: write
   pull-requests: write
@@ -24,7 +24,7 @@ jobs:
           days-before-close: 30
           start-date: '2020-05-07'
           ascending: ${{ contains(fromJson('["01", "03", "05", "07", "09", "11"]'), env.time) }}
-          operations-per-run: 250
+          operations-per-run: 110
           exempt-issue-labels: 'Accessibility,<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,Help Wanted,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.G String Freeze,0.G Feature Freeze,0.G Content Freeze'
           exempt-pr-labels: '<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.G String Freeze,0.G Feature Freeze,0.G Content Freeze'
           exempt-all-milestones: true

Makefile

@@ -857,9 +857,9 @@ THIRD_PARTY_SOURCES := $(wildcard $(SRC_DIR)/third-party/flatbuffers/*.cpp)
 HEADERS := $(wildcard $(SRC_DIR)/*.h)
 TESTSRC := $(wildcard tests/*.cpp)
 TESTHDR := $(wildcard tests/*.h)
-JSON_FORMATTER_SOURCES := $(wildcard tools/format/*.cpp) src/json.cpp
+JSON_FORMATTER_SOURCES := $(wildcard tools/format/*.cpp) src/wcwidth.cpp src/json.cpp
 JSON_FORMATTER_HEADERS := $(wildcard tools/format/*.h)
-CHKJSON_SOURCES := $(wildcard src/chkjson/*.cpp) src/json.cpp
+CHKJSON_SOURCES := $(wildcard src/chkjson/*.cpp) src/wcwidth.cpp src/json.cpp
 CLANG_TIDY_PLUGIN_SOURCES := \
   $(wildcard tools/clang-tidy-plugin/*.cpp tools/clang-tidy-plugin/*/*.cpp)
 CLANG_TIDY_PLUGIN_HEADERS := \

data/changelog.txt

@@ -35,6 +35,11 @@ Unhardcode dragging, grab fixes
 Make vehicle doors lockable and pickable
 Implement export&import of the protagonist and follower NPCs
 Expand grain farming and adjust seeds
+Creatures above cast shadows onto tiles below
+Apply different messages at different effect intensity levels
+Player character now can get sick with common cold or flu only after contacts with NPCs or ferals
+Generate vehicle prototypes from in-game vehicles
+In-game Armor sprite change
 
 
 ## Content:
@@ -64,6 +69,9 @@ Added a small office building fortified by bandits
 New location: speedway
 You can now choose a new leader for your faction without dying
 Adds new skateboard vehicle
+Most scenarios now provide vision of the nearest city on start
+Alternative resolution to clean back bay quest
+Add a synagogue
 
 
 ## Interface:
@@ -78,6 +86,9 @@ Show NPC location when selecting NPC to chat with, guard, or follow
 Display why vehicle parts cannot be installed
 Open multiple containers in Advanced Inventory Manager
 Adds the 'Mark as dangerous' keybinding to the overmap
+NPC selects melee style
+Add sundial, wind and radiation badge to "spacebar" sidebar
+fix widget error if player has no body part
 
 
 ## Mods:
@@ -108,6 +119,9 @@ Bombastic Perks adds Playstyle Perks
 Disable the Bionic Professions mod by default
 Add the Mind Over Matter mod to the CDDA repository
 [Tamable Wildlife] More tamable creatures
+[MoM] Add additional portal storm remnant map extras
+[Sky Island] Mainline Sky Island mod
+[Magiclysm] Add a spell-using feral human to Magiclysm
 
 
 ## Balance:
@@ -131,6 +145,8 @@ Hound afterimages also copy their host nicknames
 The player is substantially less effective with guns at low skill values
 Lycra is less protective
 BMI has a less all consuming impact on how healthy you are
+Being badly wounded will always allow you to swap characters in camp while you heal
+Intelligence provides a multiplier to current focus rather than adding to its value
 
 
 ## Bugfixes:
@@ -184,12 +200,19 @@ Fix the epilogue for the New England Church Community
 Flat armor penetration is spread across all armor layers instead of applying its full value to each
 Fix tow cables being unable to connect different vehicles
 Smashing now incorporates any MELEE_DAMAGE and STRENGTH enchantments
+'w'ield menu will now correctly trigger a steal warning when wielding an item that does not belong to player
+Allow crafting tools to use linked electricity
+Don't get randomly sick anymore
+Itemgroups can seal containers
+Spawned corpses should now spawn with and contain their clothes
+Can no longer get stuck for days thinking about working out if you're a WIMP with NEGATIVE WORKOUT TIME
 
 
 ## Performance:
 Make `Character::best_item_with_quality` examine items non-recursively
 Refactor effect types to use map indirection and enums instead of strings
 Removes the ludicrous amount of OMs the refugee and research centres define
+Fix Nested List lag in crafting menu
 
 
 ## Infrastructure:
@@ -204,6 +227,8 @@ Upgrade clang-tidy used in CI to LLVM 16
 Allow C++ standard includes in clang-tidy tests
 Refactor timer items to be a bit more time based
 Support for material replacement in items
+Carrier for items on ground is nullptr
+Tick_action as a separate thing from use_action
 
 
 ## Build:

data/json/bionic_spells.json

@@ -0,0 +1,34 @@
+[
+  {
+    "id": "bio_taser_spell",
+    "type": "SPELL",
+    "name": "Super Stun Gun",
+    "description": "A blast of electricity from your Super Stun Gun bionic.",
+    "effect": "attack",
+    "shape": "blast",
+    "valid_targets": [ "ally", "hostile" ],
+    "flags": [ "NO_LEGS", "NO_HANDS", "NO_FAIL", "NO_PROJECTILE" ],
+    "max_level": 1,
+    "min_damage": 15,
+    "max_damage": 15,
+    "damage_increment": 0,
+    "min_range": 1,
+    "max_range": 1,
+    "range_increment": 0,
+    "min_aoe": 0,
+    "max_aoe": 0,
+    "aoe_increment": 0,
+    "spell_class": "NONE",
+    "base_casting_time": 25,
+    "base_energy_cost": 5,
+    "energy_source": "BIONIC",
+    "difficulty": 0,
+    "sound_description": "a crackle",
+    "damage_type": "electric",
+    "sound_type": "combat",
+    "sound_ambient": false,
+    "sound_id": "misc",
+    "sound_variant": "shockwave",
+    "message": "You discharge energy from your Super Stun Gun."
+  }
+]

data/json/bionics.json

@@ -14,9 +14,9 @@
     "description": "A thin forcefield surrounds your body, continually draining power.  Everything loses velocity when penetrating this field, which results in reduced amount of dealt damage at the cost of your bionic energy.  Bullets and stabbing attacks will lose more velocity than cutting attacks and those in turn more than bashing attacks.",
     "occupied_bodyparts": [ [ "torso", 10 ], [ "head", 1 ], [ "arm_l", 1 ], [ "arm_r", 1 ], [ "leg_l", 2 ], [ "leg_r", 2 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "act_cost": "10 J",
-    "react_cost": "10 J",
-    "trigger_cost": "25kJ",
+    "act_cost": "1 kJ",
+    "react_cost": "1 kJ",
+    "trigger_cost": "10 kJ",
     "time": "1 s"
   },
   {
@@ -1582,6 +1582,16 @@
     "flags": [ "BIONIC_NPC_USABLE" ],
     "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "WEAPON_DISPERSION", "multiply": -0.25 } ] } ]
   },
+  {
+    "id": "bio_taser",
+    "type": "bionic",
+    "name": { "str": "Super Stun Gun" },
+    "description": "You have a powerful stun gun built into your hand.  Activate to zap an adjacent enemy.",
+    "occupied_bodyparts": [ [ "hand_r", 3 ] ],
+    "flags": [ "BIONIC_NPC_USABLE" ],
+    "spell_on_activation": { "id": "bio_taser_spell" },
+    "activated_close_ui": true
+  },
   {
     "id": "bio_teleport",
     "type": "bionic",
@@ -1702,7 +1712,9 @@
     "occupied_bodyparts": [ [ "torso", 2 ], [ "mouth", 1 ] ],
     "flags": [ "BIONIC_FAULTY" ],
     "social_modifiers": { "persuade": -20, "lie": 10, "intimidate": 20 },
-    "canceled_mutations": [ "GROWL", "SNARL", "HISS", "CROAK" ]
+    "//": "bird mutants might have an entirely different vocal chord structure rather than just a different tone of voice",
+    "canceled_mutations": [ "GROWL", "SNARL", "HISS", "CROAK" ],
+    "mutation_conflicts": [ "SCREECH" ]
   },
   {
     "id": "bio_watch",
@@ -1746,10 +1758,17 @@
     "id": "bio_weight",
     "type": "bionic",
     "name": { "str": "Titanium Skeletal Bracing" },
-    "description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain.  Your carrying capacity is increased by 20 kilograms, or about 44 pounds.",
+    "description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain.  Your carrying capacity is increased by 20 kilograms, or about 44 pounds, and you receive slightly less bashing damage to your arms, legs and torso.",
     "occupied_bodyparts": [ [ "torso", 8 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "leg_l", 3 ], [ "leg_r", 3 ] ],
     "weight_capacity_bonus": "20 kg",
     "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ],
+    "protec": [
+      [ "torso", { "bash": 2 } ],
+      [ "arm_l", { "bash": 2 } ],
+      [ "arm_r", { "bash": 2 } ],
+      [ "leg_l", { "bash": 2 } ],
+      [ "leg_r", { "bash": 2 } ]
+    ],
     "mutation_conflicts": [
       "AMORPHOUS",
       "BENDY2",

data/json/construction.json

@@ -8171,8 +8171,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "2 h",
-    "tools": [ [ [ "shovel", -1 ], [ "primitive_shovel", -1 ] ] ],
-    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ],
     "components": [ [ [ "fire_brick", 30 ] ], [ [ "clay_lump", 5 ] ], [ [ "any_fresh_water", 2, "LIST" ] ] ],
     "pre_flags": "DIGGABLE",
     "pre_special": "check_empty",

data/json/effect_on_condition.json

@@ -400,7 +400,7 @@
     "type": "effect_on_condition",
     "eoc_type": "AVATAR_DEATH",
     "condition": {
-      "and": [ { "npc_allies_global": 1 }, { "u_query": "You have died. Continue as one of your followers?", "default": false } ]
+      "and": [ { "npc_allies_global": 1 }, { "u_query": "You have died.  Continue as one of your followers?", "default": false } ]
     },
     "effect": [ "take_control_menu" ]
   },