Merge pull request #2220 from jarveson/jake/exclusive-overwrite

ee: dont overwrite same priority with less duration

sim/core/exclusive_effect.go

@@ -130,7 +130,7 @@ func (ee *ExclusiveEffect) Activate(sim *Simulation) bool {
 		return true
 	}
 
-	if ee.Category.SingleAura && ee.Category.activeEffect != nil && ee.Category.activeEffect != ee && ee.Category.activeEffect.Priority > ee.Priority {
+	if ee.Category.SingleAura && ee.Category.activeEffect != nil && ee.Category.activeEffect != ee && (ee.Category.activeEffect.Priority > ee.Priority || (ee.Priority == ee.Category.activeEffect.Priority && ee.Category.activeEffect.Aura.RemainingDuration(sim) > ee.Aura.Duration)) {
 		return false
 	}
 

sim/core/exclusive_effect_test.go

@@ -0,0 +1,56 @@
+package core
+
+import (
+	"testing"
+	"time"
+)
+
+func TestSingleAuraExclusiveDurationNoOverwrite(t *testing.T) {
+	sim := &Simulation{}
+
+	target := Unit{
+		Type:        EnemyUnit,
+		Index:       0,
+		Level:       83,
+		auraTracker: newAuraTracker(),
+	}
+	mangle := MangleAura(&target)
+	trauma := MakePermanent(TraumaAura(&target, 2))
+
+	// Trauma in this case should *never* be overwritten
+	// as its duration from 'MakePermanent' should make it non overwritable by 1 min duration mangles
+	trauma.Activate(sim)
+
+	sim.CurrentTime = 1 * time.Second
+
+	mangle.Activate(sim)
+
+	if !(trauma.IsActive() && !mangle.IsActive()) {
+		t.Fatalf("lower duration exclusive aura overwrote previous!")
+	}
+}
+
+func TestSingleAuraExclusiveDurationOverwrite(t *testing.T) {
+	sim := &Simulation{}
+
+	target := Unit{
+		Type:        EnemyUnit,
+		Index:       0,
+		Level:       83,
+		auraTracker: newAuraTracker(),
+	}
+	mangle := MangleAura(&target)
+	trauma := TraumaAura(&target, 2)
+
+	trauma.Activate(sim)
+
+	sim.CurrentTime = 1 * time.Second
+
+	mangle.Activate(sim)
+
+	// In this case mangle should overwrite trauma as mangle will give a greater duration
+
+	if !(mangle.IsActive() && !trauma.IsActive()) {
+		t.Fatalf("longer duration exclusive aura failed to overwrite")
+	}
+}