--- orig/battery.script	2003-09-23 19:58:26.000000000 -0400
+++ battery.script	2003-09-23 21:09:52.000000000 -0400
@@ -1,6 +1,8 @@
 //
 // Map: Atlantic Seawall Battery
 // BSP: battery
+// Thu Aug 21 23:18:19 PDT 2003 - autospawns fixed for ETPro by bani
+// rain - Tue Sep 23 20:17:48 EDT 2003 - even more autospawn fixing
 
 game_manager
 {
@@ -39,8 +41,10 @@
 		wm_set_main_objective		1	0
 		wm_set_main_objective		1	1
 
+		// rain - 2.56 change
 		wait 100
-		setautospawn	"West Bunker"	1
+		// rain - use proper initial spawns
+		setautospawn	"Allied West Beach" 1
 		setautospawn	"West Bunker"	0
 
 		setstate eastbunker_wobj invisible
@@ -279,6 +283,8 @@
 		alertentity westbunker_spawns
 
 		setautospawn "Axis Main Bunker" 0
+		// bani - set allied spawn
+		setautospawn "West Bunker" 1
 	}
 
 	trigger axis_capture
@@ -314,6 +320,10 @@
 
 		alertentity westbunker_wobj
 		alertentity westbunker_spawns
+
+		// bani - reset both spawns
+		setautospawn "West Bunker" 0
+		setautospawn "Allied West Beach" 1
 	}
 }
 // ============== end spawn point controls ========
