Merge remote-tracking branch 'upstream/master' into TEXT_INPUT

data/changelog.txt

@@ -840,7 +840,7 @@ Transformed active mutations (extended claws etc) properly cause instability
 Only count CONTAINER type pockets in the pickup inventory
 Allow select-all when highlighted item is non-selectable
 Eddie can talk about his father.
-Fixes issue where ImGui popup doesnt wrap buttons to a new line when the overall length is too long
+Fixes issue where ImGui popup doesn't wrap buttons to a new line when the overall length is too long
 Wet Towels No Longer Prompt to be Turned Off
 Maybe prevent rare crater generation error
 AIM: Now moving all items will not move favourite items, if other items are present.
@@ -1000,7 +1000,7 @@ Adds VS Code Dev Containers & Workspace Config
 Allow for cross-compiling from Linux to Windows in Devcontainer
 Faster local VS builds
 Fast Windows iteration with llvm-lib and lld-link
-Cross compile object creator from linux to Windows using Devcontainer
+Cross compile object creator from Linux to Windows using Devcontainer
 add object creator to releases
 Add a launch and debug configuration to VS Code Dev Container
 Enable tests for merge queue
@@ -1014,7 +1014,7 @@ Update Flatpak manifest to use clang and include the default soundpack
 stl_emulation span::count_ is not const anymore
 No longer build object creator in CI nor include it in releases
 Add PDCurses to Windows
-Fixed linux experimental build automation issues caused by SDL dependencies
+Fixed Linux experimental build automation issues caused by SDL dependencies
 
 
 ## I18N and A11Y:
@@ -1134,7 +1134,7 @@ Hunted scenario adds a nemesis zombie chasing the PC
 Practice recipes
 Player can nickname monsters
 All items can have cosmetic variants now
-Tons of work on zones, such as personal zones, dissasembly zones and automop zones
+Tons of work on zones, such as personal zones, disassembly zones and automop zones
 Allow non-debug change of gender, hair, facial hair, eye and skin color
 Books can now be copied into a variety of condensing items: ebooks, book binders etc
 PC can track their adventure in their diary
@@ -1258,7 +1258,7 @@ Show properly-fitted clothing in the crafting screen
 Progress update while heating food
 Hides the old sidebars and replaces them with fancy json sidebars
 Jsonified "Unexplored" OMT
-Support fuzzy search with accented latin letters
+Support fuzzy search with accented Latin letters
 Many new color themes
 Possibility to turn distractions on and off
 Show compatible guns in magazine descriptions
@@ -1305,7 +1305,7 @@ Dinomod Apex predators don't appear randomly day one
 Adds TropiCataclysm to the repository
 craftable holiday sweaters for dinos
 Hylian Adventurer Profession for Mythical Martial Arts
-Many south american animals added to Tropicataclysm
+Many South American animals added to Tropicataclysm
 Adds an innawood mod for wilderness survival.
 Aftershock Exoplanet: Glacial tunnels, a new low-risk area and the fauna that inhabits them
 TropiCataclysm Adds Termites and new content for Triffids

data/json/construction/walls.json

@@ -258,7 +258,7 @@
       [ [ "frame_wood", 1 ] ],
       [ [ "chunk_rubber", 16 ] ],
       [ [ "glass_sheet", 2 ] ],
-      [ [ "superglue", 2 ], [ "duct_tape", 10 ] ]
+      [ [ "super_glue", 2 ], [ "duct_tape", 10 ] ]
     ],
     "pre_note": "Must be supported on at least two sides.",
     "pre_special": "check_support",

data/json/effects_on_condition/mapgen_eocs/godco_mapgen_eocs.json

@@ -18,7 +18,7 @@
     "type": "effect_on_condition",
     "id": "godco_place_wall_new",
     "global": false,
