Merge branch 'painres' of https://github.com/Dan1ss1mo/Cataclysm-DDA …

…into painres
Dan1ss1mo · Feb 17, 2023 · db14729 · db14729
2 parents 53d2559 + 17a7444
commit db14729
Show file tree

Hide file tree

Showing 29 changed files with 300 additions and 314 deletions.
diff --git a/data/json/items/armor/integrated.json b/data/json/items/armor/integrated.json
@@ -17,10 +17,14 @@
     "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "WATER_FRIENDLY", "SOFT" ],
     "armor": [
       {
-        "material": [ { "type": "veggy", "covered_by_mat": 100, "thickness": 2.5 } ],
+        "material": [
+          { "type": "veggy", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "wood", "covered_by_mat": 100, "thickness": 0.5 }
+        ],
         "covers": [ "hand_l", "hand_r", "foot_l", "foot_r", "leg_l", "leg_r", "arm_l", "arm_r", "torso", "head" ],
         "coverage": 100,
-        "encumbrance": 5
+        "encumbrance": 1,
+        "breathability": "GOOD"
       }
     ]
   },

diff --git a/data/json/mapgen/campground_npc.json b/data/json/mapgen/campground_npc.json
diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json
@@ -23,6 +23,7 @@
       { "trait": "NO_BASH" },
       { "trait": "RETURN_TO_START_POS" }
     ],
+    "common": false,
     "skills": [
       { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -3 } ] } },
       { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } },

diff --git a/data/json/npcs/refugee_center/surface_staff/generic_class_definitions.json b/data/json/npcs/refugee_center/surface_staff/generic_class_definitions.json
@@ -59,6 +59,7 @@
       { "trait": "NO_BASH" },
       { "trait": "RETURN_TO_START_POS" }
     ],
+    "common": false,
     "skills": [
       { "skill": "bashing", "bonus": { "rng": [ 1, 2 ] } },
       { "skill": "cutting", "bonus": { "rng": [ 1, 3 ] } },

diff --git a/data/json/obsoletion/obsolete_mapgen.json b/data/json/obsoletion/obsolete_mapgen.json
@@ -111,5 +111,132 @@
       ],
       "palettes": [ "apartment_palette" ]
     }