--- orig/fueldump_lms.script	2003-09-23 19:58:26.000000000 -0400
+++ fueldump_lms.script	2003-09-23 20:37:12.000000000 -0400
@@ -1,3 +1,4 @@
+// rain - Tue Sep 23 20:32:03 EDT 2003 - fixed setautospawns
 game_manager
 {
 	spawn
@@ -10,10 +11,12 @@
 		setstate tunnel_wobj invisible
 
 		// Setup the auto spawn points for the map
-		wait 50
+		// rain - wait 100ms instead of 50 so spawns are set up
+		wait 100
 		setstate t108 invisible
+		// rain - fix allied autospawn
 		setautospawn "Allied Entrance Spawn" 1
-		setautospawn "Axis Fuel Dump" 1
+		setautospawn "Axis Fuel Dump" 0
 
 		// Garage Doors
 		globalaccum 4 set 0		// Flexible Door 1 status. (0=stationary, 1=moving)
--- orig/fueldump.script	2003-09-23 19:58:26.000000000 -0400
+++ fueldump.script	2003-09-23 20:25:49.000000000 -0400
@@ -2,6 +2,7 @@
 // Map: Fueldump
 // Last update : 16/06/03 Sock
 // ============================================================================
+// rain - Tue Sep 23 20:24:55 EDT 2003 - fixed setautospawns
 game_manager
 {
 	spawn
@@ -83,8 +84,9 @@
 		wm_announce	"Allied team has breached the Tunnel Doors!"
 		setstate tunneldoor_toi invisible
 
-		setautospawn "Allied Entrance Spawn" 0
+		// rain - fixed axis spawn point
 		setautospawn "Tunnel Store Room" 1
+		setautospawn "Axis Fuel Dump" 0
 		alertentity t108	// Switch the tunnel spawns around
 
 		// *----------------------------------- vo ------------------------------------------*
--- orig/oasis_lms.script	2003-09-23 19:58:26.000000000 -0400
+++ oasis_lms.script	2003-09-23 20:16:08.000000000 -0400
@@ -1,3 +1,5 @@
+// rain - Tue Sep 23 20:16:02 EDT 2003 - fixed autospawns
+
 game_manager
 {
 	spawn
@@ -17,6 +19,17 @@
 		disablespeaker axis_compost_sound		// axis command post
 		disablespeaker axis_compost_sound_lms	// axis command post lms
 
+		// rain - set autospawns for LMS
+		// Set autospawn markers <team (0 = axis, 1 = allies)> <message key of marker>
+		// Spawns on siwa:
+		// Axis Garrison
+		// Allied Camp
+		// Old City
+		wait 150
+
+		setautospawn "Allied Camp"		1
+		setautospawn "Axis Garrison"		0
+
 		wait 1000
 		// *----------------------------------- vo ------------------------------------------*
 		wm_addteamvoiceannounce 0 "axis_hq_compost_construct"
--- orig/oasis.script	2003-09-23 19:58:26.000000000 -0400
+++ oasis.script	2003-09-23 20:10:46.000000000 -0400
@@ -1,3 +1,5 @@
+// rain - Tue Sep 23 19:57:17 EDT 2003 - fixed autospawns
+
 game_manager
 {
 	spawn
@@ -63,7 +65,8 @@
 		// Old City
 		wait 150
 
-		setautospawn "Old City"			1
+		// rain - properly set initial spawns
+		setautospawn "Allied Camp"		1
 		setautospawn "Old City"			0
 
 		wait 350
@@ -191,6 +194,14 @@
 		wm_objective_status 		4 1 2
 
 		alertentity old_city_wobj
+
+		// rain - properly set autospawns
+		// Spawn points: (1 = allies, 0 = axis)
+		// Axis Garrison
+		// Allied Camp
+		// Old City
+		setautospawn "Allied Camp"		1
+		setautospawn "Old City"			0
 	}
 
 	trigger allied_capture	// Flag has been touched by an allied player
@@ -220,6 +231,14 @@
 		wm_objective_status 		4 1 1
 
 		alertentity old_city_wobj
+
+		// rain - properly set autospawns
+		// Spawn points: (1 = allies, 0 = axis)
+		// Axis Garrison
+		// Allied Camp
+		// Old City
+		setautospawn "Old City"			1
+		setautospawn "Axis Garrison"		0
 	}
 
 	trigger check_obj
@@ -237,6 +256,14 @@
 
 		alertentity old_city_wobj
 		alertentity oldcityspawns
+
+		// rain - properly set autospawns
+		// Spawn points: (1 = allies, 0 = axis)
+		// Axis Garrison
+		// Allied Camp
+		// Old City
+		setautospawn "Old City"			1
+		setautospawn "Axis Garrison"		0
 	}
 
 	trigger kill
--- orig/radar.script	2003-09-23 19:58:26.000000000 -0400
+++ radar.script	2003-09-23 20:41:30.000000000 -0400
@@ -1,3 +1,5 @@
+// rain - Tue Sep 23 20:40:37 EDT 2003 - fixed setautospawns
+
 game_manager
 {
 	spawn
@@ -42,7 +44,8 @@
 		// Abandoned Villa
 		// Forward Bunker
 		// Lower Warehouse
-		setautospawn "Forward Bunker" 1
+		// rain - set allied initial autospawn properly
+		setautospawn "Abandoned Villa" 1
 		setautospawn "Forward Bunker" 0
 
 		disablespeaker allies_compost_sound
--- orig/railgun_lms.script	2003-09-23 19:58:26.000000000 -0400
+++ railgun_lms.script	2003-09-23 20:54:31.000000000 -0400
@@ -1,3 +1,5 @@
+// rain - Tue Sep 23 20:48:42 EDT 2003 - fixed autospawns
+
 game_manager
 {
 	spawn
@@ -9,6 +11,11 @@
 		disablespeaker allies_compost_sound	// command post speaker
 		disablespeaker axis_compost_sound	// command post speaker
 
+		// rain - set autospawns for LMS
+		wait 150
+		setautospawn "Axis Construction Site" 0
+		setautospawn "Allied Camp" 1
+
 		wait 1000
 		// *----------------------------------- vo ------------------------------------------*
 		wm_addteamvoiceannounce 0 "axis_hq_compost_construct"