Add debug for another way to detect end of fight

neowutran · Dec 23, 2016 · 5b0ce2c · 5b0ce2c
1 parent c95f8c4
commit 5b0ce2c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/DamageMeter.Core/PacketProcessingFactory.cs b/DamageMeter.Core/PacketProcessingFactory.cs
@@ -110,7 +110,8 @@ public static void UpdateAbnormalityTracker()
             { typeof(Tera.Game.Messages.SPlayerChangeMp) , new Action<Tera.Game.Messages.SPlayerChangeMp>((x)=>NetworkController.Instance.AbnormalityTracker.Update(x)) },
             { typeof(Tera.Game.Messages.SPartyMemberChangeHp) , new Action<Tera.Game.Messages.SPartyMemberChangeHp>((x)=>NetworkController.Instance.AbnormalityTracker.Update(x)) },
             { typeof(Tera.Game.Messages.SDespawnUser) , Helpers.Contructor<Func<Tera.Game.Messages.SDespawnUser , S_DESPAWN_USER>>()},
-            { typeof(Tera.Game.Messages.SNpcStatus) , new Action<Tera.Game.Messages.SNpcStatus>((x)=>NetworkController.Instance.AbnormalityTracker.Update(x)) },
+            { typeof(Tera.Game.Messages.SNpcStatus) , new Action<Tera.Game.Messages.SNpcStatus>((x)=>NotifyProcessor.Instance.SNpcStatus(x)) },
+//            { typeof(Tera.Game.Messages.SNpcStatus) , new Action<Tera.Game.Messages.SNpcStatus>((x)=>NetworkController.Instance.AbnormalityTracker.Update(x)) },
             { typeof(Tera.Game.Messages.S_PARTY_MEMBER_STAT_UPDATE) , new Action<Tera.Game.Messages.S_PARTY_MEMBER_STAT_UPDATE>((x)=>NetworkController.Instance.AbnormalityTracker.Update(x)) },
             { typeof(Tera.Game.Messages.S_PLAYER_STAT_UPDATE) , new Action<Tera.Game.Messages.S_PLAYER_STAT_UPDATE>((x)=>NetworkController.Instance.AbnormalityTracker.Update(x)) },
             };

diff --git a/DamageMeter.Core/Processing/NotifyProcessor.cs b/DamageMeter.Core/Processing/NotifyProcessor.cs
@@ -505,5 +505,15 @@ internal void UpdateCredits(Tera.Game.Messages.S_UPDATE_NPCGUILD message)
             UpdateCredits(message.Type, message.Credits);
         }
 
+        internal void SNpcStatus(Tera.Game.Messages.SNpcStatus message)
+        {
+            NetworkController.Instance.AbnormalityTracker.Update(message);
+            if (message.Defeated)
+            {
+                var boss = NetworkController.Instance.EntityTracker.GetOrPlaceholder(message.Npc) as NpcEntity;
+                if (boss?.Info.Boss==true && boss.Info.HuntingZoneId==950)
+                    BasicTeraData.LogError("Retreat test: "+ boss.Info.HuntingZoneId+":"+ boss.Info.TemplateId + (_lastBossMeterUser==message.Npc?" actual boss": " other boss"), false, true);
+            }
+        }
     }
 }
diff --git a/TeraCommon b/TeraCommon