map.yaml cleanup

mods/ra/maps/soviet-01/map.yaml

@@ -39,14 +39,14 @@ Players:
 		Name: France
 		Race: allies
 		ColorRamp: 115,115,143
-		Allies: Germany, Turkey
+		Allies: Germany
 		Enemies: USSR
 	PlayerReference@Germany:
 		Name: Germany
 		NonCombatant: True
 		Race: allies
 		ColorRamp: 0,0,80
-		Allies: France, Turkey
+		Allies: France
 		Enemies: USSR
 	PlayerReference@USSR:
 		Name: USSR
@@ -59,14 +59,7 @@ Players:
 		ColorRamp: 3,255,127
 		LockSpawn: True
 		LockTeam: True
-		Enemies: France, Germany, Turkey
+		Enemies: France, Germany
-	PlayerReference@Turkey:
-		Name: Turkey
-		NonCombatant: True
-		Race: allies
-		ColorRamp: 14,123,167
-		Allies: France, Germany
-		Enemies: USSR
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
@@ -230,377 +223,219 @@ Actors:
 	Actor51: barl
 		Location: 33,54
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor52: brl3
 		Location: 57,53
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor53: v08
 		Location: 41,54
 		Owner: France
 		Health: 0.5195313
-		Facing: 0
 	Actor54: v07
 		Location: 54,65
 		Owner: France
 		Health: 0.4375
-		Facing: 0
 	Actor55: v07
 		Location: 38,52
 		Owner: France
 		Health: 0.4375
-		Facing: 0
 	Actor56: v06
 		Location: 46,51
 		Owner: France
 		Health: 0.9921875
-		Facing: 0
 	Actor57: v05
 		Location: 36,55
 		Owner: France
 		Health: 0.5
-		Facing: 0
 	Actor58: v04
 		Location: 35,51
 		Owner: France
 		Health: 0.3515625
-		Facing: 0
 	Actor59: v02
 		Location: 36,57
 		Owner: France
 		Health: 0.5625
-		Facing: 0
 	Actor60: brl3
 		Location: 34,52
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor61: barl
 		Location: 57,54
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor62: barl
 		Location: 55,54
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor63: brl3
 		Location: 51,72
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor64: brl3
 		Location: 51,71
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor65: brl3
 		Location: 47,71
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	BridgeBarrel: barl
 		Location: 46,71
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor67: barl
 		Location: 47,70
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor68: brl3
 		Location: 43,50
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor69: brl3
 		Location: 45,52
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor70: barl
 		Location: 41,51
 		Owner: France
-		Health: 1
-		Facing: 0
 	Actor71: barl
 		Location: 50,72
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor72: barl
 		Location: 42,50
 		Owner: Germany
-		Health: 1
-		Facing: 0
-	Airfield3: afld
-		Location: 35,81
-		Owner: USSR
-		Health: 1
-		Facing: 0
-	Powerplant1: powr
-		Location: 43,82
-		Owner: USSR
-		Health: 1
-		Facing: 0
 	Actor75: barl
 		Location: 56,53
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor76: barl
 		Location: 58,53
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor77: brl3
 		Location: 59,53
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor78: brl3
 		Location: 54,53
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor79: barl
 		Location: 59,56
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor80: brl3
 		Location: 48,66
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor81: barl
 		Location: 45,65
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor82: barl
 		Location: 34,57
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor83: brl3
 		Location: 35,58
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor84: barl
 		Location: 46,67
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor85: barl
 		Location: 48,67
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor86: brl3
 		Location: 38,65
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor87: barl
 		Location: 40,52
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor88: barl
 		Location: 39,64
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor89: brl3
 		Location: 41,53
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor90: brl3
 		Location: 46,66
 		Owner: Germany
-		Health: 1
-		Facing: 0
-	Airfield1: afld
-		Location: 39,77
-		Owner: USSR
-		Health: 1
-		Facing: 0
-	Powerplant2: powr
-		Location: 45,82
-		Owner: USSR
-		Health: 1
-		Facing: 0
-	Airfield2: afld
-		Location: 37,79
-		Owner: USSR
-		Health: 1
-		Facing: 0
 	Actor94: barl
 		Location: 35,56
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor95: brl3
 		Location: 38,64
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor96: brl3
 		Location: 34,55
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor97: barl
 		Location: 35,55
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor98: barl
 		Location: 45,50
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor99: v04
 		Location: 58,54
 		Owner: France
 		Health: 0.4140625
