Merge pull request #111 from AtomicFox556/CleverRaven-master

Merge new changes from DDA

.clang-tidy

@@ -66,9 +66,6 @@ readability-*,\
 -bugprone-throw-keyword-missing,\
 -bugprone-unchecked-optional-access,\
 -bugprone-unhandled-exception-at-new,\
--clang-analyzer-cplusplus.NewDeleteLeaks,\
--clang-analyzer-cplusplus.StringChecker,\
--clang-analyzer-optin.cplusplus.UninitializedObject,\
 -misc-confusable-identifiers,\
 -misc-const-correctness,\
 -misc-no-recursion,\

CMakePresets.json

@@ -23,7 +23,7 @@
         "LOCALIZE": "True",
         "TILES": "True",
         "SOUND": "True",
-        "TESTS":  "False"
+        "TESTS": "False"
       }
     },
     {
@@ -47,9 +47,6 @@
     }
   ],
   "buildPresets": [
-    {
-      "name": "linux-tiles-sounds-x64",
-      "configurePreset": "linux-tiles-sounds-x64"
-    }
+    { "name": "linux-tiles-sounds-x64", "configurePreset": "linux-tiles-sounds-x64" }
   ]
 }

data/changelog.txt

@@ -22,6 +22,7 @@ Allow mutants to walk underwater
 Add support for running and smashing animations
 Allow zones to interact across multiple Z levels
 Creatures can stumble into invisible players to discover them
+Add molting for exoskeleton mutations
 
 
 ## Content:
@@ -41,6 +42,8 @@ Crustacean mutation tree
 Dead trees can be harvested for wood(once per tree)
 Added a new location called survivor forest camp
 Addition of non-NPC civilians for lore reasons
+Nether spiders as a new bossfight for the game.
+New conversion kits, guns, and calibres
 
 
 ## Interface:
@@ -135,6 +138,7 @@ NPC morale modifiers now updates regularly instead of being permanently applied
 Fix UI and accessibility issues in the overmap UI and character creation menu
 Fix unicode path encoding error in Windows MinGW build
 Difficulty 0 recipes are no longer arbitrarily difficult
+Make EOC u_sell_item() actually transfers the items' ownership
 
 
 ## Performance:
@@ -151,6 +155,7 @@ Modernize string_formatter
 Migrate some JSON APIs to string_view
 Add units::temperature_delta
 Upgrade clang-tidy used in CI to LLVM 16
+Allow C++ standard includes in clang-tidy tests
 
 
 ## Build:

data/core/traps.json

@@ -5,7 +5,7 @@
     "id": "tr_ledge",
     "name": "ledge",
     "color": "i_cyan",
-    "memorial_male": { "ctxt": "memorial_female", "str": "Fell down a ledge." },
+    "memorial_male": { "ctxt": "memorial_male", "str": "Fell down a ledge." },
     "memorial_female": { "ctxt": "memorial_female", "str": "Fell down a ledge." },
     "symbol": " ",
     "visibility": 0,

data/credits/es_AR.credits

@@ -25,7 +25,7 @@
 <color_yellow>LyleSY</color> - Por más dinosaurios.
 <color_yellow>irwiss</color>, <color_yellow>Maleclypse</color>, <color_yellow>Venera3</color>, <color_yellow>MylieDaniels</color>, <color_yellow>andrei8l</color>, <color_yellow>mqrause</color> y <color_yellow>Eltank</color>.
 
-<color_white>Agradecimientos especiales por contribución artística:</color>
+<color_white>Agradecimientos especiales por contribución en arte:</color>
 <color_yellow>Fris0uman</color>, <color_yellow>Golfavel</color>, <color_yellow>vetall812</color>, <color_yellow>Dandy-boy</color> y muchos más.
 
 <color_white>Para ver la lista completa de colaboradores, por favor, visitá:</color>
@@ -43,13 +43,13 @@
 
 <color_white>Agradecimientos especiales (<color_cyan>0.F</color>):</color>
 <color_yellow>Aivean</color> - Por un desempeño asombroso.
-<color_yellow>anothersimulacrum</color> - For cansarme.
+<color_yellow>anothersimulacrum</color> - Por cansarme.
 <color_yellow>jbytheway</color> - Por hacerme conseguir cosas.
 <color_yellow>BrettDong</color> - Por las traducciones y otras cosas.
 <color_yellow>Qrox</color> - Por mostrar la locación de los mensajes de error.
 <color_yellow>LyleSY</color> - Por los dinosaurios.
 
