[BUG] CTOV villages and Vanilla villages can overlap

Fixes #121
ChoiceTheorem · Jun 14, 2024 · c9862de · c9862de
1 parent 46321a7
commit c9862de
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 64 deletions.
diff --git a/checklist.md b/checklist.md
@@ -15,3 +15,4 @@
     - [] Building jewelry workshop set
     - [] Building Archery range set
     - [] Add this through pool mod
+5. Fuse CTOV structure set to vanilla one.
diff --git a/...dgen/structure_set/pillager_outposts.json → ...ldgen_modifier/ctov/pillager_outpost.json b/...dgen/structure_set/pillager_outposts.json → ...ldgen_modifier/ctov/pillager_outpost.json
@@ -1,5 +1,7 @@
 {
-	"structures": [
+	"type": "lithostitched:add_structure_set_entries",
+	"structure_set": "minecraft:pillager_outposts",
+	"entries": [
 		{
 			"structure": "ctov:pillager_outpost_beach",
 			"weight": 1
@@ -44,17 +46,5 @@
 			"structure": "ctov:pillager_outpost_taiga",
 			"weight": 1
 		}
-	],
-	"placement": {
-		"type": "minecraft:random_spread",
-		"salt": 165745296,
-		"frequency_reduction_method": "legacy_type_1",
-		"frequency": 0.2,
-		"exclusion_zone": {
-			"other_set": "ctov:villages",
-			"chunk_count": 10
-		},
-		"spacing": 32,
-		"separation": 8
-	}
+	]
 }
diff --git a/...ctov/worldgen/structure_set/villages.json → ...tched/worldgen_modifier/ctov/village.json b/...ctov/worldgen/structure_set/villages.json → ...tched/worldgen_modifier/ctov/village.json
@@ -1,5 +1,7 @@
 {
-	"structures": [
+	"type": "lithostitched:add_structure_set_entries",
+	"structure_set": "minecraft:villages",
+	"entries": [
 		{
 			"structure": "ctov:large/village_beach",
 			"weight": 1
@@ -86,177 +88,171 @@
 		},
 		{
 			"structure": "ctov:medium/village_beach",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_christmas",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_desert",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_desert_oasis",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_dark_forest",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_jungle",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_jungle_tree",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_mesa",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_mesa_fortified",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_mountain",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_mountain_alpine",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_mushroom",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_plains",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_plains_fortified",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_savanna",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_savanna_na",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_snowy_igloo",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_swamp",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_swamp_fortified",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_taiga",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:medium/village_taiga_fortified",
-			"weight": 4
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_beach",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_christmas",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_desert",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_desert_oasis",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_dark_forest",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_jungle",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_jungle_tree",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_mesa",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_mesa_fortified",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_mountain",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_mountain_alpine",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_mushroom",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_plains",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_plains_fortified",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_savanna",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_savanna_na",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_snowy_igloo",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_swamp",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_swamp_fortified",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_taiga",
-			"weight": 15
+			"weight": 1
 		},
 		{
 			"structure": "ctov:small/village_taiga_fortified",
-			"weight": 15
+			"weight": 1
 		}
-	],
-	"placement": {
-		"type": "minecraft:random_spread",
-		"salt": 153873121,
-		"spacing": 50,
-		"separation": 25
-	}
+	]
 }