From 743ab1bb61c2c6a9cbfce905e67c5ec8d0317b70 Mon Sep 17 00:00:00 2001
From: lassnuttun <3059167604@qq.com>
Date: Sat, 19 Aug 2023 15:22:03 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=88=B7?=
 =?UTF-8?q?=E6=BA=90=E7=9F=B3=E9=94=AD=E7=9A=84=E4=B8=8D=E6=9C=9F=E8=80=8C?=
 =?UTF-8?q?=E9=81=87=E9=80=BB=E8=BE=91=E7=9A=84=E5=8F=98=E9=87=8F=E5=90=8D?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{encounter_.json => encounter_for_deposit.json}      | 2 +-
 .../{encounter_.json => encounter_for_deposit.json}      | 2 +-
 .../Sami/{encounter_.json => encounter_for_deposit.json} | 2 +-
 src/MaaCore/Config/ResourceLoader.cpp                    | 6 +++---
 .../Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp | 9 +++------
 5 files changed, 9 insertions(+), 12 deletions(-)
 rename resource/roguelike/Mizuki/{encounter_.json => encounter_for_deposit.json} (99%)
 rename resource/roguelike/Phantom/{encounter_.json => encounter_for_deposit.json} (99%)
 rename resource/roguelike/Sami/{encounter_.json => encounter_for_deposit.json} (99%)

diff --git a/resource/roguelike/Mizuki/encounter_.json b/resource/roguelike/Mizuki/encounter_for_deposit.json
similarity index 99%
rename from resource/roguelike/Mizuki/encounter_.json
rename to resource/roguelike/Mizuki/encounter_for_deposit.json
index 503eddf9c9..2f3263aa2c 100644
--- a/resource/roguelike/Mizuki/encounter_.json
+++ b/resource/roguelike/Mizuki/encounter_for_deposit.json
@@ -1,5 +1,5 @@
 {
-    "theme": "Mizuki_",
+    "theme": "Mizuki_deposit",
     "stage": [
         {
             "name": "悬高之葬",
diff --git a/resource/roguelike/Phantom/encounter_.json b/resource/roguelike/Phantom/encounter_for_deposit.json
similarity index 99%
rename from resource/roguelike/Phantom/encounter_.json
rename to resource/roguelike/Phantom/encounter_for_deposit.json
index 082b8ef162..d7a62fab69 100644
--- a/resource/roguelike/Phantom/encounter_.json
+++ b/resource/roguelike/Phantom/encounter_for_deposit.json
@@ -1,5 +1,5 @@
 {
-    "theme": "Phantom_",
+    "theme": "Phantom_deposit",
     "stage": [
         {
             "name": "扎营",
diff --git a/resource/roguelike/Sami/encounter_.json b/resource/roguelike/Sami/encounter_for_deposit.json
similarity index 99%
rename from resource/roguelike/Sami/encounter_.json
rename to resource/roguelike/Sami/encounter_for_deposit.json
index 072b3e49ac..2025f9e2d0 100644
--- a/resource/roguelike/Sami/encounter_.json
+++ b/resource/roguelike/Sami/encounter_for_deposit.json
@@ -1,5 +1,5 @@
 {
-    "theme": "Sami_",
+    "theme": "Sami_deposit",
     "stage": [
         {
             "name": "低地市集",
diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp
index a33e440777..6f52ef235c 100644
--- a/src/MaaCore/Config/ResourceLoader.cpp
+++ b/src/MaaCore/Config/ResourceLoader.cpp
@@ -160,9 +160,9 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
     AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Phantom"_p / "encounter.json"_p);
     AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Mizuki"_p / "encounter.json"_p);
     AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Sami"_p / "encounter.json"_p);
-    AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Phantom"_p / "encounter_.json"_p);
-    AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Mizuki"_p / "encounter_.json"_p);
-    AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Sami"_p / "encounter_.json"_p);
+    AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Phantom"_p / "encounter_for_deposit.json"_p);
+    AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Mizuki"_p / "encounter_for_deposit.json"_p);
+    AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Sami"_p / "encounter_for_deposit.json"_p);
 
     // 太占内存的资源，都是惰性加载
     FutureAppendBegins
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp
index 895af30081..d3678ccdec 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp
@@ -40,13 +40,10 @@ bool asst::RoguelikeStageEncounterTaskPlugin::_run()
 
     std::string rogue_theme = status()->get_properties(Status::RoguelikeTheme).value();
     std::string rogue_mode = status()->get_properties(Status::RoguelikeMode).value();
-    // 存钱模式
-    std::vector<RoguelikeEvent> events;
+    std::vector<RoguelikeEvent> events = RoguelikeStageEncounter.get_events(rogue_theme);
+    // 刷源石锭模式
     if (rogue_mode == "1") {
-        events = RoguelikeStageEncounter.get_events(rogue_theme + "_");
-    }
-    else {
-        events = RoguelikeStageEncounter.get_events(rogue_theme);
+        events = RoguelikeStageEncounter.get_events(rogue_theme + "_deposit");
     }
     std::vector<std::string> event_names;
     std::unordered_map<std::string, RoguelikeEvent> event_map;