Merge branch 'beta' into stable

EverestAPI · Dec 2, 2023 · ddba361 · ddba361
2 parents 8f49188 + e09645a
commit ddba361
Show file tree

Hide file tree

Showing 16 changed files with 1,289 additions and 380 deletions.
diff --git a/Celeste.Mod.mm/Content/Dialog/English.txt b/Celeste.Mod.mm/Content/Dialog/English.txt
@@ -266,21 +266,24 @@
 	OOBE_SETTINGS_OK=			OK
 
 # Mod Toggle Menu
-	MODOPTIONS_MODTOGGLE=				TOGGLE MODS
-	MODOPTIONS_MODTOGGLE_LOADING=		Loading mod information...
-	MODOPTIONS_MODTOGGLE_TOGGLEDEPS=	Toggle Dependencies Automatically
-	MODOPTIONS_MODTOGGLE_TOGGLEDEPS_MESSAGE1=	When you enable a mod, all its dependencies will be enabled.
-	MODOPTIONS_MODTOGGLE_TOGGLEDEPS_MESSAGE2=	When you disable a mod, all mods that depend on it will be disabled.
-	MODOPTIONS_MODTOGGLE_MESSAGE_1=		If you enable or disable mods, your blacklist.txt will be replaced,
-	MODOPTIONS_MODTOGGLE_MESSAGE_2=		and Celeste will restart to apply changes.
-	MODOPTIONS_MODTOGGLE_MESSAGE_3=		Highlighted mods are used by other enabled mods as a dependency.
-	MODOPTIONS_MODTOGGLE_WHITELISTWARN= Disable your whitelist for these settings to be applied properly.
-	MODOPTIONS_MODTOGGLE_ENABLEALL=		Enable All
-	MODOPTIONS_MODTOGGLE_DISABLEALL=	Disable All
-	MODOPTIONS_MODTOGGLE_CANCEL=		Cancel
-	MODOPTIONS_MODTOGGLE_ZIPS=			Zip Files
-	MODOPTIONS_MODTOGGLE_DIRECTORIES=	Directories
-	MODOPTIONS_MODTOGGLE_BINS=			Map Bin Files
+	MODOPTIONS_MODTOGGLE=							TOGGLE MODS
+	MODOPTIONS_MODTOGGLE_LOADING=					Loading mod information...
+	MODOPTIONS_MODTOGGLE_TOGGLEDEPS=				Toggle Dependencies Automatically
+	MODOPTIONS_MODTOGGLE_TOGGLEDEPS_MESSAGE1=		When you enable a mod, all its dependencies will be enabled.
+	MODOPTIONS_MODTOGGLE_TOGGLEDEPS_MESSAGE2=		When you disable a mod, all mods that depend on it will be disabled.
+	MODOPTIONS_MODTOGGLE_PROTECTFAVORITES=			Protect Favorites
+	MODOPTIONS_MODTOGGLE_PROTECTFAVORITES_MESSAGE=	Press {0} to add or remove mods from your favorite list.
+	MODOPTIONS_MODTOGGLE_MESSAGE_1=					If you enable or disable mods, your blacklist.txt will be replaced,
+	MODOPTIONS_MODTOGGLE_MESSAGE_2=					and Celeste will restart to apply changes.
+	MODOPTIONS_MODTOGGLE_MESSAGE_3=					Highlighted mods are used by other enabled mods as a dependency.
+	MODOPTIONS_MODTOGGLE_WHITELISTWARN= 			Disable your whitelist for these settings to be applied properly.
+	MODOPTIONS_MODTOGGLE_ENABLEALL=					Enable All
+	MODOPTIONS_MODTOGGLE_DISABLEALL=				Disable All
+	MODOPTIONS_MODTOGGLE_CANCEL=					Cancel
+	MODOPTIONS_MODTOGGLE_ZIPS=						Zip Files
+	MODOPTIONS_MODTOGGLE_DIRECTORIES=				Directories
+	MODOPTIONS_MODTOGGLE_BINS=						Map Bin Files
+	MODOPTIONS_MODTOGGLE_SEARCHBOX_PLACEHOLDER=		Press 'Tab' or 'Enter' to scroll to the next match
 
 # Asset Reload Helper
 	ASSETRELOADHELPER_RELOADINGMAP=			Reloading map

