AI Modifier DropDown (#389)

* AI Modifiers

* Update MultiplayerGameLobby.ini

* Update MPMaps / MPMapsBase

* Folder for AI Modifier Files

* Update Extreme AI.ini

* Update Extreme AI.ini

package/INI/Game Options/AI/Brutal AI.ini

@@ -0,0 +1,6 @@
+[General]
+TeamDelays=500,1000,1500
+AIVirtualPurifiers=10,10,10
+MinimumAIDefensiveTeams=0,0,0
+MaximumAIDefensiveTeams=0,0,0
+DissolveUnfilledTeamDelay=2500

package/INI/Game Options/Brutal AI.ini → package/INI/Game Options/AI/Extreme AI.ini

@@ -3,7 +3,7 @@
 IgnoreGlobalAITriggers=yes
 
 
-;Values Needed for new Brutal AI
+;Values Needed for new Extreme AI
 [AI]
 BuildPower=NAPOWR,GAPOWR,YAPOWR,NANRCT
 BuildBarracks=NAHAND,GAPILE,YABRCK
@@ -24,15 +24,15 @@ HelipadLimit=2
 AirstripRatio=.12
 AirstripLimit=0
 BaseSizeAdd=10;6
-AIBaseSpacing=1;2
+AIBaseSpacing=2
 AttackInterval=0.2
-AttackDelay=0.4;0.2
+AttackDelay=0.2
 MaximumBaseDefenseValue=100
 TeslaRatio=.2
 TeslaLimit=20
 
 
-;Values Needed for new Brutal AI
+;Values Needed for new Extreme AI
 [General]
 TeamDelays=100,500,1000
 AIVirtualPurifiers=50,24,12
@@ -86,7 +86,7 @@ AITriggerFailureWeightDelta=-5
 CurleyShuffle=no
 
 
-;Make sure all AI difficulty levels are affected by 'Brutal AI'
+;Make sure all AI difficulty levels are affected by Extreme AI
 [Easy]
 BuildTime=.5
 BuildDelay=.01
@@ -278,7 +278,7 @@ TargetDistanceCoefficient=-1
 TargetDistanceCoefficient=-1
 
 
-; New AI Buildings
+;New AI Buildings
 [BuildingTypes]
 1000=RAZER-GAWEAP0
 1001=RAZER-NAWEAP0
@@ -295,7 +295,6 @@ TargetDistanceCoefficient=-1
 1012=RAZER-YAYARD
 1013=RAZER-GTGCAN
 
-
 ;Decrease the amount of pillbox spam from AI
 [GAPILL]
 AntiInfantryValue=15
@@ -306,27 +305,7 @@ AIBuildThis=yes
 [NADEPT]
 AIBuildThis=yes
 
-;WantsExtraSpace=yes adds +1 to AIBaseSpacing
-[GAWEAP]
-WantsExtraSpace=yes
-[NAWEAP]
-WantsExtraSpace=yes
-[YAWEAP]
-WantsExtraSpace=yes
-[GAPILE]
-WantsExtraSpace=yes
-[NAHAND]
-WantsExtraSpace=yes
-[YABRCK]
-WantsExtraSpace=yes
-[GAREFN]
-WantsExtraSpace=yes
-[NAREFN]
-WantsExtraSpace=yes
-[YAREFN]
-WantsExtraSpace=yes
-
-; AI Buildings
+;AI Buildings
 [RAZER-GAWEAP0]
 Image=GAWEAP
 UIName=Name:GAWEAP

package/INI/MPMaps.ini

@@ -51,7 +51,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkDisableSuperWeapons=false
 chkSuperWeapons=true
@@ -80,7 +80,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkBuildOffAlly=true
 chkNoSpawnPreviews=false
@@ -105,7 +105,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkDisableSuperWeapons=false
 chkSuperWeapons=true
@@ -135,7 +135,7 @@ chkCrates=false
 chkMultiEng=false
 chkIngameAllying=false
 chkNoDogEngiEat=false
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=True
 chkBuildOffAlly=true
 chkRA2Mode=false
@@ -215,7 +215,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkSuperWeapons=true
 chkBuildOffAlly=true

package/INI/MPMapsBase.ini

@@ -45,7 +45,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkDisableSuperWeapons=false
 chkSuperWeapons=true
@@ -74,7 +74,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkBuildOffAlly=true
 chkNoSpawnPreviews=false
@@ -99,7 +99,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkDisableSuperWeapons=false
 chkSuperWeapons=true
@@ -129,7 +129,7 @@ chkCrates=false
 chkMultiEng=false
 chkIngameAllying=false
 chkNoDogEngiEat=false
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=True
 chkBuildOffAlly=true
 chkRA2Mode=false
@@ -209,7 +209,7 @@ chkShortGame=true
 chkRedeplMCV=true
 chkCrates=false
 chkIngameAllying=true
-chkBrutalAI=false
+cmbAIModifier=0
 chkDestrBridges=true
 chkSuperWeapons=true
 chkBuildOffAlly=true

package/Resources/MultiplayerGameLobby.ini

@@ -181,7 +181,7 @@ $CC-GO11=lblStartingUnits:XNALabel
 $CC-GO12=cmbStartingUnits:GameLobbyDropDown
 
 ; Right column
-$CC-GO13=chkBrutalAI:GameLobbyCheckBox
+;$CC-GO13=chkBrutalAI:GameLobbyCheckBox
 $CC-GO14=chkDestrBridges:GameLobbyCheckBox
 $CC-GO15=chkSuperWeapons:GameLobbyCheckBox
 $CC-GO16=chkBuildOffAlly:GameLobbyCheckBox
@@ -191,7 +191,8 @@ $CC-GO19=chkNoSpawnPreviews:GameLobbyCheckBox
 $CC-GO20=chkNoYuriNoFrance:GameLobbyCheckBox
 $CC-GO21=chkNoSpy:GameLobbyCheckBox
 $CC-GO06=chkNoDogEngiEat:GameLobbyCheckBox
-
+$CC-G022=lblAIModifier:XNALabel
+$CC-G023=cmbAIModifier:GameLobbyDropDown
 $CC01=BtnSaveLoadGameOptions:XNAClientButton
 
 [BtnSaveLoadGameOptions]
@@ -393,24 +394,26 @@ SpawnIniOption=BridgeDestroy
 Checked=True
 ToolTip=You can destroy low bridges by force-firing on them.
 Text=Destroyable Bridges
-$Y=getBottom(chkBrutalAI) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$Y=5
+$X=getWidth($ParentControl) / 2
+;$Y=getBottom(chkBrutalAI) + GAME_OPTION_GAP
+;$X=getX(chkBrutalAI)
 
 [chkSuperWeapons]
 SpawnIniOption=Superweapons
 Checked=True
 DistanceFromRightBorder=130
 Text=Superweapons
 $Y=getBottom(chkDestrBridges) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkBuildOffAlly]
 SpawnIniOption=BuildOffAlly
 Checked=True
 ToolTip=Check to allow players to build near their allies' buildings.
 Text=Build Off Ally ConYards
 $Y=getBottom(chkSuperWeapons) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkRA2Mode]
 SpawnIniOption=Ra2Mode
