Merge branch 'CleverRaven:master' into item-faults

CleverRaven · Mar 5, 2024 · 5c7448d · 5c7448d
2 parents 147ae1a + d05fefb
commit 5c7448d
Show file tree

Hide file tree

Showing 66 changed files with 3,189 additions and 1,948 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -48,12 +48,12 @@ cert-*,\
 -cert-dcl37-c,\
 -cert-dcl51-cpp,\
 -cert-err58-cpp,\
-clang-diagnostic-*,\
 -clang-analyzer-core.CallAndMessage,\
 -clang-analyzer-core.DivideZero,\
 -clang-analyzer-core.NonNullParamChecker,\
 -clang-analyzer-core.UndefinedBinaryOperatorResult,\
 -clang-analyzer-cplusplus.NewDelete,\
+clang-diagnostic-*,\
 cppcoreguidelines-slicing,\
 google-explicit-constructor,\
 llvm-namespace-comment,\
@@ -62,9 +62,6 @@ modernize-*,\
 -modernize-use-auto,\
 -modernize-use-trailing-return-type,\
 performance-*,\
--performance-avoid-endl,\
--performance-noexcept-swap,\
--performance-no-automatic-move,\
 readability-*,\
 -bugprone-assignment-in-if-condition,\
 -bugprone-easily-swappable-parameters,\
@@ -88,6 +85,9 @@ readability-*,\
 -modernize-return-braced-init-list,\
 -modernize-use-default-member-init,\
 -modernize-use-nodiscard,\
+-performance-avoid-endl,\
+-performance-noexcept-swap,\
+-performance-no-automatic-move,\
 -readability-avoid-unconditional-preprocessor-if,\
 -readability-container-data-pointer,\
 -readability-convert-member-functions-to-static,\

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1556,6 +1556,10 @@
     "id": "MAG_EJECT",
     "type": "json_flag"
   },
+  {
+    "id": "MANUAL_CBM_INSTALLATION",
+    "type": "json_flag"
+  },
   {
     "id": "MECH_BAT",
     "type": "json_flag"

diff --git a/data/json/itemgroups/zoo.json b/data/json/itemgroups/zoo.json
@@ -0,0 +1,24 @@
+[
+  {
+    "id": "gift_shop_zoo",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "item": "novel_pulp", "prob": 30, "count": [ 1, 5 ] },
+      { "item": "toy_figurine", "prob": 75, "count": [ 1, 10 ] },
+      { "item": "deck_of_cards", "prob": 60, "count": [ 1, 5 ] },
+      { "item": "monopoly", "prob": 5, "count": [ 1, 2 ] },
+      { "item": "teddy_bear", "prob": 25, "count": [ 1, 2 ] }
+    ]
+  },
+  {
+    "id": "shelves_zoo",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "SUS_janitors_closet", "prob": 15 },
+      { "group": "gift_shop_zoo", "prob": 25 },
+      { "group": "tools_general", "prob": 10 }
+    ]
+  }
+]
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -212,7 +212,7 @@
     "price": 500,
     "price_postapoc": 10,
     "material": [ "stone" ],
-    "weight": "700 g",
+    "weight": "2700 g",
     "volume": "1 L",
     "to_hit": -2,
     "melee_damage": { "bash": 2 }

diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json
@@ -463,7 +463,7 @@
     "type": "TOOL",
     "name": { "str": "permanent marker" },
     "description": "A King Size™ industrial-strength permanent marker, about halfway between a typical marker and a can of spray paint in size.  Activate it to write something down.  However, writing \"Elbereth\" probably won't help you.",
-    "weight": "113 g",
+    "weight": "28 g",
     "volume": "50 ml",
     "price": 500,
     "price_postapoc": 10,

diff --git a/data/json/mapgen/library.json b/data/json/mapgen/library.json
@@ -32,7 +32,7 @@
         ".....4..................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette", "library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "library_palette" ],
       "place_nested": [ { "chunks": [ [ "null", 199 ], [ "fire_field", 1 ] ], "x": [ 10, 20 ], "y": [ 9, 19 ] } ]
     }
   },
@@ -70,9 +70,8 @@
         ".....4..................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette_vandalized", "vandalized_library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "standard_building_vandalized_palette", "vandalized_library_palette" ],
       "place_rubble": [ { "x": [ 4, 21 ], "y": [ 5, 21 ], "repeat": [ 30, 100 ] } ],
-      "nested": { "|": { "chunks": [ [ "bile_field", 10 ], [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 75 ] ] } },
       "place_nested": [ { "chunks": [ [ "null", 80 ], [ "fire_field", 20 ] ], "x": [ 10, 20 ], "y": [ 9, 19 ] } ]
     }
   },
@@ -164,7 +163,7 @@
         ".5.....5..#[[[y| | [#...",
         "..........######o####..."
       ],
-      "palettes": [ "standard_building_palette", "library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "library_palette" ],
       "place_nested": [ { "chunks": [ [ "null", 199 ], [ "fire_field", 1 ] ], "x": [ 3, 22 ], "y": [ 10, 14 ] } ],
       "place_monsters": [ { "monster": "GROUP_MAYBE_ZOMBIE", "x": [ 16, 21 ], "y": [ 5, 7 ], "density": 1 } ]
     }
@@ -203,9 +202,8 @@
         ".5.....5..#[[[y| | [#...",
         "..........######o####..."
       ],
