Merge pull request #77 from hocha113/8075

8075

Author: hocha113

Content/ADV/Common/BaseDamageTracker.cs

@@ -165,7 +165,7 @@ public override void OnHitByProjectile(NPC npc, Projectile projectile, NPC.HitIn
             }
         }
 
-        public sealed override void OnKill(NPC npc) {
+        public sealed override void OnNPCDeath(NPC npc) {
             if (IsTargetByID(npc)) {//这个判定是不必要的，不过还是写上吧
                 Check(npc);//作为 DeathTrackingNPC 的子类，OnKill会被客户端调用，所以这里的运行不会出现问题
             }

Content/ADV/Common/DeathTrackingNPC.cs

@@ -6,18 +6,20 @@ namespace CalamityOverhaul.Content.ADV.Common
     internal class DeathTrackingNPC : GlobalNPC
     {
         public override bool InstancePerEntity => true;
-
+        private bool _deathHandled = false;
         public override void HitEffect(NPC npc, NPC.HitInfo hit) {
-            if (npc.life > 0) {
+            if (_deathHandled) {
                 return;
             }
-            OnKill(npc);
+            if (npc.life <= 0 || !npc.active) {//有些情况下是手动设置的死亡，这时life可能不为0，但active会被设为false
+                _deathHandled = true;
+                OnNPCDeath(npc);
+            }
         }
-
         /// <summary>
         /// 当NPC被击杀时调用，在客户端或者服务端上均会运行
         /// </summary>
         /// <param name="npc"></param>
-        public new virtual void OnKill(NPC npc) { }
+        public virtual void OnNPCDeath(NPC npc) { }
     }
 }

Content/ADV/Common/GiftScenarioBase.cs

@@ -18,7 +18,7 @@ void IWorldInfo.OnWorldLoad() {
 
         public override bool AppliesToEntity(NPC entity, bool lateInstantiation) => GiftScenarioBase.SpawnedDic.Keys.Any(g => g.TargetBossID == entity.type);
 
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (!CWRRef.GetBossRushActive()//Boss Rush时不触发礼物场景
                 && GiftScenarioBase.BossIDToInds.TryGetValue(npc.type, out var giftScenarioBase)
                 && giftScenarioBase.CanSpawned()) {

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

@@ -71,6 +71,9 @@ public override bool CanOverride() {
             if (!CWRRef.Has) {//如果没有灾厄Mod，就不覆盖AI，避免潜在的兼容性问题
                 return false;
             }
+            if (!VaultUtils.isSinglePlayer) {
+                return false;//本AI包含多个需要本地玩家驱动的状态转换和场景触发，在多人模式下可能会出现同步问题，暂时只在单人模式启用
+            }
             if (CWRRef.GetBossRushActive()) {
                 return false;
             }

Content/ADV/Scenarios/SupCal/FirstMetSupCal.cs

@@ -261,7 +261,7 @@ void IWorldInfo.OnWorldLoad() {
             RandomTimer = 0;
         }
         public override bool AppliesToEntity(NPC entity, bool lateInstantiation) => entity.type == CWRID.NPC_CalamitasClone;//应用于目标NPC
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (npc.type == CWRID.NPC_CalamitasClone && !CWRWorld.BossRush) {
                 Spawned = true;
                 RandomTimer = 60 * Main.rand.Next(3, 5);//给一个3到5秒的缓冲时间，打完立刻触发不太合适

Content/ADV/Scenarios/SupCal/ModifySupCalNPCs/ModifySupCalNPC.cs

@@ -13,7 +13,7 @@ namespace CalamityOverhaul.Content.ADV.Scenarios.SupCal.ModifySupCalNPCs
     internal class TraceSupCalDeath : DeathTrackingNPC
     {
         internal static bool SupCalDefeated { get; set; }
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (npc.type == CWRID.NPC_SupremeCalamitas) {
                 SupCalDefeated = true;
             }

Content/ADV/Scenarios/SupCal/Quest/PallbearerQuest/SupCalMoonLordReward.cs

@@ -148,7 +148,7 @@ void IWorldInfo.OnWorldLoad() {
             RandomTimer = 0;
         }
         public override bool AppliesToEntity(NPC entity, bool lateInstantiation) => entity.type == NPCID.MoonLordCore;
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (npc.type == NPCID.MoonLordCore && !CWRWorld.BossRush) {
                 Spawned = true;
                 RandomTimer = 60 * Main.rand.Next(3, 5);//给一个3到5秒的缓冲时间，打完立刻触发不太合适

Content/ADV/Scenarios/SupCal/SupCalDefeat.cs

@@ -93,7 +93,7 @@ void IWorldInfo.OnWorldLoad() {
             RandomTimer = 0;
         }
         public override bool AppliesToEntity(NPC entity, bool lateInstantiation) => entity.type == CWRID.NPC_SupremeCalamitas;
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (npc.type == CWRID.NPC_SupremeCalamitas && Main.LocalPlayer.GetItem().type == HalibutOverride.ID && !CWRWorld.BossRush) {
                 Spawned = true;
                 RandomTimer = 60 * Main.rand.Next(3, 5);//给一个3到5秒的缓冲时间，打完立刻触发不太合适

Content/ADV/Scenarios/SupCal/SupCalPlayerDefeat.cs

@@ -166,7 +166,7 @@ public override bool PreAI(NPC npc) {
             return true;
         }
 
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (npc.type == CWRID.NPC_SupremeCalamitas) {
                 //Boss被击杀时重置状态
                 hasRecordedDeath = false;

Content/ADV/Scenarios/SupCal/SupCalVictory.cs

@@ -137,7 +137,7 @@ void IWorldInfo.OnWorldLoad() {
 
         public override bool AppliesToEntity(NPC entity, bool lateInstantiation) => entity.type == CWRID.NPC_SupremeCalamitas;
 
-        public override void OnKill(NPC npc) {
+        public override void OnNPCDeath(NPC npc) {
             if (FirstMetSupCal.ThisIsToFight && npc.type == CWRID.NPC_SupremeCalamitas) {
                 Player player = Main.LocalPlayer;
                 if (player.TryGetOverride<HalibutPlayer>(out var halibutPlayer)) {