fixes for rel effects cleanup and damage effect bonus usage

cptn-solo · Aug 27, 2023 · 319ee32 · 319ee32
1 parent 836305b
commit 319ee32
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Assets/Scripts/ECS/EcsRelationEffectsExtensions.cs b/Assets/Scripts/ECS/EcsRelationEffectsExtensions.cs
@@ -488,7 +488,7 @@ private static AdjustmentType TryGetAdjustment(RelationEffectKey key, ref Effect
                         return GetDmgEffectKeyAdjustment(ref relEffect, out factor, out value);
                     break;
                 case RelationsEffectType.DmgEffectBonusKey:
-                    if (relEffect.Rule.Key.RelationsEffectType switch
+                    if (relEffect.Rule.EffectType switch
                     {
                         RelationsEffectType.DmgEffectBonusAbs => true,
                         RelationsEffectType.DmgEffectBonusPercent => true,
@@ -523,6 +523,7 @@ public static AdjustmentType GetRelationAdjustment(this EcsWorld world, int subj
                     continue;
 
                 var retval = TryGetAdjustment(key, ref relEffect, out factor, out value, rangeValue);
+
                 if (retval == AdjustmentType.NA)
                     continue;
 

diff --git a/Assets/Scripts/ECS/Systems/Battle/BattleClearUsedRelationsEffectSystem.cs b/Assets/Scripts/ECS/Systems/Battle/BattleClearUsedRelationsEffectSystem.cs
@@ -7,7 +7,7 @@ namespace Assets.Scripts.ECS.Systems
     public class BattleClearUsedRelationsEffectSystem : BaseEcsSystem
     {
         private readonly EcsFilterInject<
-            Inc<ProcessedHeroTag>
+            Inc<PositionComp>
             > filter = default;
 
         public override void RunIfActive(IEcsSystems systems)

diff --git a/Assets/Scripts/UI/Common/BaseItemsContainer.cs b/Assets/Scripts/UI/Common/BaseItemsContainer.cs
@@ -1,8 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
-using static UnityEditor.Progress;
 
 namespace Assets.Scripts.UI.Common
 {

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 0
     16:9: 1
     Others: 0
-  bundleVersion: 0.50.0
+  bundleVersion: 0.50.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0