Skip to content

Commit

Permalink
Combo point OtherID added
Browse files Browse the repository at this point in the history
  • Loading branch information
sanguinerarogue committed Apr 11, 2024
1 parent afefbff commit 32a56f4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,7 @@ enum OtherAction {
OtherActionHealingModel = 12; // Indicates healing received from healing model.
OtherActionPotion = 13; // Used by APL to generically refer to either the prepull or combat potion.
OtherActionMove = 14; // Used by movement to be able to show it in timeline
OtherActionComboPoints = 15; //Used by APL to generically add Combo Points.
}

message ActionID {
Expand Down
2 changes: 1 addition & 1 deletion sim/core/apl_actions_misc.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (action *APLActionAddComboPoints) Execute(sim *Simulation) {
if sim.Log != nil {
action.character.Log(sim, "Adding combo points (%s points)", numPoints)
}
metrics := action.character.NewComboPointMetrics(ActionID{SpellID: 432264})
metrics := action.character.NewComboPointMetrics(ActionID{OtherID: proto.OtherAction_OtherActionComboPoints})
action.character.AddComboPoints(sim, action.numPoints, metrics)
}

Expand Down
4 changes: 4 additions & 0 deletions ui/core/proto_utils/action_id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ export class ActionId {
baseName = 'Energy Tick';
iconUrl = resourceTypeToIcon[ResourceType.ResourceTypeEnergy];
break;
case OtherAction.OtherActionComboPoints:
baseName = 'Combo Point Gain';
iconUrl = resourceTypeToIcon[ResourceType.ResourceTypeComboPoints];
break;
case OtherAction.OtherActionFocusRegen:
baseName = 'Focus Tick';
iconUrl = resourceTypeToIcon[ResourceType.ResourceTypeFocus];
Expand Down

0 comments on commit 32a56f4

Please sign in to comment.