diff --git a/GalacticScale2/DSP_Plugins.GalacticScale.csproj b/GalacticScale2/DSP_Plugins.GalacticScale.csproj index e7a227e0..00dafeb9 100644 --- a/GalacticScale2/DSP_Plugins.GalacticScale.csproj +++ b/GalacticScale2/DSP_Plugins.GalacticScale.csproj @@ -1,466 +1,463 @@  - - - - Debug - AnyCPU - {BD2A2BB8-F34B-4E0B-8E6C-F561D367E76D} - Library - Properties - GalacticScale - GalacticScale - v4.8 - 512 - true - - 2.0.55.2 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - Always - - - - $(BepInExCore_Dir)\0Harmony.dll - - - ..\..\Assembly-CSharp_publicized_0_8_21_8562.dll - - - $(BepInExCore_Dir)\BepInEx.dll - - - $(BepInExCore_Dir)\BepInEx.Harmony.dll - - - ..\..\GSUI.dll - - - C:\Users\inno\AppData\Roaming\r2modmanPlus-local\DysonSphereProgram\profiles\Default\BepInEx\plugins\nebula-NebulaMultiplayerModApi\NebulaAPI.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\netstandard.dll - - - - - - - - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.dll - - - ..\..\..\Program Files (x86)\Steam\steamapps\common\Dyson Sphere Program\DSPGAME_Data\Managed\UnityEngine.AnimationModule.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.AssetBundleModule.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.AudioModule.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.CoreModule.dll - - - False - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.ImageConversionModule.dll - - - False - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.IMGUIModule.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.PhysicsModule.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.TextRenderingModule.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.UI.dll - - - $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.UIModule.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - galacticbundle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Debug + AnyCPU + {BD2A2BB8-F34B-4E0B-8E6C-F561D367E76D} + Library + Properties + GalacticScale + GalacticScale + v4.8 + 512 + true + + 2.0.55.2 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + Always + + + + $(BepInExCore_Dir)\0Harmony.dll + + + ..\..\Assembly-CSharp_publicized_0_8_21_8562.dll + + + $(BepInExCore_Dir)\BepInEx.dll + + + $(BepInExCore_Dir)\BepInEx.Harmony.dll + + + ..\..\GSUI.dll + + + C:\Users\inno\AppData\Roaming\r2modmanPlus-local\DysonSphereProgram\profiles\Default\BepInEx\plugins\nebula-NebulaMultiplayerModApi\NebulaAPI.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\netstandard.dll + + + + + + + + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.dll + + + ..\..\..\Program Files (x86)\Steam\steamapps\common\Dyson Sphere Program\DSPGAME_Data\Managed\UnityEngine.AnimationModule.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.AssetBundleModule.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.AudioModule.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.CoreModule.dll + + + False + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.ImageConversionModule.dll + + + False + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.IMGUIModule.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.PhysicsModule.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.TextRenderingModule.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.UI.dll + + + $(DSP_Dir)\DSPGAME_Data\Managed\UnityEngine.UIModule.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + galacticbundle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GalacticScale2/Scripts/Bootstrap.cs b/GalacticScale2/Scripts/Bootstrap.cs index 32215852..4de476c9 100644 --- a/GalacticScale2/Scripts/Bootstrap.cs +++ b/GalacticScale2/Scripts/Bootstrap.cs @@ -20,7 +20,7 @@ public partial class GS2 // [BepInDependency("nebula.api", BepInDependency.DependencyFlags.HardDependency)] public class Bootstrap : BaseUnityPlugin { - public const string VERSION = "2.2.0.3"; + public const string VERSION = "2.2.0.4"; public new static ManualLogSource Logger; diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Planets.cs b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Planets.cs index 7e4e96b7..a235fe93 100644 --- a/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Planets.cs +++ b/GalacticScale2/Scripts/GalacticScale2.0/Generators/GS2Dev/Planets.cs @@ -242,20 +242,21 @@ public void SelectPlanetThemes(GSStar star) { foreach (var planet in star.Planets) { - if (planet == birthPlanet) + var heat = CalculateThemeHeat(star, planet.OrbitRadius); + var type = EThemeType.Planet; + if (planet != birthPlanet) + { + if (planet.Scale == 10f) type = EThemeType.Gas; + planet.Theme = GSSettings.ThemeLibrary.Query(random, type, heat, planet.Radius); + } + else { GS2.Warn("Setting Theme for BirthPlanet"); var habitableTheme = GSSettings.ThemeLibrary.Query(random, EThemeType.Telluric, EThemeHeat.Temperate, preferences.GetInt("birthPlanetSize", 200), EThemeDistribute.Default, true); if (preferences.GetBool("birthPlanetUnlock")) planet.Theme = habitableTheme; else planet.Theme = "Mediterranean"; planet.Scale = 1f; - continue; } - - var heat = CalculateThemeHeat(star, planet.OrbitRadius); - var type = EThemeType.Planet; - if (planet.Scale == 10f) type = EThemeType.Gas; - planet.Theme = GSSettings.ThemeLibrary.Query(random, type, heat, planet.Radius); //Warn($"Planet Theme Selected. {planet.Name}:{planet.Theme} Radius:{planet.Radius * planet.Scale} {((planet.Scale == 10f) ? EThemeType.Gas : EThemeType.Planet)}"); foreach (var body in planet.Bodies) if (body != planet) diff --git a/GalacticScale2/Scripts/GalacticScale2.0/Patches/-Debug/ColorFloat4.cs b/GalacticScale2/Scripts/GalacticScale2.0/Patches/-Debug/ColorFloat4.cs deleted file mode 100644 index 6760b4b7..00000000 --- a/GalacticScale2/Scripts/GalacticScale2.0/Patches/-Debug/ColorFloat4.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UnityEngine; -using System; - -namespace GalacticScale -{ - public static class ColorFloat4 - { - public static operator Color(this Vector4 v4) - { - return new Color(); - } - public static ColorFloat4(){} - } -} \ No newline at end of file