diff --git a/Celeste.Mod.mm/Content/Dialog/French.txt b/Celeste.Mod.mm/Content/Dialog/French.txt
@@ -254,6 +254,8 @@
 	MODOPTIONS_MODTOGGLE_TOGGLEDEPS=	(Dés)activer les dépendances automatiquement
 	MODOPTIONS_MODTOGGLE_TOGGLEDEPS_MESSAGE1=	Si vous activez un mod, toutes ses dépendances seront également activées.
 	MODOPTIONS_MODTOGGLE_TOGGLEDEPS_MESSAGE2=	Si vous désactivez un mod, tous les mods qui l'utilisent comme dépendance seront désactivés.
+	MODOPTIONS_MODTOGGLE_PROTECTFAVORITES=			Protéger les mods favoris
+	MODOPTIONS_MODTOGGLE_PROTECTFAVORITES_MESSAGE=	Appuyez sur {0} pour ajouter/supprimer des mods de la liste des favoris.
 	MODOPTIONS_MODTOGGLE_MESSAGE_1=		Si vous activez ou désactivez des mods, votre blacklist.txt sera remplacé,
 	MODOPTIONS_MODTOGGLE_MESSAGE_2=		et Celeste va redémarrer pour appliquer les changements.
 	MODOPTIONS_MODTOGGLE_MESSAGE_3=		Les mods mis en surbrillance sont utilisés par d'autres mods activés comme des dépendances.
@@ -264,6 +266,7 @@
 	MODOPTIONS_MODTOGGLE_ZIPS=			Fichiers ZIP
 	MODOPTIONS_MODTOGGLE_DIRECTORIES=	Dossiers
 	MODOPTIONS_MODTOGGLE_BINS=			Fichiers .bin de maps
+	MODOPTIONS_MODTOGGLE_SEARCHBOX_PLACEHOLDER=		Appuyez sur Tab ou Entrée pour lancer la recherche
 
 # Asset Reload Helper
 	ASSETRELOADHELPER_RELOADINGMAP=			Rechargement de la map...

diff --git a/Celeste.Mod.mm/Mod/Entities/CoreModeTrigger.cs b/Celeste.Mod.mm/Mod/Entities/CoreModeTrigger.cs
@@ -3,20 +3,41 @@
 namespace Celeste.Mod.Entities {
     [CustomEntity("everest/coreModeTrigger", "cavern/coremodetrigger")]
     public class CoreModeTrigger : Trigger {
-        private readonly Session.CoreModes mode;
+        private enum Modes {
+            None,
+            Hot,
+            Cold,
+            Toggle
+        }
+
+        private readonly Modes mode;
         private readonly bool playEffects;
 
-        public CoreModeTrigger(EntityData data, Vector2 offset) 
+        public CoreModeTrigger(EntityData data, Vector2 offset)
             : base(data, offset) {
-            mode = data.Enum("mode", Session.CoreModes.None);
+            mode = data.Enum("mode", Modes.None);
             playEffects = data.Bool("playEffects", true);
         }
 
         public override void OnEnter(Player player) {
             Level level = Scene as Level;
-            if (level.CoreMode == mode)
+
+            Session.CoreModes newMode = Session.CoreModes.None;
+
+            if (mode == Modes.Toggle) {
+                if (level.CoreMode == Session.CoreModes.Hot)
+                    newMode = Session.CoreModes.Cold;
+                else if (level.CoreMode == Session.CoreModes.Cold)
+                    newMode = Session.CoreModes.Hot;
+            } else {
+                newMode = (Session.CoreModes) mode;
+            }
+
+            if (level.CoreMode == newMode)
                 return;
-            level.CoreMode = mode;
+
+            level.CoreMode = newMode;
+
             if (playEffects) {
                 Input.Rumble(RumbleStrength.Medium, RumbleLength.Medium);
                 level.Flash(Color.White * 0.15f, true);