Merge pull request #536 from wowsims/kg/spell-known-aura-known

Core: Add APL "Spell Known" and "Aura Known" values
wowsims · Apr 1, 2024 · 903b5e7 · 903b5e7
2 parents ab474e6 + c793cd0
commit 903b5e7
Show file tree

Hide file tree

Showing 12 changed files with 638 additions and 95 deletions.
diff --git a/proto/apl.proto b/proto/apl.proto
@@ -81,7 +81,7 @@ message APLAction {
     }
 }
 
-// NextIndex: 67
+// NextIndex: 69
 message APLValue {
     oneof value {
         // Operators
@@ -121,6 +121,7 @@ message APLValue {
         APLValueAutoSwingTime auto_swing_time = 64;
 
         // Spell values
+        APLValueSpellIsKnown spell_is_known = 68;
         APLValueSpellCanCast spell_can_cast = 19;
         APLValueSpellIsReady spell_is_ready = 20;
         APLValueSpellTimeToReady spell_time_to_ready = 21;
@@ -132,6 +133,7 @@ message APLValue {
         APLValueSpellCurrentCost spell_current_cost = 62;
 
         // Aura values
+        APLValueAuraIsKnown aura_is_known = 67;
         APLValueAuraIsActive aura_is_active = 22;
         APLValueAuraIsActiveWithReactionTime aura_is_active_with_reaction_time = 50;
         APLValueAuraRemainingTime aura_remaining_time = 23;
@@ -394,6 +396,9 @@ message APLValueAutoSwingTime {
     SwingType auto_type = 1;
 }
 
+message APLValueSpellIsKnown {
+    ActionID spell_id = 1;
+}
 message APLValueSpellCanCast {
     ActionID spell_id = 1;
 }
@@ -427,6 +432,10 @@ message APLValueSpellCurrentCost {
     ActionID spell_id = 1;
 }
 
+message APLValueAuraIsKnown {
+    UnitReference source_unit = 2;
+    ActionID aura_id = 1;
+}
 message APLValueAuraIsActive {
     UnitReference source_unit = 2;
     ActionID aura_id = 1;

diff --git a/sim/core/apl_value.go b/sim/core/apl_value.go
@@ -125,6 +125,8 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue {
 		return rot.newValueAutoSwingTime(config.GetAutoSwingTime())
 
 	// Spells
+	case *proto.APLValue_SpellIsKnown:
+		return rot.newValueSpellIsKnown(config.GetSpellIsKnown())
 	case *proto.APLValue_SpellCanCast:
 		return rot.newValueSpellCanCast(config.GetSpellCanCast())
 	case *proto.APLValue_SpellIsReady:
@@ -141,8 +143,12 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue {
 		return rot.newValueSpellIsChanneling(config.GetSpellIsChanneling())
 	case *proto.APLValue_SpellChanneledTicks:
 		return rot.newValueSpellChanneledTicks(config.GetSpellChanneledTicks())
+	case *proto.APLValue_SpellCurrentCost:
+		return rot.newValueSpellCurrentCost(config.GetSpellCurrentCost())
 
 	// Auras
+	case *proto.APLValue_AuraIsKnown:
+		return rot.newValueAuraIsKnown(config.GetAuraIsKnown())
 	case *proto.APLValue_AuraIsActive:
 		return rot.newValueAuraIsActive(config.GetAuraIsActive())
 	case *proto.APLValue_AuraIsActiveWithReactionTime:

diff --git a/sim/core/apl_values_aura.go b/sim/core/apl_values_aura.go
@@ -7,13 +7,39 @@ import (
 	"github.com/wowsims/sod/sim/core/proto"
 )
 
+type APLValueAuraIsKnown struct {
+	DefaultAPLValueImpl
+	aura AuraReference
+}
+
+func (rot *APLRotation) newValueAuraIsKnown(config *proto.APLValueAuraIsKnown) APLValue {
+	aura := rot.GetAPLAura(rot.GetSourceUnit(config.SourceUnit), config.AuraId)
+	return &APLValueAuraIsKnown{
+		aura: aura,
+	}
+}
+func (value *APLValueAuraIsKnown) Type() proto.APLValueType {
+	return proto.APLValueType_ValueTypeBool
+}
+func (value *APLValueAuraIsKnown) GetBool(sim *Simulation) bool {
+	return value.aura.Get() != nil
+}
+func (value *APLValueAuraIsKnown) String() string {
+	return fmt.Sprintf("Aura Active(%s)", value.aura.String())
+}
+
 type APLValueAuraIsActive struct {
 	DefaultAPLValueImpl
 	aura AuraReference
 }
 
 func (rot *APLRotation) newValueAuraIsActive(config *proto.APLValueAuraIsActive) APLValue {
 	aura := rot.GetAPLAura(rot.GetSourceUnit(config.SourceUnit), config.AuraId)
+
+	if aura.Get() == nil {
+		return nil
+	}
+
 	return &APLValueAuraIsActive{
 		aura: aura,
 	}
@@ -22,7 +48,7 @@ func (value *APLValueAuraIsActive) Type() proto.APLValueType {
 	return proto.APLValueType_ValueTypeBool
 }
 func (value *APLValueAuraIsActive) GetBool(sim *Simulation) bool {
-	return value.aura.Get() != nil && value.aura.Get().IsActive()
+	return value.aura.Get().IsActive()
 }
 func (value *APLValueAuraIsActive) String() string {
 	return fmt.Sprintf("Aura Active(%s)", value.aura.String())

diff --git a/sim/core/apl_values_operators.go b/sim/core/apl_values_operators.go
@@ -271,6 +271,7 @@ type APLValueCompare struct {
 
 func (rot *APLRotation) newValueCompare(config *proto.APLValueCompare) APLValue {
 	lhs, rhs := rot.coerceToSameType(rot.newAPLValue(config.Lhs), rot.newAPLValue(config.Rhs))
+
 	if lhs == nil || rhs == nil {
 		return nil
 	}

diff --git a/sim/core/apl_values_spell.go b/sim/core/apl_values_spell.go
@@ -7,6 +7,27 @@ import (
 	"github.com/wowsims/sod/sim/core/proto"
 )
 
+type APLValueSpellIsKnown struct {
+	DefaultAPLValueImpl
+	spell *Spell
+}
+
+func (rot *APLRotation) newValueSpellIsKnown(config *proto.APLValueSpellIsKnown) APLValue {
+	spell := rot.GetAPLSpell(config.SpellId)
+	return &APLValueSpellIsKnown{
+		spell: spell,
+	}
+}
+func (value *APLValueSpellIsKnown) Type() proto.APLValueType {
+	return proto.APLValueType_ValueTypeBool
+}
+func (value *APLValueSpellIsKnown) GetBool(sim *Simulation) bool {
+	return value.spell != nil
+}
+func (value *APLValueSpellIsKnown) String() string {
+	return fmt.Sprintf("Is Known(%s)", value.spell.ActionID)
+}
+
 type APLValueSpellCanCast struct {
 	DefaultAPLValueImpl
 	spell *Spell