Add logical support for listing global TaskForces, Scripts and TeamTypes in their selection windows

Rampastring · Rampastring · commit e97c75458760 · 2026-03-22T14:14:21.000+02:00
Checkboxes for the feature are disabled by default to avoid overwhelming users, especially new users
diff --git a/src/TSMapEditor/Config/Default/UI/Windows/SelectScriptWindow.ini b/src/TSMapEditor/Config/Default/UI/Windows/SelectScriptWindow.ini
@@ -2,9 +2,10 @@
 $Width=300
 $Height=RESOLUTION_HEIGHT - 100
 $CC0=lblDescription:XNALabel
-$CC1=tbSearch:EditorSuggestionTextBox
-$CC2=btnSelect:EditorButton
-$CC3=lbObjectList:EditorListBox
+$CC1=chkIncludeGlobalScripts:XNACheckBox
+$CC2=tbSearch:EditorSuggestionTextBox
+$CC3=btnSelect:EditorButton
+$CC4=lbObjectList:EditorListBox
 HasCloseButton=true
 
 
@@ -14,9 +15,16 @@ $Y=EMPTY_SPACE_TOP
 FontIndex=1
 $Text=translate(Select Script:)
 
-[tbSearch]
+[chkIncludeGlobalScripts]
 $X=EMPTY_SPACE_SIDES
 $Y=getBottom(lblDescription) + EMPTY_SPACE_TOP
+$Text=translate(Include Global Scripts)
+; We don't want this check box to be available by default. Comment out or remove the line below to enable it.
+$Enabled=0
+
+[tbSearch]
+$X=EMPTY_SPACE_SIDES
+$Y=ifElse(isVisible(chkIncludeGlobalScripts), getBottom(chkIncludeGlobalScripts) + VERTICAL_SPACING, getBottom(lblDescription) + EMPTY_SPACE_TOP)
 $Width=getWidth(SelectScriptWindow) - (EMPTY_SPACE_SIDES * 2)
 $Suggestion=translate(Search Scripts...)
 
diff --git a/src/TSMapEditor/Config/Default/UI/Windows/SelectTaskForceWindow.ini b/src/TSMapEditor/Config/Default/UI/Windows/SelectTaskForceWindow.ini
@@ -2,9 +2,10 @@
 $Width=300
 $Height=RESOLUTION_HEIGHT - 100
 $CC0=lblDescription:XNALabel
-$CC1=tbSearch:EditorSuggestionTextBox
-$CC2=btnSelect:EditorButton
-$CC3=lbObjectList:EditorListBox
+$CC1=chkIncludeGlobalTaskForces:XNACheckBox
+$CC2=tbSearch:EditorSuggestionTextBox
+$CC3=btnSelect:EditorButton
+$CC4=lbObjectList:EditorListBox
 HasCloseButton=true
 
 
@@ -14,9 +15,16 @@ $Y=EMPTY_SPACE_TOP
 FontIndex=1
 $Text=translate(Select TaskForce:)
 
-[tbSearch]
+[chkIncludeGlobalTaskForces]
 $X=EMPTY_SPACE_SIDES
 $Y=getBottom(lblDescription) + EMPTY_SPACE_TOP
+$Text=translate(Include Global TaskForces)
+; We don't want this check box to be available by default. Comment out or remove the line below to enable it.
+$Enabled=0
+
+[tbSearch]
+$X=EMPTY_SPACE_SIDES
+$Y=ifElse(isVisible(chkIncludeGlobalTaskForces), getBottom(chkIncludeGlobalTaskForces) + VERTICAL_SPACING, getBottom(lblDescription) + EMPTY_SPACE_TOP)
 $Width=getWidth(SelectTaskForceWindow) - (EMPTY_SPACE_SIDES * 2)
 $Suggestion=translate(Search TaskForce...)
 
diff --git a/src/TSMapEditor/Config/Default/UI/Windows/SelectTeamTypeWindow.ini b/src/TSMapEditor/Config/Default/UI/Windows/SelectTeamTypeWindow.ini
@@ -2,9 +2,10 @@
 $Width=300
 $Height=RESOLUTION_HEIGHT - 100
 $CC0=lblDescription:XNALabel
-$CC1=tbSearch:EditorSuggestionTextBox
-$CC2=btnSelect:EditorButton
-$CC3=lbObjectList:EditorListBox
+$CC1=chkIncludeGlobalTeamTypes:XNACheckBox
+$CC2=tbSearch:EditorSuggestionTextBox
+$CC3=btnSelect:EditorButton
+$CC4=lbObjectList:EditorListBox
 HasCloseButton=true
 
 
@@ -14,9 +15,16 @@ $Y=EMPTY_SPACE_TOP
 FontIndex=1
 $Text=translate(Select TeamType:)
 
-[tbSearch]
+[chkIncludeGlobalTeamTypes]
 $X=EMPTY_SPACE_SIDES
 $Y=getBottom(lblDescription) + EMPTY_SPACE_TOP
