Reuse ModifySP struct and adjust SP if SP greater than new max SP

Author: kdovtdc

pkg/engine/attribute/attribute.go

@@ -29,7 +29,7 @@ type Manager interface {
 	Getter
 
 	ModifySP(data info.ModifySP) error
-	ModifyMaxSP(data info.ModifyMaxSP) error
+	ModifyMaxSP(data info.ModifySP) error
 
 	AddTarget(target key.TargetID, base info.Attributes) error
 

pkg/engine/attribute/modify.go

@@ -201,8 +201,15 @@ func (s *Service) ModifySP(data info.ModifySP) error {
 	return s.emitSPChange(data.Key, data.Source, old, s.sp)
 }
 
-func (s *Service) ModifyMaxSP(data info.ModifyMaxSP) error {
+func (s *Service) ModifyMaxSP(data info.ModifySP) error {
 	old := s.sp
 	s.maxsp += data.Amount
+	if s.sp > s.maxsp {
+		s.ModifySP(info.ModifySP{
+			Key:    data.Key,
+			Source: data.Source,
+			Amount: s.maxsp - s.sp,
+		})
+	}
 	return s.emitMaxSPChange(data.Key, data.Source, old, s.maxsp)
 }

pkg/engine/info/attribute.go

@@ -59,18 +59,7 @@ type ModifySP struct {
 	// The source of this modification
 	Source key.TargetID `json:"source"`
 
-	// The amount of SP to be added or removed
-	Amount int `json:"amount"`
-}
-
-type ModifyMaxSP struct {
-	// A unique identifier for this modification
-	Key key.Reason `json:"key"`
-
-	// The source of this modification
-	Source key.TargetID `json:"source"`
-
-	// The amount of maximum SP available
+	// The amount of SP or maximum SP to be added or removed
 	Amount int `json:"amount"`
 }
 

pkg/simulation/attribute.go

@@ -35,7 +35,7 @@ func (sim *Simulation) ModifySP(data info.ModifySP) error {
 	return sim.Attr.ModifySP(data)
 }
 
-func (sim *Simulation) ModifyMaxSP(data info.ModifyMaxSP) error {
+func (sim *Simulation) ModifyMaxSP(data info.ModifySP) error {
 	return sim.Attr.ModifyMaxSP(data)
 }