Merge branch 'dev' into main

Triky313 · Aug 16, 2023 · d7bfbab · d7bfbab
2 parents ed89d85 + 7b767b1
commit d7bfbab
Show file tree

Hide file tree

Showing 19 changed files with 422 additions and 90 deletions.
diff --git a/src/StatisticsAnalysisTool/App.xaml b/src/StatisticsAnalysisTool/App.xaml
@@ -24,7 +24,7 @@
                 <ResourceDictionary Source="Styles/DashboardStyles.xaml" />
                 <ResourceDictionary Source="Styles/DungeonStyles.xaml" />
                 <ResourceDictionary Source="Styles/DamageMeterStyles.xaml" />
-                <ResourceDictionary Source="Styles/MailMonitoringStyle.xaml" />
+                <ResourceDictionary Source="Styles/TradeMonitoringStyle.xaml" />
                 <ResourceDictionary Source="Styles/GatheringStyles.xaml" />
                 <ResourceDictionary Source="Styles/PartyBuilderStyle.xaml" />
                 <ResourceDictionary Source="Styles/StorageHistoryStyle.xaml" />

diff --git a/src/StatisticsAnalysisTool/Languages/ko-KR.xml b/src/StatisticsAnalysisTool/Languages/ko-KR.xml
@@ -782,4 +782,11 @@
 	<translation name="ANOTHER_APP_TO_START_PATH">프로그램을 시작할 수 있는 다른 경로</translation>
 	<translation name="CANNOT_START_OTHER_APP">다른 경로에 있는 프로그램을 시작할 수 없습니다</translation>
 	<translation name="FISHING">낚시</translation>
+	<translation name="SELECT_ALBION_ONLINE_MAIN_GAME_FOLDER">Albion Online 게임 폴더 선택</translation>
+	<translation name="PLEASE_SELECT_A_CORRECT_ALBION_ONLINE_MAIN_GAME_FOLDER">올바른 Albion Online 게임 폴더를 선택하세요.</translation>
+	<translation name="PLEASE_SELECT_A_CORRECT_FOLDER">올바른 폴더를 선택하세요</translation>
+	<translation name="SELECT_MAIN_GAME_FOLDER_DOTS">기본 게임 폴더를 선택하세요..</translation>
+	<translation name="CONFIRM">확인</translation>
+	<translation name="OVERHEALED_PERCENTAGE_OF_TOTAL_HEALING">총 치유량 중 초과 치유량(Overheal) 비율</translation>
+	<translation name="HEALING_WITHOUT_OVERHEALED">초과 치유를 제외한 치유량</translation>
 </translations>
diff --git a/src/StatisticsAnalysisTool/Languages/ru-RU.xml b/src/StatisticsAnalysisTool/Languages/ru-RU.xml
@@ -84,8 +84,8 @@
 	<translation name="MAINHAND">Правая рука</translation>
 	<translation name="HEAD">Голова</translation>
 	<translation name="SHOES">Обувь</translation>
-	<translation name="BAG">Сумка</translation>
-	<translation name="CAPE">Плащ</translation>
+	<translation name="BAG">Сумки</translation>
+	<translation name="CAPE">Плащи</translation>
 	<translation name="FOOD">Еда</translation>
 	<translation name="PLAYER">Игрок</translation>
 	<translation name="GENERAL_INFORMATION">Общая информация</translation>
@@ -120,29 +120,29 @@
 	<translation name="LOAD_FULL_ITEM_INFO">Загрузить все предметы</translation>
 	<translation name="UNKNOWN">Неизвестно</translation>
 
-	<translation name="CLOTH_ARMOR">Тканевые мантии</translation>
-	<translation name="CLOTH_HELMET">Тканевые колпаки</translation>
-	<translation name="CLOTH_SHOES">Тканевые сандалии</translation>
-	<translation name="LEATHER_ARMOR">Кожаные куртки</translation>
-	<translation name="LEATHER_HELMET">Кожаные капюшоны</translation>
-	<translation name="LEATHER_SHOES">Кожаные ботинки</translation>
+	<translation name="CLOTH_ARMOR">Тканевая броня</translation>
+	<translation name="CLOTH_HELMET">Тканевый шлем</translation>
+	<translation name="CLOTH_SHOES">Тканевая обувь</translation>
+	<translation name="LEATHER_ARMOR">Кожаная броня</translation>
+	<translation name="LEATHER_HELMET">Кожаный шлем</translation>
+	<translation name="LEATHER_SHOES">Кожаная обувь</translation>
 	<translation name="PLATE_ARMOR">Латная броня</translation>
