caravans no longer collide with other caravans

pyanodon · Nov 16, 2023 · 7d6e7c7 · 7d6e7c7
1 parent ec71f33
commit 7d6e7c7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -13,6 +13,7 @@ Date: ???
     - Fixed that dingrit mk2,mk3,mk4 module recipes were not outputting any empty cages
     - Moved all aerial turbine code to pyAE
     - fixed digosaurus being recorded in kill statistics
+    - caravans no longer collide with other caravans
     - fixed crash when mixing oculas and factorissimo 2 (https://github.com/pyanodon/pybugreports/issues/336)
 ---------------------------------------------------------------------------------------------------
 Version: 2.1.9

diff --git a/prototypes/creatures/caravan.lua b/prototypes/creatures/caravan.lua
@@ -43,6 +43,7 @@ ITEM {
 
 data:extend{{
 	type = 'unit',
+	ai_settings = {do_separation = false},
 	additional_pastable_entities = {'caravan'},
 	name = 'caravan',
 	can_open_gates = true,

diff --git a/prototypes/creatures/nuka-caravan.lua b/prototypes/creatures/nuka-caravan.lua
@@ -41,13 +41,14 @@ data:extend(
 	additional_pastable_entities = {'nukavan'},
     icon = '__pyalienlifegraphics2__/graphics/icons/nuka-van.png',
     icon_size = 64,
+	ai_settings = {do_separation = false},
     flags = {'placeable-player', 'placeable-off-grid', 'not-repairable', 'breaths-air', 'building-direction-8-way'},
 	minable = {mining_time = 0.1, result = 'nukavan'},
     max_health = 6125,
 	map_color = {1, 1, 1},
     order = 'b-b-a',
     subgroup='enemies',
-	collision_mask = {caravan_collision_mask},
+	collision_mask = {caravan_collision_mask, 'not-colliding-with-itself'},
     resistances =
 	{
 		{