Fix multiple bugs where translating colors caused colors to stop working

Author: Rampastring

src/TSMapEditor/Models/TriggerCondition.cs

@@ -10,8 +10,8 @@ namespace TSMapEditor.Models
     /// </summary>
     public class TriggerCondition : ICloneable
     {
-        public const int DEF_PARAM_COUNT = 2;
-        public const int MAX_PARAM_COUNT = 4;
+        public const int DEF_PARAM_COUNT = TriggerEventType.DEF_PARAM_COUNT;
+        public const int MAX_PARAM_COUNT = TriggerEventType.MAX_PARAM_COUNT;
 
         public TriggerCondition()
         {

src/TSMapEditor/UI/UIHelpers.cs

@@ -1,6 +1,8 @@
 using Rampastring.XNAUI.Input;
 using Rampastring.XNAUI.XNAControls;
 using System.Collections.Generic;
+using TSMapEditor.Misc;
+using TSMapEditor.Models;
 using TSMapEditor.UI.Controls;
 
 namespace TSMapEditor.UI
@@ -51,5 +53,18 @@ public static T GetScrollItem<T>(List<T> list, T current, Cursor cursor, bool al
 
             return current;
         }
+
+        public static void AddColorOptionsToDropDown(NamedColor[] colors, XNADropDown dropDown)
+        {
+            foreach (var supportedColor in colors)
+            {
+                dropDown.AddItem(new XNADropDownItem()
+                {
+                    Text = Translate("NamedColors." + supportedColor.Name, supportedColor.Name),
+                    TextColor = supportedColor.Value,
+                    Tag = supportedColor.Name
+                });
+            }
+        }
     }
 }

src/TSMapEditor/UI/Windows/PlaceWaypointWindow.cs

@@ -45,7 +45,7 @@ public override void Initialize()
             // Init color dropdown options
             ddWaypointColor = FindChild<XNADropDown>(nameof(ddWaypointColor));
             ddWaypointColor.AddItem(Translate(this, "None", "None"));
-            Array.ForEach(Waypoint.SupportedColors, sc => ddWaypointColor.AddItem(Translate("NamedColors." + sc.Name, sc.Name), sc.Value));
+            UIHelpers.AddColorOptionsToDropDown(Waypoint.SupportedColors, ddWaypointColor);
         }
 
         private void BtnPlace_LeftClick(object sender, EventArgs e)
@@ -79,7 +79,7 @@ public bool PlaceWaypoint(int waypointNumber, Point2D cellCoords)
                 return false;
             }
 
-            string waypointColor = ddWaypointColor.SelectedItem != null ? ddWaypointColor.SelectedItem.Text : null;
+            string waypointColor = ddWaypointColor.SelectedItem != null ? (string)ddWaypointColor.SelectedItem.Tag : null;
 
             mutationManager.PerformMutation(new PlaceWaypointMutation(mutationTarget, cellCoords, waypointNumber, waypointColor));
             return true;

src/TSMapEditor/UI/Windows/ScriptsWindow.cs

@@ -245,13 +245,10 @@ public override void Initialize()
             btnEditorPresetValues = FindChild<MenuButton>(nameof(btnEditorPresetValues));
             btnEditorPresetValuesWindow = FindChild<EditorButton>(nameof(btnEditorPresetValuesWindow));
             lblActionDescriptionValue = FindChild<XNALabel>(nameof(lblActionDescriptionValue));
-            ddScriptColor = FindChild<XNADropDown>(nameof(ddScriptColor));            
+            ddScriptColor = FindChild<XNADropDown>(nameof(ddScriptColor));
 
             ddScriptColor.AddItem(Translate(this, "None", "None"));
-            Array.ForEach(Script.SupportedColors, supportedColor =>
-            {
-                ddScriptColor.AddItem(Translate("NamedColors." + supportedColor.Name, supportedColor.Name), supportedColor.Value);
-            });
+            UIHelpers.AddColorOptionsToDropDown(Script.SupportedColors, ddScriptColor);
 
             tbFilter.TextChanged += TbFilter_TextChanged;
 
@@ -619,7 +616,7 @@ private void DdScriptColor_SelectedIndexChanged(object sender, EventArgs e)
                 return;
             }
 
-            editedScript.EditorColor = ddScriptColor.SelectedItem.Text;
+            editedScript.EditorColor = (string)ddScriptColor.SelectedItem.Tag;
             lbScriptTypes.SelectedItem.TextColor = ddScriptColor.SelectedItem.TextColor.Value;
         }
 
@@ -1081,7 +1078,7 @@ private void EditScript(Script script)
                 lbActions.AddTaggedItem(new ScriptListBoxItemTag(actionEntry, text, description));
             }
 
