Merge pull request #75124 from MisfitMaid/apiary-additions

Add apiaries to the farm generation
CleverRaven · Jul 21, 2024 · c9f6b19 · c9f6b19
2 parents a9e4235 + 90dfccb
commit c9f6b19
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 0 deletions.
diff --git a/data/json/mapgen/farm.json b/data/json/mapgen/farm.json
@@ -580,5 +580,92 @@
       ],
       "palettes": [ "roof_palette" ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "farm_1_apiary" ] ],
+    "//": "Apiary",
+    "weight": 250,
+    "object": {
+      "fill_ter": "t_dirt",
+      "rows": [
+        "                        ",
+        "                        ",
+        "     FFFFFFFFFFFFFFFFFF ",
+        "     F         ,      F ",
+        "     F ⬡⬡  ⬡⬡  ⬡⬡  ⬡⬡ F ",
+        ",,,  F ⬡⬡  ⬡⬡  ⬡⬡  ⬡⬡ F ",
+        ",,,,,g,,,,,     ,,    F ",
+        "  ,,,g,,,,   ,        F ",
+        "     F ⬡⬡  ⬡⬡  ⬡⬡  ⬡⬡ F ",
+        "   , F ⬡⬡  ⬡⬡  ⬡⬡  ⬡⬡ F ",
+        "     F               ,F ",
+        "    ,FFFFFFFFFFFFFFFFFF ",
+        "     ,,                 ",
+        "           ,      ##### ",
+        "               , ♦#r♠♥# ",
+        "                ,,+___# ",
+        "                  ##### ",
+        "                        ",
+        " FFFFFFFFFFFFFFFFFFFFFF ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F ",
+        " F  DDDDDDDDDDDDDDDD  F ",
+        " F                    F "
+      ],
+      "terrain": { "⬡": [ [ "t_apiary", 5 ], [ "t_apiary_empty", 95 ] ] },
+      "items": {
+        "♠": [
+          { "item": "hive", "chance": 50, "repeat": [ 2, 4 ] },
+          { "item": "home_hw", "chance": 50 },
+          { "item": "tools_common", "chance": 50 }
+        ],
+        "r": { "item": "honey_market_stall", "repeat": [ 4, 12 ] }
+      },
+      "furniture": { "♥": "f_machinery_light", "♠": "f_locker", "♦": "f_woodchips" },
+      "sealed_item": { "D": { "item": { "item": "seed_corn" }, "furniture": "f_plant_seedling", "chance": 70 } },
+      "palettes": [ "farm" ],
+      "place_monster": [
+        { "group": "GROUP_BEEKEEPER", "x": [ 6, 21 ], "y": [ 3, 10 ], "pack_size": 1, "chance": 10 },
+        { "group": "GROUP_BEE", "x": [ 6, 21 ], "y": [ 3, 10 ], "pack_size": [ 2, 4 ], "chance": 20 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ [ "farm_1_apiary_roof" ] ],
+    "weight": 250,
+    "object": {
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                  ..... ",
+        "                  ...=. ",
+        "                  ..... ",
+        "                  ..... ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ]
+    }
   }
 ]
diff --git a/data/json/overmap/overmap_mutable/farm_mutable.json b/data/json/overmap/overmap_mutable/farm_mutable.json
@@ -77,6 +77,8 @@
       "farm_1_coop_roof": { "overmap": "farm_1_coop_roof_north" },
       "farm_1_greenhouse": { "overmap": "farm_1_greenhouse_north", "south": "house_to_extension" },
       "farm_1_greenhouse_roof": { "overmap": "farm_1_greenhouse_roof_north" },
+      "farm_1_apiary": { "overmap": "farm_1_apiary_north", "south": "house_to_extension" },
+      "farm_1_apiary_roof": { "overmap": "farm_1_apiary_roof_north" },
       "farm_2": { "overmap": "farm_2_north", "connections": { "north": { "connection": "local_road" } } },
       "farm_2_roof": { "overmap": "farm_2_roof_north" },
       "farm_3": { "overmap": "farm_3_north" },
@@ -362,6 +364,11 @@
           "name": "ext_greenhouse",
           "chunk": [ { "overmap": "farm_1_greenhouse", "pos": [ 0, 0, 0 ] }, { "overmap": "farm_1_greenhouse_roof", "pos": [ 0, 0, 1 ] } ],
           "weight": 1
+        },
+        {
+          "name": "ext_apiary",
+          "chunk": [ { "overmap": "farm_1_apiary", "pos": [ 0, 0, 0 ] }, { "overmap": "farm_1_apiary_roof", "pos": [ 0, 0, 1 ] } ],
+          "weight": 1
         }
       ],
       [

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
@@ -635,6 +635,22 @@
     "name": "greenhouse roof",
     "sym": "o"
   },
+  {
+    "type": "overmap_terrain",
+    "id": [ "farm_1_apiary" ],
+    "copy-from": "generic_rural_building",
+    "name": "apiary",
+    "sym": "h",
+    "color": "yellow"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": [ "farm_1_apiary_roof" ],
+    "copy-from": "generic_rural_building",
+    "name": "apiary roof",
+    "sym": "h",
+    "color": "yellow"
+  },
   {
     "type": "overmap_terrain",
     "id": "horse_farm_isherwood_9_roof",