Published Backward Compatible Version

MegaPiggy · Jun 1, 2021 · b707a8f · b707a8f
1 parent 7f7ee13
commit b707a8f
Show file tree

Hide file tree

Showing 42 changed files with 210 additions and 2,033 deletions.
diff --git a/Character.cs b/Character.cs
diff --git a/CharacterExtensions.cs b/CharacterExtensions.cs
diff --git a/CharacterIdentifiable.cs b/CharacterIdentifiable.cs
diff --git a/Config/ConfigElement.cs b/Config/ConfigElement.cs
@@ -27,12 +27,6 @@ static bool GetAttributeOfType<T>(FieldInfo field, out T attribute) where T : At
             return attribute != null;
         }
 
-        public override void SetValue<T>(T value)
-        {
-            if (value is int) value = (T)Options.Range.GetValue(value);
-            base.SetValue(value);
-        }
-
         public static ConfigElementOptions GenerateAttributesOptions(FieldInfo field)
         {
 
@@ -42,15 +36,13 @@ public static ConfigElementOptions GenerateAttributesOptions(FieldInfo field)
                 Comment = GetAttributeOfType<ConfigCommentAttribute>(field, out var comment) ? comment.Comment : null,
                 Name = GetAttributeOfType<ConfigNameAttribute>(field, out var name) ? name.Name : field.Name,
                 Parser = GetAttributeOfType<ConfigParserAttribute>(field, out var parser) ? parser.Parser : ParserRegistry.TryGetParser(field.FieldType, out var backupParser) ? backupParser : null,
-                ReloadMode = GetAttributeOfType<ConfigReloadAttribute>(field, out var reload) ? reload.Mode : ReloadMode.NORMAL,
-                Range = GetAttributeOfType<ConfigRangeAttribute>(field, out var range) ? new DoubleConstrainedInt(0, range.min, range.max) : DoubleConstrainedInt.zero
+                ReloadMode = GetAttributeOfType<ConfigReloadAttribute>(field, out var reload) ? reload.Mode : ReloadMode.NORMAL
             };
         }
 
         public FieldBackedConfigElement(FieldInfo field) : base(GenerateAttributesOptions(field))
         {
             this.field = field;
-            if (Value is int) Value = Options.Range.GetValue((int)Value);
             Options.DefaultValue = Value;
             if (Value is IStringParserProvider val) Options.Parser = val.GetParser();
             if (Options.Parser == null) throw new Exception(field.FieldType.ToString());
@@ -132,7 +124,6 @@ public class ConfigElementOptions
         public string Comment { get; internal set; }
         public object DefaultValue { get; internal set; }
         public string Name { get; internal set; }
-        public DoubleConstrainedInt Range { get; internal set; }
         public ReloadMode ReloadMode { get; internal set; }
     }
 

diff --git a/Console/Commands/CheckpointCommand.cs b/Console/Commands/CheckpointCommand.cs
@@ -34,7 +34,6 @@ public override bool Execute(string[] args)
                 Console.LogError("Failed to create a checkpoint");
                 return false;
             }
-            Main.StopSave();
             PlayerScript.player.SetCheckpoint(CreateCheckpoint().transform);
             Console.LogSuccess("Successfully created a checkpoint");
             return true;

diff --git a/Console/Commands/CompleteLevelCommand.cs b/Console/Commands/CompleteLevelCommand.cs
@@ -18,31 +18,7 @@ public override bool Execute(string[] args)
                 Console.LogError("Cannot complete a level when there is no level to complete.");
                 return false;
             }