-	<translation name="PLATE_HELMET">Латные шлемы</translation>
-	<translation name="PLATE_SHOES">Латные сапоги</translation>
+	<translation name="PLATE_HELMET">Латный шлем</translation>
+	<translation name="PLATE_SHOES">Латная обувь</translation>
 	<translation name="UNIQUE_ARMOR">Уникальная броня</translation>
-	<translation name="UNIQUE_HELMET">Уникальная шлемы</translation>
-	<translation name="UNIQUE_SHOES">Уникальная сапоги</translation>
+	<translation name="UNIQUE_HELMET">Уникальные шлемы</translation>
+	<translation name="UNIQUE_SHOES">Уникальные сапоги</translation>
 
 	<translation name="ARMOR_ARTEFACT">Броня</translation>
 	<translation name="MAGIC_ARTEFACT">Магия</translation>
 	<translation name="MELEE_ARTEFACT">Ближний бой</translation>
 	<translation name="OFFHAND_ARTEFACT">Левая рука</translation>
 	<translation name="RANGED_ARTEFACT">Дальний бой</translation>
 
-	<translation name="BEASTHEART">Звериное сердце</translation>
+	<translation name="BEASTHEART">Сердце зверя</translation>
 	<translation name="MOUNTAINHEART">Сердце горы</translation>
-	<translation name="ROCKHEART">Каменное сердце</translation>
-	<translation name="TREEHEART">Древесное сердце</translation>
+	<translation name="ROCKHEART">Сердце камня</translation>
+	<translation name="TREEHEART">Сердце древа</translation>
 	<translation name="VINEHEART">Сердце лозы</translation>
 
 	<translation name="COOKED">Еда</translation>
@@ -170,34 +170,34 @@
 	<translation name="UNIQUE">Уникальное</translation>
 
 	<translation name="FIBERGATHERER_ARMOR">Одежда жнеца</translation>
-	<translation name="FIBERGATHERER_HELMET">Рюкзак жнеца</translation>
-	<translation name="FIBERGATHERER_SHOES">Шапка жнеца</translation>
-	<translation name="FIBERGATHERER_BACKPACK">Сапоги жнеца</translation>
+	<translation name="FIBERGATHERER_HELMET">Шапка жнеца</translation>
+	<translation name="FIBERGATHERER_SHOES">Сапоги жнеца</translation>
+	<translation name="FIBERGATHERER_BACKPACK">Рюкзак жнеца</translation>
 
 	<translation name="FISHGATHERER_ARMOR">Одежда рыбака</translation>
-	<translation name="FISHGATHERER_HELMET">Рюкзак рыбака</translation>
-	<translation name="FISHGATHERER_SHOES">Шапка рыбака</translation>
-	<translation name="FISHGATHERER_BACKPACK">Сапоги рыбака</translation>
+	<translation name="FISHGATHERER_HELMET">Шапка рыбака</translation>
+	<translation name="FISHGATHERER_SHOES">Сапоги рыбака</translation>
+	<translation name="FISHGATHERER_BACKPACK">Рюкзак рыбака</translation>
 
 	<translation name="HIDEGATHERER_ARMOR">Одежда свежевателя</translation>
-	<translation name="HIDEGATHERER_HELMET">Рюкзак свежевателя</translation>
-	<translation name="HIDEGATHERER_SHOES">Шапка свежевателя</translation>
-	<translation name="HIDEGATHERERR_BACKPACK">Сапоги свежевателя</translation>
+	<translation name="HIDEGATHERER_HELMET">Шапка свежевателя</translation>
+	<translation name="HIDEGATHERER_SHOES">Сапоги свежевателя</translation>
+	<translation name="HIDEGATHERERR_BACKPACK">Рюкзак свежевателя</translation>
 
 	<translation name="OREGATHERER_ARMOR">Одежда шахтера</translation>
-	<translation name="OREGATHERER_HELMET">Рюкзак шахтера</translation>
-	<translation name="OREGATHERER_SHOES">Шапка шахтера</translation>
-	<translation name="OREGATHERER_BACKPACK">Сапоги шахтера</translation>
+	<translation name="OREGATHERER_HELMET">Шапка шахтера</translation>
+	<translation name="OREGATHERER_SHOES">Сапоги шахтера</translation>
+	<translation name="OREGATHERER_BACKPACK">Рюкзак шахтера</translation>
 
 	<translation name="ROCKGATHERER_ARMOR">Одежда каменолома</translation>
