Merge branch 'core' of github.com:EverestAPI/Everest into core

EverestAPI · Oct 30, 2023 · c348dfa · c348dfa
2 parents 1c87bc9 + fd44641
commit c348dfa
Show file tree

Hide file tree

Showing 15 changed files with 445 additions and 339 deletions.
diff --git a/Celeste.Mod.mm/Content/Dialog/English.txt b/Celeste.Mod.mm/Content/Dialog/English.txt
@@ -34,7 +34,7 @@
 	MENU_MAPLIST= 			Map List
 	MENU_MODOPTIONS= 		Mod Options
 	MENU_PAUSE_MODOPTIONS= 	Mod Options
-	
+
 	MENU_MODOPTIONS_UPDATE_FAILED=				Failed to install Everest Update
 	MENU_MODOPTIONS_ONE_MOD_FAILEDTOLOAD=		1 mod failed to load
 	MENU_MODOPTIONS_MULTIPLE_MODS_FAILEDTOLOAD=	{0} mods failed to load
@@ -46,7 +46,7 @@
 # Title Screen
 	MENU_TITLESCREEN_RESTART_VANILLA= Restarting into orig/Celeste.exe
 	MENU_TITLESCREEN_RESTART_VANILLA_SAVES_WARN= WARNING: Because of OS limitations, saves won't be shared!
-    
+
 # Extra Key Mapping
     KEY_CONFIG_ADDING= PRESS ADDITIONAL KEY FOR
     KEY_CONFIG_ADDITION_HINT= Press SHIFT + CONFIRM to add or remove additional keys
@@ -100,7 +100,8 @@
 	MODOPTIONS_COREMODULE_MENUPAGEUP=						Page Up in Menus
 	MODOPTIONS_COREMODULE_MENUPAGEDOWN=						Page Down in Menus
 	MODOPTIONS_COREMODULE_DEBUGMODE_SUBHEADER=				DEBUG MODE
-	MODOPTIONS_COREMODULE_DEBUGCONSOLE=						Debug Console
+	MODOPTIONS_COREMODULE_TOGGLEDEBUGCONSOLE=				Toggle Debug Console
+	MODOPTIONS_COREMODULE_DEBUGCONSOLE=						Open Debug Console
 	MODOPTIONS_COREMODULE_DEBUGMAP=							Debug Map
 	MODOPTIONS_COREMODULE_MOUNTAINCAM_SUBHEADER=			OVERWORLD MOUNTAIN CAMERA
 	MODOPTIONS_COREMODULE_CAMERAFORWARD=					Camera Forward
@@ -115,7 +116,7 @@
 	MODOPTIONS_COREMODULE_SOUNDTEST= 						Sound Test
 	MODOPTIONS_COREMODULE_OOBE= 							Redo Initial Setup
 	MODOPTIONS_COREMODULE_TOGGLEMODS=						Enable or Disable Mods
-	
+
 	MODOPTIONS_COREMODULE_DISCORDRICHPRESENCE=				Discord Rich Presence
 	MODOPTIONS_COREMODULE_DISCORDRICHPRESENCEOPTIONS=		Rich Presence Options
 	MODOPTIONS_COREMODULE_DISCORDSHOWICON=					Show Icon
@@ -153,7 +154,7 @@
 	MAPLIST_SEARCH=			Search
 	MAPLIST_SEARCH_MATCH=	Quick Match
 	MAPLIST_TYPE_EVERYTHING=  Everything
-	MAPLIST_RESULTS_SINGULAR= {0} result found  
+	MAPLIST_RESULTS_SINGULAR= {0} result found
 	MAPLIST_RESULTS_PLURAL=   {0} results found
 
 	LEVELSET_CELESTE= 		Celeste
@@ -179,7 +180,7 @@
 
 	UPDATER_SRC_RELEASE_GITHUB=		Tagged releases (GitHub)
 	UPDATER_SRC_BUILDBOT_AZURE=		Automatic builds (Azure)
