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

Aerin-of-the-Toast · Aug 22, 2023 · 4722f3d · 4722f3d
2 parents 1509f9b + b981c5e
commit 4722f3d
Show file tree

Hide file tree

Showing 326 changed files with 171,321 additions and 109,420 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -53,3 +53,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN wget https://github.com/Qrox/libbacktrace/releases/download/2020-01-03/libbacktrace-i686-w64-mingw32.tar.gz
 # RUN tar -xzf libbacktrace-x86_64-w64-mingw32.tar.gz --exclude=LICENSE -C /opt/mxe/usr/x86_64-w64-mingw32.static
 # RUN tar -xzf libbacktrace-i686-w64-mingw32.tar.gz --exclude=LICENSE -C /opt/mxe/usr/i686-w64-mingw32.static
+
+# #Additional steps to cross compile object_creator. Uncomment this if you want to cross-compile the object cretor
+# WORKDIR /opt/mxe
+# RUN make MXE_TARGETS='x86_64-w64-mingw32.static i686-w64-mingw32.static' qtbase
+# RUN export PATH=/opt/mxe/usr/bin:$PATH
diff --git a/Makefile b/Makefile
@@ -1302,6 +1302,9 @@ clean-tests:
 object_creator: version $(BUILD_PREFIX)cataclysm.a
 	$(MAKE) -C object_creator
 
+object_creator.exe: version $(BUILD_PREFIX)cataclysm.a
+	$(MAKE) -C object_creator object_creator.exe
+
 clean-object_creator:
 	$(MAKE) -C object_creator clean
 

diff --git a/data/changelog.txt b/data/changelog.txt
@@ -41,6 +41,8 @@ Player character now can get sick with common cold or flu only after contacts wi
 Generate vehicle prototypes from in-game vehicles
 In-game Armor sprite change
 Cockroaches flee light, hide under furniture, eat corpses, and breed faster when fed
+Cataclysm and game start dates are to be set through scenarios
+Friendly NPC crafting by crafting menu
 
 
 ## Content:
@@ -73,8 +75,9 @@ 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
- adds a chance for small, personal photographs to spawn within people’s wallets and creates a starting pool of 34 snippets from which to pull.
+Adds a chance for small, personal photographs to spawn within people’s wallets and creates a starting pool of 34 snippets from which to pull.
 Adds curved road bends, rotaries and rest stops/laybys
+JSONify Defense Mode
 
 
 ## Interface:
@@ -96,6 +99,7 @@ AIM: Add key to step outside containers; AIM: mark container that the other pane
 Change description of highlighted regions when editing the overmap
 Detailed information for stats on character creation menu
 Larger and more I18n-friendly safemode UI
+Enable/disable showing several non-player-related messages in the log
 
 
 ## Mods:
@@ -130,6 +134,7 @@ Add the Mind Over Matter mod to the CDDA repository
 [Sky Island] Mainline Sky Island mod
 [Magiclysm] Add a spell-using feral human to Magiclysm
 [MoM] Add telepathic and telekinetic damage types
+[MoM] Mind Over Matter-specific Research facility overhaul
 
 
 ## Balance:
@@ -226,13 +231,16 @@ Stop dodging good spells, fix uncanny dodge spell crash
 Fix and improve NPC randomizer
 Make sure overconfident officers reliably drop their guns
 [MoM] Fix zombie telepathic stuns
+Fix appliance power drain display right after plugging in/unplugging device
+Fix items and furniture being deleted from grappling hook usage
 
 
 ## 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
+Optimize eoc processing and other fixes to speed up waiting near many npcs
 
 
 ## Infrastructure:

diff --git a/data/core/game_balance.json b/data/core/game_balance.json
@@ -300,6 +300,20 @@
     "stype": "bool",
     "value": true
   },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_RAILROADS",
