1 files changed, 78 insertions, 0 deletions
diff --git a/backport-05_fix-farm-mapgen-3715.patch b/backport-05_fix-farm-mapgen-3715.patch
new file mode 100644
index 0000000..c737051
--- /dev/null
+++ b/backport-05_fix-farm-mapgen-3715.patch
@@ -0,0 +1,78 @@
+From 13714f68ef41c8e2cd43d6bf203065c27fbc2810 Mon Sep 17 00:00:00 2001
+From: 0Monet <146018959+0Monet@users.noreply.github.com>
+Date: Sun, 19 Nov 2023 00:22:30 +0100
+Subject: [PATCH] fix: farm mapgen (#3715)
+
+* fix_farm_mapgen
+
+* style(autofix.ci): automated formatting
+
+---------
+
+Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
+---
+ data/json/mapgen/farm.json | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/json/mapgen/farm.json b/data/json/mapgen/farm.json
+index eca907206c1..1c3952dbb8e 100644
+--- a/data/json/mapgen/farm.json
++++ b/data/json/mapgen/farm.json
+@@ -24,7 +24,7 @@
+         "  #__2___________2__#   #_1__1_# -6..........H.- F  DDDDDDDDDDDDDDDD  F ",
+         "  #__2___________2__#   #______# -u...----+----- F                    F ",
+         "  #332___________233#   #______# --+---kh......- F  DDDDDDDDDDDDDDDD  F ",
+-        "  #_____________1___#   #_1__1_# -...-.........w F                    F ",
++        "  #_____________1___#   #_1__1_# -b..-.........w F                    F ",
+         "  W_________________W   #______# -b..+......BB.- F  DDDDDDDDDDDDDDDD  F ",
+         "  W_________________W   #____ll# -.ST-.....dBBd- F                    F ",
+         "  #lll__________O___#   ###++### --w------w----- F  DDDDDDDDDDDDDDDD  F ",
+@@ -80,7 +80,6 @@
+         "F                                                                     F ",
+         "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF "
+       ],
+-      "place_items": [  ],
+       "place_item": [
+         { "item": "straw_pile", "x": [ 3, 5 ], "y": [ 5, 7 ], "amount": [ 0, 8 ] },
+         { "item": "cattlefodder", "x": [ 3, 5 ], "y": [ 5, 7 ], "amount": [ 0, 4 ] },
+@@ -90,11 +89,10 @@
+         { "item": "cattlefodder", "x": [ 19, 19 ], "y": [ 10, 15 ], "amount": [ 2, 7 ] }
+       ],
+       "place_monsters": [
+-        { "monster": "GROUP_ZOMBIE", "x": [ 4, 4 ], "y": [ 14, 14 ], "repeat": [ 1, 6 ], "density": 0.2 },
++        { "monster": "GROUP_ZOMBIE", "x": [ 9, 11 ], "y": [ 12, 14 ], "repeat": [ 1, 6 ], "density": 0.2 },
+         { "monster": "GROUP_DOMESTIC", "x": [ 10, 12 ], "y": [ 15, 17 ], "repeat": [ 1, 2 ], "density": 0.2 }
+       ],
+       "sealed_item": { "D": { "item": { "item": "seed_corn" }, "furniture": "f_plant_seedling" } },
+-      "place_nested": [ { "chunks": [ [ "NC_FARMER_spawn", 10 ], [ "null", 90 ] ], "x": 23, "y": 3 } ],
+       "palettes": [ "farm" ]
+     }
+   },
+@@ -123,7 +121,7 @@
+         "#_1__1_# -6...........m-",
+         "#__Q___# -u...----+-----",
+         "#______# --+---mm....mm-",
+-        "#_1__1_# -...-.........w",
++        "#_1__1_# -b..-.........w",
+         "#______# -b..+......BB.-",
+         "#____ll# -.ST-mm...dBBd-",
+         "###++### --w------w-----",
+@@ -131,6 +129,7 @@
+         "                        ",
+         "FFFFFFFFFFFFFFFFFFFFFFFF"
+       ],
++      "terrain": { "Q": "t_dirtfloor" },
+       "items": {
+         ".": { "item": "trash", "chance": 20 },
+         "B": [
+@@ -164,6 +163,7 @@
+         "u": [ { "item": "kitchen", "chance": 70 }, { "item": "cannedfood", "chance": 40 }, { "item": "softdrugs", "chance": 40 } ],
+         "Q": { "item": "farming_tools", "chance": 15 }
+       },
++      "place_nested": [ { "chunks": [ [ "NC_FARMER_spawn", 10 ], [ "null", 90 ] ], "x": 17, "y": 13 } ],
+       "palettes": [ "farm" ]
+     }
+   },
+-- 
+2.42.0
+