Add YR-specific TeamType properties

* Made RequiredAddOn optional

Author: ZivDero

src/TSMapEditor/Config/Events.ini

@@ -39,16 +39,16 @@ Name=No Event
 Description=This is a null event. There is no need to ever use this in a real trigger.
 
 [EnteredBy]
-Name=Entered by
+Name=Entered By
 Description=Triggers when any infantry or vehicle of given house enters an attached building or celltag. You can use -1 to mean "any house".
 P2Type=HouseType
 
 [SpiedUpon]
-Name=Spied upon
+Name=Spied Upon
 Description=Triggers when a spy has entered an attached building.
 
 [ThievedBy]
-Name=Thieved by
+Name=Thieved By
 Description=Triggers when a thief steals money from the specified house.
 Available=no ; thieves don't work
 P2Type=HouseType
@@ -148,7 +148,7 @@ P1Type=-1
 P2Type=TeamType
 
 [ZoneEntryBy]
-Name=Zone Entry by
+Name=Zone Entry By
 Description=Triggers when a unit of the specified house enters the same CellTag zone that this trigger is attached to.
 P2Type=HouseType
 
@@ -238,7 +238,7 @@ Name=Quarter Health (Any Source)
 Description=Triggers when damaged to quarter health from any source.
 
 [AttackedBy]
-Name=Attacked by
+Name=Attacked By
 Description=When attacked by some unit of specified house.
 P2Type=HouseType
 
@@ -261,12 +261,12 @@ P2Type=Number
 Name=Destroyed by Anything
 Description=Triggers when destroyed or captured or infiltrated by anything what-so-ever.
 
-[PickupCrate]
-Name=Pickup Crate
+[PickedUpCrate]
+Name=Picked Up Crate
 Description=When crate is picked up by an object attached to this trigger.
 
 [PickedUpCrateAny]
-Name=Picked up Crate (Any)
+Name=Picked Up Crate (Any)
 Description=When crate is picked up by any unit.
 
 [RandomDelay]

src/TSMapEditor/Config/UI/Windows/BasicSectionConfigWindow.ini

@@ -165,6 +165,7 @@ Text=Free Radar
 $X=getX(chkOfficial)
 $Y=getBottom(chkFreeRadar) + VERTICAL_SPACING
 Text=Enhanced Mode
+$Enabled=1 - USE_COUNTRIES
 
 ; Apply button
 

src/TSMapEditor/Config/UI/Windows/TeamTypesWindow.ini

@@ -19,21 +19,25 @@ $CC15=tbMax:EditorNumberTextBox
 $CC16=lblMax:XNALabel
 $CC17=tbTechLevel:EditorNumberTextBox
 $CC18=lblTechLevel:XNALabel
-$CC19=tbGroup:EditorNumberTextBox
-$CC20=lblGroup:XNALabel
-$CC21=tbWaypoint:EditorNumberTextBox
-$CC22=lblWaypoint:XNALabel
-$CC23=selTaskForce:EditorPopUpSelector
-$CC24=btnOpenTaskForce:EditorButton
-$CC25=lblTaskForce:XNALabel
-$CC26=selScript:EditorPopUpSelector
-$CC27=btnOpenScript:EditorButton
-$CC28=lblScript:XNALabel
-$CC29=selTag:EditorPopUpSelector
-$CC30=lblTag:XNALabel
+$CC19=ddMindControlDecision:XNADropDown
+$CC20=lblMindControlDecision:XNALabel
+$CC21=tbGroup:EditorNumberTextBox
+$CC22=lblGroup:XNALabel
+$CC23=tbWaypoint:EditorNumberTextBox
+$CC24=lblWaypoint:XNALabel
+$CC25=selTaskForce:EditorPopUpSelector
+$CC26=btnOpenTaskForce:EditorButton
+$CC27=lblTaskForce:XNALabel
+$CC28=selScript:EditorPopUpSelector
+$CC29=btnOpenScript:EditorButton
+$CC30=lblScript:XNALabel
+$CC31=selTag:EditorPopUpSelector
+$CC32=lblTag:XNALabel
+$CC33=tbTransportWaypoint:EditorNumberTextBox
+$CC34=lblTransportWaypoint:XNALabel
 ; Assign width before initializing panelBooleans so the panel can check the width of the window
 $Width=getRight(selTag) + EMPTY_SPACE_SIDES