@@ -419,23 +422,23 @@ ToolTip=Red Alert 2 Classic Mode will turn gameplay into Red Alert 2.
 Text=Red Alert 2
 DisallowedSideIndex=9
 $Y=getBottom(chkBuildOffAlly) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkBalancePatch]
 CustomIniPath=INI\Game Options\Yuri Rebalance Patch.ini
 DefaultValue=False
 ToolTip=Yuri's Revenge Rebalance 2.0@Patch notes: https://forums.cncnet.org/topic/11738-yuris-revenge-rebalanced-20/
 Text=YR Rebalance 2.0
 $Y=getBottom(chkRA2Mode) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkNoSpawnPreviews]
 CustomIniPath=INI\Game Options\No Spawn Previews.ini
 DefaultValue=False
 ToolTip=Start locations for players won't be shown in the loading screen.
 Text=No Spawn Previews
 $Y=getBottom(chkBalancePatch) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkNoYuriNoFrance]
 CustomIniPath=INI\Game Options\No_France_No_Yuri.ini
@@ -444,15 +447,15 @@ ToolTip=Yuri and France factions are disabled
 Text=No Yuri/No France
 DisallowedSideIndices=2,9
 $Y=getBottom(chkNoSpawnPreviews) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkNoSpy]
 CustomIniPath=INI\Game Options\No_Spy.ini
 DefaultValue=False
 ToolTip=Spies are disabled
 Text=No Spy
 $Y=getBottom(chkNoYuriNoFrance) + GAME_OPTION_GAP
-$X=getX(chkBrutalAI)
+$X=getX(chkDestrBridges)
 
 [chkNoDogEngiEat]
 CustomIniPath=INI\Game Options\No Dog Engi Eat.ini
@@ -462,6 +465,23 @@ Text=No Dog Engineer Kills
 $X=getX(chkNoSpy)
 $Y=getBottom(chkNoSpy) + GAME_OPTION_GAP
 
+[lblAIModifier]
+Text=AI Modifier:
+$X=getX(chkNoDogEngiEat)
+$Y=getBottom(chkNoDogEngiEat) + 13
+
+[cmbAIModifier]
+OptionName=AI Modifier
+ItemLabels=None,Brutal AI,Extreme AI
+Items=INI\Game Options\AI\No Change.ini,INI\Game Options\AI\Brutal AI.ini,INI\Game Options\AI\Extreme AI.ini
+DefaultIndex=0
+SpawnIniOption=String
+DataWriteMode=MapCode
+$X=getX(chkNoDogEngiEat)
+$Y=getBottom(lblAIModifier)
+$Width=GAME_OPTION_DD_WIDTH
+$Height=DEFAULT_CONTROL_HEIGHT
+
 [btnCnCNet]
 Location=0,0
 Size=133,23