Use nameof() where possible

KSP-RO · Jul 25, 2024 · 14e95d2 · 14e95d2
1 parent 13ca95b
commit 14e95d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/Source/ProceduralFairings/FairingBase.cs b/Source/ProceduralFairings/FairingBase.cs
@@ -466,12 +466,12 @@ private void UpdateDecouplerUIVisibility()
         {
             if (Decoupler)
             {
-                Decoupler.Actions["DecoupleAction"].active = decouplerEnabled;
-                Decoupler.Events["Decouple"].active = decouplerEnabled;
-                Decoupler.Events["Decouple"].guiActive = decouplerEnabled;
-                Decoupler.Events["ToggleStaging"].active = decouplerEnabled;
-                Decoupler.Events["ToggleStaging"].guiActive = decouplerEnabled;
-                Decoupler.Events["ToggleStaging"].guiActiveEditor = decouplerEnabled;
+                Decoupler.Actions[nameof(ModuleDecouple.DecoupleAction)].active = decouplerEnabled;
+                Decoupler.Events[nameof(ModuleDecouple.Decouple)].active = decouplerEnabled;
+                Decoupler.Events[nameof(ModuleDecouple.Decouple)].guiActive = decouplerEnabled;
+                Decoupler.Events[nameof(ToggleStaging)].active = decouplerEnabled;
+                Decoupler.Events[nameof(ToggleStaging)].guiActive = decouplerEnabled;
+                Decoupler.Events[nameof(ToggleStaging)].guiActiveEditor = decouplerEnabled;
                 Fields[nameof(autoDecoupleTopNode)].guiActive = decouplerEnabled && Mode == BaseMode.Adapter;
                 Fields[nameof(autoDecoupleTopNode)].guiActiveEditor = decouplerEnabled && Mode == BaseMode.Adapter;
             }

diff --git a/Source/ProceduralFairings/FairingSide.cs b/Source/ProceduralFairings/FairingSide.cs
@@ -165,13 +165,13 @@ public void ToggleOpenClosed()
         [KSPEvent(active = true, guiActiveEditor = true, guiActive = true, groupName = PFUtils.PAWGroup, guiName = "Toggle Petals")]
         public void TogglePetals()
         {
-            HingeAnimation.Events["Toggle"].Invoke();
+            HingeAnimation.Events[nameof(ModuleAnimateGeneric.Toggle)].Invoke();
 
             foreach (Part p in part.symmetryCounterparts)
             {
                 if (p.FindModuleImplementing<ProceduralFairingSide>() is ProceduralFairingSide side)
                 {
-                    side.HingeAnimation.Events["Toggle"].Invoke();
+                    side.HingeAnimation.Events[nameof(ModuleAnimateGeneric.Toggle)].Invoke();
                 }
             }
         }
@@ -238,12 +238,11 @@ public override void OnStartFinished(StartState state)
         {
             base.OnStartFinished(state);
 
-            HingeAnimation.Events["Toggle"].guiActiveEditor = false;
-            HingeAnimation.Events["Toggle"].guiActive = false;
-            HingeAnimation.Events["Toggle"].guiActiveUnfocused = false;
-            HingeAnimation.Events["Toggle"].guiActiveUncommand = false;
+            HingeAnimation.Events[nameof(ModuleAnimateGeneric.Toggle)].guiActiveEditor = false;
+            HingeAnimation.Events[nameof(ModuleAnimateGeneric.Toggle)].guiActive = false;
+            HingeAnimation.Events[nameof(ModuleAnimateGeneric.Toggle)].guiActiveUnfocused = false;
+            HingeAnimation.Events[nameof(ModuleAnimateGeneric.Toggle)].guiActiveUncommand = false;
             SetHingeToggles();
-
         }
 
         private void SetDensityField()
@@ -994,14 +993,14 @@ private void SetHingeToggles()
             if (HingeAnimation is null)
                 return;
 
-            Events["TogglePetals"].guiActiveEditor = hingeEnabled;
-            Events["TogglePetals"].guiActive = hingeEnabled;
-            Events["TogglePetals"].guiActiveUnfocused = hingeEnabled;
-            Events["TogglePetals"].guiActiveUncommand = hingeEnabled;
+            Events[nameof(TogglePetals)].guiActiveEditor = hingeEnabled;
+            Events[nameof(TogglePetals)].guiActive = hingeEnabled;
+            Events[nameof(TogglePetals)].guiActiveUnfocused = hingeEnabled;
+            Events[nameof(TogglePetals)].guiActiveUncommand = hingeEnabled;
 
-            HingeAnimation.Fields["deployPercent"].guiActiveEditor = hingeEnabled;
-            HingeAnimation.Fields["deployPercent"].guiActive = (hingeEnabled && HighLogic.LoadedSceneIsEditor);
-            HingeAnimation.Fields["deployPercent"].guiActiveUnfocused = false;
+            HingeAnimation.Fields[nameof(ModuleAnimateGeneric.deployPercent)].guiActiveEditor = hingeEnabled;
+            HingeAnimation.Fields[nameof(ModuleAnimateGeneric.deployPercent)].guiActive = (hingeEnabled && HighLogic.LoadedSceneIsEditor);
+            HingeAnimation.Fields[nameof(ModuleAnimateGeneric.deployPercent)].guiActiveUnfocused = false;
 
             if (!hingeEnabled && HighLogic.LoadedSceneIsFlight)
                 HingeAnimation.deployPercent = 0f;  //disabling still allows action groups to activate