-$CC31=panelBooleans:EditorPanel
+$CC35=panelBooleans:EditorPanel
 HasCloseButton=true
 
 
@@ -92,11 +96,14 @@ Text=Name:
 $X=getX(tbName)
 $Width=getWidth(tbName)
 $Y=getBottom(tbName) + VERTICAL_SPACING
+Option0=Regular
+Option1=Veteran
+Option2=Elite
 
 [lblVeteranLevel]
 $X=getX(lblName)
 $Y=getY(ddVeteranLevel) + 1
-Text=Veteran level:
+Text=Veteran Level:
 
 [ddHouse]
 $X=getX(tbName)
@@ -136,7 +143,25 @@ $Y=getBottom(tbMax) + VERTICAL_SPACING
 [lblTechLevel]
 $X=getX(lblName)
 $Y=getY(tbTechLevel) + 1
-Text=Tech level:
+Text=Tech Level:
+
+[ddMindControlDecision]
+$X=getX(tbName)
+$Width=getWidth(tbName)
+$Y=getBottom(tbTechLevel) + VERTICAL_SPACING
+$Enabled=USE_COUNTRIES
+Option0=None
+Option1=Add to Team
+Option2=Send to Grinder
+Option3=Send to Bio Reactor
+Option4=Go to Hunt
+Option5=Do Nothing
+
+[lblMindControlDecision]
+$X=getX(lblName)
+$Y=getY(ddMindControlDecision) + 1
+Text=On Mind Control:
+$Enabled=USE_COUNTRIES
 
 ; *************
 ; Second column
@@ -206,12 +231,24 @@ $X=getX(lblGroup)
 $Y=getY(lblMax)
 Text=Tag:
 
+[tbTransportWaypoint]
+$X=getX(tbGroup)
+$Width=getWidth(tbGroup)
+$Y=getY(tbTechLevel)
+$Enabled=USE_COUNTRIES
+
+[lblTransportWaypoint]
+$X=getX(lblGroup)
+$Y=getY(lblTechLevel)
+Text=Transport Wpt:
+$Enabled=USE_COUNTRIES
+
 ; **************
 ; Check boxes get generated dynamically on the area of panelBooleans
 ; **************
 
 [panelBooleans]
 $X=getX(lblSelectedTeamType)
-$Y=getBottom(tbTechLevel) + VERTICAL_SPACING
+$Y=(getBottom(ddMindControlDecision) * USE_COUNTRIES) + (getBottom(tbTechLevel) * (1 - USE_COUNTRIES)) + VERTICAL_SPACING
 $Width=getWidth(TeamTypesWindow) - getX(panelBooleans) - EMPTY_SPACE_SIDES
 $Height=getHeight(TeamTypesWindow) - getY(panelBooleans) - EMPTY_SPACE_BOTTOM

src/TSMapEditor/Models/BasicSection.cs

@@ -27,7 +27,7 @@ public class BasicSection : INIDefineable
         public int NewINIFormat { get; set; } = 4;
         public string NextScenario { get; set; }
         public string AltNextScenario { get; set; }
-        public int RequiredAddOn { get; set; }
+        public int? RequiredAddOn { get; set; }
         public bool SkipMapSelect { get; set; }
         public double CarryOverMoney { get; set; }
         public bool MultiplayerOnly { get; set; }

src/TSMapEditor/Models/TeamType.cs

@@ -29,6 +29,8 @@ public TeamType(string iniName)
         public int Max { get; set; }
         public int Priority { get; set; }
         public string Waypoint { get; set; }