-      "palettes": [ "standard_building_palette_vandalized", "vandalized_library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "standard_building_vandalized_palette", "vandalized_library_palette" ],
       "place_rubble": [ { "x": [ 4, 21 ], "y": [ 5, 21 ], "repeat": [ 30, 100 ] } ],
-      "nested": { "|": { "chunks": [ [ "bile_field", 10 ], [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 75 ] ] } },
       "place_nested": [ { "chunks": [ [ "null", 80 ], [ "fire_field", 20 ] ], "x": [ 3, 22 ], "y": [ 10, 14 ] } ],
       "place_monsters": [ { "monster": "GROUP_MAYBE_ZOMBIE", "x": [ 16, 21 ], "y": [ 5, 7 ], "density": 1 } ]
     }
@@ -301,7 +299,7 @@
         "...........#y CC  + t#..",
         "...........###########.."
       ],
-      "palettes": [ "standard_building_palette", "library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "library_palette" ],
       "nested": { "G": { "chunks": [ "roof_6x6_garden_1" ] } },
       "place_nested": [ { "chunks": [ [ "null", 199 ], [ "fire_field", 1 ] ], "x": [ 5, 9 ], "y": [ 4, 16 ] } ],
       "terrain": { "G": "t_grass" },
@@ -342,12 +340,9 @@
         "...........#y CC  + t#..",
         "...........###########.."
       ],
-      "palettes": [ "standard_building_palette_vandalized", "vandalized_library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "standard_building_vandalized_palette", "vandalized_library_palette" ],
       "place_rubble": [ { "x": [ 4, 21 ], "y": [ 5, 21 ], "repeat": [ 30, 100 ] } ],
-      "nested": {
-        "G": { "chunks": [ "roof_6x6_garden_1" ] },
-        "|": { "chunks": [ [ "bile_field", 10 ], [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 75 ] ] }
-      },
+      "nested": { "G": { "chunks": [ "roof_6x6_garden_1" ] } },
       "place_nested": [ { "chunks": [ [ "null", 199 ], [ "fire_field", 1 ] ], "x": [ 5, 9 ], "y": [ 4, 16 ] } ],
       "terrain": { "G": "t_grass" },
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] } ]
@@ -444,7 +439,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette", "library_palette" ],
+      "palettes": [ "standard_building_shared_palette", "library_palette" ],
       "place_nested": [ { "chunks": [ [ "null", 199 ], [ "fire_field", 1 ] ], "x": [ 10, 20 ], "y": [ 9, 19 ] } ]
     }
   },
@@ -482,8 +477,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette_vandalized", "vandalized_library_palette" ],
-      "nested": { "|": { "chunks": [ [ "bile_field", 10 ], [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 75 ] ] } },
+      "palettes": [ "standard_building_shared_palette", "standard_building_vandalized_palette", "vandalized_library_palette" ],
       "place_nested": [ { "chunks": [ [ "null", 80 ], [ "fire_field", 20 ] ], "x": [ 10, 20 ], "y": [ 9, 19 ] } ]
     }
   },

diff --git a/data/json/mapgen/s_clothing.json b/data/json/mapgen/s_clothing.json
@@ -33,7 +33,7 @@
         "..####################..",
         "....................4..."
       ],
-      "palettes": [ "standard_building_palette", "clothes_store_palette" ],
+      "palettes": [ "standard_building_general_and_variant_palette", "clothes_store_palette" ],
       "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" },
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] } ],
       "vehicles": { " ": { "vehicle": "shopping_cart", "chance": 1, "status": 0 } },
@@ -125,7 +125,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette", "tailor_palette" ],
+      "palettes": [ "standard_building_general_and_variant_palette", "tailor_palette" ],
       "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" },
       "place_loot": [ { "group": "cash_register_random", "x": 18, "y": [ 6, 9 ] } ]
     }
@@ -213,7 +213,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette", "furs_palette" ],
+      "palettes": [ "standard_building_general_and_variant_palette", "furs_palette" ],
       "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" },
       "place_loot": [ { "group": "cash_register_random", "x": 7, "y": 7 } ]
     }
@@ -441,7 +441,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette", "tailor_palette" ],
+      "palettes": [ "standard_building_general_and_variant_palette", "tailor_palette" ],
       "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" },
       "place_loot": [ { "group": "cash_register_random", "repeat": 2, "x": [ 10, 13 ], "y": 7 } ]
     }
@@ -727,7 +727,7 @@
         "...........-............",
         "...........-............"
       ],
-      "palettes": [ "standard_building_palette", "clothes_store_palette" ],
+      "palettes": [ "standard_building_general_and_variant_palette", "clothes_store_palette" ],
       "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white", "D": "t_linoleum_white" },
       "place_loot": [ { "group": "cash_register_random", "x": [ 10, 13 ], "y": 7 } ]
     }

diff --git a/data/json/mapgen/s_fabricstore.json b/data/json/mapgen/s_fabricstore.json
@@ -32,7 +32,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "standard_building_palette", "fabric_store_pallete" ],
+      "palettes": [ "standard_building_general_and_variant_palette", "fabric_store_pallete" ],
       "terrain": { "t": "t_linoleum_white", "S": "t_linoleum_white", "_": "t_linoleum_white" },
       "place_loot": [ { "group": "cash_register_random", "x": 7, "y": 7 } ]
     }