Fix overlapping objects in campaign maps

* reposition all objects reported as "Bad unit overlap" error in FlaME: * remove Boulder1 in cam1a that cannot be placed * reposition overlapping trees and units sharing the same tile * recreate scavenger factory with modules in sub1-5 with new "id" values to suppress "Bad module" error in FlaME * affected maps: * cam1/cam1a * cam1/sub1-2 * cam1/sub1-5 * cam2/cam2b * cam2/sub2-2 * cam3/sub3-3 Fixes ticket:4865
Warzone2100 · Mar 2, 2019 · f3a9b4d · f3a9b4d
1 parent 449278b
commit f3a9b4d
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 1 deletion.
diff --git a/data/base/wrf/cam1/cam1a/dinit.bjo b/data/base/wrf/cam1/cam1a/dinit.bjo
diff --git a/data/base/wrf/cam1/cam1a/feat.bjo b/data/base/wrf/cam1/cam1a/feat.bjo
diff --git a/data/base/wrf/cam1/cam1a/struct.bjo b/data/base/wrf/cam1/cam1a/struct.bjo
diff --git a/data/base/wrf/cam1/sub1-2/dinit.bjo b/data/base/wrf/cam1/sub1-2/dinit.bjo
diff --git a/data/base/wrf/cam1/sub1-2/feat.bjo b/data/base/wrf/cam1/sub1-2/feat.bjo
diff --git a/data/base/wrf/cam1/sub1-2/struct.bjo b/data/base/wrf/cam1/sub1-2/struct.bjo
diff --git a/data/base/wrf/cam1/sub1-5/dinit.bjo b/data/base/wrf/cam1/sub1-5/dinit.bjo
diff --git a/data/base/wrf/cam1/sub1-5/feat.bjo b/data/base/wrf/cam1/sub1-5/feat.bjo
diff --git a/data/base/wrf/cam1/sub1-5/labels.json b/data/base/wrf/cam1/sub1-5/labels.json
@@ -80,7 +80,7 @@
 
 	"object_0": {
 		"label": "NPLeftFactory",
-		"id": 481,
+		"id": 496,
 		"player": 1,
 		"type": 1
 	},

diff --git a/data/base/wrf/cam1/sub1-5/struct.bjo b/data/base/wrf/cam1/sub1-5/struct.bjo
diff --git a/data/base/wrf/cam2/cam2b/dinit.bjo b/data/base/wrf/cam2/cam2b/dinit.bjo
diff --git a/data/base/wrf/cam2/cam2b/feat.bjo b/data/base/wrf/cam2/cam2b/feat.bjo
diff --git a/data/base/wrf/cam2/cam2b/struct.bjo b/data/base/wrf/cam2/cam2b/struct.bjo
diff --git a/data/base/wrf/cam2/sub2-2/dinit.bjo b/data/base/wrf/cam2/sub2-2/dinit.bjo
diff --git a/data/base/wrf/cam2/sub2-2/feat.bjo b/data/base/wrf/cam2/sub2-2/feat.bjo
diff --git a/data/base/wrf/cam2/sub2-2/struct.bjo b/data/base/wrf/cam2/sub2-2/struct.bjo
diff --git a/data/base/wrf/cam3/sub3-3/feat.bjo b/data/base/wrf/cam3/sub3-3/feat.bjo