Skip to content

Commit 67db4f7

Browse files
blowfishproblowfishpro
committed
Revert "Allow switching in flight based on action groups"
This reverts commit e8614ce.
1 parent e60de94 commit 67db4f7

File tree

5 files changed

+0
-98
lines changed

5 files changed

+0
-98
lines changed

‎B9PartSwitch/Localization.cs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ public static class Localization
1717
public static string ModuleB9PartSwitch_DefaultSwitcherDescription { get; private set; }
1818
public static string ModuleB9PartSwitch_DefaultSwitcherDescriptionPlural { get; private set; }
1919
private static string moduleB9PartSwitch_SelectSubtype;
20-
private static string moduleB9PartSwitch_NextSubtype;
21-
private static string moduleB9PartSwitch_PreviousSubtype;
2220

2321
public static string PartSwitchFlightDialog_ResourcesWillBeDumpedWarning(string partName, string switcherDescription)
2422
{
@@ -40,16 +38,6 @@ public static string ModuleB9PartSwitch_SelectSubtype(string switcherDescription
4038
return Localizer.Format(moduleB9PartSwitch_SelectSubtype, switcherDescription);
4139
}
4240

43-
public static string ModuleB9PartSwitch_NextSubtype(string switcherDescription)
44-
{
45-
return Localizer.Format(moduleB9PartSwitch_NextSubtype, switcherDescription);
46-
}
47-
48-
public static string ModuleB9PartSwitch_PreviousSubtype(string switcherDescription)
49-
{
50-
return Localizer.Format(moduleB9PartSwitch_PreviousSubtype, switcherDescription);
51-
}
52-
5341
static Localization()
5442
{
5543
GameEvents.onLanguageSwitched.Add(() => RefreshLocalization());
@@ -70,8 +58,6 @@ private static void RefreshLocalization()
7058
ModuleB9PartSwitch_DefaultSwitcherDescription = Localizer.GetStringByTag("#LOC_B9PartSwitch_ModuleB9PartSwitch_default_switcher_description");
7159
ModuleB9PartSwitch_DefaultSwitcherDescriptionPlural = Localizer.GetStringByTag("#LOC_B9PartSwitch_ModuleB9PartSwitch_default_switcher_description_plural");
7260
moduleB9PartSwitch_SelectSubtype = Localizer.GetStringByTag("#LOC_B9PartSwitch_ModuleB9PartSwitch_select_subtype");
73-
moduleB9PartSwitch_NextSubtype = Localizer.GetStringByTag("#LOC_B9PartSwitch_ModuleB9PartSwitch_next_subtype");
74-
moduleB9PartSwitch_PreviousSubtype = Localizer.GetStringByTag("#LOC_B9PartSwitch_ModuleB9PartSwitch_previous_subtype");
7561
}
7662
}
7763
}

‎B9PartSwitch/PartSwitch/ModuleB9PartSwitch.cs‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ public class ModuleB9PartSwitch : CustomPartModule, IPartMassModifier, IPartCost
5050
[NodeData]
5151
public bool advancedTweakablesOnly = false;
5252

