Merge pull request #10650 from pchote/remove-fragile-diplomacy

Remove fragile diplomacy.

mods/ra/chrome/ingame-diplomacy.yaml

@@ -1,91 +0,0 @@
-Background@INGAME_DIPLOMACY_BG:
-	Logic: DiplomacyLogic
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 490
-	Height: 355
-	Children:
-		Label@LABEL_TITLE:
-			X: (PARENT_RIGHT - WIDTH)/2
-			Y: 17
-			Width: 250
-			Height: 20
-			Text: Diplomacy
-			Align: Center
-			Font: Bold
-		Container@DIPLOMACY_HEADERS:
-			X: 20
-			Y: 40
-			Width: PARENT_RIGHT-40
-			Height: PARENT_BOTTOM
-			Children:
-				Label@PLAYER_HEADER:
-					X: 20
-					Width: 160
-					Height: 25
-					Font: Bold
-					Text: Player
-				Label@THEIR_STANCE_HEADER:
-					X: 210
-					Width: 80
-					Height: 25
-					Font: Bold
-					Text: Their Stance
-					Align: Center
-				Label@MY_STANCE_HEADER:
-					X: 307
-					Width: 100
-					Height: 25
-					Font: Bold
-					Text: My Stance
-					Align: Center
-		ScrollPanel@DIPLOMACY_PANEL:
-			X: 20
-			Y: 67
-			Width: PARENT_RIGHT-40
-			Height: PARENT_BOTTOM-87-35
-			TopBottomSpacing: 5
-			ItemSpacing: 5
-			Children:
-				ScrollItem@TEAM_TEMPLATE:
-					Width: PARENT_RIGHT
-					Height: 25
-					Children:
-						Label@TEAM:
-							X: 10
-							Width: PARENT_RIGHT
-							Height: PARENT_BOTTOM
-							Font: Bold
-				ScrollItem@PLAYER_TEMPLATE:
-					Width: PARENT_RIGHT-35
-					Height: 25
-					Children:
-						Image@FLAG:
-							X: 20
-							Y: 5
-							Width: 35
-							Height: PARENT_BOTTOM-5
-							ImageName: random
-							ImageCollection: flags
-						Label@PLAYER:
-							X: 55
-							Width: 160
-							Height: PARENT_BOTTOM
-							Font: Bold
-						Label@THEIR_STANCE:
-							X: 210
-							Width: 80
-							Height: PARENT_BOTTOM
-							Align: Center
-						DropDownButton@MY_STANCE:
-							X: 307
-							Width: 100
-							Height: PARENT_BOTTOM
-		Button@CLOSE:
-			X: PARENT_RIGHT-145
-			Y: PARENT_BOTTOM - 45
-			Width: 120
-			Height: 25
-			Text: Close
-			Key: escape
-			Font: Bold

mods/ra/chrome/ingame-player.yaml

@@ -115,25 +115,6 @@ Container@PLAYER_WIDGETS:
 									Y: 6
 									ImageCollection: order-icons
 									ImageName: debug
-						MenuButton@DIPLOMACY_BUTTON:
-							Logic: AddFactionSuffixLogic
-							MenuContainer: INGAME_DIPLOMACY_BG
-							HideIngameUI: false
-							Pause: false
-							Key: P
-							X: 160
-							Width: 28
-							Height: 28
-							Background: sidebar-button
-							TooltipText: Diplomacy
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Children:
-								Image@ICON:
-									X: 6
-									Y: 6
-									ImageCollection: order-icons
-									ImageName: diplomacy
 						MenuButton@OPTIONS_BUTTON:
 							Logic: AddFactionSuffixLogic
 							Key: escape

mods/ra/chrome/lobby-options.yaml

@@ -18,39 +18,34 @@ Background@LOBBY_OPTIONS_BIN:
 			Height: PARENT_BOTTOM-75
 			Children:
 				Checkbox@EXPLORED_MAP_CHECKBOX:
-					Width: 140
+					Width: 150
 					Height: 20
 					Text: Explored Map
 				Checkbox@FOG_CHECKBOX:
 					Y: 35
-					Width: 140
+					Width: 150
 					Height: 20
 					Text: Fog of War
-				Checkbox@SHORTGAME_CHECKBOX:
-					X: 150
-					Width: 140
-					Height: 20
-					Text: Short Game
 				Checkbox@CRATES_CHECKBOX:
-					X: 150
-					Y: 35
-					Width: 140
+					X: 170
+					Width: 225
 					Height: 20
 					Text: Crates
 				Checkbox@ALLYBUILDRADIUS_CHECKBOX:
-					X: 290
-					Width: 140
+					X: 170
+					Y: 35
+					Width: 225
 					Height: 20
 					Text: Build off Allies' ConYards
-				Checkbox@FRAGILEALLIANCES_CHECKBOX:
-					X: 290
-					Y: 35
-					Width: 140
+				Checkbox@SHORTGAME_CHECKBOX:
+					X: 400
+					Width: 150
 					Height: 20
-					Text: Diplomacy Changes
+					Text: Short Game
 				Checkbox@ALLOWCHEATS_CHECKBOX:
-					Y: 70
-					Width: 140
+					X: 400
+					Y: 35
+					Width: 150
 					Height: 20
 					Text: Debug Menu
 				Label@DIFFICULTY_DESC:

mods/ra/maps/monster-tank-madness/map.yaml

@@ -42,7 +42,7 @@ Players:
 		Color: ABB7E4
 		LockSpawn: True
 		LockTeam: True
-		Enemies: BadGuy, USSR, Ukraine, Turkey
+		Enemies: BadGuy, USSR, Ukraine, Turkey, FriendlyMadTanks
 	PlayerReference@BadGuy:
 		Name: BadGuy
 		Faction: soviet
@@ -71,6 +71,12 @@ Players:
 		Faction: soviet
 		Color: D1987C
 		Enemies: Greece, BadGuy, USSR, Ukraine, Outpost
+	PlayerReference@FriendlyMadTanks:
+		Name: FriendlyMadTanks
+		Faction: soviet
+		Color: D1987C
+		Allies: Greece
+		Enemies: BadGuy, USSR, Ukraine
 	PlayerReference@Outpost:
 		Name: Outpost
 		NonCombatant: True

mods/ra/maps/monster-tank-madness/monster-tank-madness.lua

@@ -124,11 +124,9 @@ LandingPossible = function()
 end
 
 SuperTankDomeInfiltrated = function()
-	turkey.SetStance(player, "Ally")
-	turkey.SetStance(neutral, "Ally")
-
 	SuperTankAttack = true
 	Utils.Do(SuperTanks, function(tnk)
+		tnk.Owner = friendlyMadTanks
 		if not tnk.IsDead then
 			Trigger.ClearAll(tnk)
 			tnk.Stop()
@@ -276,6 +274,7 @@ InitPlayers = function()
 	ussr = Player.GetPlayer("USSR")
 	ukraine = Player.GetPlayer("Ukraine")
 	turkey = Player.GetPlayer("Turkey")
+	friendlyMadTanks = Player.GetPlayer("FriendlyMadTanks")
 
 	player.Cash = 0
 	ussr.Cash = 2000

mods/ra/mod.yaml

@@ -80,7 +80,6 @@ Assemblies:
 ChromeLayout:
 	./mods/ra/chrome/ingame.yaml
 	./mods/ra/chrome/ingame-chat.yaml
-	./mods/ra/chrome/ingame-diplomacy.yaml
 	./mods/ra/chrome/ingame-fmvplayer.yaml
 	./mods/ra/chrome/ingame-info.yaml
 	./mods/ra/chrome/ingame-infoscripterror.yaml