+  },
+  {
+    "method": "json",
+    "object": {
+      "items": {
+        ";": [
+          { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
+          { "item": "camping", "chance": 5 },
+          { "item": "archery", "chance": 2 }
+        ],
+        ",": [
+          { "item": "dresser", "chance": 5, "repeat": [ 1, 2 ] },
+          { "item": "camping", "chance": 5 },
+          { "item": "archery", "chance": 2 }
+        ],
+        "t": [ { "item": "misc_smoking", "chance": 2 }, { "item": "cannedfood", "chance": 2, "repeat": [ 1, 2 ] } ]
+      },
+      "place_vehicles": [
+        { "chance": 5, "fuel": 15, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 16, "y": 3 },
+        { "chance": 5, "fuel": -1, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 5, "y": 19 },
+        { "chance": 20, "fuel": 20, "rotation": 0, "status": 0, "vehicle": "lux_rv", "x": 43, "y": 18 },
+        { "chance": 5, "fuel": 15, "rotation": 180, "status": -1, "vehicle": "campground_vehicles", "x": 27, "y": 14 },
+        { "chance": 5, "fuel": 15, "rotation": 360, "status": -1, "vehicle": "campground_vehicles", "x": 18, "y": 32 },
+        { "chance": 5, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "campground_vehicles", "x": 7, "y": 34 },
+        { "chance": 5, "fuel": -1, "rotation": 270, "status": -1, "vehicle": "campground_vehicles", "x": 17, "y": 40 },
+        { "chance": 5, "fuel": -1, "rotation": 0, "status": -1, "vehicle": "rv", "x": 42, "y": 27 },
+        { "chance": 5, "fuel": 15, "rotation": 90, "status": -1, "vehicle": "campground_vehicles", "x": 35, "y": 43 }
+      ],
+      "rows": [
+        "_____________________ssssss_ss_......sssssssss__",
+        "_______sssssssssssssssbbbbs__ss......|ww||||||||",
+        "________#####ss....ssstttts__ss......+ff|&+TT+&|",
+        "________#;;;#s......sstttts__ss......wDh|||TT|||",
+        "________#;,;cs......ssbbbbs__ss......|ww|&+TT+&|",
+        "________#;;;#s......sssssss__ss......TTT|||TT|||",
+        "_s#####s#####ss......sBs____sss......TTT+TTTTTT|",
+        "_s#;;;#ssssss_s......sss____ss.......TTT|SSTTSS|",
+        "_s#;,;#s______s......................ssO|||TT|||",
+        "_s#;;;#s_____ss......................s__|&+TT+&|",
+        "_s##c##s____s........................s__|||TT|||",
+        "_sssssss___s.........................s__|&+TT+&|",
+        "_sbttbsss_s..........................s__||||||||",
+        "_sbttbsBsss...._ss...................ss_________",
+        "_sbttbssss....____s...................s_________",
+        "_sbttbsss....s_#####.......sss.........sHssHss__",
+        "_ssssssss....__#;;;#.......s__s.............nH__",
+        "_s...........__#;,;c.......ss__...............__",
+        "_s...........__#;;;#..bbbb..s__...............__",
+        "_s...........__#####..tttt..s__...............__",
+        "_s...........s_sssss..tttt..___...............__",
+        "_s............__sss...bbbb..._s...............__",
+        "_sssssss......__sss.......H.s__...............__",
+        "________s.....___s.H........s__......ss_________",
+        "________s.....s__s.n...o..nHs__......s__________",
+        "__sssssss.....s__H.........ss__s.....sssssssss__",
+        "__sbbbbss......__.....H...ssss__..............__",
+        "__sttttss......___.......H#####_s.............__",
+        "__sttttss......s__......ss#;;;#__.............__",
+        "__sbbbbss......s__......ssc;,;#__.............__",
+        "_ssssssss.......___.....ss#;;;#__.............__",
+        "_sBsssss.........__s....ss#####__....ssssssss___",
+        "_sssss..........._......._______s....sbttbsBs___",
+        "__ss.......................____.....ssbttbsss___",
+        "__s.................................ssbttbs_____",
+        "__s................................._sbttbs_____",
+        "__s.......ss.......................s_ssssss_____",
+        "__ss....s____s.....................s____________",
+        "ssssssss__ssss......................s___________",
+        "s##c##s_sssBsss......................s__________",
+        "s#;;;#s_sssssss.......................sssssss___",
+        "s#;,;#s_sbttbss.....sssssssssss........s#####___",
+        "s#;;;#s_sbttbss.....s#####sbbbbs.......s#;;;#___",
+        "s#####s_sbttbss.....s#;;;#sttttss.....ssc;,;#___",
+        "________sbttbss.....sc;,;#sttttsss...sss#;;;#___",
+        "________sssssss.....s#;;;#sbbbbssBssssss#####___",
+        "______________sssssss#####sssssssss____ssssss___",
+        "____________________ssssss______________________"
+      ],
+      "palettes": [ "campground_palette" ],
+      "place_npcs": [  ]
+    },
+    "om_terrain": [ [ "campground_1a_npc", "campground_1b_npc" ], [ "campground_2a_npc", "campground_2b_npc" ] ],
+    "type": "mapgen",
+    "weight": 100
+  },
+  {
+    "method": "json",
+    "om_terrain": [ "campground_roof_npc" ],
+    "type": "mapgen",
+    "weight": 100,
+    "object": {
+      "rows": [
+        "                        ",
+        "             ___________",
+        "             |.........I",
+        "             |.........I",
+        "             |.........I",
+        "             |.........I",
+        "             |.........I",
+        "             ---o......I",
+        "                |......I",
+        "                |......I",
+        "                |......I",
+        "                |......I",
+        "                --------",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "terrain": {
+        ".": "t_flat_roof",
+        " ": "t_open_air",
+        "_": "t_gutter_north",
+        "-": "t_gutter_south",
+        "|": "t_gutter_west",
+        "I": "t_gutter_east",
+        "o": "t_gutter_drop"
+      }
+    }
   }
 ]
diff --git a/data/json/obsoletion/overmap/overmap_terrain/overmap_terrain_obsoletion.json b/data/json/obsoletion/overmap/overmap_terrain/overmap_terrain_obsoletion.json
@@ -18,5 +18,25 @@
     "id": [ "apartments_con_tower_001", "apartments_con_tower_101" ],
     "copy-from": "apartments_tower_any",
     "flags": [ "SHOULD_NOT_SPAWN" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": [ "campground_1a_npc", "campground_1b_npc", "campground_2a_npc", "campground_2b_npc" ],
+    "name": "campground",
+    "sym": "+",
+    "color": "i_green",
+    "see_cost": 5,
+    "mondensity": 2,
+    "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD", "SHOULD_NOT_SPAWN" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "campground_roof_npc",
+    "name": "campground roof",
+    "sym": "+",
+    "color": "i_green",
+    "see_cost": 5,
+    "mondensity": 2,
+    "flags": [ "SHOULD_NOT_SPAWN" ]
   }
 ]