-		Facing: 0
 	Actor100: v02
 		Location: 56,54
 		Owner: France
 		Health: 0.7070313
-		Facing: 0
 	Actor101: dome
 		Location: 45,79
 		Owner: USSR
-		Health: 1
-		Facing: 0
 	Actor102: barl
 		Location: 46,61
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor103: brl3
 		Location: 43,66
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor104: barl
 		Location: 43,67
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor105: brl3
 		Location: 59,57
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor106: barl
 		Location: 57,58
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor107: barl
 		Location: 58,58
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor108: brl3
 		Location: 59,58
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor109: brl3
 		Location: 56,58
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor110: barl
 		Location: 56,59
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor111: barl
 		Location: 56,60
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor112: barl
 		Location: 41,68
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor113: barl
 		Location: 42,67
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor114: brl3
 		Location: 49,55
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor115: barl
 		Location: 48,55
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor116: barl
 		Location: 47,56
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor117: brl3
 		Location: 46,56
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor118: pbox
 		Location: 46,55
 		Owner: France
-		Health: 1
-		Facing: 0
 	Actor119: pbox
 		Location: 48,54
 		Owner: France
-		Health: 1
-		Facing: 0
 	Actor120: barl
 		Location: 34,51
 		Owner: Germany
-		Health: 1
-		Facing: 0
 	Actor121: v05
 		Location: 48,62
 		Owner: France
 		Health: 0.4140625
-		Facing: 0
-	Church: v01
-		Location: 40,63
-		Owner: France
-		Health: 0.5390625
-		Facing: 0
 	Actor123: jeep
 		Location: 46,52
 		Owner: France
 		Health: 0.6640625
 		Facing: 96
-	StartJeep: jeep
-		Location: 44,76
-		Owner: France
-		Health: 0.5195313
-		Facing: 32
 	Actor125: jeep
 		Location: 55,57
 		Owner: France
-		Health: 1
 		Facing: 160
 	Actor126: jeep
 		Location: 39,65
@@ -610,164 +445,165 @@ Actors:
 	Actor127: c9
 		Location: 50,64
 		Owner: France
-		Health: 1
 		Facing: 192
 		SubCell: 1
 	Actor128: c8
 		Location: 47,61
 		Owner: France
-		Health: 1
 		Facing: 0
 		SubCell: 3
 	Actor129: c8
 		Location: 41,50
-		Owner: Turkey
+		Owner: France
-		Health: 1
 		Facing: 224
 		SubCell: 3
 	Actor130: c6
 		Location: 46,61
 		Owner: France
-		Health: 1
 		Facing: 128
 		SubCell: 2
 	Actor131: c5
 		Location: 46,61
 		Owner: France
-		Health: 1
 		Facing: 0
 		SubCell: 1
 	Actor132: c4
 		Location: 44,67
 		Owner: France
-		Health: 1
 		Facing: 96
 		SubCell: 1
 	Actor133: c2
 		Location: 40,54
 		Owner: France
-		Health: 1
 		Facing: 160
 		SubCell: 2
 	Actor134: c2
 		Location: 45,61
 		Owner: France
-		Health: 1
 		Facing: 64
 		SubCell: 4
 	Actor135: e1
 		Location: 54,60
 		Owner: France
-		Health: 1
 		Facing: 160
 		SubCell: 4
 	Actor136: e1
 		Location: 49,60
 		Owner: France
-		Health: 1
 		Facing: 128
 		SubCell: 2
 	Actor137: c5
 		Location: 45,51
 		Owner: France
-		Health: 1
 		Facing: 224
 		SubCell: 0
 	Actor138: e1
 		Location: 34,58
 		Owner: France
-		Health: 1
 		Facing: 96
 		SubCell: 0
 	Actor139: e1
 		Location: 53,54
 		Owner: France
-		Health: 1
 		Facing: 128
 		SubCell: 2
 	Actor140: e1
 		Location: 58,56
 		Owner: France
