Merge branch 'dev'

Triky313 · May 2, 2024 · 25519e9 · 25519e9
2 parents afb5203 + a6bd879
commit 25519e9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/src/StatisticsAnalysisTool/Dungeon/DungeonBindings.cs b/src/StatisticsAnalysisTool/Dungeon/DungeonBindings.cs
@@ -301,7 +301,7 @@ private bool Filter(object obj)
         }
 
         bool isLevelOkay = false;
-        bool isTierOkay = false;
+        bool isTierOkay = true;
         bool isModeOkay = false;
         bool isMapTypeOkay = false;
         bool isTimestampOkay = false;
@@ -311,10 +311,11 @@ private bool Filter(object obj)
             isLevelOkay = true;
         }
 
-        if (IsTierOkay(obj))
-        {
-            isTierOkay = true;
-        }
+        // TODO: Tier is currently not recognized. Value must be searched for again. - Is always set to true for the time being
+        //if (IsTierOkay(obj))
+        //{
+        //    isTierOkay = true;
+        //}
 
         if (IsModeOkay(obj))
         {

diff --git a/...work/Handler/AuctionGetResponseHandler.cs → ...dler/AuctionGetRequestsResponseHandler.cs b/...work/Handler/AuctionGetResponseHandler.cs → ...dler/AuctionGetRequestsResponseHandler.cs
@@ -4,16 +4,16 @@
 
 namespace StatisticsAnalysisTool.Network.Handler;
 
-public class AuctionGetResponseHandler : ResponsePacketHandler<AuctionGetResponse>
+public class AuctionGetRequestsResponseHandler : ResponsePacketHandler<AuctionGetRequests>
 {
     private readonly TrackingController _trackingController;
 
-    public AuctionGetResponseHandler(TrackingController trackingController) : base((int) OperationCodes.AuctionGetRequests)
+    public AuctionGetRequestsResponseHandler(TrackingController trackingController) : base((int) OperationCodes.AuctionGetRequests)
     {
         _trackingController = trackingController;
     }
 
-    protected override async Task OnActionAsync(AuctionGetResponse value)
+    protected override async Task OnActionAsync(AuctionGetRequests value)
     {
         _trackingController.MarketController.AddBuyOrders(value.AuctionEntries);
         await Task.CompletedTask;

diff --git a/src/StatisticsAnalysisTool/Network/NetworkManager.cs b/src/StatisticsAnalysisTool/Network/NetworkManager.cs
@@ -100,7 +100,7 @@ private static IPhotonReceiver Build(TrackingController trackingController)
         builder.AddResponseHandler(new GetMailInfosResponseHandler(trackingController));
         builder.AddResponseHandler(new ReadMailResponseHandler(trackingController));
         builder.AddResponseHandler(new AuctionGetOffersResponseHandler(trackingController));
-        builder.AddResponseHandler(new AuctionGetResponseHandler(trackingController));
+        builder.AddResponseHandler(new AuctionGetRequestsResponseHandler(trackingController));
         builder.AddResponseHandler(new GetCharacterEquipmentResponseHandler(trackingController));
         builder.AddResponseHandler(new FishingFinishResponseHandler(trackingController));
         builder.AddResponseHandler(new AuctionGetLoadoutOffersResponseHandler(trackingController));

diff --git a/...perations/Responses/AuctionGetResponse.cs → ...perations/Responses/AuctionGetRequests.cs b/...perations/Responses/AuctionGetResponse.cs → ...perations/Responses/AuctionGetRequests.cs
@@ -10,11 +10,11 @@
 
 namespace StatisticsAnalysisTool.Network.Operations.Responses;
 
-public class AuctionGetResponse
+public class AuctionGetRequests
 {
     public readonly List<AuctionEntry> AuctionEntries = new();
 
-    public AuctionGetResponse(Dictionary<byte, object> parameters)
+    public AuctionGetRequests(Dictionary<byte, object> parameters)
     {
         ConsoleManager.WriteLine(new ConsoleFragment(GetType().Name, parameters, ConsoleColorType.EventColor));
 

diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -49,5 +49,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.3.1.*")]
-[assembly: AssemblyFileVersion("7.3.1.0")]
+[assembly: AssemblyVersion("7.3.2.*")]
+[assembly: AssemblyFileVersion("7.3.2.0")]
diff --git a/src/StatisticsAnalysisTool/UserControls/DungeonControl.xaml b/src/StatisticsAnalysisTool/UserControls/DungeonControl.xaml
@@ -34,7 +34,8 @@
                                       SelectedItem="{Binding DungeonBindings.SelectedDungeonStatsType}" 
                                       IsSynchronizedWithCurrentItem="True" DisplayMemberPath="Name" SelectedValuePath="StatsViewType" />
                         </DockPanel>
-                        <ContentPresenter ContentTemplate="{StaticResource DungeonStatsFilterTemplate}" Content="{Binding DungeonBindings.DungeonStatsFilter}"/>
+                        <!--TODO: Tier is currently not recognized. Value must be searched for again. - Is always set to true for the time being-->
+                        <!--<ContentPresenter ContentTemplate="{StaticResource DungeonStatsFilterTemplate}" Content="{Binding DungeonBindings.DungeonStatsFilter}"/>-->
                         <Separator Background="{StaticResource SolidColorBrush.Background.3}" Height="4" Margin="0,2,0,2" />
 
                         <ContentPresenter ContentTemplate="{StaticResource Dungeon.Stats.Template}" Content="{Binding DungeonBindings.Stats}" Margin="0,10,0,0"/>