-<color_white>Agradecimiento especial para las contribuciones en arte (<color_cyan>0.F</color>):</color>
+<color_white>Agradecimiento especial por contribuciones en arte (<color_cyan>0.F</color>):</color>
 <color_yellow>acepleiades</color>, <color_yellow>barsoosayque</color>, <color_yellow>Fris0uman</color>, <color_yellow>int-ua</color> y muchos más.
 
 <color_white>Para ver la lista completa de colaboradores, por favor, visitá:</color>

data/json/flags.json

@@ -2145,5 +2145,40 @@
   {
     "id": "ELECTRONIC",
     "type": "json_flag"
+  },
+  {
+    "id": "AFS_CS_LOCKER_CARD",
+    "type": "json_flag",
+    "info": "ID card granting access to the crashing ship's locker room."
+  },
+  {
+    "id": "AFS_CS_ARMORY_CARD",
+    "type": "json_flag",
+    "info": "ID card granting access to the crashing ship's armory."
+  },
+  {
+    "id": "AFS_CS_EXOBAY_CARD",
+    "type": "json_flag",
+    "info": "ID card granting access to the crashing ship's exobay."
+  },
+  {
+    "id": "CREDIT_CARD_SHAPED",
+    "type": "json_flag",
+    "restriction": "Item must be shaped like a credit card"
+  },
+  {
+    "id": "BANK_NOTE_SHAPED",
+    "type": "json_flag",
+    "restriction": "Item must be shaped like a bank note"
+  },
+  {
+    "id": "COIN_SHAPED",
+    "type": "json_flag",
+    "restriction": "Item must be shaped like a coin"
+  },
+  {
+    "id": "BANK_NOTE_STRAP_SHAPED",
+    "type": "json_flag",
+    "restriction": "Item must be shaped like a bank note strap"
   }
 ]

data/json/furniture_and_terrain/furniture-decorative.json

@@ -64,7 +64,7 @@
     "id": "f_cleat",
     "type": "furniture",
     "name": "cleat",
-    "description": "A small horn cleat with two “horns” extending parallel to the deck or the axis of the spar, and resembling a small anvil.  They are used to secure mooring lines, ropes, and similar.",
+    "description": "A small horn cleat with two \"horns\" extending parallel to the deck or the axis of the spar, and resembling a small anvil.  They are used to secure mooring lines, ropes, and similar.",
     "symbol": "B",
     "color": "light_gray",
     "looks_like": "f_bitts",

data/json/furniture_and_terrain/furniture-tools.json

@@ -1633,7 +1633,7 @@
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
     "deconstruct": {
-      "items": [ { "item": "chain", "count": 1 }, { "item": "block_and_tackle", "count": 1 }, { "item": "nuts_bolts", "count": 2 } ]
+      "items": [ { "item": "chain", "count": 1 }, { "item": "block_and_tackle", "count": 1 }, { "item": "nuts_bolts", "charges": 2 } ]
     },
     "crafting_pseudo_item": "fake_lift_heavy"
   }

data/json/furniture_and_terrain/terrain-mechanisms.json

@@ -171,14 +171,15 @@
         { "item": "rope_6", "count": [ 3, 4 ] },
         { "item": "2x4", "count": [ 1, 4 ] },
         { "item": "splinter", "count": [ 2, 4 ] },
+        { "item": "nuts_bolts", "charges": [ 2, 3 ] },
         { "item": "block_and_tackle", "count": [ 0, 1 ] }
       ]
     },
     "deconstruct": {
       "ter_set": "t_dirtfloor",
       "items": [
         { "item": "rope_30", "count": 1 },
-        { "item": "nuts_bolts", "count": 1 },
+        { "item": "nuts_bolts", "charges": 3 },
         { "item": "2x4", "count": 8 },
         { "item": "block_and_tackle", "count": 1 }
       ]

data/json/itemgroups/SUS/domestic.json

@@ -438,6 +438,7 @@
       { "item": "copper_pan", "prob": 30 },
       { "item": "dutch_oven", "prob": 5 },
       { "item": "kettle", "prob": 80 },
+      { "item": "coffeepot", "prob": 50 },
       { "item": "aluminum_pan", "prob": 15 },
       { "item": "pot_aluminum", "prob": 15 }
     ]

data/json/itemgroups/Weapons_Mods_Ammo/ammo.json

