Further expand regional terrains and work them into some map palettes (…

…#35836)
CleverRaven · Dec 8, 2019 · 6cdfcc5 · 6cdfcc5
1 parent c42d4ea
commit 6cdfcc5
Show file tree

Hide file tree

Showing 20 changed files with 135 additions and 340 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-regional-pseudo.json b/data/json/furniture_and_terrain/furniture-regional-pseudo.json
@@ -21,6 +21,17 @@
     "required_str": 0,
     "flags": [ "TRANSPARENT", "NOITEM" ]
   },
+  {
+    "type": "furniture",
+    "id": "f_region_water_plant",
+    "name": "this should never actually show up, it's a pseudo furniture",
+    "description": "this should never actually show up, it's a pseudo furniture",
+    "symbol": " ",
+    "color": "black",
+    "move_cost_mod": 0,
+    "required_str": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  },
   {
     "type": "furniture",
     "id": "f_region_flower_decorative",

diff --git a/data/json/furniture_and_terrain/terrain-regional-pseudo.json b/data/json/furniture_and_terrain/terrain-regional-pseudo.json
@@ -19,6 +19,26 @@
     "move_cost": 0,
     "flags": [ "TRANSPARENT", "NOITEM" ]
   },
+  {
+    "type": "terrain",
+    "id": "t_region_groundcover_forest",
+    "name": "this should never actually show up, it's a pseudo terrain",
+    "description": "this should never actually show up, it's a pseudo terrain",
+    "symbol": " ",
+    "color": "black",
+    "move_cost": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_region_groundcover_swamp",
+    "name": "this should never actually show up, it's a pseudo terrain",
+    "description": "this should never actually show up, it's a pseudo terrain",
+    "symbol": " ",
+    "color": "black",
+    "move_cost": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  },
   {
     "type": "terrain",
     "id": "t_region_tree",

diff --git a/data/json/mapgen_palettes/abandoned_barn_p.json b/data/json/mapgen_palettes/abandoned_barn_p.json
@@ -3,56 +3,20 @@
     "type": "palette",
     "id": "desolatebarn_palette",
     "terrain": {
-      ".": [
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass",
-        "t_grass_long",
-        "t_grass_dead",
-        "t_grass_dead",
-        "t_grass_dead",
-        "t_dirt",
-        "t_dirt",
-        "t_underbrush",
-        "t_underbrush",
-        "t_underbrush",
-        "t_tree",
-        "t_tree_dead",
-        "t_tree_peach",
-        "t_tree_apple",
-        "t_tree_pine",
-        "t_tree_deadpine",
-        "t_tree_willow",
-        "t_tree_young",
-        "t_tree_young"
-      ],
-      "#": "t_underbrush",
+      ".": [ [ "t_region_groundcover", 50 ], [ "t_region_shrub", 2 ], "t_region_tree" ],
+      "#": "t_region_shrub",
       "&": "t_wall_wood_broken",
-      "+": [ "t_door_c", "t_door_o", "t_door_c", "t_door_o", "t_door_boarded", "t_door_boarded_damaged" ],
+      "+": [ [ "t_door_c", 2 ], [ "t_door_o", 2 ], "t_door_boarded", "t_door_boarded_damaged" ],
       "-": "t_wall_wood_chipped",
       ":": "t_fencegate_c",
-      "~": [ "t_swater_sh", "t_covered_well", "t_covered_well", "t_covered_well", "t_water_pump" ],
+      "~": [ "t_swater_sh", [ "t_covered_well", 3 ], "t_water_pump" ],
       "0": "t_window_empty",
-      "1": "t_tree_young",
-      "4": "t_tree_deadpine",
-      "5": "t_tree_pine",
-      "6": "t_tree_pear",
+      "1": "t_region_tree",
+      "4": "t_region_tree_evergreen",
+      "5": "t_region_tree_evergreen",
+      "6": "t_region_tree_fruit",
       "7": "t_tree_dead",
-      "8": "t_tree_peach",
+      "8": "t_region_tree_nut",
       "^": "t_dirtfloor",
       "_": "t_dirtfloor",
       "=": "t_dirtfloor",
@@ -75,13 +39,13 @@
       "n": "t_dirtfloor",
       "N": "t_dirtfloor",
       "O": "t_column",
-      "p": "t_grass",
+      "p": "t_region_groundcover",
       "P": "t_dirtfloor",
-      "r": "t_grass",
+      "r": "t_region_groundcover",
       "R": "t_dirtfloor",
       "s": "t_dirtfloor",
       "S": "t_dirtfloor",
-      "t": "t_tree",
+      "t": "t_region_tree",
       "T": "t_dirtfloor",
       "u": "t_dirtfloor",
       "v": "t_fence_h",
@@ -93,6 +57,7 @@
       ">": "t_ladder_down"
     },
     "furniture": {
+      ".": [ [ "f_null", 100 ], "f_region_weed", "f_boulder_small", "f_boulder_medium" ],
       "=": "f_smoking_rack",
       "^": "f_rubble",
       "{": "f_rack",
@@ -102,7 +67,7 @@
       "b": "f_brazier",
       "c": "f_clay_kiln",
       "C": "f_crate_o",
-      "f": "f_dandelion",
+      "f": "f_region_weed",
       "h": "f_hay",
       "I": "f_stool",
       "!": "f_canvas_door_o",

diff --git a/data/json/mapgen_palettes/acidia_camp_palette.json b/data/json/mapgen_palettes/acidia_camp_palette.json
@@ -3,9 +3,9 @@
     "type": "palette",
     "id": "acidia_camp_palette",
     "terrain": {
-      "^": [ "t_tree", "t_tree", "t_tree", "t_tree_young", "t_tree_dead", "t_tree_pine", "t_tree_pine", "t_tree_pine" ],
-      "+": [ "t_door_c", "t_door_c", "t_door_c", "t_door_o", "t_door_o", "t_door_locked_interior" ],
-      ",": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+      "^": "t_region_tree",
+      "+": [ [ "t_door_c", 3 ], [ "t_door_o", 2 ], "t_door_locked_interior" ],
+      ",": "t_region_groundcover",
       "#": "t_palisade",
       "$": "t_dirt",
       "(": "t_dirtfloor",
@@ -47,43 +47,29 @@
       "Z": "t_radio_controls"
     },
     "furniture": {
-      "#": "f_null",
       "$": "f_crate_o",
       "(": "f_bench",
       ")": "f_standing_tank",
       ";": "f_groundsheet",
-      "'": "f_null",
-      "*": "f_null",
-      "_": "f_null",
       "3": "f_crate_o",
-      "4": "f_null",
       "7": "f_brazier",
-      "8": "f_null",
       "9": "f_bulletin",
       "A": "f_anvil",
-      "B": "f_null",
       "b": "f_straw_bed",
       "C": "f_clay_kiln",
       "c": "f_counter",
       "D": "f_canvas_door",
       "F": "f_fireplace",
       "f": "f_forge_rock",
-      "G": "f_null",
       "H": "f_hay",
-      "h": "f_null",
       "K": "f_kiln_empty",
       "k": "f_wood_keg",
-      "m": "f_null",
       "o": "f_woodstove",
       "Q": "f_trashcan",
       "r": "f_rack",
-      "S": "f_null",
-      "T": "f_null",
       "t": "f_table",
-      "U": "f_null",
       "u": "f_cupboard",
       "W": "f_canvas_wall",
-      "w": "f_null",
       "y": "f_smoking_rack",
       "e": "f_arcfurnace_empty"
     }

diff --git a/data/json/mapgen_palettes/airliner_palette.json b/data/json/mapgen_palettes/airliner_palette.json
@@ -3,7 +3,7 @@
     "type": "palette",
     "id": "airliner_palette",
     "terrain": {
-      " ": [ [ "t_grass", 40 ], [ "t_grass_long", 6 ], [ "t_dirt", 10 ] ],
+      " ": "t_region_groundcover_urban",
       "A": "t_open_air",
       ",": "t_rock",
       "d": "t_dirtmound",

diff --git a/data/json/mapgen_palettes/apartment.json b/data/json/mapgen_palettes/apartment.json
@@ -3,7 +3,7 @@
     "type": "palette",
     "id": "apartment_palette",
     "terrain": {
-      " ": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ], [ "t_underbrush", 1 ] ],
+      " ": [ [ "t_region_groundcover_urban", 50 ], "t_region_shrub_decorative" ],
       "+": [ [ "t_door_c", 2 ], "t_door_o" ],
       "-": "t_wall",
       "%": "t_rock",
@@ -112,9 +112,9 @@
     "type": "palette",
     "id": "apartment_con_old",
     "terrain": {
-      " ": [ [ "t_grass", 3 ], "t_dirt" ],
+      " ": "t_region_groundcover_urban",
       "#": "t_rock",
-      "%": "t_shrub",
+      "%": "t_region_shrub_decorative",
       "+": "t_door_c",
       "-": "t_wall",
       "|": "t_wall",
@@ -125,7 +125,7 @@
       "E": "t_elevator",
       "G": "t_door_glass_c",
       "R": "t_railing_v",
-      "p": "t_grass",
+      "p": "t_region_groundcover_urban",
       "s": "t_sidewalk",
       "w": "t_window",
       "X": "t_door_locked",

diff --git a/data/json/mapgen_palettes/bandit_camp.json b/data/json/mapgen_palettes/bandit_camp.json
@@ -3,6 +3,7 @@
     "type": "palette",
     "id": "bandit_camp",
     "furniture": {
+      ",": [ [ "f_null", 200 ], [ "f_region_weed", 2 ], "f_boulder_small" ],
       "@": "f_bed",
       "K": "f_wood_keg",
       "L": "f_locker",
@@ -21,9 +22,9 @@
     },
     "terrain": {
       "#": "t_wall_log",
-      "%": "t_shrub",
+      "%": "t_region_shrub",
       "+": "t_door_c",
-      ",": "t_grass",
+      ",": "t_region_groundcover",
       ".": "t_rock_floor",
       "/": "t_dirt",
       "@": "t_rock_floor",

diff --git a/data/json/mapgen_palettes/bike_shop_palette.json b/data/json/mapgen_palettes/bike_shop_palette.json
@@ -3,8 +3,8 @@
     "type": "palette",
     "id": "bike_shop",
     "terrain": {
-      " ": [ "t_dirt", "t_grass", "t_grass", "t_grass" ],
-      "*": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_tree" ],
+      " ": "t_region_groundcover_urban",
+      "*": [ [ "t_region_groundcover_urban", 4 ], "t_region_tree_shade" ],
       "_": "t_sidewalk",
       ".": "t_floor",
       "#": "t_wall_w",

diff --git a/data/json/mapgen_palettes/cabin.json b/data/json/mapgen_palettes/cabin.json
@@ -7,9 +7,9 @@
       "+": [ [ "t_door_c", 3 ], "t_door_locked" ],
       "=": "t_door_c",
       "-": "t_fence",
-      ".": [ [ "t_grass", 3 ], "t_dirt", "t_grass_long" ],
-      "~": [ [ "t_dirt", 3 ], "t_grass" ],
-      "*": [ [ "t_grass", 10 ], [ "t_grass_long", 5 ], "t_shrub" ],
+      ".": [ [ "t_region_groundcover", 4 ], "t_region_groundcover_forest" ],
+      "~": [ [ "t_dirt", 3 ], "t_region_groundcover" ],
+      "*": [ [ "t_region_groundcover", 15 ], "t_region_shrub" ],
       "G": "t_fencegate_c",
       "o": "t_column",
       "P": "t_water_pump",

diff --git a/data/json/mapgen_palettes/campground.json b/data/json/mapgen_palettes/campground.json
@@ -3,35 +3,25 @@
     "type": "palette",
     "id": "campground_palette",
     "terrain": {
-      "#": "t_grass",
+      "#": "t_region_groundcover",
       "&": "t_thconc_floor",
       "+": [ "t_door_c", "t_door_o" ],
-      "_": [
-        [ "t_dirt", 3 ],
-        [ "t_grass", 5 ],
-        [ "t_grass_long", 25 ],
-        [ "t_grass_tall", 5 ],
-        [ "t_underbrush", 2 ],
-        [ "t_shrub", 5 ],
-        [ "t_tree", 4 ],
-        [ "t_tree_pine", 2 ],
-        [ "t_tree_birch", 1 ]
-      ],
-      ";": [ [ "t_dirt", 10 ], [ "t_grass", 15 ], [ "t_grass_long", 2 ] ],
-      ",": [ [ "t_dirt", 10 ], [ "t_grass", 15 ], [ "t_grass_long", 2 ] ],
-      "B": [ [ "t_dirt", 10 ], [ "t_grass", 15 ], [ "t_grass_long", 2 ] ],
-      "H": [ [ "t_dirt", 100 ], [ "t_grass", 5 ], [ "t_grass_long", 1 ] ],
-      "n": [ [ "t_dirt", 100 ], [ "t_grass", 5 ], [ "t_grass_long", 1 ] ],
+      "_": [ [ "t_region_groundcover_forest", 40 ], [ "t_region_shrub", 5 ], [ "t_region_tree", 7 ] ],
+      ";": "t_region_groundcover",
+      ",": "t_region_groundcover",
+      "B": "t_region_groundcover",
+      "H": [ [ "t_dirt", 15 ], "t_region_groundcover" ],
+      "n": [ [ "t_dirt", 15 ], "t_region_groundcover" ],
       "S": "t_thconc_floor",
       "T": "t_thconc_floor",
       "f": "t_floor",
       "D": "t_floor",
       "h": "t_floor",
-      ".": [ [ "t_dirt", 100 ], [ "t_grass", 5 ], [ "t_grass_long", 1 ] ],
-      "b": [ [ "t_dirt", 10 ], [ "t_grass", 15 ], [ "t_grass_long", 2 ] ],
-      "c": [ [ "t_dirt", 10 ], [ "t_grass", 15 ], [ "t_grass_long", 2 ] ],
-      "s": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 1 ] ],
-      "t": [ [ "t_dirt", 10 ], [ "t_grass", 15 ], [ "t_grass_long", 2 ] ],
+      ".": [ [ "t_dirt", 15 ], "t_region_groundcover" ],
+      "b": "t_region_groundcover",
+      "c": "t_region_groundcover",
+      "s": "t_region_groundcover_urban",
+      "t": "t_region_groundcover",
       "|": "t_wall_w",
       "w": "t_window",
       "o": "t_pit_shallow",