-            ddScriptColor.SelectedIndex = ddScriptColor.Items.FindIndex(item => item.Text == editedScript.EditorColor);
+            ddScriptColor.SelectedIndex = ddScriptColor.Items.FindIndex(item => (string)item.Tag == editedScript.EditorColor);
             if (ddScriptColor.SelectedIndex < 0)
                 ddScriptColor.SelectedIndex = 0;
 

src/TSMapEditor/UI/Windows/TeamTypesWindow.cs

@@ -113,10 +113,7 @@ public override void Initialize()
             ddTeamTypeColor = FindChild<XNADropDown>(nameof(ddTeamTypeColor));
 
             ddTeamTypeColor.AddItem(Translate(this, "HouseColor", "House Color"));
-            foreach (var supportedColor in TeamType.SupportedColors)
-            {
-                ddTeamTypeColor.AddItem(Translate("NamedColors." + supportedColor.Name, supportedColor.Name), supportedColor.Value);
-            }
+            UIHelpers.AddColorOptionsToDropDown(TeamType.SupportedColors, ddTeamTypeColor);
             ddTeamTypeColor.SelectedIndexChanged += DdTeamTypeColor_SelectedIndexChanged;
 
             tbFilter.TextChanged += TbFilter_TextChanged;
@@ -675,7 +672,7 @@ private void EditTeamType(TeamType teamType)
             tbMax.Value = editedTeamType.Max;
             tbTechLevel.Value = editedTeamType.TechLevel;
 
-            ddTeamTypeColor.SelectedIndex = ddTeamTypeColor.Items.FindIndex(item => item.Text == editedTeamType.EditorColor);
+            ddTeamTypeColor.SelectedIndex = ddTeamTypeColor.Items.FindIndex(item => (string)item.Tag == editedTeamType.EditorColor);
             if (ddTeamTypeColor.SelectedIndex == -1)
                 ddTeamTypeColor.SelectedIndex = 0;
 
@@ -743,7 +740,7 @@ private void TbTransportWaypoint_TextChanged(object sender, EventArgs e)
 
         private void DdTeamTypeColor_SelectedIndexChanged(object sender, EventArgs e)
         {
-            editedTeamType.EditorColor = ddTeamTypeColor.SelectedIndex < 1 ? null : ddTeamTypeColor.SelectedItem.Text;
+            editedTeamType.EditorColor = ddTeamTypeColor.SelectedIndex < 1 ? null : (string)ddTeamTypeColor.SelectedItem.Tag;
             lbTeamTypes.SelectedItem.TextColor = editedTeamType.GetXNAColor();
         }
 

src/TSMapEditor/UI/Windows/TriggersWindow.cs

@@ -158,10 +158,7 @@ public override void Initialize()
             // Init color dropdown options
             ddTriggerColor = FindChild<XNADropDown>(nameof(ddTriggerColor));
             ddTriggerColor.AddItem(Translate(this, "Color.None", "None"));
-            Array.ForEach(Trigger.SupportedColors, sc =>
-            {
-                ddTriggerColor.AddItem(Translate("NamedColors." + sc.Name, sc.Name), sc.Value);
-            });
+            UIHelpers.AddColorOptionsToDropDown(Trigger.SupportedColors, ddTriggerColor);
 
             lbEvents = FindChild<EditorListBox>(nameof(lbEvents));
             selEventType = FindChild<EditorPopUpSelector>(nameof(selEventType));
@@ -1923,6 +1920,7 @@ private void EventWindowDarkeningPanel_Hidden(object sender, EventArgs e)
             {
                 var condition = new TriggerCondition(triggerEventType);
                 editedTrigger.Conditions.Add(condition);
+                SetTriggerEventHardcodedParameters(condition);
                 EditTrigger(editedTrigger);
                 lbEvents.SelectedIndex = lbEvents.Items.Count - 1;
 
@@ -2348,7 +2346,7 @@ private void EditTrigger(Trigger trigger)
             chkEasy.Checked = editedTrigger.Easy;
             chkMedium.Checked = editedTrigger.Normal;
             chkHard.Checked = editedTrigger.Hard;
-            ddTriggerColor.SelectedIndex = ddTriggerColor.Items.FindIndex(item => item.Text == editedTrigger.EditorColor);
+            ddTriggerColor.SelectedIndex = ddTriggerColor.Items.FindIndex(item => (string)item.Tag == editedTrigger.EditorColor);
             if (ddTriggerColor.SelectedIndex < 0)
                 ddTriggerColor.SelectedIndex = 0;
 
@@ -2407,7 +2405,7 @@ private void DdTriggerColor_SelectedIndexChanged(object sender, EventArgs e)
                 return;
             }
 
-            editedTrigger.EditorColor = ddTriggerColor.SelectedItem.Text;
+            editedTrigger.EditorColor = (string)ddTriggerColor.SelectedItem.Tag;
             lbTriggers.SelectedItem.TextColor = ddTriggerColor.SelectedItem.TextColor.Value;
         }