Fix vanquishing API (#448)

Pass Health/Energy from GWCA Fix for enemy primary professions Fix for LiveCharts2 memory leak Update GWCA Closes #447 Closes #446 Closes #445 Closes #444 Closes #442
gwdevhub · Oct 29, 2023 · 51d6fb0 · 51d6fb0
1 parent c105257
commit 51d6fb0
Show file tree

Hide file tree

Showing 22 changed files with 90 additions and 72 deletions.
diff --git a/Daybreak.GWCA/header/payloads/LivingEntity.h b/Daybreak.GWCA/header/payloads/LivingEntity.h
@@ -17,6 +17,8 @@ namespace Daybreak {
         uint32_t Level = 0;
         uint32_t EntityState = 0;
         uint32_t EntityAllegiance = 0;
+        float Health;
+        float Energy;
     };
 
     void to_json(json& j, const LivingEntity& p);

diff --git a/Daybreak.GWCA/header/payloads/StatePayload.h b/Daybreak.GWCA/header/payloads/StatePayload.h
@@ -10,6 +10,8 @@ namespace Daybreak {
         float PosX = 0;
         float PosY = 0;
         uint32_t State = 0;
+        float Health = 0;
+        float Energy = 0;
     };
 
     void to_json(json& j, const StatePayload& p);

diff --git a/Daybreak.GWCA/source/GameModule.cpp b/Daybreak.GWCA/source/GameModule.cpp
@@ -100,16 +100,6 @@ namespace Daybreak::Modules::GameModule {
         return agentList;
     }
 
-    std::list<GW::NPC> GetNpcs() {
-        std::list<GW::NPC> npcs;
-        auto worldContext = GW::GetWorldContext();
-        for (auto& npc : worldContext->npcs) {
-            npcs.push_back(npc);
-        }
-
-        return npcs;
-    }
-
     std::vector<GW::TitleTier> GetTitleTiers() {
         std::vector<GW::TitleTier> titles;
         auto worldContext = GW::GetWorldContext();
@@ -186,6 +176,16 @@ namespace Daybreak::Modules::GameModule {
             entity.Level = agent.level;
             entity.PosX = agent.pos.x;
             entity.PosY = agent.pos.y;
+            entity.Health = agent.hp;
+            entity.Energy = agent.energy;
+            if (agent.primary == 0) {
+                const auto npc = GW::Agents::GetNPCByID(agent.player_number);
+                if (npc) {
+                    entity.PrimaryProfessionId = npc->primary;
+                }
+            }
+
+
             entities.push_back(entity);
         }
 
@@ -255,6 +255,8 @@ namespace Daybreak::Modules::GameModule {
             player.NpcDefinition = agent->player_number;
             player.PrimaryProfessionId = (uint32_t)agent->primary;
             player.SecondaryProfessionId = (uint32_t)agent->secondary;
+            player.Health = agent->hp * (agent->max_hp > 0 ? agent->max_hp : 1);
+            player.Energy = agent->energy * (agent->max_energy > 0 ? agent->max_energy : 1);
         }
         else if (professionState) {
             player.PrimaryProfessionId = (uint32_t)professionState->primary;
@@ -372,11 +374,6 @@ namespace Daybreak::Modules::GameModule {
             return gamePayload;
         }
 
-        auto npcs = GetNpcs();
-        if (npcs.empty()) {
-            return gamePayload;
-        }
-
         auto attributes = GetPartyAttributes();
         if (attributes.empty()) {
             return gamePayload;

diff --git a/Daybreak.GWCA/source/GameStateModule.cpp b/Daybreak.GWCA/source/GameStateModule.cpp
@@ -43,6 +43,8 @@ namespace Daybreak::Modules::GameStateModule {
             state.PosX = agent.pos.x;
             state.PosY = agent.pos.y;
             state.State = agent.type_map;
+            state.Health = agent.hp * (agent.max_hp > 0 ? agent.max_hp : 1);
+            state.Energy = agent.energy * (agent.max_energy > 0 ? agent.max_energy : 1);
             states.push_back(state);
         }
 

diff --git a/Daybreak.GWCA/source/ItemNameModule.cpp b/Daybreak.GWCA/source/ItemNameModule.cpp
@@ -16,58 +16,27 @@
 
 namespace Daybreak::Modules::ItemNameModule {
     std::vector<std::tuple<uint32_t, std::promise<NamePayload>*, std::wstring*>> WaitingList;
-    std::queue<std::tuple<uint32_t, std::list<uint32_t>, std::promise<NamePayload>>*> PromiseQueue;
+    std::queue<std::tuple<uint32_t, std::vector<uint32_t>, std::promise<NamePayload>>*> PromiseQueue;
     std::mutex GameThreadMutex;
     GW::HookEntry GameThreadHook;
     volatile bool initialized = false;
 
-
-    // TODO #442: Delete this once it is merged into GWCA
-    GW::Item* GetItemByModelIdAndModifiers(uint32_t modelid, const std::list<GW::ItemModifier> modifiers, int bagStart, int bagEnd) {
-        GW::Bag** bags = GW::Items::GetBagArray();
-        GW::Bag* bag = NULL;
-
-        for (int bagIndex = bagStart; bagIndex <= bagEnd; ++bagIndex) {
-            bag = bags[bagIndex];
-            if (!(bag && bag->items.valid())) continue;
-            for (GW::Item* item : bag->items) {
-                if (item && item->model_id == modelid && item->mod_struct_size == modifiers.size()) {
-                    auto match = true;
-                    auto listIt = modifiers.begin();
-                    for (uint32_t i = 0; i < item->mod_struct_size; i++) {
-                        // Compare each element from the array to the corresponding element in the list
-                        if (!(item->mod_struct[i] == *listIt)) {
-                            match = false;
-                            break;
-                        }
-                        ++listIt;
-                    }
-
-                    if (match) {
-                        return item;
-                    }
-                }
-            }
-        }
-
-        return NULL;
-    }
-
-    std::wstring* GetAsyncName(uint32_t id, std::list<uint32_t> modifiers) {
-        std::list<GW::ItemModifier> parsedModifiers;
-        for (auto mod : modifiers) {
+    std::wstring* GetAsyncName(uint32_t id, std::vector<uint32_t> modifiers) {
+        GW::ItemModifier parsedModifiers[64];
+        for (auto i = 0; i < modifiers.size(); i++) {
             GW::ItemModifier parsedModifier;
+            const auto mod = modifiers.at(i);
             parsedModifier.mod = mod;
-            parsedModifiers.push_back(parsedModifier);
+            parsedModifiers[i] = parsedModifier;
         }
 
-        auto item = GetItemByModelIdAndModifiers(id, parsedModifiers, 1, 23);
+        auto item = GW::Items::GetItemByModelIdAndModifiers(id, parsedModifiers, modifiers.size(), 1, 23);
         if (!item) {
             return nullptr;
         }
 
         auto name = new std::wstring();
-        GW::Items::AsyncGetItemByName(item, *name);
+        GW::Items::AsyncGetItemName(item, *name);
         return name;
     }
 
@@ -136,7 +105,7 @@ namespace Daybreak::Modules::ItemNameModule {
     void GetName(const httplib::Request& req, httplib::Response& res) {
         auto callbackEntry = new GW::HookEntry;
         uint32_t id = 0;
-        std::list<uint32_t> modifiers;
+        std::vector<uint32_t> modifiers;
 
         auto id_it = req.params.find("id");
         if (id_it == req.params.end()) {
@@ -177,7 +146,7 @@ namespace Daybreak::Modules::ItemNameModule {
             }
         }
 
-        auto response = new std::tuple<uint32_t, std::list<uint32_t>, std::promise<NamePayload>>();
+        auto response = new std::tuple<uint32_t, std::vector<uint32_t>, std::promise<NamePayload>>();
         std::get<0>(*response) = id;
         std::promise<NamePayload>& promise = std::get<2>(*response);
         std::get<1>(*response) = modifiers;

diff --git a/Daybreak.GWCA/source/MainPlayerModule.cpp b/Daybreak.GWCA/source/MainPlayerModule.cpp
@@ -255,6 +255,8 @@ namespace Daybreak::Modules::MainPlayerModule {
             player.NpcDefinition = agent->player_number;
             player.PrimaryProfessionId = (uint32_t)agent->primary;
             player.SecondaryProfessionId = (uint32_t)agent->secondary;
+            player.Health = agent->hp * (agent->max_hp > 0 ? agent->max_hp : 1);
+            player.Energy = agent->energy * (agent->max_energy > 0 ? agent->max_energy : 1);
         }
         else if (professionState) {
             player.PrimaryProfessionId = (uint32_t)professionState->primary;

diff --git a/Daybreak.GWCA/source/payloads/LivingEntity.cpp b/Daybreak.GWCA/source/payloads/LivingEntity.cpp
@@ -19,6 +19,8 @@ namespace Daybreak {
             {"Level", p.Level},
             {"EntityState", p.EntityState},
             {"EntityAllegiance", p.EntityAllegiance},
+            {"Health", p.Health},
+            {"Energy", p.Energy}
         };
     }
 }
diff --git a/Daybreak.GWCA/source/payloads/SessionPayload.cpp b/Daybreak.GWCA/source/payloads/SessionPayload.cpp
@@ -8,7 +8,7 @@ namespace Daybreak {
     void to_json(json& j, const SessionPayload& p) {
         j = json
         {
-            {"FoedKilled", p.FoesKilled},
+            {"FoesKilled", p.FoesKilled},
             {"FoesToKill", p.FoesToKill},
             {"MapId", p.MapId},
             {"InstanceTimer", p.InstanceTimer},

diff --git a/Daybreak.GWCA/source/payloads/StatePayload.cpp b/Daybreak.GWCA/source/payloads/StatePayload.cpp
@@ -11,7 +11,9 @@ namespace Daybreak {
             {"Id", p.Id},
             {"PosX", p.PosX},
             {"PosY", p.PosY},
-            {"State", p.State}
+            {"State", p.State},
+            {"Health", p.Health},
+            {"Energy", p.Energy}
         };
     }
 }
diff --git a/Daybreak/Controls/Minimap/GuildwarsMinimap.xaml.cs b/Daybreak/Controls/Minimap/GuildwarsMinimap.xaml.cs
@@ -159,22 +159,33 @@ this.GameData is null ||
             return;
         }
 
-        this.GameData.MainPlayer!.Position = this.GameState.States?.FirstOrDefault(state => state.Id == this.GameData.MainPlayer.Id)?.Position ?? new Position();
-        foreach(var worldPlayer in this.GameData.WorldPlayers!)
+        var mainPlayerState = this.GameState.States?.FirstOrDefault(state => state.Id == this.GameData.MainPlayer?.Id);
+        this.GameData.MainPlayer!.Position = mainPlayerState?.Position ?? new Position();
+        this.GameData.MainPlayer!.CurrentHealth = mainPlayerState?.Health ?? 0;
+        this.GameData.MainPlayer!.CurrentEnergy = mainPlayerState?.Energy ?? 0;
+        foreach (var worldPlayer in this.GameData.WorldPlayers!)
         {
-            worldPlayer.Position = this.GameState.States?.FirstOrDefault(state => state.Id == worldPlayer.Id)?.Position ?? new Position();
+            var worldPlayerState = this.GameState.States?.FirstOrDefault(state => state.Id == worldPlayer.Id);
+            worldPlayer.Position = worldPlayerState?.Position ?? new Position();
+            worldPlayer.CurrentHealth = worldPlayerState?.Health ?? 0;
+            worldPlayer.CurrentEnergy = worldPlayerState?.Energy ?? 0;
         }
 
         foreach (var partyPlayer in this.GameData.Party!)
         {
-            partyPlayer.Position = this.GameState.States?.FirstOrDefault(state => state.Id == partyPlayer.Id)?.Position ?? new Position();
+            var partyPlayerState = this.GameState.States?.FirstOrDefault(state => state.Id == partyPlayer.Id);
+            partyPlayer.Position = partyPlayerState?.Position ?? new Position();
+            partyPlayer.CurrentHealth = partyPlayerState?.Health ?? 0;
+            partyPlayer.CurrentEnergy = partyPlayerState?.Energy ?? 0;
         }
 
         foreach (var entity in this.GameData.LivingEntities!)
         {
             var state = this.GameState.States?.FirstOrDefault(state => state.Id == entity.Id);
             entity.Position = state?.Position ?? new Position();
             entity.State = state?.State ?? LivingEntityState.Unknown;
+            entity.Health = state?.Health ?? 0;
+            entity.Energy = state?.Energy ?? 0;
         }
     }
 

diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj
@@ -13,7 +13,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.8.133</Version>
+    <Version>0.9.8.134</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

diff --git a/Daybreak/Models/Guildwars/EntityGameState.cs b/Daybreak/Models/Guildwars/EntityGameState.cs
@@ -4,4 +4,6 @@ public sealed class EntityGameState
     public int Id { get; set; }
     public Position Position { get; set; }
     public LivingEntityState State { get; set; }
+    public float Health { get; set; }
+    public float Energy { get; set; }
 }
diff --git a/Daybreak/Models/Guildwars/LivingEntity.cs b/Daybreak/Models/Guildwars/LivingEntity.cs
@@ -21,4 +21,8 @@ public sealed class LivingEntity : IEntity
     public LivingEntityState State { get; set; }
 
     public LivingEntityAllegiance Allegiance { get; init; }
+
+    public float Health { get; set; }
+
+    public float Energy { get; set; }
 }
diff --git a/Daybreak/Models/Guildwars/MainPlayerInformation.cs b/Daybreak/Models/Guildwars/MainPlayerInformation.cs
@@ -14,9 +14,9 @@ public sealed class MainPlayerInformation : IEntity
     public Profession? SecondaryProfession { get; init; }
     public List<Profession>? UnlockedProfession { get; init; }
     public Build? CurrentBuild { get; init; }
-    public float CurrentHealth { get; init; }
+    public float CurrentHealth { get; set; }
     public float MaxHealth { get; init; }
-    public float CurrentEnergy { get; init; }
+    public float CurrentEnergy { get; set; }
     public float MaxEnergy { get; init; }
     public float HealthRegen { get; init; }
     public float EnergyRegen { get; init; }

diff --git a/Daybreak/Models/Guildwars/PlayerInformation.cs b/Daybreak/Models/Guildwars/PlayerInformation.cs
@@ -14,9 +14,9 @@ public sealed class PlayerInformation : IEntity
     public Build? CurrentBuild { get; init; }
     public Npc? NpcDefinition { get; init; }
     public uint ModelType { get; init; }
-    public float CurrentHealth { get; init; }
+    public float CurrentHealth { get; set; }
     public float MaxHealth { get; init; }
-    public float CurrentEnergy { get; init; }
+    public float CurrentEnergy { get; set; }
     public float MaxEnergy { get; init; }
     public float HealthRegen { get; init; }
     public float EnergyRegen { get; init; }

diff --git a/Daybreak/Models/Guildwars/WorldPlayerInformation.cs b/Daybreak/Models/Guildwars/WorldPlayerInformation.cs
@@ -14,9 +14,9 @@ public sealed class WorldPlayerInformation : IEntity
     public Profession? SecondaryProfession { get; init; }
     public List<Profession>? UnlockedProfession { get; init; }
     public Build? CurrentBuild { get; init; }
-    public float CurrentHealth { get; init; }
+    public float CurrentHealth { get; set; }
     public float MaxHealth { get; init; }
-    public float CurrentEnergy { get; init; }
+    public float CurrentEnergy { get; set; }
     public float MaxEnergy { get; init; }
     public float HealthRegen { get; init; }
     public float EnergyRegen { get; init; }

diff --git a/Daybreak/Services/Scanner/GWCAMemoryReader.cs b/Daybreak/Services/Scanner/GWCAMemoryReader.cs
@@ -558,7 +558,9 @@ public async Task EnsureInitialized(Process process, CancellationToken cancellat
                         0x40008 => LivingEntityState.ToBeCleanedUp,
                         0x400000 => LivingEntityState.Player,
                         _ => LivingEntityState.Unknown
-                    }
+                    },
+                    Health = state.Health,
+                    Energy = state.Energy
                 };
             }).ToList();
 
@@ -835,7 +837,9 @@ private static LivingEntity ParsePayload(LivingEntityPayload livingEntityPayload
             {
                 X = livingEntityPayload.PosX,
                 Y = livingEntityPayload.PosY,
-            }
+            },
+            Health = livingEntityPayload.Health,
+            Energy = livingEntityPayload.Energy
         };
     }
 