53-
[NodeData]
54-
public bool showNextSubtypeAction = false;
55-
56-
[NodeData]
57-
public bool showPreviousSubtypeAction = false;
58-
5953
[NodeData(name = "currentSubtype", persistent = true)]
6054
public string CurrentSubtypeName
6155
{
@@ -85,65 +79,6 @@ private set
8579

8680
#endregion
8781

88-
#region Actions
89-
90-
[KSPAction]
91-
public void ShowSubtypesWindowAction(KSPActionParam param) => PartSwitchFlightDialog.Spawn(this);
92-
93-
[KSPAction]
94-
public void NextSubtypeAction(KSPActionParam param)
95-
{
96-
if (!switchInFlight) return;
97-
98-
PartSubtype FindNextSubtype()
99-
{
100-
for (int i = currentSubtypeIndex + 1; i < subtypes.Count; i++)
101-
{
102-
if (subtypes[i].allowSwitchInFlight) return subtypes[i];
103-
}
104-
for (int i = 0; i < currentSubtypeIndex; i++)
105-
{
106-
if (subtypes[i].allowSwitchInFlight) return subtypes[i];
107-
}
108-
109-
return null;
110-
}
111-
112-
PartSubtype nextSubtype = FindNextSubtype();
113-
114-
if (nextSubtype.IsNull()) return;
115-
116-
PartSwitchFlightDialog.MaybeCreateResourceRemovalWarning(this, () => SwitchSubtype(nextSubtype.Name));
117-
}
118-
119-
[KSPAction]
120-
public void PreviousSubtypeAction(KSPActionParam param)
121-
{
122-
if (!switchInFlight) return;
123-
124-
PartSubtype FindPreviousSubtype()
125-
{
126-
for (int i = currentSubtypeIndex - 1; i >= 0; i--)
127-
{
128-
if (subtypes[i].allowSwitchInFlight) return subtypes[i];
129-
}
130-
for (int i = SubtypesCount - 1; i > currentSubtypeIndex; i--)
131-
{
132-
if (subtypes[i].allowSwitchInFlight) return subtypes[i];
133-
}
134-
135-
return null;
136-
}
137-
138-
PartSubtype nextSubtype = FindPreviousSubtype();
139-
140-
if (nextSubtype.IsNull()) return;
141-
142-
PartSwitchFlightDialog.MaybeCreateResourceRemovalWarning(this, () => SwitchSubtype(nextSubtype.Name));
143-
}
144-
145-
#endregion
146-
14782
#region Private Fields
14883

14984
// Tweakscale integration (set via reflection, readonly is ok)
@@ -497,20 +432,6 @@ private void SetupGUI()
497432
subtypeTitleField.guiName = switcherDescription;
498433
subtypeTitleField.advancedTweakable = advancedTweakablesOnly;
499434
subtypeTitleField.guiActiveEditor = subtypes.Count == 1;
500-
501-
bool switchInFlightEnabled = switchInFlight && subtypes.Any(s => s.allowSwitchInFlight);
502-
503-
BaseAction showSubtypesWindowAction = Actions[nameof(ShowSubtypesWindowAction)];
504-
showSubtypesWindowAction.guiName = Localization.ModuleB9PartSwitch_SelectSubtype(switcherDescription); // Select <<1>>
505-
showSubtypesWindowAction.active = switchInFlightEnabled;
506-
507-
BaseAction nextSubtypeAction = Actions[nameof(NextSubtypeAction)];
508-
nextSubtypeAction.guiName = Localization.ModuleB9PartSwitch_NextSubtype(switcherDescription); // Next <<1>>
509-
nextSubtypeAction.active = showNextSubtypeAction && switchInFlightEnabled;
510-
511-
BaseAction previousSubtypeAction = Actions[nameof(PreviousSubtypeAction)];
512-
previousSubtypeAction.guiName = Localization.ModuleB9PartSwitch_PreviousSubtype(switcherDescription); // Previous <<1>>
513-
previousSubtypeAction.active = showPreviousSubtypeAction && switchInFlightEnabled;
514435

515436
if (HighLogic.LoadedSceneIsFlight)
516437
UpdateSwitchEventFlightVisibility();

‎B9PartSwitch/PartSwitch/PartSwitchFlightDialog.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public static class PartSwitchFlightDialog
88
{
99
public static void Spawn(ModuleB9PartSwitch module)
1010
{
11-
if (!module.subtypes.Any(subtype => subtype != module.CurrentSubtype && subtype.allowSwitchInFlight)) return;
1211
MaybeCreateResourceRemovalWarning(module, () => CreateDialogue(module));
1312
}
1413

‎GameData/B9PartSwitch/Localization/en-us.cfg‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Localization
77
#LOC_B9PartSwitch_ModuleB9PartSwitch_default_switcher_description = Subtype
88
#LOC_B9PartSwitch_ModuleB9PartSwitch_default_switcher_description_plural = Subtypes
99
#LOC_B9PartSwitch_ModuleB9PartSwitch_select_subtype = Select <<1>>
10-
#LOC_B9PartSwitch_ModuleB9PartSwitch_next_subtype = Next <<1>>
11-
#LOC_B9PartSwitch_ModuleB9PartSwitch_previous_subtype = Previous <<1>>
1210
#LOC_B9PartSwitch_PartSwitchFlightDialog_resources_will_be_dumped_warning = <<1>> has resources that will be dumped by switching the <<2>>
1311
#LOC_B9PartSwitch_PartSwitchFlightDialog_confirm_resource_removal_dialog_title = Confirm Resource Removal
1412
#LOC_B9PartSwitch_PartSwitchFlightDialog_select_new_subtype_dialog_title = Select <<1>>

‎GameData/B9PartSwitch/Localization/pt-br.cfg‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Localization
77
#LOC_B9PartSwitch_ModuleB9PartSwitch_default_switcher_description = Subtipo
88
#LOC_B9PartSwitch_ModuleB9PartSwitch_default_switcher_description_plural = Subtipos
99
#LOC_B9PartSwitch_ModuleB9PartSwitch_select_subtype = Selecione <<1>>
10-
#LOC_B9PartSwitch_ModuleB9PartSwitch_next_subtype = Próximo <<1>>
11-
#LOC_B9PartSwitch_ModuleB9PartSwitch_previous_subtype = Anterior <<1>>
1210
#LOC_B9PartSwitch_PartSwitchFlightDialog_resources_will_be_dumped_warning = <<1>> tem recursos que serão despejados, trocando o <<2>>
1311
#LOC_B9PartSwitch_PartSwitchFlightDialog_confirm_resource_removal_dialog_title = Confirme a Remoção de Recursos
1412
#LOC_B9PartSwitch_PartSwitchFlightDialog_select_new_subtype_dialog_title = Selecione <<1>>

0 commit comments

Comments
 (0)