From e86c26a0d803eb84b0f535d2290071db6cdb307c Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Mon, 24 Feb 2025 09:34:09 +0100 Subject: [PATCH] Code polish --- Projects/TerraTech/TerraTech/Class1.cs | 3 +++ .../TerraTech/ModuleShieldGeneratorManager.cs | 25 ++++++++----------- .../TerraTech/TerraTech/ModuleWingManager.cs | 18 ++++++------- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Projects/TerraTech/TerraTech/Class1.cs b/Projects/TerraTech/TerraTech/Class1.cs index 173aabd..a0798f0 100644 --- a/Projects/TerraTech/TerraTech/Class1.cs +++ b/Projects/TerraTech/TerraTech/Class1.cs @@ -65,6 +65,9 @@ namespace TerraTech { float max = 32f; ModuleWingManager.Setup(Config); + ModuleBoosterManager.Setup(Config); + ModuleShieldGeneratorManager.Setup(Config); + ModuleWeaponGunManager.Setup(Config); xpMultiplier = Config.Bind("General", "XP Multiplier", 1f, diff --git a/Projects/TerraTech/TerraTech/ModuleShieldGeneratorManager.cs b/Projects/TerraTech/TerraTech/ModuleShieldGeneratorManager.cs index 94aaf85..c2f3700 100644 --- a/Projects/TerraTech/TerraTech/ModuleShieldGeneratorManager.cs +++ b/Projects/TerraTech/TerraTech/ModuleShieldGeneratorManager.cs @@ -20,7 +20,7 @@ namespace TerraTech { shieldRadiusMultiplier = config.Bind( "Shield", "Shield Radius Multiplier", 1f, new ConfigDescription("Shield Radius Multiplier", new AcceptableValueRange(min, max))); - shieldRadiusMultiplier.SettingChanged += (sender, args) => ModuleShieldGeneratorManager.DoPatch(); + shieldRadiusMultiplier.SettingChanged += (sender, args) => DoPatch(); shieldHeartbeatIntervalMultiplier = config.Bind("Shield", "Shield Heartbeat Interval Multiplier", 1f, @@ -28,31 +28,28 @@ namespace TerraTech { new AcceptableValueRange(min, max))); shieldHeartbeatIntervalMultiplier.SettingChanged += (sender, args) => - ModuleShieldGeneratorManager.DoPatch(); + DoPatch(); shieldPowerUpDelayMultiplier = config.Bind( "Shield", "Shield Power Up Delay Multiplier", 1f, new ConfigDescription("Shield Power Up Delay Multiplier", new AcceptableValueRange(min, max))); - shieldPowerUpDelayMultiplier.SettingChanged += (sender, args) => ModuleShieldGeneratorManager.DoPatch(); + shieldPowerUpDelayMultiplier.SettingChanged += (sender, args) => DoPatch(); shieldRadiusMultiplierHealing = config.Bind( "Shield", "Shield Radius Multiplier Healing", 1f, new ConfigDescription("Shield Radius Multiplier Healing", new AcceptableValueRange(min, max))); - shieldRadiusMultiplierHealing.SettingChanged += (sender, args) => ModuleShieldGeneratorManager.DoPatch(); + shieldRadiusMultiplierHealing.SettingChanged += (sender, args) => DoPatch(); } private static void ConfigureShieldGenerator(MultipliedObject obj) { - obj.AddField(new FieldConfiguration("m_HealingHeartbeatInterval", - ModuleShieldGeneratorManager.shieldHeartbeatIntervalMultiplier)); + obj.AddField( + new FieldConfiguration("m_HealingHeartbeatInterval", shieldHeartbeatIntervalMultiplier)); - obj.AddField(new FieldConfiguration( - "m_Radius", ModuleShieldGeneratorManager.shieldRadiusMultiplier, instance => { - var shield = (ModuleShieldGenerator)instance; - return shield.m_Healing ? ModuleShieldGeneratorManager.shieldRadiusMultiplierHealing - : ModuleShieldGeneratorManager.shieldRadiusMultiplier; - })); + obj.AddField(new FieldConfiguration("m_Radius", shieldRadiusMultiplier, instance => { + var shield = (ModuleShieldGenerator)instance; + return shield.m_Healing ? shieldRadiusMultiplierHealing : shieldRadiusMultiplier; + })); - obj.AddField(new FieldConfiguration("m_PowerUpDelay", - ModuleShieldGeneratorManager.shieldPowerUpDelayMultiplier)); + obj.AddField(new FieldConfiguration("m_PowerUpDelay", shieldPowerUpDelayMultiplier)); } [HarmonyPrefix] diff --git a/Projects/TerraTech/TerraTech/ModuleWingManager.cs b/Projects/TerraTech/TerraTech/ModuleWingManager.cs index 4c3bb78..1f3e7ae 100644 --- a/Projects/TerraTech/TerraTech/ModuleWingManager.cs +++ b/Projects/TerraTech/TerraTech/ModuleWingManager.cs @@ -19,30 +19,26 @@ namespace TerraTech { aerofoilAngleRangeMultiplier = config.Bind( "Aerofoil", "Aerofoil Angle Range Multiplier", 1f, new ConfigDescription("Aerofoil Angle Range Multiplier", new AcceptableValueRange(min, max))); - aerofoilAngleRangeMultiplier.SettingChanged += (sender, args) => ModuleWingManager.DoPatch(); + aerofoilAngleRangeMultiplier.SettingChanged += (sender, args) => DoPatch(); aerofoilAngleTurnSpeedMultiplier = config.Bind("Aerofoil", "Aerofoil Angle Turn Speed Multiplier", 1f, new ConfigDescription("Aerofoil Angle Turn Speed Multiplier", new AcceptableValueRange(min, max))); - aerofoilAngleTurnSpeedMultiplier.SettingChanged += (sender, args) => ModuleWingManager.DoPatch(); + aerofoilAngleTurnSpeedMultiplier.SettingChanged += (sender, args) => DoPatch(); aerofoilLiftStrengthMultiplier = config.Bind( "Aerofoil", "Aerofoil Lift Strength Multiplier", 1f, new ConfigDescription("Aerofoil Lift Strength Multiplier", new AcceptableValueRange(min, max))); - aerofoilLiftStrengthMultiplier.SettingChanged += (sender, args) => ModuleWingManager.DoPatch(); + aerofoilLiftStrengthMultiplier.SettingChanged += (sender, args) => DoPatch(); } private static void ConfigureAerofoil(MultipliedObject obj) { - obj.AddField( - new FieldConfiguration("flipAngleRangeActual", ModuleWingManager.aerofoilAngleRangeMultiplier)); - obj.AddField( - new FieldConfiguration("flipAngleRangeVisual", ModuleWingManager.aerofoilAngleRangeMultiplier)); + obj.AddField(new FieldConfiguration("flipAngleRangeActual", aerofoilAngleRangeMultiplier)); + obj.AddField(new FieldConfiguration("flipAngleRangeVisual", aerofoilAngleRangeMultiplier)); - obj.AddField(new FieldConfiguration("flipAngleTurnSpeed", - ModuleWingManager.aerofoilAngleTurnSpeedMultiplier)); - obj.AddField( - new FieldConfiguration("liftStrength", ModuleWingManager.aerofoilLiftStrengthMultiplier)); + obj.AddField(new FieldConfiguration("flipAngleTurnSpeed", aerofoilAngleTurnSpeedMultiplier)); + obj.AddField(new FieldConfiguration("liftStrength", aerofoilLiftStrengthMultiplier)); } [HarmonyPrefix]