diff --git a/Daybreak/Services/Scanner/Models/LivingEntityPayload.cs b/Daybreak/Services/Scanner/Models/LivingEntityPayload.cs
@@ -12,4 +12,6 @@ internal class LivingEntityPayload
     public uint PrimaryProfessionId { get; set; }
     public uint SecondaryProfessionId { get; set; }
     public uint Timer { get; set; }
+    public float Health { get; set; }
+    public float Energy { get; set; }
 }
diff --git a/Daybreak/Services/Scanner/Models/StatePayload.cs b/Daybreak/Services/Scanner/Models/StatePayload.cs
@@ -5,4 +5,6 @@ internal sealed class StatePayload
     public float PosX { get; set; }
     public float PosY { get; set; }
     public uint State { get; set; }
+    public float Health { get; set; }
+    public float Energy { get; set; }
 }
diff --git a/Daybreak/Views/FocusView.xaml.cs b/Daybreak/Views/FocusView.xaml.cs
@@ -527,6 +527,10 @@ private void FocusView_Unloaded(object _, RoutedEventArgs e)
     {
         this.cancellationTokenSource?.Cancel();
         this.cancellationTokenSource = null;
+        this.GameData = default;
+        this.GameState = default;
+        this.PathingData = default;
+        this.InventoryData = default;
     }
 
     private void Browser_MaximizeClicked(object _, EventArgs e)

diff --git a/Daybreak/Views/MetricsView.xaml.cs b/Daybreak/Views/MetricsView.xaml.cs
@@ -80,6 +80,17 @@ private void UserControl_Unloaded(object sender, RoutedEventArgs e)
     {
         this.metricsService.MetricRecorded -= this.MetricsService_MetricRecorded;
         this.metricsService.SetRecorded -= this.MetricsService_SetRecorded;
+
+        /*
+         * #444 - Due to a bug in LiveCharts2, metrics need to be cleared manually, otherwise they would
+         * cause a memory leak.
+         */
+        foreach (var metric in this.Metrics)
+        {
+            metric.Metrics?.Clear();
+        }
+
+        this.Metrics.Clear();
     }
 
     private void CartesianChart_Loaded(object sender, RoutedEventArgs e)

diff --git a/GWCA b/GWCA
+5 −1		Include/GWCA/Managers/ItemMgr.h
+4 −0		Include/GWCA/Managers/QuestMgr.h
+21 −1		Source/ItemMgr.cpp
+19 −0		Source/QuestMgr.cpp