+    "info": "Allows to place procgen railroads during overmap generation.",
+    "stype": "bool",
+    "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "OVERMAP_PLACE_RAILROADS_BEFORE_ROADS",
+    "info": "Defines whether to place railroads before roads.",
+    "stype": "bool",
+    "value": false
+  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "OVERMAP_PLACE_SPECIALS",

diff --git a/data/json/effect_on_condition.json b/data/json/effect_on_condition.json
@@ -1330,5 +1330,13 @@
       { "u_add_trait": "CHITIN2" },
       { "u_add_trait": "CRUSTACEAN_CARAPACE" }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "yrax_trifacet_activation",
+    "effect": [
+      { "u_spawn_monster": "mon_yrax_trifacet", "real_count": 1, "min_radius": 1, "max_radius": 2 },
+      { "u_message": "The hostile trifacet violently unfolds just clear of your hand!", "type": "bad" }
+    ]
   }
 ]
diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
@@ -165,8 +165,9 @@
     "damage_modifier": 10,
     "damage_reduction": { "all": 10 },
     "durability": 80,
-    "flags": [ "OBSTACLE", "COVERED", "APPLIANCE", "ENABLED_DRAINS_EPOWER", "ARCADE", "CTRL_ELECTRONIC" ],
+    "flags": [ "OBSTACLE", "COVERED", "HALF_CIRCLE_LIGHT", "APPLIANCE", "ENABLED_DRAINS_EPOWER", "ARCADE", "CTRL_ELECTRONIC" ],
     "epower": "-150 W",
+    "bonus": 10,
     "item": "arcade_machine",
     "looks_like": "f_arcade_machine",
     "breaks_into": [

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -462,6 +462,15 @@
       { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "mutant_tiny",
+    "//": "mutants so tiny they don't drop chunks of meat",
+    "type": "harvest",
+    "entries": [
+      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.5 },
+      { "drop": "mutant_blood", "type": "blood", "mass_ratio": 0.1 }
+    ]
+  },
   {
     "id": "mammal_small_fur",
     "//": "does not drop stomach or other small organs",

diff --git a/data/json/item_category.json b/data/json/item_category.json
@@ -189,6 +189,13 @@
     "zone": "LOOT_CORPSES",
     "sort_rank": 12
   },