-	<translation name="ROCKGATHERER_HELMET">Рюкзак каменолома</translation>
-	<translation name="ROCKGATHERER_SHOES">Шапка каменолома</translation>
-	<translation name="ROCKGATHERER_BACKPACK">Сапоги каменолома</translation>
+	<translation name="ROCKGATHERER_HELMET">Шапка каменолома</translation>
+	<translation name="ROCKGATHERER_SHOES">Сапоги каменолома</translation>
+	<translation name="ROCKGATHERER_BACKPACK">Рюкзак каменолома</translation>
 
 	<translation name="WOODGATHERER_ARMOR">Одежда дровосека</translation>
-	<translation name="WOODGATHERER_HELMET">Рюкзак дровосека</translation>
-	<translation name="WOODGATHERER_SHOES">Шапка дровосека</translation>
-	<translation name="WOODGATHERER_BACKPACK">Сапоги дровосека</translation>
+	<translation name="WOODGATHERER_HELMET">Шапка дровосека</translation>
+	<translation name="WOODGATHERER_SHOES">Сапоги дровосека</translation>
+	<translation name="WOODGATHERER_BACKPACK">Рюкзак дровосека</translation>
 
 	<translation name="BRIDGEWATCH">Bridgewatch</translation>
 	<translation name="CAERLEON">Caerleon</translation>
@@ -247,13 +247,13 @@
 
 	<translation name="CLOTH">Ткань</translation>
 	<translation name="FIBER">Волокно</translation>
-	<translation name="HIDE">Шкуры</translation>
+	<translation name="HIDE">Шкура</translation>
 	<translation name="LEATHER">Кожа</translation>
 	<translation name="METALBAR">Слитки</translation>
 	<translation name="ORE">Руда</translation>
 	<translation name="WOOD">Древесина</translation>
 	<translation name="PLANKS">Брусья</translation>
-	<translation name="ROCK">Камни</translation>
+	<translation name="ROCK">Камень</translation>
 	<translation name="STONEBLOCK">Блоки</translation>
 
 	<translation name="ARENA_SIGILS">Знак арены</translation>
@@ -689,7 +689,7 @@
 	<translation name="GATHERING_ACTIVE">Отслеживать собирательство</translation>
 	<translation name="THIS_WEEK">Эта неделя</translation>
 	<translation name="LAST_WEEK">Прошлая неделя</translation>
-	<translation name="GENERALLY">Обычное</translation>
+	<translation name="GENERALLY">Общие сведения</translation>
 	<translation name="MOST_GATHERED_RESOURCE">Больше всего собрано</translation>
 	<translation name="MOST_GATHERED_ON_MAP">Большe всего собрано на локации</translation>
 	<translation name="TOTAL_RESOURCES">Всего ресурсов</translation>
@@ -786,4 +786,6 @@
 	<translation name="PLEASE_SELECT_A_CORRECT_FOLDER">Пожалуста, выберите правильную папку</translation>
 	<translation name="SELECT_MAIN_GAME_FOLDER_DOTS">Выбрать папку с игрой...</translation>
 	<translation name="CONFIRM">Подтвердить</translation>
+	<translation name="OVERHEALED_PERCENTAGE_OF_TOTAL_HEALING">Процент перехила от общего значения лечения</translation>
+	<translation name="HEALING_WITHOUT_OVERHEALED">Лечение без перехила</translation>
 </translations>
diff --git a/src/StatisticsAnalysisTool/Network/EventCodes.cs b/src/StatisticsAnalysisTool/Network/EventCodes.cs
@@ -262,9 +262,9 @@ public enum EventCodes
     InvitedToArenaMatch,
     PlayerCounts,
     OtherGrabbedLoot,
-    InCombatStateUpdate = 263, // map[0:671362 1:true 2:true 252:257] | 1 = true; player hits enemy | 2 = true; enemy hits player
-    GrabbedLoot = 264, // LOOT: map[0:424 1:Triky313 2:Bruno313 4:1841 5:1 252:256] | SILVER: map[0:6436 2:Triky313 3:true 5:1550115 252:256] (0: ObjectId, 1: LootedBody, 2: Looter, 4: ItemId, 5: Quantity) 
-    SiegeCampClaimStart = 265,
+    InCombatStateUpdate = 262, // map[0:671362 1:true 2:true 252:257] | 1 = true; player hits enemy | 2 = true; enemy hits player
+    GrabbedLoot = 263, // LOOT: map[0:424 1:Triky313 2:Bruno313 4:1841 5:1 252:256] | SILVER: map[0:6436 2:Triky313 3:true 5:1550115 252:256] (0: ObjectId, 1: LootedBody, 2: Looter, 4: ItemId, 5: Quantity) 
+    SiegeCampClaimStart = 264,
     SiegeCampClaimCancel,
     SiegeCampClaimFinished,
     SiegeCampScheduleResult,