diff --git a/data/json/obsoletion/overmap_special/specials.json b/data/json/obsoletion/overmap_special/specials.json
@@ -338,6 +338,23 @@
     "occurrences": [ 0, 0 ],
     "flags": [ "UNIQUE" ]
   },
+  {
+    "type": "overmap_special",
+    "id": "campground_npc",
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "campground_1a_npc_north" },
+      { "point": [ 1, 0, 0 ], "overmap": "campground_1b_npc_north" },
+      { "point": [ 0, 1, 0 ], "overmap": "campground_2a_npc_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "campground_2b_npc_north" },
+      { "point": [ 1, 0, 1 ], "overmap": "campground_roof_npc_north" }
+    ],
+    "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 1, 0, 0 ] } ],
+    "locations": [ "forest" ],
+    "city_distance": [ 10, -1 ],
+    "city_sizes": [ 3, 12 ],
+    "occurrences": [ 0, 0 ],
+    "flags": [ "CLASSIC" ]
+  },
   {
     "type": "overmap_special",
     "id": "Farm",

diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -4221,23 +4221,6 @@
     "occurrences": [ 0, 3 ],
     "flags": [ "CLASSIC", "WILDERNESS" ]
   },
-  {
-    "type": "overmap_special",
-    "id": "campground_npc",
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "campground_1a_npc_north" },
-      { "point": [ 1, 0, 0 ], "overmap": "campground_1b_npc_north" },
-      { "point": [ 0, 1, 0 ], "overmap": "campground_2a_npc_north" },
-      { "point": [ 1, 1, 0 ], "overmap": "campground_2b_npc_north" },
-      { "point": [ 1, 0, 1 ], "overmap": "campground_roof_npc_north" }
-    ],
-    "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 1, 0, 0 ] } ],
-    "locations": [ "forest" ],
-    "city_distance": [ 10, -1 ],
-    "city_sizes": [ 3, 12 ],
-    "occurrences": [ 0, 3 ],
-    "flags": [ "CLASSIC" ]
-  },
   {
     "type": "overmap_special",
     "id": "desolate barn",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
@@ -606,16 +606,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": [
-      "campground_1a",
-      "campground_1b",
-      "campground_2a",
-      "campground_2b",
-      "campground_1a_npc",
-      "campground_1b_npc",
-      "campground_2a_npc",
-      "campground_2b_npc"
-    ],
+    "id": [ "campground_1a", "campground_1b", "campground_2a", "campground_2b" ],
     "name": "campground",
     "sym": "+",
     "color": "i_green",
@@ -625,7 +616,7 @@
   },
   {
     "type": "overmap_terrain",
-    "id": [ "campground_roof", "campground_roof_npc" ],
+    "id": "campground_roof",
     "name": "campground roof",
     "sym": "+",
     "color": "i_green",