Use FormerRegister in PeekRegister, drop ExitZone, fix CI warnings

themeldingwars · Feb 9, 2025 · cd8fb1d · cd8fb1d
1 parent 8b2e841
commit cd8fb1d
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 38 deletions.
diff --git a/UdpHosts/GameServer/NetworkClient.cs b/UdpHosts/GameServer/NetworkClient.cs
@@ -218,9 +218,6 @@ private void Matrix_PacketAvailable(GamePacket packet)
                 Factory.Get<BaseController>().Init(this, Player, AssignedShard, Logger);
                 Player.EnterZoneAck();
                 break;
-            case MatrixPacketType.ExitZone:
-                NetChannels[ChannelType.Matrix].SendMessage(new ExitZone());
-                break;
             case MatrixPacketType.ExitZoneAck:
                 Player.ExitZoneAck();
                 break;

diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Other/SendTipMessageCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Other/SendTipMessageCommand.cs
@@ -16,7 +16,6 @@ public SendTipMessageCommand(SendTipMessageCommandDef par)
     public bool Execute(Context context)
     {
         // var message = new SendTipMessage() { };
-
         return true;
     }
 }
diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Register/PeekRegisterCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Register/PeekRegisterCommand.cs
@@ -15,7 +15,7 @@ public PeekRegisterCommand(PeekRegisterCommandDef par)
 
     public bool Execute(Context context)
     {
-        context.Register = AbilitySystem.RegistryOp(context.Register, context.Register, (Operand)Params.Regop);
+        context.Register = AbilitySystem.RegistryOp(context.Register, context.FormerRegister, (Operand)Params.Regop);
 
         return context.Register != 0;
     }

diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Requirement/RequireHasEffectCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Requirement/RequireHasEffectCommand.cs
@@ -61,29 +61,32 @@ public bool Execute(Context context)
                 result = true;
             }
         }
-        // else
-        // {
-        //     var target = context.Self;
-        //     foreach (EffectState active in target.GetActiveEffects())
-        //     {
-        //         if (active == null)
-        //         {
-        //             continue;
-        //         }
-        //
-        //         if (active.Effect.Id == Params.EffectId && active.Stacks >= Params.StackCount)
-        //         {
-        //             result = true;
-        //
-        //             if (Params.SameInitiator == 1 && context.Initiator != active.Context.Initiator)
-        //             {
-        //                 result = false;
-        //             }
-        //
-        //             break;
-        //         }
-        //     }
-        // }
+
+        /*
+        else
+        {
+            var target = context.Self;
+            foreach (EffectState active in target.GetActiveEffects())
+            {
+                if (active == null)
+                {
+                    continue;
+                }
+
+                if (active.Effect.Id == Params.EffectId && active.Stacks >= Params.StackCount)
+                {
+                    result = true;
+
+                    if (Params.SameInitiator == 1 && context.Initiator != active.Context.Initiator)
+                    {
+                        result = false;
+                    }
+
+                    break;
+                }
+            }
+        }
+        */
 
         if (Params.Negate == 1)
         {

diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/PushTargetsCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/PushTargetsCommand.cs
@@ -1,4 +1,5 @@
-using GameServer.Data.SDB.Records.apt;
+using System;
+using GameServer.Data.SDB.Records.apt;
 
 namespace GameServer.Aptitude;
 
@@ -18,6 +19,7 @@ public bool Execute(Context context)
         if (Params.Former == 1 && context.FormerTargets.Count > 0)
         {
             // assuming push == saving for later, this shouldnt occur and it doesnt in 1962
+            Console.WriteLine($"[PushTargets] Former = 1, FormerTargets count {context.FormerTargets.Count}");
         }
 
         if (Params.Current == 1)

diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/TargetByEffectCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/TargetByEffectCommand.cs
@@ -16,7 +16,6 @@ public TargetByEffectCommand(TargetByEffectCommandDef par)
     public bool Execute(Context context)
     {
         // todo Params.FilterList, equal to 1 in 1086 instances, 0 in 6 instances
-        var result = false;
         var previousTargets = context.Targets;
         var newTargets = new AptitudeTargets();
 

diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/Todo/TargetCharacterNPCsCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/Todo/TargetCharacterNPCsCommand.cs
@@ -22,10 +22,12 @@ public bool Execute(Context context)
 
         context.FormerTargets = new AptitudeTargets(context.Targets);
 
-        // foreach (var npc in player.OwnedNPCs)
-        // {
-        //     context.Targets.Push(npc);
-        // }
+        /*
+        foreach (var npc in player.OwnedNPCs)
+        {
+            context.Targets.Push(npc);
+        }
+        */
 
         return true;
     }

diff --git a/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/Todo/TargetFriendliesCommand.cs b/UdpHosts/GameServer/Systems/Aptitude/Commands/Target/Todo/TargetFriendliesCommand.cs
@@ -1,7 +1,4 @@
 using GameServer.Data.SDB.Records.aptfs;
-using GameServer.Entities.Deployable;
-using GameServer.Entities.Thumper;
-using GameServer.Entities.Vehicle;
 
 namespace GameServer.Aptitude;
 
@@ -24,11 +21,11 @@ public bool Execute(Context context)
 
         foreach (var target in previousTargets)
         {
+            // add || (target is hostile)
             if (
                 (target == context.Self && Params.IncludeSelf == 0)
                 || (target == context.Initiator && Params.IncludeInitiator == 0)
                 || (target == context.Self.Owner && Params.IncludeOwner == 0))
-                /* || (target is hostile) */
             {
                 continue;
             }