+$Text=translate(Include Global TeamTypes)
+; We don't want this check box to be available by default. Comment out or remove the line below to enable it.
+$Enabled=0
+
+[tbSearch]
+$X=EMPTY_SPACE_SIDES
+$Y=ifElse(isVisible(chkIncludeGlobalTeamTypes), getBottom(chkIncludeGlobalTeamTypes) + VERTICAL_SPACING, getBottom(lblDescription) + EMPTY_SPACE_TOP)
 $Width=getWidth(SelectTeamTypeWindow) - (EMPTY_SPACE_SIDES * 2)
 $Suggestion=translate(Search TeamType...)
 
diff --git a/src/TSMapEditor/Config/Translations/en/Translation_en.ini b/src/TSMapEditor/Config/Translations/en/Translation_en.ini
@@ -359,6 +359,16 @@ WindowController.NoTriggerAttached.Description=The specified Tag has no attached
 ListExtensions.TaskForceParseError=Failed to load TaskForce {0}. It might be missing a section or be otherwise invalid.
 ListExtensions.TeamTypes.TaskForceNotFound=TeamType {0} has an invalid TaskForce ({1}) specified!
 
+; *************************************************
+;                     Hint texts
+; *************************************************
+
+TaskForce.GetHintText.Contains=Contains:
+TaskForce.GetHintText.TotalCost=Total Cost: ${0}
+TeamType.GetHintText.Owner=Owner: {0}
+TeamType.GetHintText.Script=Script: {0}
+TeamType.GetHintText.Waypoint=Waypoint: {0}
+
 ; *************************************************
 ;                    TileSelector
 ; *************************************************
@@ -397,6 +407,7 @@ TileInfoDisplay.CellTag=CellTag:\s
 TileInfoDisplay.UsagesOfWaypoint=Usages of waypoint {0}:
 TileInfoDisplay.TriggerInWaypoint=trigger '{0}',\s
 TileInfoDisplay.ScriptInWaypoint=script '{0}',\s
+TileInfoDisplay.TeamTypeInwaypoint=team '{0}',\s
 
 ; *************************************************
 ;                   TopBarMenu
@@ -1009,6 +1020,7 @@ SelectScriptActionWindow.tbSearch.Suggestion=Search script action...
 SelectScriptActionWindow.btnSelect.Text=Select
 
 SelectScriptWindow.lblDescription.Text=Select Script:
+SelectScriptWindow.chkIncludeGlobalScripts.Text=Include Global Scripts
 SelectScriptWindow.tbSearch.Suggestion=Search Script...
 SelectScriptWindow.btnSelect.Text=Select
 
@@ -1033,12 +1045,15 @@ SelectTagWindow.tbSearch.Suggestion=Search Tag...
 SelectTagWindow.btnSelect.Text=Select
 
 SelectTaskForceWindow.lblDescription.Text=Select TaskForce:
+SelectTaskForceWindow.chkIncludeGlobalTaskForces.Text=Include Global TaskForces
 SelectTaskForceWindow.tbSearch.Suggestion=Search TaskForce...
 SelectTaskForceWindow.btnSelect.Text=Select
 
 SelectTeamTypeWindow.lblDescription.Text=Select TeamType:
+SelectTeamTypeWindow.chkIncludeGlobalTeamTypes.Text=Include Global TeamTypes
 SelectTeamTypeWindow.tbSearch.Suggestion=Search TeamType...
 SelectTeamTypeWindow.btnSelect.Text=Select
+SelectTeamTypeWindow.None=None
 
 SelectTechnoTypeWindow.lblDescription.Text=Select Techno Type:
 SelectTechnoTypeWindow.tbSearch.Suggestion=Search Techno Type...
diff --git a/src/TSMapEditor/UI/Parser.cs b/src/TSMapEditor/UI/Parser.cs
@@ -398,6 +398,17 @@ private int GetFunctionIntegerValue()
                 case "horizontalCenterOnParent":
                     parsingControl.CenterOnParentHorizontally();
                     return parsingControl.X;
+                case "isVisible":
+                    return GetControl(parameters[0]).Visible ? 1 : 0;
+                case "ifElse":
+                    if (parameters.Count != 3)
+                        throw new INIConfigException($"Incorrect number of parameters for function {functionName} in expression {Input}");
+
+                    bool selector = GetExprValueWithContextSave(parameters[0], parsingControl) > 0;
+                    if (selector)
+                        return GetExprValueWithContextSave(parameters[1], parsingControl);
+
+                    return GetExprValueWithContextSave(parameters[2], parsingControl);
 
                 default:
                     throw new INIConfigException("Unknown function " + functionName + " in expression " + Input);
diff --git a/src/TSMapEditor/UI/Windows/SelectScriptWindow.cs b/src/TSMapEditor/UI/Windows/SelectScriptWindow.cs
@@ -1,6 +1,8 @@
-﻿using System;
-using Rampastring.XNAUI;
+﻿using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using TSMapEditor.Models;
 
 namespace TSMapEditor.UI.Windows
