Merge branch 'dev'

Triky313 · Jul 22, 2024 · fb792ae · fb792ae
2 parents bc8393d + ace0b9f
commit fb792ae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/src/StatisticsAnalysisTool/Network/EventCodes.cs b/src/StatisticsAnalysisTool/Network/EventCodes.cs
@@ -65,6 +65,7 @@ public enum EventCodes
     HarvestCancel,
     HarvestFinished, // map[0:5270 1:637926215956544319 2:637926215972723131 3:4250 4:1 5:1 7:28 8:[] 9:[] 252:54] - 0: UserId, 3: ObjectId, 4:ItemId 5: Res Standard Quantity 6: Sammelbonus Res, 6: Premium Bonus Res, 8: Inhalt in der Ressource
     TakeSilver, // map[0:-57 1:2178162 2:-57 3:10000000 8:10000 252:55]
+    RemoveSilver,
     ActionOnBuildingStart,
     ActionOnBuildingCancel,
     ActionOnBuildingFinished, // Repear: [60]evInstallResourceCancel - map[0:1562 1:63802829 282167 2:442 3:454 4:2 252:60] 0: UserObjectId, 2: ActionId, 4: ActionType
@@ -243,6 +244,7 @@ public enum EventCodes
     PartyOnClusterPartyJoined,
     PartySetRoleFlag, // map[0:8 1:[-118 61 -70 72 17 -107 121 72 -102 110 20 -25 64 20 106 2] 252:225] (0: FlagType, 1: ObjectId)
     PartyInviteOrJoinPlayerEquipmentInfo,
+    PartyReadyCheckUpdate,
     SpellCooldownUpdate,
     NewHellgateExitPortal,
     NewExpeditionExit,
@@ -500,6 +502,7 @@ public enum EventCodes
     PartyStartHuntRequest,
     PartyStartHuntRequested,
     PartyStartHuntRequestAnswer,
+    PartyPlayerLeaveScheduled,
     GuildInviteDeclined,
     CancelMultiSpellSlots,
     NewVisualEventObject,
@@ -588,4 +591,6 @@ public enum EventCodes
     CastleGateSwitchUseFinished,
     FortificationBuildingWillDowngrade,
     BotCommand,
+    JournalAchievementProgressUpdate,
+    JournalClaimableRewardUpdate
 }
diff --git a/src/StatisticsAnalysisTool/Network/OperationCodes.cs b/src/StatisticsAnalysisTool/Network/OperationCodes.cs
@@ -215,14 +215,10 @@ public enum OperationCodes
     AllianceChangeGoldPaymentFlag,
     AllianceGetDetailInfo,
     GetIslandInfos,
-    AbandonMyIsland,
     BuyMyIsland,
     BuyGuildIsland,
-    AbandonGuildIsland,
     UpgradeMyIsland,
     UpgradeGuildIsland,
-    MoveMyIsland,
-    MoveGuildIsland,
     TerritoryFillNutrition,
     TeleportBack,
     PartyInvitePlayer,
@@ -253,7 +249,7 @@ public enum OperationCodes
     TreasureChestUsingStart,
     TreasureChestUsingCancel,
     UseLootChest, // <- LootLogger: https://github.com/EmeraldKnight79/AO-DU-LootLogger/blob/b1ab099e0d82bdee0a87c153f4bbae324295656e/LootLogger/PacketHandler.cs#L68
-    UseShrine = 250,
+    UseShrine,
     UseHellgateShrine,
     GetSiegeBannerInfo,
     LaborerStartJob,
@@ -300,7 +296,7 @@ public enum OperationCodes
     UsePortalEntrance,
     ResetPortalBinding,
     QueryPortalBinding,
-    ClaimPaymentTransaction = 297,
+    ClaimPaymentTransaction,
     ChangeUseFlag,
     ClientPerformanceStats,
     ExtendedHardwareStats, //  map[0:NVIDIA GeForce RTX 3090 1:AMD Ryzen 7 2700X Eight-Core Processor  2:Windows 10  (10.0.0) 64bit 3:3693 4:24348 5:16293 6:DE-DE 7:Custom 8:1746 10:-1 253:303]
@@ -309,8 +305,6 @@ public enum OperationCodes
     TerritoryClaimCancel,
     DeliverCarriableObjectStart,
     DeliverCarriableObjectCancel,
-    ClaimPowerCrystalStart,
-    ClaimPowerCrystalCancel,
     TerritoryUpgradeWithPowerCrystal,
     RequestAppStoreProducts,
     VerifyProductPurchase,
@@ -320,15 +314,15 @@ public enum OperationCodes
     SetAchievementsAutoLearn,
     DepositItemToGuildCurrency,
     WithdrawalItemFromGuildCurrency,
-    AuctionSellSpecificItemRequest = 315,
-    FishingStart = 316, // 0: EventId, 2: Used fishing rod
+    AuctionSellSpecificItemRequest,
+    FishingStart, // 0: EventId, 2: Used fishing rod
     FishingCasting,
     FishingCast,
     FishingCatch,
     FishingPull,
     FishingGiveLine,
-    FishingFinish = 322, // Request: 1: true is finished | false is failed - Response: Fishing finished
-    FishingCancel = 323, // Request: Fishing canceled
+    FishingFinish, // Request: 1: true is finished | false is failed - Response: Fishing finished
+    FishingCancel, // Request: Fishing canceled
     CreateGuildAccessTag,
     DeleteGuildAccessTag,
     RenameGuildAccessTag,
@@ -451,8 +445,8 @@ public enum OperationCodes
     GetPvpChallengeData,
     ClaimPvpChallengeWeeklyReward,
     GetPersonalMightStats,
-    AuctionGetLoadoutOffers = 446,
-    AuctionBuyLoadoutOffer = 447,
+    AuctionGetLoadoutOffers,
+    AuctionBuyLoadoutOffer,
     AccountDeletionRequest,
     AccountReactivationRequest,
     GetModerationEscalationDefiniton,
@@ -500,5 +494,11 @@ public enum OperationCodes
     ClaimDailyMightBonus,
     GetFortificationGroupInfo,
     UpgradeFortificationGroup,
+    CancelUpgradeFortificationGroup,
+    DowngradeFortificationGroup,
     GetClusterActivityChestEstimates,
+    PartyReadyCheckBegin,
+    PartyReadyCheckUpdate,
+    ClaimAlbionJournalReward,
+    TrackAlbionJournalAchievements
 }
diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -53,5 +53,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.6.0.*")]
-[assembly: AssemblyFileVersion("7.6.0.0")]
+[assembly: AssemblyVersion("7.7.0.*")]
+[assembly: AssemblyFileVersion("7.7.0.0")]