From 4f6713c8dbc4a4472fe3e3d9e4b9a7bff9fe3a45 Mon Sep 17 00:00:00 2001 From: Samuel Aeberhard Date: Sat, 14 Dec 2024 09:34:30 +0100 Subject: [PATCH] Changing namespace and fixing an issue that required users to manually disable world traits in the base game. --- MiniBase.sln | 8 +++++++- {MiniBaseSO => MiniBase}/ILRepack.targets | 0 MiniBaseSO/MiniBaseSO.csproj => MiniBase/MiniBase.csproj | 0 {MiniBaseSO => MiniBase}/MiniBaseBiomeProfile.cs | 0 {MiniBaseSO => MiniBase}/MiniBaseConfig.cs | 0 {MiniBaseSO => MiniBase}/MiniBaseOptions.cs | 0 {MiniBaseSO => MiniBase}/MiniBaseUtils.cs | 0 {MiniBaseSO => MiniBase}/MiniBaseWorldGen.cs | 0 {MiniBaseSO => MiniBase}/Mod.cs | 0 .../dlc/expansion1/worldgen/clusters/MiniBase.yaml | 0 .../dlc/expansion1/worldgen/worlds/BabyMarshyMoonlet.yaml | 0 .../expansion1/worldgen/worlds/BabyNiobiumMoonlet.yaml | 0 .../dlc/expansion1/worldgen/worlds/BabyOilyMoonlet.yaml | 0 .../dlc/expansion1/worldgen/worlds/MiniBase.yaml | 0 .../ModAssets/worldgen/clusters/MiniBase.yaml | 1 + .../ModAssets/worldgen/worlds/MiniBase.yaml | 0 {MiniBaseSO => MiniBase}/Model/MoonletData.cs | 0 {MiniBaseSO => MiniBase}/Patches.cs | 0 .../Profiles/MiniBaseBiomeProfiles.cs | 0 .../Profiles/MiniBaseCoreBiomeProfiles.cs | 0 {MiniBaseSO => MiniBase}/Properties/AssemblyInfo.cs | 0 {MiniBaseSO => MiniBase}/STRINGS.cs | 0 {MiniBaseSO => MiniBase}/mod.yaml | 0 {MiniBaseSO => MiniBase}/mod_info.yaml | 0 {MiniBaseSO => MiniBase}/packages.config | 0 25 files changed, 8 insertions(+), 1 deletion(-) rename {MiniBaseSO => MiniBase}/ILRepack.targets (100%) rename MiniBaseSO/MiniBaseSO.csproj => MiniBase/MiniBase.csproj (100%) rename {MiniBaseSO => MiniBase}/MiniBaseBiomeProfile.cs (100%) rename {MiniBaseSO => MiniBase}/MiniBaseConfig.cs (100%) rename {MiniBaseSO => MiniBase}/MiniBaseOptions.cs (100%) rename {MiniBaseSO => MiniBase}/MiniBaseUtils.cs (100%) rename {MiniBaseSO => MiniBase}/MiniBaseWorldGen.cs (100%) rename {MiniBaseSO => MiniBase}/Mod.cs (100%) rename {MiniBaseSO => MiniBase}/ModAssets/dlc/expansion1/worldgen/clusters/MiniBase.yaml (100%) rename {MiniBaseSO => MiniBase}/ModAssets/dlc/expansion1/worldgen/worlds/BabyMarshyMoonlet.yaml (100%) rename {MiniBaseSO => MiniBase}/ModAssets/dlc/expansion1/worldgen/worlds/BabyNiobiumMoonlet.yaml (100%) rename {MiniBaseSO => MiniBase}/ModAssets/dlc/expansion1/worldgen/worlds/BabyOilyMoonlet.yaml (100%) rename {MiniBaseSO => MiniBase}/ModAssets/dlc/expansion1/worldgen/worlds/MiniBase.yaml (100%) rename {MiniBaseSO => MiniBase}/ModAssets/worldgen/clusters/MiniBase.yaml (91%) rename {MiniBaseSO => MiniBase}/ModAssets/worldgen/worlds/MiniBase.yaml (100%) rename {MiniBaseSO => MiniBase}/Model/MoonletData.cs (100%) rename {MiniBaseSO => MiniBase}/Patches.cs (100%) rename {MiniBaseSO => MiniBase}/Profiles/MiniBaseBiomeProfiles.cs (100%) rename {MiniBaseSO => MiniBase}/Profiles/MiniBaseCoreBiomeProfiles.cs (100%) rename {MiniBaseSO => MiniBase}/Properties/AssemblyInfo.cs (100%) rename {MiniBaseSO => MiniBase}/STRINGS.cs (100%) rename {MiniBaseSO => MiniBase}/mod.yaml (100%) rename {MiniBaseSO => MiniBase}/mod_info.yaml (100%) rename {MiniBaseSO => MiniBase}/packages.config (100%) diff --git a/MiniBase.sln b/MiniBase.sln index 734ac0c..6c2ae96 100644 --- a/MiniBase.sln +++ b/MiniBase.sln @@ -3,10 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32901.215 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniBaseSO", "MiniBaseSO\MiniBaseSO.csproj", "{F4FF2774-AD08-4369-AA33-B0611B8AA06E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniBase", "MiniBase\MiniBase.csproj", "{F4FF2774-AD08-4369-AA33-B0611B8AA06E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModUtils", "ModUtils\ModUtils.csproj", "{339718FB-7413-4EFC-BC53-70E1B5E0D027}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniBase.Test", "MiniBase.Test\MiniBase.Test.csproj", "{25D7A6D2-2CA0-4D8E-8747-05ED6D67C71A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {339718FB-7413-4EFC-BC53-70E1B5E0D027}.Debug|Any CPU.Build.0 = Debug|Any CPU {339718FB-7413-4EFC-BC53-70E1B5E0D027}.Release|Any CPU.ActiveCfg = Release|Any CPU {339718FB-7413-4EFC-BC53-70E1B5E0D027}.Release|Any CPU.Build.0 = Release|Any CPU + {25D7A6D2-2CA0-4D8E-8747-05ED6D67C71A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {25D7A6D2-2CA0-4D8E-8747-05ED6D67C71A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25D7A6D2-2CA0-4D8E-8747-05ED6D67C71A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {25D7A6D2-2CA0-4D8E-8747-05ED6D67C71A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MiniBaseSO/ILRepack.targets b/MiniBase/ILRepack.targets similarity index 100% rename from MiniBaseSO/ILRepack.targets rename to MiniBase/ILRepack.targets diff --git a/MiniBaseSO/MiniBaseSO.csproj b/MiniBase/MiniBase.csproj similarity index 100% rename from MiniBaseSO/MiniBaseSO.csproj rename to MiniBase/MiniBase.csproj diff --git a/MiniBaseSO/MiniBaseBiomeProfile.cs b/MiniBase/MiniBaseBiomeProfile.cs similarity index 100% rename from MiniBaseSO/MiniBaseBiomeProfile.cs rename to MiniBase/MiniBaseBiomeProfile.cs diff --git a/MiniBaseSO/MiniBaseConfig.cs b/MiniBase/MiniBaseConfig.cs similarity index 100% rename from MiniBaseSO/MiniBaseConfig.cs rename to MiniBase/MiniBaseConfig.cs diff --git a/MiniBaseSO/MiniBaseOptions.cs b/MiniBase/MiniBaseOptions.cs similarity index 100% rename from MiniBaseSO/MiniBaseOptions.cs rename to MiniBase/MiniBaseOptions.cs diff --git a/MiniBaseSO/MiniBaseUtils.cs b/MiniBase/MiniBaseUtils.cs similarity index 100% rename from MiniBaseSO/MiniBaseUtils.cs rename to MiniBase/MiniBaseUtils.cs diff --git a/MiniBaseSO/MiniBaseWorldGen.cs b/MiniBase/MiniBaseWorldGen.cs similarity index 100% rename from MiniBaseSO/MiniBaseWorldGen.cs rename to MiniBase/MiniBaseWorldGen.cs diff --git a/MiniBaseSO/Mod.cs b/MiniBase/Mod.cs similarity index 100% rename from MiniBaseSO/Mod.cs rename to MiniBase/Mod.cs diff --git a/MiniBaseSO/ModAssets/dlc/expansion1/worldgen/clusters/MiniBase.yaml b/MiniBase/ModAssets/dlc/expansion1/worldgen/clusters/MiniBase.yaml similarity index 100% rename from MiniBaseSO/ModAssets/dlc/expansion1/worldgen/clusters/MiniBase.yaml rename to MiniBase/ModAssets/dlc/expansion1/worldgen/clusters/MiniBase.yaml diff --git a/MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/BabyMarshyMoonlet.yaml b/MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/BabyMarshyMoonlet.yaml similarity index 100% rename from MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/BabyMarshyMoonlet.yaml rename to MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/BabyMarshyMoonlet.yaml diff --git a/MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/BabyNiobiumMoonlet.yaml b/MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/BabyNiobiumMoonlet.yaml similarity index 100% rename from MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/BabyNiobiumMoonlet.yaml rename to MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/BabyNiobiumMoonlet.yaml diff --git a/MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/BabyOilyMoonlet.yaml b/MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/BabyOilyMoonlet.yaml similarity index 100% rename from MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/BabyOilyMoonlet.yaml rename to MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/BabyOilyMoonlet.yaml diff --git a/MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/MiniBase.yaml b/MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/MiniBase.yaml similarity index 100% rename from MiniBaseSO/ModAssets/dlc/expansion1/worldgen/worlds/MiniBase.yaml rename to MiniBase/ModAssets/dlc/expansion1/worldgen/worlds/MiniBase.yaml diff --git a/MiniBaseSO/ModAssets/worldgen/clusters/MiniBase.yaml b/MiniBase/ModAssets/worldgen/clusters/MiniBase.yaml similarity index 91% rename from MiniBaseSO/ModAssets/worldgen/clusters/MiniBase.yaml rename to MiniBase/ModAssets/worldgen/clusters/MiniBase.yaml index 0f9bfdc..a1ba75f 100644 --- a/MiniBaseSO/ModAssets/worldgen/clusters/MiniBase.yaml +++ b/MiniBase/ModAssets/worldgen/clusters/MiniBase.yaml @@ -2,6 +2,7 @@ name: STRINGS.CLUSTER_NAMES.DEFAULT.NAME description: STRINGS.CLUSTER_NAMES.DEFAULT.DESCRIPTION coordinatePrefix: V-MINI forbiddenDlcId: EXPANSION1_ID +disableStoryTraits: true difficulty: 5 menuOrder: -1 diff --git a/MiniBaseSO/ModAssets/worldgen/worlds/MiniBase.yaml b/MiniBase/ModAssets/worldgen/worlds/MiniBase.yaml similarity index 100% rename from MiniBaseSO/ModAssets/worldgen/worlds/MiniBase.yaml rename to MiniBase/ModAssets/worldgen/worlds/MiniBase.yaml diff --git a/MiniBaseSO/Model/MoonletData.cs b/MiniBase/Model/MoonletData.cs similarity index 100% rename from MiniBaseSO/Model/MoonletData.cs rename to MiniBase/Model/MoonletData.cs diff --git a/MiniBaseSO/Patches.cs b/MiniBase/Patches.cs similarity index 100% rename from MiniBaseSO/Patches.cs rename to MiniBase/Patches.cs diff --git a/MiniBaseSO/Profiles/MiniBaseBiomeProfiles.cs b/MiniBase/Profiles/MiniBaseBiomeProfiles.cs similarity index 100% rename from MiniBaseSO/Profiles/MiniBaseBiomeProfiles.cs rename to MiniBase/Profiles/MiniBaseBiomeProfiles.cs diff --git a/MiniBaseSO/Profiles/MiniBaseCoreBiomeProfiles.cs b/MiniBase/Profiles/MiniBaseCoreBiomeProfiles.cs similarity index 100% rename from MiniBaseSO/Profiles/MiniBaseCoreBiomeProfiles.cs rename to MiniBase/Profiles/MiniBaseCoreBiomeProfiles.cs diff --git a/MiniBaseSO/Properties/AssemblyInfo.cs b/MiniBase/Properties/AssemblyInfo.cs similarity index 100% rename from MiniBaseSO/Properties/AssemblyInfo.cs rename to MiniBase/Properties/AssemblyInfo.cs diff --git a/MiniBaseSO/STRINGS.cs b/MiniBase/STRINGS.cs similarity index 100% rename from MiniBaseSO/STRINGS.cs rename to MiniBase/STRINGS.cs diff --git a/MiniBaseSO/mod.yaml b/MiniBase/mod.yaml similarity index 100% rename from MiniBaseSO/mod.yaml rename to MiniBase/mod.yaml diff --git a/MiniBaseSO/mod_info.yaml b/MiniBase/mod_info.yaml similarity index 100% rename from MiniBaseSO/mod_info.yaml rename to MiniBase/mod_info.yaml diff --git a/MiniBaseSO/packages.config b/MiniBase/packages.config similarity index 100% rename from MiniBaseSO/packages.config rename to MiniBase/packages.config