-            if (Levels.isRedHeart())
-            {
-                var FakeBtn = Object.FindObjectOfType<FakeButtonScript>();
-                if (FakeBtn != null)
-                    FakeBtn.Pound();
-                else
-                    Console.LogError("No fake button found.");
-                var potClose = Object.FindObjectOfType<PotCloseTrigger>();
-                if (potClose != null)
-                {
-                    Patches.PotClosedPatch.OnPotClosed += CompleteRedHeart;
-                    potClose.OnTriggerEnter2D(Main.CreatePlayerCollider());
-                    return true;
-                }
-                else
-                    Console.LogError("No pot found.");
-            }
-            return CompleteLevel();//Levels.isRedHeart() ? CompleteRedHeart() : CompleteLevel();
-        }
-
-        private static void CompleteRedHeart()
-        {
-            SAObjects.GetRootGameObject("PotTrap").SetChildActive("LevelClearEmpty", true);
-            CompleteLevel();
-            Patches.PotClosedPatch.OnPotClosed -= CompleteRedHeart;
+            return CompleteLevel();
         }
 
         private static bool CompleteLevel()
@@ -53,11 +29,7 @@ private static bool CompleteLevel()
                 Console.LogError("Failed to complete level. No 'mom' button found.");
                 return false;
             }
-            Main.StopSave();
-            LevelManager.levelManager.deaths = 0;
-            LevelManager.levelManager.bubbaTokens = new bool[3] { true, true, true };
-            LevelManager.levelManager.collectedMoustaches = LevelManager.levelManager.totalMoustaches;
-            MainScript.main.levelTime = 0.0f;
+            MainScript.main.levelTime = 0.01f;
             ClearBtn.Pound();
             Console.LogSuccess("Successfully completed level.");
             return true;

diff --git a/Console/Commands/CoordinatesCommand.cs b/Console/Commands/CoordinatesCommand.cs
@@ -31,7 +31,6 @@ public override bool Execute(string[] args)
 					float result3;
 					if (float.TryParse(args[1], out result1) & float.TryParse(args[2], out result2) & float.TryParse(args[3], out result3))
 					{
-						Main.StopSave();
 						PlayerScript.player.transform.position = new UnityEngine.Vector3(result1, result2, result3);
 						return true;
 					}

diff --git a/Console/Commands/LoadLevelCommand.cs b/Console/Commands/LoadLevelCommand.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 using SALT.Extensions;
 
 namespace SALT.Console.Commands
@@ -18,7 +19,7 @@ internal class LoadLevelCommand : ConsoleCommand
         public static int Increment()
         {
             i += 1;
-            if (i > (int)EnumUtils.GetHighestValue<Level>())
+            if (i >= SceneManager.sceneCountInBuildSettings)
                 i = 0;
             return i;
         }
@@ -47,7 +48,16 @@ public override List<string> GetAutoComplete(int argIndex, string argText)
             if (argIndex == 0)
             {
                 List<Level> levels = EnumUtils.GetAll<Level>().ToList();
-                return levels.Select<Level,string>(l => l.ToString()).ToList();
+                List<Level> realLevels = new List<Level>();
+                int index = 1;
+                foreach (Level lvl in levels)
+                {
+                    if (index > SceneManager.sceneCountInBuildSettings)
+                        break;
+                    realLevels.Add(lvl);
+                    index++;
+                }
+                return realLevels.Select<Level,string>(l => l.ToString()).ToList();
             }
             return base.GetAutoComplete(argIndex, argText);
         }

diff --git a/Console/Commands/OldDumpCommand.cs b/Console/Commands/OldDumpCommand.cs
@@ -77,7 +77,7 @@ public override List<string> GetAutoComplete(int argIndex, string argText)
 		{
 			if (argIndex == 0)
 			{
-				List<string> vs = new List<string>() { "all" };
+				List<string> vs = new List<string>{ "all" };
 				vs.AddRange(Console.dumpActions.Keys);
 				return vs;
 			}

diff --git a/Console/Commands/RespawnCommand.cs b/Console/Commands/RespawnCommand.cs
@@ -18,7 +18,6 @@ public override bool Execute(string[] args)
                 Console.LogError("Respawn failed");
                 return false;
             }
-            Main.StopSave();
             player.Kill();//InvokePrivateMethod("Kill");
             Console.LogSuccess("Successfully Respawned");
             return true;