diff --git a/MenuVariantsMod/.gitignore b/MenuVariantsMod/.gitignore new file mode 100644 index 0000000..1d39855 --- /dev/null +++ b/MenuVariantsMod/.gitignore @@ -0,0 +1,2 @@ +.idea +Folder.DotSettings.user \ No newline at end of file diff --git a/MenuVariantsMod/BezelLoad.cs b/MenuVariantsMod/BezelLoad.cs index d41e393..7e3de85 100644 --- a/MenuVariantsMod/BezelLoad.cs +++ b/MenuVariantsMod/BezelLoad.cs @@ -1,51 +1,35 @@ using Monocle; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -using TowerFall; using FortRise; -using MonoMod.ModInterop; using System.Diagnostics; namespace MenuVariantsMod { public class BezelLoad { - public static List BezelList; - public static List BezelNames = new List(); - public static void Load() { - var _separator = Path.DirectorySeparatorChar.ToString(); - var _customLogos = "Content" + _separator + "Mod" + _separator + "CustomBezels" + _separator; - string[] directories = Directory.GetDirectories(_customLogos); - string[] array = directories; + public static List BezelList = new(); + public static List BezelNames = new(); + + private static readonly string CUSTOM_BEZELS_DIR ="Content/CustomBezels"; + + public static void Load(FortContent content) + { BezelNames.Add("DEFAULT"); BezelList = new List(); - foreach (string text in array) + + foreach (RiseCore.Resource resource in content[CUSTOM_BEZELS_DIR].Childrens) { - Console.WriteLine(text); - var text2 = text.Replace("Content" + _separator, ""); - Atlas atlas = new Atlas(text2 + _separator + "atlas.xml", text2 + _separator + "atlas.png", true); - var BezelData = Calc.LoadXML(text + _separator + "BezelData.xml"); + Atlas atlas = AtlasExt.CreateAtlas(content, $"{resource.Path}/atlas.xml", $"{resource.Path}/atlas.png", ContentAccess.ModContent); + + RiseCore.Resource bezelDataResource = content[$"{resource.Path}/BezelData.xml"]; + var BezelData = Calc.LoadXML(bezelDataResource.Stream); var TrueBezelData = BezelData["BezelData"]; - Console.WriteLine(atlas); if (atlas == null) { Debugger.Break(); } - //if (TrueLogoData != null) - //{ - CustomBezel BezelCustomData = new CustomBezel(TrueBezelData, atlas); - //if (logoCustomData != null) - //{ - BezelList.Add(BezelCustomData); - BezelNames.Add(TrueBezelData.ChildText("Name")); - // } - - //} + CustomBezel BezelCustomData = new CustomBezel(TrueBezelData, atlas); + BezelList.Add(BezelCustomData); + BezelNames.Add(TrueBezelData.ChildText("Name")); } } } diff --git a/MenuVariantsMod/Content/CustomBezels/ClassicBlue/BezelData.xml b/MenuVariantsMod/Content/CustomBezels/ClassicBlue/BezelData.xml new file mode 100644 index 0000000..63cc56a --- /dev/null +++ b/MenuVariantsMod/Content/CustomBezels/ClassicBlue/BezelData.xml @@ -0,0 +1,6 @@ + + + ASCENSION + aspectBarLeft + aspectBarRight + \ No newline at end of file diff --git a/MenuVariantsMod/Content/CustomBezels/ClassicBlue/atlas.png b/MenuVariantsMod/Content/CustomBezels/ClassicBlue/atlas.png new file mode 100644 index 0000000..bafae55 Binary files /dev/null and b/MenuVariantsMod/Content/CustomBezels/ClassicBlue/atlas.png differ diff --git a/MenuVariantsMod/Content/CustomBezels/ClassicBlue/atlas.xml b/MenuVariantsMod/Content/CustomBezels/ClassicBlue/atlas.xml new file mode 100644 index 0000000..f28d846 --- /dev/null +++ b/MenuVariantsMod/Content/CustomBezels/ClassicBlue/atlas.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/MenuVariantsMod/Content/CustomLogos/TowerSus/LogoData.xml b/MenuVariantsMod/Content/CustomLogos/TowerSus/LogoData.xml new file mode 100644 index 0000000..6394762 --- /dev/null +++ b/MenuVariantsMod/Content/CustomLogos/TowerSus/LogoData.xml @@ -0,0 +1,18 @@ + + + TOWERSUS + True + True + False + True + False + + title/TowerSus + title/TowerSusLight + title/ascension + title/TowerSusBg + title/bigArrow + title/ascensionCoreAnimation + + + \ No newline at end of file diff --git a/MenuVariantsMod/Content/CustomLogos/TowerSus/atlas.png b/MenuVariantsMod/Content/CustomLogos/TowerSus/atlas.png new file mode 100644 index 0000000..b2af601 Binary files /dev/null and b/MenuVariantsMod/Content/CustomLogos/TowerSus/atlas.png differ diff --git a/MenuVariantsMod/Content/CustomLogos/TowerSus/atlas.xml b/MenuVariantsMod/Content/CustomLogos/TowerSus/atlas.xml new file mode 100644 index 0000000..108a524 --- /dev/null +++ b/MenuVariantsMod/Content/CustomLogos/TowerSus/atlas.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/MenuVariantsMod/CustomBezel.cs b/MenuVariantsMod/CustomBezel.cs index dc2eea9..166c543 100644 --- a/MenuVariantsMod/CustomBezel.cs +++ b/MenuVariantsMod/CustomBezel.cs @@ -1,19 +1,10 @@ using Monocle; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; using System.Xml; -using System.Security.Cryptography.X509Certificates; -using Microsoft.Xna.Framework; namespace MenuVariantsMod { public class CustomBezel //Just the class for BEZELS.... { - public string Name; public string Left; public string Right; @@ -26,6 +17,5 @@ public CustomBezel(XmlElement xml, Atlas atlas) Right = xml.ChildText("Right", defaultValue: "Name Not Defined"); Atlas = atlas; } - } } \ No newline at end of file diff --git a/MenuVariantsMod/CustomLogo.cs b/MenuVariantsMod/CustomLogo.cs index c46a1b5..6cda35f 100644 --- a/MenuVariantsMod/CustomLogo.cs +++ b/MenuVariantsMod/CustomLogo.cs @@ -1,17 +1,10 @@ using Monocle; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; using System.Xml; -using System.Security.Cryptography.X509Certificates; using Microsoft.Xna.Framework; namespace MenuVariantsMod { - public class CustomLogo //Just the class for logos.... + public class CustomLogo { public bool VanillaBg; public bool VanillaArrow; @@ -45,6 +38,5 @@ public CustomLogo(XmlElement xml, Atlas atlas) Atlas = atlas; BgOrigin = xml.ChildPosition("BgOrigin", defaultValue: new Vector2(148f, 74f)); } - } } \ No newline at end of file diff --git a/MenuVariantsMod/ExampleModModule.cs b/MenuVariantsMod/ExampleModModule.cs deleted file mode 100644 index a803d4e..0000000 --- a/MenuVariantsMod/ExampleModModule.cs +++ /dev/null @@ -1,123 +0,0 @@ -using FortRise; -using HarmonyLib; -using Monocle; -using MonoMod.ModInterop; -using TowerFall; -using System.Reflection; -using MonoMod.RuntimeDetour; -using System.Diagnostics; -using System.Drawing; -using MonoMod.Utils; - -namespace MenuVariantsMod; - - -[Fort("com.CoolModder.MenuVariantsMod", "MenuVariantsMod")] -public class MenuVariantModModule : FortModule -{ - public static Atlas ExampleAtlas; - public static SpriteData Data; - - public static MenuVariantModModule Instance; - public static List Vanilla; - public static int SettingLogoCount; - - public static List MenuVariantNames = new List(); - public MenuVariantModModule() - { - Instance = this; - } - public override Type SettingsType => typeof(ModSettings); - public static ModSettings Settings => (ModSettings)Instance.InternalSettings; - - public override void LoadContent() - { - - } - - public override void Load() - { - var _separator = Path.DirectorySeparatorChar.ToString(); - var _customLogos = "Content" + _separator + "Mod" + _separator + "CustomLogos" + _separator; - Directory.CreateDirectory(_customLogos); - MenuVariantModModule.MenuVariantNames.Add("ASCENSION"); - MenuVariantModModule.MenuVariantNames.Add("DARK WORLD"); - LogoLoad.Load(); - BezelLoad.Load(); - Console.WriteLine("Custom Logos are here"); - On.TowerFall.Logo.ctor += MyLogo.ctor; - On.TowerFall.TFGame.LoadContent += MyBezel.MyLoad; - typeof(ModExports).ModInterop(); - } - - public override void Unload() - { - On.TowerFall.Logo.ctor -= MyLogo.ctor; - On.TowerFall.TFGame.LoadContent -= MyBezel.MyLoad; - } - public override void CreateModSettings(List optionList) - { - var optionButton = new OptionsButton("TITLE MODE"); - optionButton.SetCallbacks( - ()=> {optionButton.State = SettingName();}, - ()=> {Settings.MenuVariant--; SettingName(); }, - ()=>{Settings.MenuVariant++; SettingName(); }, - null - ); - optionList.Add(optionButton); - var optionBezelButton = new OptionsButton("BEZEL MODE"); - optionBezelButton.SetCallbacks( - () => { optionBezelButton.State = SideSettingName(); }, - () => { Settings.BezelVariant--; SideSettingName(); }, - () => { Settings.BezelVariant++; SideSettingName(); }, - null - ); - optionList.Add(optionButton); - optionList.Add(optionBezelButton); - string SideSettingName() - { - optionBezelButton.CanLeft = Settings.BezelVariant > 0; - optionBezelButton.CanRight = Settings.BezelVariant < BezelLoad.BezelNames.Count - 1; - Refresher.RefreshBezel(); - return BezelLoad.BezelNames[Settings.BezelVariant]; - } - string SettingName() - { - Refresher.RefreshLogo(); - optionButton.CanLeft = Settings.MenuVariant > 0; - optionButton.CanRight = Settings.MenuVariant < MenuVariantNames.Count - 1; - return MenuVariantNames[Settings.MenuVariant]; - } - - } - - -} - -// Harmony can be supported - -[HarmonyPatch(typeof(MainMenu), "BoolToString")] -public class MyPatcher -{ - static void Postfix(ref string __result) - { - if (__result == "ON") - { - __result = "ENABLED"; - return; - } - __result = "DISABLED"; - } -} - - -/* -Example of interppting with libraries -Learn more: https://github.com/MonoMod/MonoMod/blob/master/README-ModInterop.md -*/ - -[ModExportName("ExampleModExport")] -public static class ModExports -{ - public static int Add(int x, int y) => x + y; -} \ No newline at end of file diff --git a/MenuVariantsMod/LogoLoad.cs b/MenuVariantsMod/LogoLoad.cs index 432cc87..776ee71 100644 --- a/MenuVariantsMod/LogoLoad.cs +++ b/MenuVariantsMod/LogoLoad.cs @@ -1,14 +1,5 @@ using Monocle; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -using TowerFall; using FortRise; -using MonoMod.ModInterop; using System.Diagnostics; namespace MenuVariantsMod @@ -16,38 +7,33 @@ namespace MenuVariantsMod public class LogoLoad { public static List LogoList; - public static void Load() { + private static readonly string CUSTOM_LOGOS_DIR = "Content/CustomLogos"; + + public static void Load(FortContent content) + { MenuVariantModModule.Vanilla = new List(); MenuVariantModModule.Vanilla.Add(true); MenuVariantModModule.Vanilla.Add(true); - var _separator = Path.DirectorySeparatorChar.ToString(); - var _customLogos = "Content" + _separator + "Mod" + _separator + "CustomLogos" + _separator; - string[] directories = Directory.GetDirectories(_customLogos); - string[] array = directories; + LogoList = new List(); - foreach (string text in array) + foreach (RiseCore.Resource resource in content[CUSTOM_LOGOS_DIR].Childrens) { - Console.WriteLine(text); - var text2 = text.Replace("Content" + _separator, ""); - Atlas atlas = new Atlas(text2 + _separator + "atlas.xml", text2 + _separator + "atlas.png", true); - var LogoData = Calc.LoadXML(text + _separator + "LogoData.xml"); + if (resource.Childrens == null) + continue; + + Atlas atlas = AtlasExt.CreateAtlas(content, $"{resource.Path}/atlas.xml" , $"{resource.Path}/atlas.png", ContentAccess.ModContent); + RiseCore.Resource logoDataResource = content[$"{resource.Path}/LogoData.xml"]; + var LogoData = Calc.LoadXML(logoDataResource.Stream); var TrueLogoData = LogoData["LogoData"]; - Console.WriteLine(atlas); + if (atlas == null) { Debugger.Break(); } - //if (TrueLogoData != null) - //{ - CustomLogo logoCustomData = new CustomLogo(TrueLogoData, atlas); - //if (logoCustomData != null) - //{ - LogoList.Add(logoCustomData); - MenuVariantModModule.MenuVariantNames.Add(TrueLogoData.ChildText("Name")); - MenuVariantModModule.Vanilla.Add(false); - // } - - //} + CustomLogo logoCustomData = new CustomLogo(TrueLogoData, atlas); + LogoList.Add(logoCustomData); + MenuVariantModModule.MenuVariantNames.Add(TrueLogoData.ChildText("Name")); + MenuVariantModModule.Vanilla.Add(false); } } } diff --git a/MenuVariantsMod/MenuVariantsMod.csproj b/MenuVariantsMod/MenuVariantsMod.csproj index 76f1a78..a3aa765 100644 --- a/MenuVariantsMod/MenuVariantsMod.csproj +++ b/MenuVariantsMod/MenuVariantsMod.csproj @@ -4,27 +4,35 @@ net472 11 enable + false + false - - 1701;1702;0104;1061;0246;0118;0123 - 0 - False + + 1701;1702;0104;1061;0246;0118;0123 + 0 + False + ..\..\Towerfall - Ascension\Mods\MenuVariantsMod\ + false + false - - 1701;1702;0104;1061;0246;0118;0123 - 0 - False + + 1701;1702;0104;1061;0246;0118;0123 + 0 + False + ..\..\Towerfall - Ascension\Mods\MenuVariantsMod\ + false + false - - + + - + PreserveNewest @@ -33,23 +41,26 @@ - - ..\..\0Harmony.dll + + ..\..\Towerfall - Ascension\0Harmony.dll + False - - ..\..\FNA.dll + + ..\..\Towerfall - Ascension\FNA.dll + False - - ..\..\MMHOOK_TowerFall.dll + + ..\..\Towerfall - Ascension\MMHOOK_TowerFall.dll + False - - ..\..\TowerFall.exe + + ..\..\Towerfall - Ascension\TowerFall.exe + False - - - + + diff --git a/MenuVariantsMod/MenuVariantsModModule.cs b/MenuVariantsMod/MenuVariantsModModule.cs new file mode 100644 index 0000000..a4adae0 --- /dev/null +++ b/MenuVariantsMod/MenuVariantsModModule.cs @@ -0,0 +1,98 @@ +using FortRise; +using HarmonyLib; +using Monocle; +using MonoMod.ModInterop; +using TowerFall; + +namespace MenuVariantsMod; + + +[Fort("com.CoolModder.MenuVariantsMod", "MenuVariantsMod")] +public class MenuVariantModModule : FortModule +{ + public static Atlas ExampleAtlas; + public static SpriteData Data; + + public static MenuVariantModModule Instance; + public static List Vanilla; + + public static List MenuVariantNames = new(); + public MenuVariantModModule() + { + Instance = this; + } + public override Type SettingsType => typeof(ModSettings); + public static ModSettings Settings => (ModSettings)Instance.InternalSettings; + + public override void Load() + { + On.TowerFall.Logo.ctor += MyLogo.ctor; + typeof(ModExports).ModInterop(); + } + public override void LoadContent() + { + string customLogos = Path.Combine("Mods", Content.MetadataPath.Replace("mod:", ""), "Content", "CustomLogos"); + Directory.CreateDirectory(customLogos); + string customBezels = Path.Combine("Mods", Content.MetadataPath.Replace("mod:", ""), "Content", "CustomBezels"); + Directory.CreateDirectory(customBezels); + + MenuVariantNames.Add("ASCENSION"); + MenuVariantNames.Add("DARK WORLD"); + + LogoLoad.Load(Content); + BezelLoad.Load(Content); + + MyBezel.MyLoad(); + } + + public override void Unload() + { + On.TowerFall.Logo.ctor -= MyLogo.ctor; + } + + public override void CreateModSettings(TextContainer textContainer) + { + var logoSelect = new TextContainer.SelectionOption("Logo", MenuVariantNames.ToArray()); + logoSelect.Value = (MenuVariantNames[Settings.MenuVariant], Settings.MenuVariant); + logoSelect.OnValueChanged = value => + { + Settings.MenuVariant = value.Item2; + Refresher.RefreshLogo(); + }; + var bezelSelect = new TextContainer.SelectionOption("Bezel", BezelLoad.BezelNames.ToArray()); + bezelSelect.Value = (BezelLoad.BezelNames[Settings.BezelVariant], Settings.BezelVariant); + bezelSelect.OnValueChanged = value => + { + Settings.BezelVariant = value.Item2; + Refresher.RefreshBezel(); + }; + + textContainer.Add(logoSelect); + textContainer.Add(bezelSelect); + } +} + +// Harmony can be supported +[HarmonyPatch(typeof(MainMenu), "BoolToString")] +public class MyPatcher +{ + static void Postfix(ref string __result) + { + if (__result == "ON") + { + __result = "ENABLED"; + return; + } + __result = "DISABLED"; + } +} + + +/* +Example of interppting with libraries +Learn more: https://github.com/MonoMod/MonoMod/blob/master/README-ModInterop.md +*/ +[ModExportName("MenuVariantMod")] +public static class ModExports +{ +} \ No newline at end of file diff --git a/MenuVariantsMod/ExampleModSettings.cs b/MenuVariantsMod/MenuVariantsModSettings.cs similarity index 95% rename from MenuVariantsMod/ExampleModSettings.cs rename to MenuVariantsMod/MenuVariantsModSettings.cs index b1c4f69..3142ae0 100644 --- a/MenuVariantsMod/ExampleModSettings.cs +++ b/MenuVariantsMod/MenuVariantsModSettings.cs @@ -1,6 +1,5 @@ using Monocle; using FortRise; -using TowerFall; namespace MenuVariantsMod; diff --git a/MenuVariantsMod/MyBezel.cs b/MenuVariantsMod/MyBezel.cs index f79c619..51c3d13 100644 --- a/MenuVariantsMod/MyBezel.cs +++ b/MenuVariantsMod/MyBezel.cs @@ -1,41 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Xml; -using HarmonyLib; -using Microsoft.Xna.Framework; using Monocle; -using TowerFall; using MenuVariantsMod; -using MonoMod.Cil; -using MonoMod.RuntimeDetour.HookGen; -using MonoMod.Utils; -using System.Diagnostics; - -public class MyBezel : TFGame +public class MyBezel { - private static ConstructorInfo base_Logo; - - public static Image ascension; - public static Image title; - public static Image titleLight; - public static Image arrow; - public static Image bg; - public static Sprite ascensionCore; - public static Image[] letters; - public static float[] lettersY; - - public static float lightMult = 1f; - public static SineWave lightSine; - - public MyBezel(bool noIntro) : base(noIntro) - { - } - - public static void MyLoad(On.TowerFall.TFGame.orig_LoadContent orig, TFGame self) + public static void MyLoad() { - orig(self); + if (MenuVariantModModule.Settings.BezelVariant > 0 && !BezelLoad.BezelList.Any()) + MenuVariantModModule.Settings.BezelVariant = 0; + if (MenuVariantModModule.Settings.BezelVariant > 0) { var LoadedBezel = BezelLoad.BezelList[MenuVariantModModule.Settings.BezelVariant - 1]; diff --git a/MenuVariantsMod/MyLogo.cs b/MenuVariantsMod/MyLogo.cs index fc3d72f..b1bb554 100644 --- a/MenuVariantsMod/MyLogo.cs +++ b/MenuVariantsMod/MyLogo.cs @@ -13,7 +13,7 @@ using System.Diagnostics; -public class MyLogo : Logo +public class MyLogo { private static ConstructorInfo base_Logo; @@ -26,7 +26,6 @@ public class MyLogo : Logo public static Image[] letters; public static float[] lettersY; - public static float lightMult = 1f; public static SineWave lightSine; public static Logo Instance; @@ -38,7 +37,11 @@ public static void ctor(On.TowerFall.Logo.orig_ctor orig, Logo self) self.RemoveAll(); var towerTarget = LogoData.Get("towerTarget"); var coreTarget = LogoData.Get("towerTarget"); - if (MenuVariantsMod.MenuVariantModModule.Vanilla[MenuVariantModModule.Settings.MenuVariant] == true) + + if (MenuVariantModModule.Settings.MenuVariant >= MenuVariantModModule.Vanilla.Count) + MenuVariantModModule.Settings.MenuVariant = 0; + + if (MenuVariantsMod.MenuVariantModModule.Vanilla[MenuVariantModModule.Settings.MenuVariant]) { if (MenuVariantModModule.Settings.MenuVariant == 0) { @@ -136,22 +139,21 @@ public static void ctor(On.TowerFall.Logo.orig_ctor orig, Logo self) } else { - var LoadedLogo = LogoLoad.LogoList[MenuVariantModModule.Settings.MenuVariant-2]; + var LoadedLogo = LogoLoad.LogoList[MenuVariantModModule.Settings.MenuVariant - 2]; var atlas = LoadedLogo.Atlas; - if (LoadedLogo.VanillaTitle == true) + if (LoadedLogo.VanillaTitle) { title = new Image(TFGame.MenuAtlas[LoadedLogo.Title]); titleLight = new Image(TFGame.MenuAtlas[LoadedLogo.TitleLight]); } else { - Console.WriteLine(LoadedLogo.Title); title = new Image(atlas[LoadedLogo.Title]); titleLight = new Image(atlas[LoadedLogo.TitleLight]); } title.Origin = new Vector2(126f, 37f); titleLight.Origin = new Vector2(126f, 37f); - if (LoadedLogo.VanillaArrow == true) + if (LoadedLogo.VanillaArrow) { arrow = new Image(TFGame.MenuAtlas[LoadedLogo.Arrow]); } @@ -160,7 +162,7 @@ public static void ctor(On.TowerFall.Logo.orig_ctor orig, Logo self) arrow = new Image(atlas[LoadedLogo.Arrow]); } arrow.Origin = new Vector2(156f, 24f); - if (LoadedLogo.VanillaBg == true) + if (LoadedLogo.VanillaBg) { bg = new Image(TFGame.MenuAtlas[LoadedLogo.Bg]); bg.Origin = new Vector2(148f, 74f); @@ -170,7 +172,7 @@ public static void ctor(On.TowerFall.Logo.orig_ctor orig, Logo self) bg = new Image(atlas[LoadedLogo.Bg]); bg.Origin = new Vector2(LoadedLogo.BgOrigin.X, LoadedLogo.BgOrigin.Y); } - if (LoadedLogo.VanillaAscension == true) + if (LoadedLogo.VanillaAscension) { ascension = new Image(TFGame.MenuAtlas[LoadedLogo.Ascension]); } diff --git a/MenuVariantsMod/Refresher.cs b/MenuVariantsMod/Refresher.cs index 718a1c9..cbe6846 100644 --- a/MenuVariantsMod/Refresher.cs +++ b/MenuVariantsMod/Refresher.cs @@ -1,21 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Xml; -using HarmonyLib; +using System.Reflection; using Microsoft.Xna.Framework; using Monocle; using TowerFall; -using MenuVariantsMod; -using MonoMod.Cil; -using MonoMod.RuntimeDetour.HookGen; using MonoMod.Utils; -using System.Diagnostics; - namespace MenuVariantsMod { - public class Refresher { private static ConstructorInfo base_Logo; @@ -54,7 +44,7 @@ public static void RefreshLogo() var coreTarget = LogoData.Get("towerTarget"); MyLogo.Instance.RemoveAll(); - if (MenuVariantsMod.MenuVariantModModule.Vanilla[MenuVariantModModule.Settings.MenuVariant] == true) + if (MenuVariantModModule.Vanilla[MenuVariantModModule.Settings.MenuVariant]) { if (MenuVariantModModule.Settings.MenuVariant == 0) { @@ -91,7 +81,7 @@ public static void RefreshLogo() LogoData.Set("letters", letters); LogoData.Set("lettersY", lettersY); LogoData.Set("darkWorldMode", false); - Console.WriteLine("Ascension goes Brr"); + MyLogo.Instance.Add(bg, ascension, ascensionCore, arrow, title, titleLight); MyLogo.Instance.Add(letters); LogoData.Set("dark", null); @@ -154,20 +144,19 @@ public static void RefreshLogo() { var LoadedLogo = LogoLoad.LogoList[MenuVariantModModule.Settings.MenuVariant - 2]; var atlas = LoadedLogo.Atlas; - if (LoadedLogo.VanillaTitle == true) + if (LoadedLogo.VanillaTitle) { title = new Image(TFGame.MenuAtlas[LoadedLogo.Title]); titleLight = new Image(TFGame.MenuAtlas[LoadedLogo.TitleLight]); } else { - Console.WriteLine(LoadedLogo.Title); title = new Image(atlas[LoadedLogo.Title]); titleLight = new Image(atlas[LoadedLogo.TitleLight]); } title.Origin = new Vector2(126f, 37f); titleLight.Origin = new Vector2(126f, 37f); - if (LoadedLogo.VanillaArrow == true) + if (LoadedLogo.VanillaArrow) { arrow = new Image(TFGame.MenuAtlas[LoadedLogo.Arrow]); } @@ -176,7 +165,7 @@ public static void RefreshLogo() arrow = new Image(atlas[LoadedLogo.Arrow]); } arrow.Origin = new Vector2(156f, 24f); - if (LoadedLogo.VanillaBg == true) + if (LoadedLogo.VanillaBg) { bg = new Image(TFGame.MenuAtlas[LoadedLogo.Bg]); bg.Origin = new Vector2(148f, 74f); @@ -186,7 +175,7 @@ public static void RefreshLogo() bg = new Image(atlas[LoadedLogo.Bg]); bg.Origin = new Vector2(LoadedLogo.BgOrigin.X, LoadedLogo.BgOrigin.Y); } - if (LoadedLogo.VanillaAscension == true) + if (LoadedLogo.VanillaAscension) { ascension = new Image(TFGame.MenuAtlas[LoadedLogo.Ascension]); } diff --git a/MenuVariantsMod/meta.json b/MenuVariantsMod/meta.json index c4ab77d..17e6332 100644 --- a/MenuVariantsMod/meta.json +++ b/MenuVariantsMod/meta.json @@ -1,7 +1,7 @@ { "name": "MenuVariantsMod", - "version": "1.0.0", - "author": "CoolModder", - "description": "Adds setting to change your mneu theme! Includes TowerSus!", + "version": "1.1.0", + "author": "CoolModder, Lync, Teuria", + "description": "Adds setting to change your menu theme!", "dll": "MenuVariantsMod.dll" -} \ No newline at end of file +}