-	
+
 # currently unused
 	UPDATER_SRC_BUILDBOT= 			Automatic builds
 
@@ -226,7 +227,7 @@
 	MODUPDATECHECKER_MENU_HEADER_RESTART= Choose an action
 	MODUPDATECHECKER_SHUTDOWN= Exit
 	MODUPDATECHECKER_RESTART= Restart
-	
+
 # Auto Mod Updater
 	AUTOUPDATECHECKER_CHECKING=		Checking for mod updates...
 	AUTOUPDATECHECKER_UPDATING=		Auto-updating

diff --git a/Celeste.Mod.mm/Content/Dialog/French.txt b/Celeste.Mod.mm/Content/Dialog/French.txt
@@ -1,4 +1,4 @@
-# Check English.txt for up-to-date notes.
+# Check English.txt for up-to-date notes.
 
 # Helper Postcards
 	POSTCARD_LEVELGONE= 		{big}Merci ((player)) !{/big}{n}Mais {#ff1144}((sid)){#} est dans une autre montagne.
@@ -82,8 +82,9 @@
 	MODOPTIONS_COREMODULE_MENUPAGEUP=						Page précédente (menus)
 	MODOPTIONS_COREMODULE_MENUPAGEDOWN=						Page suivante (menus)
 	MODOPTIONS_COREMODULE_DEBUGMODE_SUBHEADER=				MODE DEBUG
-	MODOPTIONS_COREMODULE_DEBUGCONSOLE=						Console de debug
-	MODOPTIONS_COREMODULE_DEBUGMAP=							Carte de debug
+	MODOPTIONS_COREMODULE_TOGGLEDEBUGCONSOLE=				Ouvrir/Fermer la console de debug
+	MODOPTIONS_COREMODULE_DEBUGCONSOLE=						Ouvrir la console de debug
+	MODOPTIONS_COREMODULE_DEBUGMAP=							Ouvrir la carte de debug
 	MODOPTIONS_COREMODULE_MOUNTAINCAM_SUBHEADER=			CAMERA DANS LE MENU PRINCIPAL
 	MODOPTIONS_COREMODULE_CAMERAFORWARD=					Avancer
 	MODOPTIONS_COREMODULE_CAMERABACKWARD=					Reculer

diff --git a/Celeste.Mod.mm/Content/Dialog/Simplified Chinese.txt b/Celeste.Mod.mm/Content/Dialog/Simplified Chinese.txt
@@ -80,7 +80,8 @@
 	MODOPTIONS_COREMODULE_MENUPAGEUP=						向上翻页
 	MODOPTIONS_COREMODULE_MENUPAGEDOWN=						向下翻页
 	MODOPTIONS_COREMODULE_DEBUGMODE_SUBHEADER=				调试模式
-	MODOPTIONS_COREMODULE_DEBUGCONSOLE=						调试控制台
+	MODOPTIONS_COREMODULE_TOGGLEDEBUGCONSOLE=				开关调试控制台
+	MODOPTIONS_COREMODULE_DEBUGCONSOLE=						打开调试控制台
 	MODOPTIONS_COREMODULE_DEBUGMAP=							调试地图
 	MODOPTIONS_COREMODULE_MOUNTAINCAM_SUBHEADER=			选关界面镜头
 	MODOPTIONS_COREMODULE_CAMERAFORWARD=					向前移动
@@ -133,7 +134,7 @@
 	UPDATER_VERSIONS_TITLE= 		更改 Everest 版本
 	UPDATER_VERSIONS_CURRENT= 		当前版本：((version))
 	UPDATER_VERSIONS_REQUESTING= 	刷新中…
-	
+
 	UPDATER_VERSIONS_ERR_DOWNLOAD= 	下载版本列表失败。
 	UPDATER_VERSIONS_ERR_FORMAT= 	未知格式。
 

diff --git a/Celeste.Mod.mm/Mod/Core/CoreModuleSettings.cs b/Celeste.Mod.mm/Mod/Core/CoreModuleSettings.cs
@@ -312,8 +312,13 @@ public string CurrentBranch {
             set => _CurrentBranch = value is "dev" or "beta" or "stable" ? "updater_src_" + value : value; // branch names were changed at some point
         }
 
+        private Dictionary<string, LogLevel> _LogLevels = new Dictionary<string, LogLevel>();
+
         [SettingIgnore]
-        public Dictionary<string, LogLevel> LogLevels { get; set; } = new Dictionary<string, LogLevel>();
+        public Dictionary<string, LogLevel> LogLevels {
+            get => _LogLevels;
+            set => _LogLevels = value ?? new Dictionary<string, LogLevel>();
+        }
 
         [SettingSubHeader("MODOPTIONS_COREMODULE_MENUNAV_SUBHEADER")]
         [SettingInGame(false)]
@@ -323,6 +328,10 @@ public string CurrentBranch {
         public ButtonBinding MenuPageDown { get; set; }
 
         [SettingSubHeader("MODOPTIONS_COREMODULE_DEBUGMODE_SUBHEADER")]
+        [SettingInGame(false)]
+        [DefaultButtonBinding(0, Keys.OemTilde)]
+        public ButtonBinding ToggleDebugConsole { get; set; }
+
         [SettingInGame(false)]
         [DefaultButtonBinding(0, Keys.OemPeriod)]
         public ButtonBinding DebugConsole { get; set; }

diff --git a/Celeste.Mod.mm/Mod/Everest/ButtonBinding.cs b/Celeste.Mod.mm/Mod/Everest/ButtonBinding.cs
@@ -18,17 +18,17 @@ public class ButtonBinding {
 
         public List<Buttons> Buttons {
             get => Binding.Controller;
-            set => Binding.Controller = value;
+            set => Binding.Controller = value ?? new List<Buttons>();
         }
 
         public List<Keys> Keys {
             get => Binding.Keyboard;
-            set => Binding.Keyboard = value;
+            set => Binding.Keyboard = value ?? new List<Keys>();
         }
 
         public List<patch_MInput.patch_MouseData.MouseButtons> MouseButtons {
             get => ((patch_Binding) Binding).Mouse;
-            set => ((patch_Binding) Binding).Mouse = value;
+            set => ((patch_Binding) Binding).Mouse = value ?? new List<patch_MInput.patch_MouseData.MouseButtons>();
         }
 
         private Binding _Binding;

diff --git a/Celeste.Mod.mm/Mod/Everest/Everest.Events.cs b/Celeste.Mod.mm/Mod/Everest/Everest.Events.cs
@@ -8,6 +8,8 @@
 using _OuiJournal = Celeste.OuiJournal;
 using _OuiMainMenu = Celeste.OuiMainMenu;
 using _Player = Celeste.Player;
+using _Seeker = Celeste.Seeker;
+using _AngryOshiro = Celeste.AngryOshiro;
 
 namespace Celeste.Mod {
     public static partial class Everest {
@@ -184,6 +186,22 @@ internal static void Spawn(_Player player)
                 public static event Action<_Player> OnDie;
                 internal static void Die(_Player player)
                     => OnDie?.Invoke(player);
+
+                public static event Action<_Player> OnRegisterStates;
+                internal static void RegisterStates(_Player player)
+                    => OnRegisterStates?.Invoke(player);
+            }
+
+            public static class Seeker {
+                public static event Action<_Seeker> OnRegisterStates;
+                internal static void RegisterStates(_Seeker seeker)
+                    => OnRegisterStates?.Invoke(seeker);
+            }
+
+            public static class AngryOshiro {
+                public static event Action<_AngryOshiro> OnRegisterStates;
+                internal static void RegisterStates(_AngryOshiro oshiro)
+                    => OnRegisterStates?.Invoke(oshiro);
             }
 
             public static class Input {