Merge pull request #13 from CleverRaven/master

Updating Master
CleverRaven · Jul 17, 2018 · 9334fcd · 9334fcd
2 parents 5fc3ee6 + 3ce526f
commit 9334fcd
Show file tree

Hide file tree

Showing 20 changed files with 2,599 additions and 565 deletions.
diff --git a/data/json/mapgen/lab/lab_common.json b/data/json/mapgen/lab/lab_common.json
@@ -0,0 +1,177 @@
+[
+  {
+    "type": "palette",
+    "id": "lab_palette",
+    "furniture": {
+      "b": "f_bed",
+      "l": "f_locker",
+      "X": "f_crate_c",
+      "r": "f_rack",
+      "d": "f_desk",
+      "h": "f_chair",
+      "f": "f_fridge",
+      "t": "f_table",
+      "c": "f_counter",
+      "S": "f_sink",
+      "T": "f_toilet",
+      "#": "f_null"
+    },
+    "terrain": {
+      "6": "t_console",
+      "x": "t_console_broken",
+      "g": "t_reinforced_glass",
+      "G": "t_reinforced_door_glass_c",
+      ".": "t_rock_floor",
+      ",": "t_floor_blue",
+      "-": "t_concrete_wall",
+      "|": "t_concrete_wall",
+      "+": "t_door_metal_c",
+      "D": "t_door_metal_locked",
+      "#": "t_rock"
+    },
+    "toilets": {
+        "T": {}
+    }
+  },
+  {
+    "type": "palette",
+    "id": "lab_loot_generic",
+    "mapping": {
+      "c": {
+        "items": [
+          { "item": "dissection", "chance": 10 },
+          { "item": "chem_lab", "chance": 10 },
+          { "item": "mut_lab", "chance": 2 }
+        ]
+      },
+      "f": {
+        "items": [
+          { "item": "fridge", "chance": 60, "repeat": 2 }
+        ]
+      },
+      "S": {
+        "items": [
+          { "item": "harddrugs", "chance": 20 }
+        ]
+      },
+      "X": {
+        "items": [
+          { "item": "chem_lab", "chance": 10 },
+          { "item": "mut_lab", "chance": 2 },
+          { "item": "robots", "chance": 5 },
+          { "item": "science", "chance": 5 },
+          { "item": "sewage_plant", "chance": 5 },
+          { "item": "harddrugs", "chance": 5 },
+          { "item": "softdrugs", "chance": 5 }
+        ]
+      },
+      "d": {
+        "items": [
+          { "item": "office", "chance": 30 },
+          { "item": "textbooks", "chance": 3 },
+          { "item": "science", "chance": 3 }
+        ]
+      },
+      "h": {
+        "item": [ {"item": "coat_lab", "chance": 10} ]
+      }
+    }
+  },
+  {
+    "//": "Creates border walls for a lab based on its neighboring tiles.",
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "lab_border_walls",
+    "object": {
+      "mapgensize": [ 24, 24 ],
+      "place_nested": [
+        { "chunks": [ "sub_t_concrete_wall" ], "x": 11, "y": 23, "neighbors": { "south": ["empty_rock"] } },
+        { "chunks": [ "sub_t_concrete_wall" ], "x": 12, "y": 23, "neighbors": { "south": ["empty_rock"] } },
+        { "chunks": [ "sub_t_concrete_wall" ], "x": 23, "y": 11, "neighbors": { "east": ["empty_rock"] } },
+        { "chunks": [ "sub_t_concrete_wall" ], "x": 23, "y": 12, "neighbors": { "east": ["empty_rock"] } },
+        { "chunks": [ "lab_north_wall" ], "x": 0, "y": 0, "neighbors": { "north": ["empty_rock"] } },
+        { "chunks": [ "lab_west_wall" ], "x": 0, "y": 0, "neighbors": { "west": ["empty_rock"] } }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "lab_north_wall",
+    "object": {
+      "mapgensize": [ 24, 24 ],
+      "place_terrain": [
+        { "ter": "t_concrete_wall", "x": 0, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 1, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 2, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 3, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 4, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 5, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 6, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 7, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 8, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 9, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 10, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 11, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 12, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 13, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 14, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 15, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 16, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 17, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 18, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 19, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 20, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 21, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 22, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 23, "y": 0 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "lab_west_wall",
+    "object": {
+      "mapgensize": [ 24, 24 ],
+      "place_terrain": [
+        { "ter": "t_concrete_wall", "x": 0, "y": 0 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 1 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 2 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 3 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 4 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 5 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 6 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 7 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 8 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 9 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 10 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 11 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 12 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 13 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 14 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 15 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 16 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 17 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 18 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 19 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 20 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 21 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 22 },
+        { "ter": "t_concrete_wall", "x": 0, "y": 23 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "sub_t_concrete_wall",
+    "object": {
+      "rows": [ "-" ],
+      "palettes": [
+        "lab_palette"
+      ],
+      "mapgensize": [ 1, 1 ]
+    }
+  }
+]