+        public string TransportWaypoint { get; set; }
+        public int? MindControlDecision { get; set; }
         public int TechLevel { get; set; }
         public int VeteranLevel { get; set; }
 
@@ -67,6 +69,12 @@ public string GetHintText()
             }
 
             stringBuilder.Append("Waypoint: " + (string.IsNullOrWhiteSpace(Waypoint) ? Constants.NoneValue2 : Helpers.GetWaypointNumberFromAlphabeticalString(Waypoint)));
+
+            if (Constants.UseCountries)
+            {
+                stringBuilder.Append("TransportWaypoint: " + (string.IsNullOrWhiteSpace(TransportWaypoint) ? Constants.NoneValue2 : Helpers.GetWaypointNumberFromAlphabeticalString(TransportWaypoint)));
+            }
+
             stringBuilder.Append(Environment.NewLine + Environment.NewLine);
 
             if (VeteranLevel > 1)

src/TSMapEditor/UI/Windows/BasicSectionConfigWindow.cs

@@ -117,7 +117,10 @@ private void BtnApply_LeftClick(object sender, System.EventArgs e)
             map.Basic.IceGrowthEnabled = chkGrowingIce.Checked;
             map.Basic.TiberiumDeathToVisceroid = chkTiberiumDeathToVisceroid.Checked;
             map.Basic.FreeRadar = chkFreeRadar.Checked;
-            map.Basic.RequiredAddOn = chkRequiredAddOn.Checked ? 1 : 0;
+            if (!Constants.UseCountries)
+            {
+                map.Basic.RequiredAddOn = chkRequiredAddOn.Checked ? 1 : 0;
+            }
         }
     }
 }

src/TSMapEditor/UI/Windows/TeamTypesWindow.cs

