renaming

baaron4 · Jun 19, 2024 · ed4b5b4 · ed4b5b4
1 parent 7d6adda
commit ed4b5b4
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/GW2EIEvtcParser/EIData/Buffs/BuffSimulators/BuffSimulatorID/BuffSimulatorID.cs b/GW2EIEvtcParser/EIData/Buffs/BuffSimulators/BuffSimulatorID/BuffSimulatorID.cs
@@ -54,7 +54,7 @@ protected override void Clear()
 
         protected override void UpdateSimulator(AbstractBuffEvent buffEvent)
         {
-            buffEvent.UpdateSimulator(this, true);
+            buffEvent.UpdateSimulator(this, false);
         }
 
         public override void Extend(long extension, long oldValue, AgentItem src, long time, uint stackID)

diff --git a/GW2EIEvtcParser/EIData/Buffs/BuffSimulators/BuffSimulatorNoID/BuffSimulator.cs b/GW2EIEvtcParser/EIData/Buffs/BuffSimulators/BuffSimulatorNoID/BuffSimulator.cs
@@ -74,7 +74,7 @@ private void Add(BuffStackItem toAdd, bool addedActive, long overridenDuration,
         }
         protected override void UpdateSimulator(AbstractBuffEvent buffEvent)
         {
-            buffEvent.UpdateSimulator(this, false);
+            buffEvent.UpdateSimulator(this, true);
         }
 
         public override void Add(long duration, AgentItem src, long start, uint stackID, bool addedActive, long overridenDuration, uint overridenStackID)

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/AbstractBuffEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/AbstractBuffEvent.cs
@@ -41,7 +41,7 @@ internal void Invalidate(SkillData skillData)
             }
         }
 
-        internal abstract void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator);
+        internal abstract void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive);
 
         internal abstract void TryFindSrc(ParsedEvtcLog log);
 

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffApplies/BuffApplyEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffApplies/BuffApplyEvent.cs
@@ -41,9 +41,9 @@ internal override void TryFindSrc(ParsedEvtcLog log)
         {
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
-            simulator.Add(AppliedDuration, CreditedBy, Time, BuffInstance, _addedActive || (!useBuffInstanceSimulator && simulator.Buff.StackType == BuffStackType.StackingConditionalLoss), OverridenDurationInternal > 0 ? OverridenDurationInternal : OverridenDuration, OverridenInstance);
+            simulator.Add(AppliedDuration, CreditedBy, Time, BuffInstance, _addedActive || (forceStackType4ToBeActive && simulator.Buff.StackType == BuffStackType.StackingConditionalLoss), OverridenDurationInternal > 0 ? OverridenDurationInternal : OverridenDuration, OverridenInstance);
         }
 
         /*internal override int CompareTo(AbstractBuffEvent abe)

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffApplies/BuffExtensionEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffApplies/BuffExtensionEvent.cs
@@ -102,7 +102,7 @@ internal void OffsetNewDuration(IReadOnlyList<AbstractBuffEvent> events, int evt
             }
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
             if (ExtendedDuration <= 1)
             {

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffRemoves/BuffRemoveAllEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffRemoves/BuffRemoveAllEvent.cs
@@ -22,7 +22,7 @@ internal BuffRemoveAllEvent(AgentItem by, AgentItem to, long time, int removedDu
             RemovedStacks = removedStacks;
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
             simulator.Remove(CreditedBy, RemovedDuration, RemovedStacks, Time, BuffRemove.All, 0);
         }

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffRemoves/BuffRemoveManualEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffRemoves/BuffRemoveManualEvent.cs
@@ -18,7 +18,7 @@ internal override bool IsBuffSimulatorCompliant(bool useBuffInstanceSimulator)
             return false; // don't consider manual remove events
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
         }
         /*internal override int CompareTo(AbstractBuffEvent abe)

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffRemoves/BuffRemoveSingleEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffRemoves/BuffRemoveSingleEvent.cs
@@ -37,7 +37,7 @@ internal override bool IsBuffSimulatorCompliant(bool useBuffInstanceSimulator)
             return !OverstackOrNaturalEnd;
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
             simulator.Remove(CreditedBy, RemovedDuration, 1, Time, BuffRemove.Single, BuffInstance);
         }

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffStacks/BuffStackActiveEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffStacks/BuffStackActiveEvent.cs
@@ -14,7 +14,7 @@ internal override bool IsBuffSimulatorCompliant(bool hasStackIDs)
             return BuffInstance != 0 && base.IsBuffSimulatorCompliant(hasStackIDs);
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
             simulator.Activate(BuffInstance);
         }

diff --git a/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffStacks/BuffStackResetEvent.cs b/GW2EIEvtcParser/ParsedData/CombatEvents/BuffEvents/BuffStacks/BuffStackResetEvent.cs
@@ -16,7 +16,7 @@ internal override bool IsBuffSimulatorCompliant(bool useBuffInstanceSimulator)
             return useBuffInstanceSimulator && BuffInstance != 0 && base.IsBuffSimulatorCompliant(useBuffInstanceSimulator);
         }
 
-        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator)
+        internal override void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive)
         {
             simulator.Reset(BuffInstance, ResetToDuration);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ internal void Invalidate(SkillData skillData) @@
                 }
             }
-            internal abstract void UpdateSimulator(AbstractBuffSimulator simulator, bool useBuffInstanceSimulator);
+            internal abstract void UpdateSimulator(AbstractBuffSimulator simulator, bool forceStackType4ToBeActive);
             internal abstract void TryFindSrc(ParsedEvtcLog log);
@@ Expand Down @@