update

Author: hocha113

Content/ADV/Scenarios/Abysses/OldDukes/Campsites/OldDukeCampsite.cs

@@ -157,6 +157,11 @@ private static bool ShouldGenerateCampsite(Player player) {
                 return false;
             }
 
+            //检查老公爵不在的时候
+            if (NPC.AnyNPCs(CWRID.NPC_OldDuke)) {
+                return false;
+            }
+
             //检查是否在子世界中
             if (SubWorldRef.AnyActiveSubWorld()) {
                 return false;

Content/ADV/Scenarios/Abysses/OldDukes/ModifyOldDuke.cs

@@ -121,7 +121,7 @@ private static bool ShouldLeaveAfterCooperation(Player target) {
         }
 
         /// <summary>
-        /// 判断是否应该将NPC重定向到营地（消失并触发营地对话）。
+        /// 判断是否应该将NPC重定向到营地（消失并触发营地对话）
         /// 条件：营地已生成、不在切磋状态、当前玩家是本地玩家、不在服务端
         /// </summary>
         private static bool ShouldRedirectToCampsite(Player target) {
@@ -262,7 +262,6 @@ private static void TriggerCampsiteScenario() {
         public override bool AI() {
             canDraw = true;
             npc.alpha = 0;
-
             //战败后的潜水离开，优先级最高，无论什么状态都要执行
             if (IsInLeavingDive) {
                 State = (float)OldDukeAIState.LeavingDive;
@@ -285,7 +284,15 @@ public override bool AI() {
                 return RunStorylineAI();
             }
 
-            //接受合作后，需要执行离开潜水动画
+            //营地重定向必须在ShouldLeaveAfterCooperation之前检查
+            //因为AcceptedCooperation是永久状态，如果先检查ShouldLeaveAfterCooperation，
+            //营地建成后每次召唤老公爵都会直接进入LeavingDive消失，永远到不了营地重定向
+            if (ShouldRedirectToCampsite(target)) {
+                ExecuteCampsiteRedirect();
+                return false;
+            }
+
+            //接受合作后但营地尚未建立（或当前不在本地玩家视角），执行离开潜水动画
             if (ShouldLeaveAfterCooperation(target)) {
                 if (State != (float)OldDukeAIState.LeavingDive) {
                     State = (float)OldDukeAIState.LeavingDive;
@@ -295,12 +302,6 @@ public override bool AI() {
                 return RunStorylineAI();
             }
 
-            //营地已建立的情况下，NPC实体应该消失并重定向到营地对话
-            if (ShouldRedirectToCampsite(target)) {
-                ExecuteCampsiteRedirect();
-                return false;
-            }
-
             KillDukeSummonerProjectiles();
             //执行原版AI
             return true;
@@ -494,11 +495,8 @@ private void HandleLeavingDive() {
                 }
             }
             else if (SubState == 1) {
-                //阶段2：淡出消失
-                npc.alpha += 15;
-                npc.velocity *= 0.98f;
-
-                if (npc.alpha >= 255 || Timer > 300) {
+                //阶段2：消失
+                if (npc.alpha >= 255 || Timer > 120) {
                     FinalizeDespawn();
                 }
             }

build.txt

@@ -4,5 +4,5 @@ sortAfter = CalamityMod, InnoVault
 weakReferences = CalamityMod@2.1, ThoriumMod@1.7.2.4, BossChecklist@2.2.2, MagicStorage@0.7.0.11
 homepage = https://calamity-overhaul.cc
 author = HoCha113
-version = 0.8069
+version = 0.8071
 includeSource = true