@@ -387,7 +387,6 @@
     "//": "Military specification rifle ammo found at military sites.",
     "subtype": "distribution",
     "entries": [
-      { "item": "12mm", "prob": 40 },
       { "item": "3006_incendiary", "prob": 5 },
       { "item": "3006", "prob": 20 },
       { "item": "50_incendiary", "prob": 10 },

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -189,6 +189,7 @@
       { "group": "nested_TDI_10", "prob": 4 },
       { "group": "nested_draco", "prob": 20 },
       { "group": "nested_ar_pistol", "prob": 25 },
+      { "group": "nested_plr16", "prob": 3 },
       { "group": "nested_makarov", "prob": 15 },
       { "group": "nested_tokarev", "prob": 15 },
       { "group": "nested_walther_ppk", "prob": 20 },
@@ -295,6 +296,7 @@
       { "item": "af2011a1_38super", "prob": 25 },
       { "item": "draco", "prob": 30, "charges-min": 0, "charges-max": 0 },
       { "item": "ar_pistol", "prob": 35, "charges-min": 0, "charges-max": 0 },
+      { "item": "plr16", "prob": 3, "charges-min": 0, "charges-max": 0 },
       { "group": "guns_pistol_collectible", "prob": 1 },
       { "item": "minidraco556", "prob": 30, "charges-min": 0, "charges-max": 0 }
     ]
@@ -455,6 +457,7 @@
       { "group": "nested_ruger_pr", "prob": 1 },
       { "group": "nested_ruger_arr", "prob": 1 },
       { "group": "nested_ar_pistol", "prob": 1 },
+      { "group": "nested_plr16", "prob": 1 },
       { "group": "nested_garand", "prob": 1 },
       { "group": "nested_ar10", "prob": 1 },
       { "group": "nested_ar15", "prob": 15 },
@@ -496,6 +499,7 @@
       { "item": "browning_blr", "prob": 1, "charges-min": 0, "charges-max": 4 },
       { "item": "ruger_pr", "prob": 1, "charges-min": 0, "charges-max": 5 },
       { "item": "ar_pistol", "prob": 1, "charges-min": 0, "charges-max": 30 },
+      { "item": "plr16", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "garand", "prob": 1, "charges-min": 0, "charges-max": 8 },
       { "item": "ar10", "prob": 1, "charges-min": 0, "charges-max": 20 },
       { "item": "modular_ar15", "prob": 15, "charges-min": 0, "charges-max": 30 },
@@ -1343,6 +1347,7 @@
       { "group": "guns_improvised", "prob": 50 },
       { "item": "modular_ar15", "prob": 13, "charges-min": 0, "charges-max": 30 },
       { "item": "ar_pistol", "prob": 2, "charges-min": 0, "charges-max": 30 },
+      { "item": "plr16", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "mossberg_500", "prob": 10, "charges-min": 0, "charges-max": 6 },
       { "item": "remington_870", "prob": 11, "charges-min": 0, "charges-max": 5 },
       { "item": "remington_870", "variant": "ithaca37", "prob": 4, "charges-min": 0, "charges-max": 5 },

data/json/itemgroups/Weapons_Mods_Ammo/magazines.json

@@ -15,7 +15,6 @@
       [ "8x40_100_mag", 10 ],
       [ "8x40_250_mag", 5 ],
       [ "8x40_500_mag", 5 ],
-      [ "hk_g80mag", 40 ],
       [ "hk46mag", 15 ],
       [ "hk46bigmag", 5 ],
       [ "m107a1mag", 50 ],

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1253,6 +1253,19 @@
       { "group": "on_hand_223" }
     ]
   },
+  {
+    "id": "nested_plr16",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "plr16", "charges-min": 0, "charges-max": 10 },
+      { "group": "stanag_10_random" },
+      { "group": "stanag_10_random", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
   {
     "id": "nested_garand",
     "type": "item_group",

data/json/itemgroups/military.json

@@ -687,8 +687,6 @@
       { "item": "smokebomb", "prob": 5 },
       { "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
       { "item": "c4", "prob": 5 },
-      { "item": "hk_g80", "prob": 2 },
-      { "item": "12mm", "prob": 2 },
       { "item": "flamethrower", "prob": 1 },
       { "item": "rm451_flamethrower", "prob": 1 },
       { "item": "binoculars", "prob": 20 },
@@ -889,8 +887,6 @@
       { "item": "84x246mm_he", "prob": 8 },
       { "item": "84x246mm_hedp", "prob": 8 },
       { "item": "84x246mm_smoke", "prob": 9 },
-      { "item": "hk_g80", "prob": 5, "charges": [ 0, 20 ] },
-      { "item": "12mm", "prob": 5, "charges": [ 1, 20 ] },
       { "item": "rm614_lmg", "prob": 2, "charges": [ 0, 250 ] },
       { "item": "rm298", "prob": 1, "charges": [ 0, 250 ] },
       { "item": "m134", "prob": 1, "charges": [ 0, 200 ] },

data/json/items/armor/ballistic_armor.json

@@ -205,7 +205,7 @@
     "armor": [
       {
         "material": [ { "type": "qt_steel", "covered_by_mat": 100, "thickness": 6.35 } ],
-        "encumbrance": 2,
+        "encumbrance": 3,
         "coverage": 45,
         "covers": [ "torso" ],
         "specifically_covers": [ "torso_upper" ]