diff --git a/resource/roguelike/JieGarden/map.json b/resource/roguelike/JieGarden/map.json
index 137b4382b2..b170ff503e 100644
--- a/resource/roguelike/JieGarden/map.json
+++ b/resource/roguelike/JieGarden/map.json
@@ -16,6 +16,10 @@
             "type": "Encounter",
             "template": ["JieGarden@Roguelike@MapNodeEncounter.png", "JieGarden@Roguelike@MapNodeEncounterGrey.png"]
         },
+        {
+            "type": "Boons",
+            "template": ["JieGarden@Roguelike@MapNodeBoonspng", "JieGarden@Roguelike@MapNodeBoonsGrey.png"]
+        },
         {
             "type": "RogueTrader",
             "template": ["JieGarden@Roguelike@MapNodeRogueTrader.png", "JieGarden@Roguelike@MapNodeRogueTraderGrey.png"]
diff --git a/resource/tasks/Roguelike/JieGarden.json b/resource/tasks/Roguelike/JieGarden.json
index c544115d8a..7ef4a24029 100644
--- a/resource/tasks/Roguelike/JieGarden.json
+++ b/resource/tasks/Roguelike/JieGarden.json
@@ -10,9 +10,6 @@
         "template": "JieGarden@Roguelike@ChooseOperConfirm.png",
         "roi": [1031, 606, 249, 114]
     },
-    "JieGarden@StartExplore@Roguelike@ChooseOperConfirmToGiveUp": {
-        "template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png"
-    },
     "JieGarden@StartExplore@Roguelike@ChooseOperFlag": {
         "template": "JieGarden@Roguelike@ChooseOperConfirm.png",
         "roi": [1031, 606, 249, 114]
@@ -78,17 +75,6 @@
         "template": "JieGarden@Roguelike@ChooseOperConfirm.png",
         "roi": [1031, 606, 249, 114]
     },
-    "JieGarden@Roguelike@ChooseOperConfirmToGiveUp": {
-        "baseTask": "JieGarden@Roguelike@StageEncounterGiveUpRecruitConfirm",
-        "template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
-        "next": [
-            "JieGarden@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText",
-            "JieGarden@Roguelike@ChooseOperConfirmToGiveUp",
-            "JieGarden@Roguelike@RecruitOther",
-            "JieGarden@Roguelike@NextLevel",
-            "JieGarden@Roguelike@NextLevel#next"
-        ]
-    },
     "JieGarden@Roguelike@ChooseOperFlag": {
         "template": "JieGarden@Roguelike@ChooseOperConfirm.png",
         "roi": [1031, 606, 249, 114]
@@ -511,6 +497,8 @@
             "JieGarden@Roguelike@MapNodeEmergencyOpsGrey.png",
             "JieGarden@Roguelike@MapNodeEncounter.png",
             "JieGarden@Roguelike@MapNodeEncounterGrey.png",
+            "JieGarden@Roguelike@MapNodeBoons.png",
+            "JieGarden@Roguelike@MapNodeBoonsGrey.png",
             "JieGarden@Roguelike@MapNodeRogueTrader.png",
             "JieGarden@Roguelike@MapNodeRogueTraderGrey.png",
             "JieGarden@Roguelike@MapNodeBoskyPassage.png",
diff --git a/resource/tasks/Roguelike/Sarkaz.json b/resource/tasks/Roguelike/Sarkaz.json
index 7ca788a669..5518094431 100644
--- a/resource/tasks/Roguelike/Sarkaz.json
+++ b/resource/tasks/Roguelike/Sarkaz.json
@@ -6,9 +6,6 @@
             "Sarkaz@StartExplore@Roguelike@ChooseOperConfirm#next"
         ]
     },
-    "Sarkaz@StartExplore@Roguelike@ChooseOperConfirmToGiveUp": {
-        "template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png"
-    },
     "Sarkaz@StartExplore@Roguelike@EnterAfterRecruit": {
         "template": "Sarkaz@Roguelike@EnterAfterRecruit.png",
         "next": ["#self", "Sarkaz@Roguelike@NextLevel"]
@@ -95,15 +92,6 @@
             "Sarkaz@Roguelike@ChooseOperConfirm#next"
         ]
     },
-    "Sarkaz@Roguelike@ChooseOperConfirmToGiveUp": {
-        "baseTask": "Sarkaz@Roguelike@StageEncounterGiveUpRecruitConfirm",
-        "template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
-        "next": [
-            "Sarkaz@Roguelike@ChooseOperConfirmToGiveUp",
-            "Sarkaz@Roguelike@RecruitOther",
-            "Sarkaz@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText"
-        ]
-    },
     "Sarkaz@Roguelike@ClickToDrops": {
         "specificRect": [600, 600, 25, 25]
     },
diff --git a/resource/tasks/Roguelike/base.json b/resource/tasks/Roguelike/base.json
index 5837841ebc..f33918ab78 100644
--- a/resource/tasks/Roguelike/base.json
+++ b/resource/tasks/Roguelike/base.json
@@ -474,9 +474,9 @@
         "baseTask": "Roguelike@StageEncounterGiveUpRecruitConfirm",
         "template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
         "next": [
+            "Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText",
             "Roguelike@ChooseOperConfirmToGiveUp",
-            "Roguelike@RecruitOther",
-            "Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText"
+            "Roguelike@RecruitSkip#next"
         ]
     },
     "Roguelike@ChooseOperFlag": {
@@ -1789,10 +1789,12 @@
         "baseTask": "Roguelike@StageEncounterGiveUpRecruitConfirm",
         "template": "Roguelike@StageEncounterGiveUpRecruitConfirm.png",
         "next": [
-            "StartExplore@Roguelike@ChooseOperConfirmToGiveUp",
+            "StartExplore@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText",
             "StartExplore@Roguelike@RecruitOther",
             "StartExplore@Roguelike@EnterAfterRecruit",
-            "StartExplore@Roguelike@ChooseOperConfirmToGiveUp@NextAfterLoadingText"
+            "Roguelike@NextLevel",
+            "Roguelike@NextLevel#next",
+            "StartExplore@Roguelike@ChooseOperConfirmToGiveUp"
         ]
     },
     "StartExplore@Roguelike@RecruitOther": {
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
index 5c53a167b0..e20464e28b 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
@@ -134,7 +134,7 @@ bool asst::RoguelikeCustomStartTaskPlugin::hijack_squad()
             .run();
     }
 
-    constexpr size_t SwipeTimes = 2;
+    constexpr size_t SwipeTimes = 7;
     for (size_t i = 0; i != SwipeTimes; ++i) {
         if (need_exit()) {
             return false;
@@ -190,7 +190,7 @@ bool asst::RoguelikeCustomStartTaskPlugin::hijack_reward()
 
 bool asst::RoguelikeCustomStartTaskPlugin::hijack_roles()
 {
-    constexpr size_t SwipeTimes = 2;
+    constexpr size_t SwipeTimes = 7;
     const std::string& required_role = m_customs[RoguelikeCustomType::Roles];
 
     for (size_t i = 0; i != SwipeTimes; ++i) {