-		Health: 1
 		Facing: 128
 		SubCell: 1
 	Actor141: e1
 		Location: 58,52
 		Owner: France
-		Health: 1
 		Facing: 160
 		SubCell: 0
 	Actor142: e1
 		Location: 54,64
 		Owner: France
-		Health: 1
 		Facing: 160
 		SubCell: 3
 	Actor143: c7
 		Location: 56,54
 		Owner: France
-		Health: 1
 		Facing: 0
 		SubCell: 3
 	Actor144: e1
 		Location: 40,51
 		Owner: France
-		Health: 1
 		Facing: 160
 		SubCell: 0
 	Actor145: e1
 		Location: 35,53
 		Owner: France
-		Health: 1
 		Facing: 96
 		SubCell: 1
 	Actor146: e1
 		Location: 35,54
 		Owner: France
-		Health: 1
 		Facing: 0
 		SubCell: 4
 	Actor147: e1
 		Location: 43,64
 		Owner: France
-		Health: 1
 		Facing: 96
 		SubCell: 0
 	Actor148: e1
 		Location: 56,63
 		Owner: France
-		Health: 1
 		Facing: 192
 		SubCell: 2
 	Actor149: e1
 		Location: 40,67
 		Owner: France
-		Health: 1
 		Facing: 32
 		SubCell: 4
+	Church: v01
+		Location: 40,63
+		Owner: France
+		Health: 0.5390625
+	StartJeep: jeep
+		Location: 44,76
+		Owner: France
+		Health: 0.5195313
+		Facing: 32
 	LonelyGuard: e1
 		Location: 42,81
 		Owner: USSR
 		Health: 0.1367188
 		Facing: 0
 		SubCell: 2
-	StartJeepMovePoint: waypoint
+	Airfield1: afld
-		Location: 47,66
+		Location: 39,77
-		Owner: Neutral
+		Owner: USSR
+	Airfield2: afld
+		Location: 37,79
+		Owner: USSR
+	Airfield3: afld
+		Location: 35,81
+		Owner: USSR
+	Powerplant1: powr
+		Location: 43,82
+		Owner: USSR
+	Powerplant2: powr
+		Location: 45,82
+		Owner: USSR
 	ParadropEntryPoint1: waypoint
 		Location: 67,65
 		Owner: Neutral
+	ParadropPoint1: waypoint
+		Location: 47,67
+		Owner: Neutral
+	StartJeepMovePoint: waypoint
+		Location: 47,66
+		Owner: Neutral
 	BridgeWaypoint: waypoint
 		Location: 47,70
 		Owner: Neutral
-	YakEntry: waypoint
-		Location: 51,84
-		Owner: Neutral
 	Flare: flare
 		Location: 47,65
 		Owner: France
-	ParadropPoint1: waypoint
+	YakEntry: waypoint
-		Location: 47,67
+		Location: 51,84
 		Owner: Neutral
 
 Smudges:
@@ -818,7 +654,6 @@ Rules:
 			GenericVisibility: Enemy, Ally, Neutral
 			GenericStancePrefix: false
 			ShowOwnerRow: false
-	PBOX:
 	JEEP:
 		Explodes:
 		JamsRadar:

mods/ra/maps/soviet-01/soviet01.lua

@@ -34,7 +34,6 @@ WorldLoaded = function()
 	player = Player.GetPlayer("USSR")
 	france = Player.GetPlayer("France")
 	germany = Player.GetPlayer("Germany")
-	turkey = Player.GetPlayer("Turkey")
 
 	Trigger.OnObjectiveAdded(player, function(p, id)
 		Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective")
@@ -62,11 +61,11 @@ WorldLoaded = function()
 end
 
 Tick = function()
-	if france.HasNoRequiredUnits() and germany.HasNoRequiredUnits() and turkey.HasNoRequiredUnits() then
+	if france.HasNoRequiredUnits() and germany.HasNoRequiredUnits() then
 		player.MarkCompletedObjective(VillageRaidObjective)
 	end
 
 	if player.HasNoRequiredUnits() then
 		france.MarkCompletedObjective(CivilProtectionObjective)
 	end
-end
+end