@@ -379,12 +379,12 @@ public enum EventCodes
     TutorialUpdate,
     TriggerHintBox,
     RandomDungeonPositionInfo,
-    NewLootChest = 378, // map[0:23 1:[20.5 177.5] 2:423 3:KEEPER_SOLO_BOOKCHEST_STANDARD 4:FOREST_GREEN_LOOTCHEST_KEEPER_SOLO_BOOKCHEST_STANDARD 5:4 6:637734315213820408 7:[] 8:[] 13:true 252:367] // map[0:4399 1:[165 -263] 3:TREASURE_SOLO_UNCOMMON 4:SWAMP_DEAD_LOOTCHEST_TREASURE_SOLO_UNCOMMON 5:4 6:637926439332719127 7:[] 8:[] 13:true 14:SWAMP_DEAD_TREASURE_SOLO 16:31ff503a-ded6-53d6-974a-7e32e3126457 252:370]
-    UpdateLootChest = 379, // 0=ObjectId, 3=PlayerGuid, 4=PlayerGuid, 7=Free4All map[0:4769 1:5 2:637927794424868192 3:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 4:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 6:true 7:true 8:2.6 9:true 252:371]
-    LootChestOpened = 380, // map[0:23 252:369]
+    NewLootChest = 377, // map[0:23 1:[20.5 177.5] 2:423 3:KEEPER_SOLO_BOOKCHEST_STANDARD 4:FOREST_GREEN_LOOTCHEST_KEEPER_SOLO_BOOKCHEST_STANDARD 5:4 6:637734315213820408 7:[] 8:[] 13:true 252:367] // map[0:4399 1:[165 -263] 3:TREASURE_SOLO_UNCOMMON 4:SWAMP_DEAD_LOOTCHEST_TREASURE_SOLO_UNCOMMON 5:4 6:637926439332719127 7:[] 8:[] 13:true 14:SWAMP_DEAD_TREASURE_SOLO 16:31ff503a-ded6-53d6-974a-7e32e3126457 252:370]
+    UpdateLootChest = 378, // 0=ObjectId, 3=PlayerGuid, 4=PlayerGuid, 7=Free4All map[0:4769 1:5 2:637927794424868192 3:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 4:[[-45 -35 124 14 -23 103 -41 74 -71 66 67 20 -12 60 44 -101]] 6:true 7:true 8:2.6 9:true 252:371]
+    LootChestOpened = 379, // map[0:23 252:369]
     UpdateLootProtectedByMobsWithMinimapDisplay,
-    NewShrine = 382, // map[0:19 1:[-89 90] 2:180 3:GENERAL_SHRINE_COMBAT_BUFF 4:SHRINE_NON_COMBAT_BUFF 5:1 6:637734312344532502 252:371]
-    UpdateShrine = 383, // map[0:19 1:2 2:637734313445294913 252:372]
+    NewShrine = 381, // map[0:19 1:[-89 90] 2:180 3:GENERAL_SHRINE_COMBAT_BUFF 4:SHRINE_NON_COMBAT_BUFF 5:1 6:637734312344532502 252:371]
+    UpdateShrine = 382, // map[0:19 1:2 2:637734313445294913 252:372]
     UpdateRoom,
     NewMistDungeonRoomMobSoul,
     NewHellgateShrine,
@@ -398,10 +398,10 @@ public enum EventCodes
     UnlockVanityUnlock,
     AvatarUnlocked,
     CustomizationChanged,
-    GuildVaultInfo = 398,
-    BaseVaultInfo = 399,
+    GuildVaultInfo = 397,
+    BaseVaultInfo = 398,
     BankVaultInfo, // map[0:6 1:6466931c-65a1-4c5d-870b-8724cf2611dc@3007 2:[] 3:[] 4:[] 5:[] 6:[] 7:[] 8:[] 252:390]
-    RecoveryVaultPlayerInfo = 401,
+    RecoveryVaultPlayerInfo = 400,
     RecoveryVaultGuildInfo,
     UpdateWardrobe,
     CastlePhaseChanged,
@@ -481,7 +481,7 @@ public enum EventCodes
     DoSimpleActionCancel,
     DoSimpleActionFinished,
     NotifyGuestAccountVerified,