@@ -46,6 +46,8 @@ public TeamTypesWindow(WindowManager windowManager, Map map) : base(windowManage
         private EditorNumberTextBox tbPriority;
         private EditorNumberTextBox tbMax;
         private EditorNumberTextBox tbTechLevel;
+        private XNADropDown ddMindControlDecision;
+        private EditorNumberTextBox tbTransportWaypoint;
         private EditorNumberTextBox tbGroup;
         private EditorNumberTextBox tbWaypoint;
         private EditorPopUpSelector selTaskForce;
@@ -71,6 +73,8 @@ public override void Initialize()
             tbPriority = FindChild<EditorNumberTextBox>(nameof(tbPriority));
             tbMax = FindChild<EditorNumberTextBox>(nameof(tbMax));
             tbTechLevel = FindChild<EditorNumberTextBox>(nameof(tbTechLevel));
+            ddMindControlDecision = FindChild<XNADropDown>(nameof(ddMindControlDecision));
+            tbTransportWaypoint = FindChild<EditorNumberTextBox>(nameof(tbTransportWaypoint));
             tbGroup = FindChild<EditorNumberTextBox>(nameof(tbGroup));
             tbWaypoint = FindChild<EditorNumberTextBox>(nameof(tbWaypoint));
             selTaskForce = FindChild<EditorPopUpSelector>(nameof(selTaskForce));
@@ -80,10 +84,6 @@ public override void Initialize()
             var panelBooleans = FindChild<EditorPanel>("panelBooleans");
             AddBooleanProperties(panelBooleans);
 
-            ddVeteranLevel.AddItem("Regular");
-            ddVeteranLevel.AddItem("Veteran");
-            ddVeteranLevel.AddItem("Elite");
-
             lbTeamTypes.SelectedIndexChanged += LbTeamTypes_SelectedIndexChanged;
 
             FindChild<EditorButton>("btnNewTeamType").LeftClick += BtnNewTeamType_LeftClick;
@@ -288,8 +288,10 @@ private void EditTeamType(TeamType teamType)
             tbPriority.TextChanged -= TbPriority_TextChanged;
             tbMax.TextChanged -= TbMax_TextChanged;
             tbTechLevel.TextChanged -= TbTechLevel_TextChanged;
+            ddMindControlDecision.SelectedIndexChanged -= DdMindControlDecision_SelectedIndexChanged;
             tbGroup.TextChanged -= TbGroup_TextChanged;
             tbWaypoint.TextChanged -= TbWaypoint_TextChanged;
+            tbTransportWaypoint.TextChanged -= TbTransportWaypoint_TextChanged;
             checkBoxes.ForEach(chk => chk.CheckedChanged -= FlagCheckBox_CheckedChanged);
 
             editedTeamType = teamType;
@@ -302,8 +304,11 @@ private void EditTeamType(TeamType teamType)
                 tbPriority.Text = string.Empty;
                 tbMax.Text = string.Empty;
                 tbTechLevel.Text = string.Empty;
+                ddMindControlDecision.SelectedIndex = -1;
+
                 tbGroup.Text = string.Empty;
                 tbWaypoint.Text = string.Empty;
+                tbTransportWaypoint.Text = string.Empty;
 
                 selTaskForce.Text = string.Empty;
                 selTaskForce.Tag = null;
@@ -328,6 +333,12 @@ private void EditTeamType(TeamType teamType)
             tbGroup.Value = editedTeamType.Group;
             tbWaypoint.Value = Helpers.GetWaypointNumberFromAlphabeticalString(editedTeamType.Waypoint);
 
+            if (Constants.UseCountries)
+            {
+                ddMindControlDecision.SelectedIndex = editedTeamType.MindControlDecision ?? -1;
+                tbTransportWaypoint.Value = Helpers.GetWaypointNumberFromAlphabeticalString(editedTeamType.TransportWaypoint);
+            }
+            
             if (editedTeamType.TaskForce != null)
                 selTaskForce.Text = editedTeamType.TaskForce.Name + " (" + editedTeamType.TaskForce.ININame + ")";
             else
@@ -351,8 +362,10 @@ private void EditTeamType(TeamType teamType)
             tbPriority.TextChanged += TbPriority_TextChanged;
             tbMax.TextChanged += TbMax_TextChanged;
             tbTechLevel.TextChanged += TbTechLevel_TextChanged;
+            ddMindControlDecision.SelectedIndexChanged += DdMindControlDecision_SelectedIndexChanged;
             tbGroup.TextChanged += TbGroup_TextChanged;
             tbWaypoint.TextChanged += TbWaypoint_TextChanged;
+            tbTransportWaypoint.TextChanged += TbTransportWaypoint_TextChanged;
             checkBoxes.ForEach(chk => chk.CheckedChanged += FlagCheckBox_CheckedChanged);
         }
 
@@ -370,6 +383,14 @@ private void TbWaypoint_TextChanged(object sender, EventArgs e)
             editedTeamType.Waypoint = Helpers.WaypointNumberToAlphabeticalString(tbWaypoint.Value);
         }
 
+        private void TbTransportWaypoint_TextChanged(object sender, EventArgs e)
+        {
+            if (Constants.UseCountries)
+            {
+                editedTeamType.TransportWaypoint = Helpers.WaypointNumberToAlphabeticalString(tbTransportWaypoint.Value);
+            }
+        }
+
         private void TbGroup_TextChanged(object sender, EventArgs e)
         {
             editedTeamType.Group = tbGroup.Value;
@@ -401,6 +422,14 @@ private void DdVeteranLevel_SelectedIndexChanged(object sender, EventArgs e)
             editedTeamType.VeteranLevel = ddVeteranLevel.SelectedIndex + 1;
         }
 
+        private void DdMindControlDecision_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (Constants.UseCountries)
+            {
+                editedTeamType.MindControlDecision = ddMindControlDecision.SelectedIndex;
+            }
+        }
+
         private void TbName_TextChanged(object sender, EventArgs e)
         {
             editedTeamType.Name = tbName.Text;