-    "//": "4 hours 20 minutes per wall (from regular ground to full palisade) * 373 walls = ~1,567 hours.  Divided into 8-hour work shifts, thats ~196 days, or six and a half months for one person.  Presuming we have ~11 people working in a single shift, each building 1 wall, that should be ~18 days to build.  Please correct me if I messed up the math.",
+    "//": "4 hours 20 minutes per wall (from regular ground to full palisade) * 373 walls = ~1,567 hours.  Divided into 8-hour work shifts, that's ~196 days, or six and a half months for one person.  Presuming we have ~11 people working in a single shift, each building 1 wall, that should be ~18 days to build.  Please correct me if I messed up the math.",
     "effect": [
       { "mapgen_update": "place_right_corner_wall", "om_terrain": "godco_1" },
       { "mapgen_update": "place_gate_wall", "om_terrain": "godco_2" },

data/json/encounters/randec_independent_travelers.json

@@ -94,7 +94,7 @@
     "method": "json",
     "update_mapgen_id": "nest_RandEnc_campervan_traveler_remove",
     "object": {
-      "remove_npcs": [ { "class": "FM_caravan_merchant_random", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
+      "remove_npcs": [ { "class": "traveler_camper_van", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
       "remove_vehicles": [ { "vehicles": [ "traveler_van_motorhome" ], "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
     }
   }

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -1621,7 +1621,7 @@
       [ "10gal_hat", 3 ],
       [ "glasses_monocle", 2 ],
       [ "duct_tape", 60 ],
-      [ "superglue", 20 ],
+      { "group": "superglue", "prob": 20 },
       [ "firecracker_pack", 5 ],
       [ "firecracker", 5 ],
       [ "wolfsuit", 3 ],

data/json/itemgroups/Clothing_Gear/gear.json

@@ -23,7 +23,7 @@
   {
     "id": "gasmask_inserts_in_use",
     "type": "item_group",
-    "//": "Accessories grouped together for use as pre-installed spawnes within gas masks.",
+    "//": "Accessories grouped together for use as pre-installed spawns within gas masks.",
     "subtype": "distribution",
     "items": [
       {
@@ -172,7 +172,7 @@
       { "group": "tools_tailor", "prob": 20 },
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
       [ "duct_tape", 10 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "plastichoboreel", 5 ],
       [ "survivormap", 5 ],
       { "item": "teargas_sprayer", "prob": 25, "charges": [ 9, 10 ] }

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -289,7 +289,7 @@
       { "item": "liq_bandage_spray", "prob": 5, "charges": [ 1, -1 ] },
       { "group": "adhesive_bandages_box_used", "prob": 15 },
       { "item": "duct_tape", "prob": 20, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 10 },
+      { "group": "superglue", "prob": 10 },
       { "item": "sewing_kit", "prob": 10, "charges": [ 0, -1 ] },
       { "item": "mouthpiece", "prob": 10 },
       { "item": "cigar", "prob": 20, "count": [ 1, 5 ] },
@@ -377,7 +377,7 @@
       [ "stereo", 10 ],
       [ "wrench", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_steel", 50 ],
       [ "sneakers_steel", 35 ],
@@ -2139,7 +2139,7 @@
       { "item": "chem_calcium_chloride", "prob": 2 },
       { "prob": 3, "group": "yeast_bag_plastic" },
       { "prob": 1, "group": "yogurt_starter_culture_bag_plastic_4" },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 30 },
       { "item": "bottle_glass", "prob": 10 },
       { "item": "syringe", "prob": 1 },
       { "item": "adrenaline_injector", "prob": 1 },
@@ -2465,7 +2465,7 @@
       [ "screwdriver", 40 ],
       [ "screwdriver_set", 10 ],
       { "item": "duct_tape", "prob": 10, "charges": [ 25, 400 ] },
-      { "item": "superglue", "prob": 5 },
+      { "group": "superglue", "prob": 5 },
       [ "boots", 70 ],
       [ "boots_winter", 60 ],
       [ "boots_hiking", 30 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -97,11 +97,10 @@
       [ "toilet_paper", 10 ],
       { "item": "handflare", "prob": 15, "charges": 300 },
       [ "duct_tape", 25 ],
-      [ "superglue", 20 ],
+      { "group": "superglue", "prob": 45 },
       { "item": "flashlight", "prob": 25, "charges": [ 0, 300 ] },
       [ "thread", 20 ],
       { "group": "ammo_pocket_batteries_full", "prob": 25 },
-      [ "superglue", 25 ],
       { "item": "candle", "prob": 25, "charges": [ 0, 100 ] },
       [ "hammer", 20 ],
       [ "screwdriver", 20 ],
@@ -1202,7 +1201,7 @@
       { "item": "screwdriver", "prob": 40 },
       { "item": "screwdriver_set", "prob": 20 },
       { "item": "socket_screwdriver_set", "prob": 10 },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 55 },
       { "item": "hacksaw", "prob": 17 },
       { "item": "pliers", "prob": 40 },
       { "item": "gloves_leather", "prob": 45 },
@@ -1211,7 +1210,6 @@
       { "item": "manual_mechanics", "prob": 35 },
       { "item": "manual_fabrication", "prob": 20 },
       { "item": "duct_tape", "prob": 70, "charges": [ 50, 200 ] },
-      { "item": "superglue", "prob": 25 },
       { "item": "misc_repairkit", "prob": 15 },
       { "group": "tools_toolbox", "prob": 2 }
     ]
@@ -1272,7 +1270,7 @@
           { "item": "screwdriver_set", "prob": 20 },
           { "item": "socket_screwdriver_set", "prob": 20 },
           { "item": "duct_tape", "prob": 50 },
-          { "item": "superglue", "prob": 10 },
+          { "group": "superglue", "prob": 10 },
           { "item": "misc_repairkit", "prob": 25 },
           { "group": "tools_toolbox", "prob": 2 }
         ]
@@ -1450,7 +1448,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "hand_controls", 1 ],
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ]
@@ -1510,7 +1508,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1541,7 +1539,7 @@
       [ "glasses_safety", 10 ],
       [ "solar_cell", 10 ],
       [ "screwdriver", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       { "item": "polisher", "prob": 15, "charges": [ 0, 100 ] },
       [ "solar_panel", 15 ],
       [ "spare_tire_carrier", 10 ],
@@ -1799,7 +1797,7 @@
       { "item": "soldering_iron", "prob": 65 },
       { "item": "soldering_iron_portable", "prob": 65, "charges": [ 0, 50 ] },
       [ "solder_wire", 50 ],
-      [ "superglue", 55 ],
+      { "group": "superglue", "prob": 55 },
       [ "screwdriver", 60 ],
       [ "motor_small", 30 ]
     ]
@@ -2099,7 +2097,7 @@
       [ "yarn", 15 ],
       [ "sinew", 15 ],
       [ "duct_tape", 15 ],
-      [ "superglue", 5 ],
+      { "group": "superglue", "prob": 5 },
       [ "feather", 15 ],
       [ "mag_animecon", 15 ],
       [ "mag_beauty", 15 ],

data/json/itemgroups/SUS/domestic.json

@@ -130,7 +130,7 @@
       { "item": "string_36", "count": [ 1, 4 ], "prob": 50 },
       { "item": "string_36", "count": [ 1, 4 ], "prob": 20 },
       { "item": "duct_tape", "prob": 40, "charges": [ 25, 400 ] },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 30 },
       { "item": "plastic_straw", "prob": 70, "count": [ 1, 6 ] },
       { "item": "plastic_straw", "prob": 40, "count": [ 1, 6 ] },
       { "item": "corkscrew", "prob": 60 },
@@ -286,7 +286,7 @@
       { "item": "thread", "prob": 30 },
       { "item": "sewing_kit", "prob": 47, "charges": [ 50, 150 ] },
       { "item": "solder_wire", "prob": 40 },
-      { "item": "superglue", "prob": 40 },
+      { "group": "superglue", "prob": 40 },
       { "item": "knitting_needles", "prob": 40 },
       { "item": "duct_tape", "prob": 40, "charges": [ 5, 160 ] },
       { "item": "wax_paraffin", "prob": 10 },
@@ -329,7 +329,7 @@
     "subtype": "collection",
     "entries": [
       { "group": "tools_common", "count": 2 },
-      { "item": "superglue", "prob": 90 },
+      { "group": "superglue", "prob": 90 },
       { "item": "boxcutter", "prob": 85 },
       { "item": "duct_tape", "prob": 85, "charges": [ 5, 200 ] },
       { "item": "flashlight", "prob": 80, "ammo-item": "light_disposable_cell", "charges": [ 100, 300 ] },
@@ -397,7 +397,7 @@
       { "item": "corkscrew", "prob": 70 },
       { "group": "adhesive_bandages_box_used", "prob": 60 },
       { "item": "duct_tape", "prob": 40, "charges": [ 100, 400 ] },
-      { "item": "superglue", "prob": 30 },
+      { "group": "superglue", "prob": 30 },
       { "item": "light_battery_cell", "count": 4, "prob": 50, "charges": 100 },
       { "item": "deck_of_cards", "prob": 50 },
       { "item": "teleumbrella", "prob": 50 },

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -14,6 +14,7 @@
       { "group": "guns_pistol_common_38", "prob": 11 },
       { "group": "guns_pistol_common_44", "prob": 1 },
       { "group": "guns_pistol_common_10mm", "prob": 1 },
+      { "group": "guns_pistol_common_762_39", "prob": 1 },
       { "group": "guns_pistol_common_other", "prob": 39 }
     ]
   },
@@ -51,6 +52,7 @@
       { "group": "guns_pistol_common_display_44", "prob": 1 },
       { "group": "guns_pistol_common_display_45colt", "prob": 5 },
       { "group": "guns_pistol_common_display_10mm", "prob": 1 },
+      { "group": "guns_pistol_common_display_762_39", "prob": 1 },
       { "group": "guns_pistol_common_display_other", "prob": 46 }
     ]
   },
@@ -64,7 +66,6 @@
       { "group": "guns_pistol_rare_223", "prob": 1 },
       { "group": "guns_pistol_rare_45", "prob": 15 },
       { "group": "guns_pistol_rare_40", "prob": 6 },
-      { "group": "guns_pistol_rare_762", "prob": 1 },
       { "group": "guns_pistol_rare_357mag", "prob": 8 },
       { "group": "guns_pistol_rare_38", "prob": 1 },
       { "group": "guns_pistol_rare_44", "prob": 45 },
@@ -151,7 +152,6 @@
     "id": "guns_pistol_obscure_display",
     "//": "Very obscure pistols which are illegal to sell.",
     "items": [
-      { "item": "draco", "prob": 30 },
       { "item": "ar_pistol", "prob": 35 },
       { "group": "guns_pistol_collectible", "prob": 1 },
       { "item": "minidraco556", "prob": 30 }

data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json

@@ -86,6 +86,15 @@
     "id": "guns_pistol_common_10mm",
     "items": [ { "group": "nested_sw_610", "prob": 5 } ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_762_39",
+    "items": [
+      { "group": "nested_draco", "prob": 10 },
+      { "group": "nested_draco_mini", "prob": 5 },
+      { "group": "nested_draco_micro", "prob": 8 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_other",
@@ -276,6 +285,11 @@
     "id": "guns_pistol_common_display_10mm",
     "items": [ { "item": "sw_610", "prob": 5 } ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_display_762_39",
+    "items": [ { "item": "draco", "prob": 10 }, { "item": "draco_mini", "prob": 5 }, { "item": "draco_micro", "prob": 8 } ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_other",
@@ -287,7 +301,8 @@
     "items": [
       { "group": "nested_90two", "prob": 20 },
       { "group": "nested_usp_9mm", "prob": 13 },
-      { "group": "nested_p08", "prob": 7 }
+      { "group": "nested_p08", "prob": 7 },
+      { "group": "nested_draco_9mm", "prob": 14 }
     ]
   },
   {
@@ -305,11 +320,6 @@
     "id": "guns_pistol_rare_40",
     "items": [ { "group": "nested_90two40", "prob": 2 }, { "group": "nested_sig_40", "prob": 10 } ]
   },
-  {
-    "type": "item_group",
-    "id": "guns_pistol_rare_762",
-    "items": [ { "group": "nested_draco", "prob": 20 } ]
-  },
   {
     "type": "item_group",
     "id": "guns_pistol_rare_357mag",
@@ -357,7 +367,12 @@
   {
     "type": "item_group",
     "id": "guns_pistol_rare_display_9mm",
-    "items": [ { "item": "m9", "variant": "90two", "prob": 5 }, { "item": "usp_9mm", "prob": 48 }, { "item": "p08", "prob": 5 } ]
+    "items": [
+      { "item": "m9", "variant": "90two", "prob": 5 },
+      { "item": "usp_9mm", "prob": 48 },
+      { "item": "p08", "prob": 5 },
+      { "item": "draco_9mm", "prob": 21 }
+    ]
   },
   {
     "type": "item_group",
@@ -369,11 +384,6 @@
     "id": "guns_pistol_rare_display_40",
     "items": [ { "item": "90two40", "prob": 2 }, { "item": "sig_40", "prob": 5 } ]
   },
-  {
-    "type": "item_group",
-    "id": "guns_pistol_rare_display_762",
-    "items": [ { "item": "draco", "prob": 20 } ]
-  },
   {
     "type": "item_group",
     "id": "guns_pistol_rare_display_357mag",