+  {
+    "id": "tool_magazine",
+    "type": "ITEM_CATEGORY",
+    "name": { "str": "TOOL MAGAZINES" },
+    "zone": "LOOT_TOOL_MAGAZINE",
+    "sort_rank": -15
+  },
   {
     "id": "armor",
     "type": "ITEM_CATEGORY",

diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -54,7 +54,7 @@
       [ "fertilizer_liquid", 20 ],
       [ "fertilizer_commercial", 30 ],
       [ "fungicide", 20 ],
-      [ "insecticide", 30 ],
+      { "group": "insecticide_bag_plastic", "prob": 30 },
       { "item": "chem_saltpetre", "prob": 15, "charges-min": 10, "charges-max": 50 },
       [ "sickle", 40 ],
       { "group": "tools_toolbox", "prob": 10 },
@@ -160,7 +160,7 @@
     "items": [
       [ "fertilizer_liquid", 10 ],
       [ "fertilizer_commercial", 10 ],
-      [ "insecticide", 10 ],
+      { "group": "insecticide_bag_plastic", "prob": 10 },
       [ "pot_canning", 5 ],
       { "item": "jar_3l_glass_sealed", "prob": 25, "count": [ 2, 10 ] },
       { "item": "wooden_barrel", "prob": 20, "count": [ 2, 4 ] }

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -3378,7 +3378,7 @@
       [ "makeshift_machete", 4 ],
       [ "machete_gimmick", 3 ],
       [ "fungicide", 10 ],
-      [ "insecticide", 10 ],
+      { "group": "insecticide_bag_plastic", "prob": 10 },
       { "prob": 1, "group": "antifungal_bottle_plastic_pill_prescription_0_10" },
       { "prob": 5, "group": "antiparasitic_bottle_plastic_pill_prescription_0_10" },
       { "prob": 1, "group": "diazepam_bottle_plastic_pill_prescription_0_10" },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -203,7 +203,7 @@
       [ "oxy_powder", 2 ],
       [ "hazmat_suit", 5 ],
       [ "fungicide", 10 ],
-      [ "insecticide", 5 ],
+      { "group": "insecticide_bag_plastic", "prob": 5 },
       { "item": "oxygen_tank", "prob": 40, "charges": [ 0, 24 ] },
       [ "autoclave", 20 ],
       { "item": "smoxygen_tank", "prob": 10, "charges": [ 0, 12 ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -1969,7 +1969,7 @@
       [ "towel", 50 ],
       [ "scissors_medical", 50 ],
       [ "fungicide", 10 ],
-      [ "insecticide", 10 ],
+      { "group": "insecticide_bag_plastic", "prob": 10 },
       { "item": "soap", "prob": 20, "charges": [ 1, 10 ] },
       { "item": "chem_hydrogen_peroxide", "prob": 10, "charges": [ 1, 10 ] },
       [ "canister_empty", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -57,135 +57,6 @@
     "subtype": "distribution",
     "entries": [ { "group": "everyday_corpse", "prob": 85 }, { "group": "grave_cremains", "prob": 15 } ]
   },
-  {
-    "id": "everyday_corpse",
-    "type": "item_group",
-    "subtype": "collection",
-    "entries": [
-      { "group": "everyday_gear", "prob": 40 },
-      { "group": "coats_unisex", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "common_gloves", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "hatstore_hats", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "scarfs_unisex", "damage": [ 1, 4 ], "prob": 20 },
-      { "group": "accesories_personal_unisex", "prob": 15 },
-      {
-        "distribution": [
-          {
-            "collection": [
-              {
-                "distribution": [
-                  { "group": "male_underwear", "prob": 90, "damage": [ 1, 4 ] },
-                  { "item": "union_suit", "prob": 10, "damage": [ 1, 4 ] }
-                ]
-              },
-              {
-                "distribution": [
-                  {
-                    "collection": [
-                      { "group": "pants_male", "prob": 60, "damage": [ 1, 4 ] },
-                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
-                      { "item": "leather_belt", "prob": 30, "damage": [ 1, 4 ] }
-                    ]
-                  },
-                  { "item": "suit", "prob": 5, "damage": [ 1, 4 ] },
-                  { "item": "tux", "prob": 5, "damage": [ 1, 4 ] },
-                  { "item": "thawb", "prob": 10, "damage": [ 1, 4 ] },
-                  { "item": "cassock", "prob": 10, "damage": [ 1, 4 ] },
-                  { "item": "haori", "prob": 10, "damage": [ 1, 4 ] }
-                ]
-              },
-              { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] },
-              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
-              { "group": "socks_unisex", "damage": [ 1, 4 ], "prob": 50 },
-              { "group": "accesories_personal_mens", "prob": 15, "damage": [ 1, 4 ] },
-              { "group": "corpse_male", "damage": 4 }
-            ]
-          },
-          {
-            "collection": [
-              { "group": "female_underwear", "prob": 90, "damage": [ 1, 4 ] },
-              { "group": "accesories_personal_womens", "prob": 15, "damage": [ 1, 4 ] },
-              {
-                "distribution": [
-                  {
-                    "collection": [
-                      { "group": "pants_female", "prob": 60, "damage": [ 1, 4 ] },
-                      { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
-                      { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
-                      {
-                        "distribution": [
-                          {
-                            "collection": [
-                              {
-                                "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
-                              },
-                              { "item": "garter_belt", "prob": 50, "damage": [ 1, 4 ] }
-                            ]
-                          },
-                          { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] }
-                        ]
-                      }
-                    ],
-                    "prob": 70
-                  },
-                  {
-                    "collection": [
-                      {
-                        "distribution": [
-                          { "item": "gown", "prob": 10, "damage": [ 1, 4 ] },
-                          { "item": "dress", "prob": 70, "damage": [ 1, 4 ] },
-                          { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] }
-                        ]
-                      },
-                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
-                      {
-                        "collection": [
-                          {
-                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
-                          },
-                          { "item": "garter_belt", "prob": 50, "damage": [ 1, 4 ] }
-                        ]
-                      },
-                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
-                    ],
-                    "prob": 20
-                  },
-                  {
-                    "collection": [
-                      { "item": "dress_wedding", "damage": [ 1, 4 ] },
-                      { "item": "veil_wedding", "damage": [ 1, 4 ] },
-                      { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] },
-                      {
-                        "collection": [
-                          {
-                            "distribution": [ { "item": "stockings", "prob": 50, "damage": [ 1, 4 ] }, { "item": "tights", "prob": 50, "damage": [ 1, 4 ] } ]
-                          },
-                          { "item": "garter_belt", "prob": 50, "damage": [ 1, 4 ] }
-                        ]
-                      },
-                      { "item": "long_glove_white", "prob": 20, "damage": [ 1, 4 ] }
-                    ],
-                    "prob": 10
-                  }
-                ]
-              },
-              { "group": "corpse_female", "damage": 4 }
-            ]
-          },
-          {
-            "collection": [
-              { "group": "underwear", "prob": 90, "damage": [ 0, 4 ] },
-              { "group": "pants", "prob": 60, "damage": [ 0, 4 ] },
-              { "group": "shoes_unisex", "prob": 30, "damage": [ 1, 4 ] },
-              { "group": "shirts_unisex", "prob": 60, "damage": [ 1, 4 ] },
-              { "group": "socks_unisex", "prob": 50, "damage": [ 1, 4 ] },
-              { "group": "corpse_child", "damage": 4 }
-            ]
-          }
-        ]
-      }
-    ]
-  },
   {
     "id": "tool_common_stack",
     "type": "item_group",
@@ -1279,7 +1150,7 @@
       { "item": "lye_powder", "prob": 5, "container-item": "bag_canvas_small" },
       [ "oxy_powder", 5 ],
       [ "fungicide", 5 ],
-      [ "insecticide", 5 ],
+      { "group": "insecticide_bag_plastic", "prob": 5 },
       { "item": "charcoal", "prob": 5, "container-item": "bag_canvas" },
       [ "toilet_paper", 30 ],
       [ "plunger_toilet", 10 ],

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json
@@ -310,28 +310,28 @@
     "subtype": "collection",
     "id": "nested_ar15_with_kits",
     "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.",
-    "entries": [ { "group": "boxed_ar15kits" }, { "item": "modular_ar15", "charges-min": 0, "charges-max": 0 } ]
+    "entries": [ { "group": "boxed_ar15kits" }, { "item": "modular_ar15" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "nested_mdrx_with_kits",
     "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.",
-    "entries": [ { "group": "boxed_mdrxkits" }, { "item": "mdrx", "charges-min": 0, "charges-max": 0 } ]
+    "entries": [ { "group": "boxed_mdrxkits" }, { "item": "mdrx" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "nested_axmc_with_kits",
     "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.",
-    "entries": [ { "group": "boxed_axmckits" }, { "item": "axmc", "charges-min": 0, "charges-max": 0 } ]
+    "entries": [ { "group": "boxed_axmckits" }, { "item": "axmc" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "nested_cz600_with_kits",
     "//": "An item group for an empty rifle to spawn alongside one of a number of compatible conversion kits. Intended for use in gun store racks and adjacent locations.",
-    "entries": [ { "group": "boxed_cz600kits" }, { "item": "cz600", "charges-min": 0, "charges-max": 0 } ]
+    "entries": [ { "group": "boxed_cz600kits" }, { "item": "cz600" } ]
   },
   {
     "type": "item_group",