diff --git a/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_illages.json b/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_illages.json index cc3a4e324..b011be842 100644 --- a/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_illages.json +++ b/kubejs/data/tfg/lithostitched/worldgen_modifier/contains_illages.json @@ -7,11 +7,8 @@ "spawn_condition": { "type": "lithostitched:grid", "condition": { - "type": "lithostitched:not", - "condition": { - "type": "lithostitched:in_biome", - "biomes": "#tfg:has_structure/illages" - } + "type": "lithostitched:in_biome", + "biomes": "#tfg:never_has_structure/illages" }, "radius": 105, "distance_between_points": 15, diff --git a/kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt b/kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt index 18d549293..c571bfdc2 100644 Binary files a/kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt and b/kubejs/data/tfg/structures/illager_generic/mobs/berserker.nbt differ diff --git a/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt b/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt index 4525d57b8..7f13b36e7 100644 Binary files a/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt and b/kubejs/data/tfg/structures/norse/baseline/norse_root_base.nbt differ diff --git a/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt b/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt index 1eac3b081..5f9bfd5a3 100644 Binary files a/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt and b/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt differ diff --git a/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt b/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt index 7fc98a1fe..10a0aa6fd 100644 Binary files a/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt and b/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt b/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt index 550233d8b..0d5d684e0 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt and b/kubejs/data/tfg/structures/norse/ruins/bend_left.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt b/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt index 545fae375..718b51058 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt and b/kubejs/data/tfg/structures/norse/ruins/bend_right.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/cross.nbt b/kubejs/data/tfg/structures/norse/ruins/cross.nbt index 2f66efabe..09366f99e 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/cross.nbt and b/kubejs/data/tfg/structures/norse/ruins/cross.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt b/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt index f7f8ea6fb..213ffc3cc 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt and b/kubejs/data/tfg/structures/norse/ruins/fork_left.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt b/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt index dbb0196f0..560732e3a 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt and b/kubejs/data/tfg/structures/norse/ruins/fork_right.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt index 2af578b4c..cba09e1a6 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt index 8d55c5cb0..c9296c0e6 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt index cf0721606..02312dc04 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt index 6d274be26..12278a939 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt index f9f1433f4..85e98ee11 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_root_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt b/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt index 6cadb587b..43be95379 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt and b/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt b/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt index 7a33bfad8..1ccf31f6f 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt and b/kubejs/data/tfg/structures/norse/ruins/straight_long.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt b/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt index dfe1a716a..86cbdf092 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt and b/kubejs/data/tfg/structures/norse/ruins/straight_medium.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt b/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt index 564a3f3a2..a3eac497b 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt and b/kubejs/data/tfg/structures/norse/ruins/straight_short.nbt differ diff --git a/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt b/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt index 77ffe0df8..b8e4808fb 100644 Binary files a/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt and b/kubejs/data/tfg/structures/norse/ruins/t_junction.nbt differ diff --git a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json index b39361f99..85e8d895a 100644 --- a/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json +++ b/kubejs/data/tfg/worldgen/structure/illagers/norse_village_ruined.json @@ -5,7 +5,7 @@ "max_distance_from_center": 116, "biomes": "#tfg:has_structure/illages", "step": "surface_structures", - "terrain_adaptation": "beard_thin", + "terrain_adaptation": "beard_box", "start_height": { "absolute": -1 }, diff --git a/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json index 9ccefd6fc..b1f490252 100644 --- a/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json +++ b/kubejs/data/tfg/worldgen/structure_set/illagers/norse_village.json @@ -12,7 +12,7 @@ "placement": { "type": "tfc:climate", "salt": 26256356324, - "spacing": 40, + "spacing": 30, "separation": 25, "climate": { "min_temperature": -12, diff --git a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_buildings.json b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_buildings.json index b0bd44bd5..44feaa094 100644 --- a/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_buildings.json +++ b/kubejs/data/tfg/worldgen/template_pool/illagers/norse_village_living_buildings.json @@ -31,14 +31,15 @@ { "weight": 40, "element": { - "element_type": "lithostitched:limited", + "element_type": "lithostitched:delegating", "delegate": { "element_type": "minecraft:single_pool_element", "location": "tfg:norse/baseline/norse_burial_base", "processors": "tfg:illagers/norse_structures", "projection": "terrain_matching" }, - "limit": 2 + "max_count": 2, + "override_terrain_adaptation": "bury" } }, { diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index a11fd996d..e638fc53a 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -1124,6 +1124,10 @@ const registerTFGBiomeTags = (event) => { event.add('tfg:has_structure/illages', 'tfc:plateau') event.add('tfg:has_structure/illages', 'tfc:old_mountains') + event.add('tfg:never_has_structure/illages', '#tfc:is_lake') + event.add('tfg:never_has_structure/illages', '#tfc:is_ocean') + event.add('tfg:never_has_structure/illages', '#tfc:is_river') + // #endregion // #region Nether biomes