-    MightAndFavorReceivedEvent = 480, // map[0:63063 2:21021 3:16617 5:5539 6:349680 8:0 252:470] (0: Might, 2: Premium of might, 3: Favor, 5: Premium of favor, 6: Total favor, 8: ???) 
+    MightAndFavorReceivedEvent = 479, // map[0:63063 2:21021 3:16617 5:5539 6:349680 8:0 252:470] (0: Might, 2: Premium of might, 3: Favor, 5: Premium of favor, 6: Total favor, 8: ???) 
     WeeklyPvpChallengeRewardStateUpdate,
     NewUnlockedPvpSeasonChallengeRewards,
     StaticDungeonEntrancesDungeonEventStatusUpdates,
@@ -531,5 +531,17 @@ public enum EventCodes
     Transformation,
     TransformationEnd,
     UpdateTrustlevel,
-    RevealHiddenTimeStamps
+    RevealHiddenTimeStamps,
+    ModifyItemTraitFinished,
+    RerollItemTraitValueFinished,
+    HuntQuestProgressInfo,
+    HuntStarted,
+    HuntFinished,
+    HuntAborted,
+    HuntMissionStepStateUpdate,
+    NewHuntTrack,
+    HuntMissionUpdate,
+    HuntQuestMissionProgressUpdate,
+    HuntTrackUsed,
+    LegendaryItemDestroyed
 }
diff --git a/src/StatisticsAnalysisTool/Network/Handler/AuctionBuyLoadoutOfferResponseHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/AuctionBuyLoadoutOfferResponseHandler.cs
@@ -0,0 +1,20 @@
+using StatisticsAnalysisTool.Network.Manager;
+using StatisticsAnalysisTool.Network.Operations.Responses;
+using System.Threading.Tasks;
+
+namespace StatisticsAnalysisTool.Network.Handler;
+
+public class AuctionBuyLoadoutOfferResponseHandler : ResponsePacketHandler<AuctionBuyLoadoutOfferResponse>
+{
+    private readonly TrackingController _trackingController;
+
+    public AuctionBuyLoadoutOfferResponseHandler(TrackingController trackingController) : base((int) OperationCodes.AuctionBuyLoadoutOffer)
+    {
+        _trackingController = trackingController;
+    }
+
+    protected override async Task OnActionAsync(AuctionBuyLoadoutOfferResponse value)
+    {
+        await _trackingController.MarketController.AddBuyAsync(value.PurchaseIds);
+    }
+}
diff --git a/src/StatisticsAnalysisTool/Network/Handler/AuctionGetLoadoutOffersResponseHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/AuctionGetLoadoutOffersResponseHandler.cs
@@ -0,0 +1,21 @@
+using StatisticsAnalysisTool.Network.Manager;
+using StatisticsAnalysisTool.Network.Operations.Responses;
+using System.Threading.Tasks;
+
+namespace StatisticsAnalysisTool.Network.Handler;
+
+public class AuctionGetLoadoutOffersResponseHandler : ResponsePacketHandler<AuctionGetLoadoutOffersResponse>
+{
+    private readonly TrackingController _trackingController;
+
+    public AuctionGetLoadoutOffersResponseHandler(TrackingController trackingController) : base((int) OperationCodes.AuctionGetLoadoutOffers)
+    {
+        _trackingController = trackingController;
+    }
+
+    protected override async Task OnActionAsync(AuctionGetLoadoutOffersResponse value)
+    {
+        _trackingController.MarketController.AddOffers(value.AuctionEntries, value.NumberToBuyList);
+        await Task.CompletedTask;
+    }
+}
diff --git a/src/StatisticsAnalysisTool/Network/Handler/UnRegisterFromObjectRequestHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/UnRegisterFromObjectRequestHandler.cs
@@ -19,6 +19,7 @@ protected override async Task OnActionAsync(UnRegisterFromObjectRequest value)
 
         _trackingController.MarketController.ResetTempOffers();
         _trackingController.MarketController.ResetTempBuyOrders();
+        _trackingController.MarketController.ResetTempNumberToBuyList();
         await Task.CompletedTask;
     }
 }
diff --git a/src/StatisticsAnalysisTool/Network/NetworkManager.cs b/src/StatisticsAnalysisTool/Network/NetworkManager.cs
@@ -94,6 +94,8 @@ public static void StartNetworkCapture(TrackingController trackingController)
         builder.AddResponseHandler(new AuctionGetResponseHandler(trackingController));
         builder.AddResponseHandler(new GetCharacterEquipmentResponseHandler(trackingController));
         builder.AddResponseHandler(new FishingFinishResponseHandler(trackingController));
+        builder.AddResponseHandler(new AuctionGetLoadoutOffersResponseHandler(trackingController));
+        builder.AddResponseHandler(new AuctionBuyLoadoutOfferResponseHandler(trackingController));
 
         _receiver = builder.Build();
         StartDeviceCapture();