Merge pull request #11 from CleverRaven/master

Bring up-to-date
Inglonias · Dec 27, 2018 · 76c1024 · 76c1024
2 parents 7c6ef21 + 40d1d82
commit 76c1024
Showing 1 changed file with 173 additions and 0 deletions.
diff --git a/data/json/mapgen/farm.json b/data/json/mapgen/farm.json
@@ -280,5 +280,178 @@
         "Q": { "item": "farming_tools", "chance": 15 }
       }
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "farm_1" ] ],
+    "//": "Grain silo copy of silo in ranch_camp_57",
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_dirt",
+      "rows": [
+        "                        ",
+        "   |--|  ####W###W###   ",
+        " |-|__|-|#____rrr___#   ",
+        "||______||H________s#   ",
+        "|________A_________s#   ",
+        "||______||H________s#   ",
+        " |-|__|-|#__________W   ",
+        "   |--|  #_______5__#   ",
+        "         ####====####   ",
+        "                 5      ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        " FFFFFFFFFFFFFFFFFFFFFF ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        "FF                    F "
+      ],
+      "terrain": {
+        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "-": "t_wall",
+        "=": "t_door_metal_locked",
+        "_": "t_dirtfloor",
+        "|": "t_wall",
+        "#": "t_wall_wood",
+        "5": "t_barndoor",
+        "A": "t_bars",
+        "D": "t_dirtmound",
+        "F": "t_fence_barbed",
+        "H": "t_fence_h",
+        "r": "t_dirtfloor",
+        "s": "t_dirtfloor",
+        "W": "t_window_boarded"
+      },
+      "furniture": { "r": "f_rack", "s": "f_rack" },
+      "items": { "D": { "item": "hydro", "chance": 5 }, "r": { "item": "farming_tools", "chance": 25 } },
+      "place_item": [
+        { "item": "wheat", "x": [ 4, 5 ], "y": 2, "chance": 40 },
+        { "item": "wheat", "x": [ 2, 7 ], "y": 3, "chance": 30, "repeat": [ 1, 2 ] },
+        { "item": "wheat", "x": [ 1, 8 ], "y": 4, "chance": 20, "repeat": [ 1, 2 ] },
+        { "item": "wheat", "x": [ 2, 7 ], "y": 5, "chance": 30, "repeat": [ 1, 2 ] },
+        { "item": "wheat", "x": [ 4, 5 ], "y": 6, "chance": 40 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "farm_1" ] ],
+    "//": "Chicken Coop",
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_dirt",
+      "rows": [
+        "                        ",
+        "                        ",
+        "  ;;;;;;;;;###########  ",
+        "  ;        #_#_#_#_#_#  ",
+        "  ;        #_______7_#  ",
+        "  g        +_______8_#  ",
+        "  g        c__7______#  ",
+        "  ;        #_#_#_#_#_#  ",
+        "  ;        ###########  ",
+        "  ;                  ;  ",
+        "  ;                  ;  ",
+        "  ;                  ;  ",
+        "  ;;;;;;;;;;;;;;;;;;;;  ",
+        "                        ",
+        " FFFFFFFFFFFFFFFFFFFFFF ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        "FF                    F "
+      ],
+      "terrain": {
+        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "_": "t_dirtfloor",
+        "#": "t_wall_wood",
+        ";": "t_fence_wire",
+        "+": "t_door_c",
+        "7": "t_dirtfloor",
+        "8": "t_dirtfloor",
+        "c": "t_door_makeshift_c",
+        "D": "t_dirtmound",
+        "F": "t_fence_barbed",
+        "g": "t_chaingate_c"
+      },
+      "items": { "D": { "item": "hydro", "chance": 5 } },
+      "monster": { "7": { "monster": "mon_chicken" }, "8": { "monster": "mon_chicken_chick" } },
+      "place_item": [
+        { "item": "straw_pile", "x": 12, "y": 3, "chance": 75 },
+        { "item": "straw_pile", "x": 14, "y": 3, "chance": 75 },
+        { "item": "straw_pile", "x": 16, "y": 3, "chance": 75 },
+        { "item": "straw_pile", "x": 18, "y": 3, "chance": 75 },
+        { "item": "straw_pile", "x": 20, "y": 3, "chance": 75 },
+        { "item": "straw_pile", "x": 12, "y": 7, "chance": 75 },
+        { "item": "straw_pile", "x": 14, "y": 7, "chance": 75 },
+        { "item": "straw_pile", "x": 16, "y": 7, "chance": 75 },
+        { "item": "straw_pile", "x": 18, "y": 7, "chance": 75 },
+        { "item": "straw_pile", "x": 20, "y": 7, "chance": 75 },
+        { "item": "birdfood", "x": [ 3, 7 ], "y": [ 5, 11 ], "chance": 75, "repeat": [ 4, 7 ] },
+        { "item": "straw_pile", "x": 20, "y": 7, "chance": 75 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "farm_1" ] ],
+    "//": "Greenhouse",
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_dirt",
+      "rows": [
+        "                        ",
+        "                        ",
+        "     ################## ",
+        "     #DDDDDDDDDDDDDDDD# ",
+        "     #D_______________# ",
+        "     #D__DDDDDDDDDD__r# ",
+        "     +_______________r# ",
+        "     +_______________r# ",
+        "     #D__DDDDDDDDDD__r# ",
+        "     #D_______________# ",
+        "     #DDDDDDDDDDDDDDDD# ",
+        "     ################## ",
+        "                        ",
+        "                        ",
+        " FFFFFFFFFFFFFFFFFFFFFF ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        "FF                    F "
+      ],
+      "terrain": {
+        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "_": "t_dirtfloor",
+        "#": "t_wall_glass",
+        "+": "t_door_glass_c",
+        "D": "t_dirtmound",
+        "r": "t_dirtfloor",
+        "F": "t_fence_barbed"
+      },
+      "furniture": { "r": "f_rack" },
+      "items": { "D": { "item": "hydro", "chance": 5 }, "r": { "item": "tools_earthworking", "chance": 20 } }
+    }
   }
 ]