@@ -14,10 +16,15 @@ public SelectScriptWindow(WindowManager windowManager, Map map) : base(windowMan
 
         private readonly Map map;
 
+        private XNACheckBox chkIncludeGlobalScripts;
+
         public override void Initialize()
         {
             Name = nameof(SelectScriptWindow);
             base.Initialize();
+
+            chkIncludeGlobalScripts = FindChild<XNACheckBox>(nameof(chkIncludeGlobalScripts));
+            chkIncludeGlobalScripts.CheckedChanged += (_, _) => ListObjects();
         }
 
         protected override void LbObjectList_SelectedIndexChanged(object sender, EventArgs e)
@@ -35,14 +42,19 @@ protected override void ListObjects()
         {
             lbObjectList.Clear();
 
-            foreach (Script script in map.Scripts)
+            IEnumerable<Script> list = map.Scripts;
+            if (chkIncludeGlobalScripts.Checked)
+                list = map.Scripts.UnionBy(map.Rules.Scripts, script => script.ININame);
+
+            foreach (Script script in list)
             {
                 lbObjectList.AddItem(new XNAListBoxItem() 
                 {
                     Text = $"{script.Name} ({script.ININame})",
                     Tag = script,
                     TextColor = script.EditorColor == null ? lbObjectList.DefaultItemColor : script.XNAColor
                 });
+
                 if (script == SelectedObject)
                     lbObjectList.SelectedIndex = lbObjectList.Items.Count - 1;
             }
diff --git a/src/TSMapEditor/UI/Windows/SelectTaskForceWindow.cs b/src/TSMapEditor/UI/Windows/SelectTaskForceWindow.cs
@@ -1,4 +1,6 @@
 ﻿using System;
+using System.Collections.Generic;
+using System.Linq;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
 using TSMapEditor.Models;
@@ -17,10 +19,15 @@ public SelectTaskForceWindow(WindowManager windowManager, Map map) : base(window
 
         private readonly Map map;
 
+        private XNACheckBox chkIncludeGlobalTaskForces;
+
         public override void Initialize()
         {
             Name = nameof(SelectTaskForceWindow);
             base.Initialize();
+
+            chkIncludeGlobalTaskForces = FindChild<XNACheckBox>(nameof(chkIncludeGlobalTaskForces));
+            chkIncludeGlobalTaskForces.CheckedChanged += (_, _) => ListObjects();
         }
 
         protected override void LbObjectList_SelectedIndexChanged(object sender, EventArgs e)
@@ -38,9 +45,14 @@ protected override void ListObjects()
         {
             lbObjectList.Clear();
 
-            foreach (TaskForce taskForce in map.TaskForces)
+            IEnumerable<TaskForce> list = map.TaskForces;
+            if (chkIncludeGlobalTaskForces.Checked)
+                list = map.TaskForces.UnionBy(map.Rules.TaskForces, tf => tf.ININame);
+
+            foreach (TaskForce taskForce in list)
             {
                 lbObjectList.AddItem(new XNAListBoxItem() { Text = $"{taskForce.Name} ({taskForce.ININame})", Tag = taskForce });
+
                 if (taskForce == SelectedObject)
                     lbObjectList.SelectedIndex = lbObjectList.Items.Count - 1;
             }
diff --git a/src/TSMapEditor/UI/Windows/SelectTeamTypeWindow.cs b/src/TSMapEditor/UI/Windows/SelectTeamTypeWindow.cs
@@ -1,6 +1,8 @@
-﻿using System;
-using Rampastring.XNAUI;
+﻿using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using TSMapEditor.Models;
 
 namespace TSMapEditor.UI.Windows
@@ -18,10 +20,15 @@ public SelectTeamTypeWindow(WindowManager windowManager, Map map) : base(windowM
 
         public bool IsForSecondaryTeam { get; set; }
 
+        private XNACheckBox chkIncludeGlobalTeamTypes;
+
         public override void Initialize()
         {
             Name = nameof(SelectTeamTypeWindow);
             base.Initialize();
+
+            chkIncludeGlobalTeamTypes = FindChild<XNACheckBox>(nameof(chkIncludeGlobalTeamTypes));
+            chkIncludeGlobalTeamTypes.CheckedChanged += (_, _) => ListObjects();
         }
 
         protected override void LbObjectList_SelectedIndexChanged(object sender, EventArgs e)
@@ -42,7 +49,11 @@ protected override void ListObjects()
             if (IncludeNone)
                 lbObjectList.AddItem(Translate(this, "None", "None"));
 
-            foreach (TeamType teamType in map.TeamTypes)
+            IEnumerable<TeamType> list = map.TeamTypes;
+            if (chkIncludeGlobalTeamTypes.Checked)
+                list = map.TeamTypes.UnionBy(map.Rules.TeamTypes, teamType => teamType.ININame);
+
+            foreach (TeamType teamType in list)
             {
                 lbObjectList.AddItem(new XNAListBoxItem() { Text = $"{teamType.ININame} {teamType.Name}", TextColor = teamType.GetXNAColor(), Tag = teamType });
                 if (teamType == SelectedObject)
