Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apl spell values for channel and travel time #3314

Merged
merged 2 commits into from
Jul 14, 2023
Merged

Apl spell values for channel and travel time #3314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec47b76
add spell travel time
rosenrusinov Jul 14, 2023
9b1bf9f
add channel time
rosenrusinov Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions proto/apl.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ message APLValue {
APLValueSpellIsReady spell_is_ready = 20;
APLValueSpellTimeToReady spell_time_to_ready = 21;
APLValueSpellCastTime spell_cast_time = 35;
APLValueSpellChannelTime spell_channel_time = 36;
APLValueSpellTravelTime spell_travel_time = 37;

// Aura values
APLValueAuraIsActive aura_is_active = 22;
Expand Down Expand Up @@ -240,6 +242,12 @@ message APLValueSpellTimeToReady {
message APLValueSpellCastTime {
ActionID spell_id = 1;
}
message APLValueSpellChannelTime {
ActionID spell_id = 1;
}
message APLValueSpellTravelTime {
ActionID spell_id = 1;
}

message APLValueAuraIsActive {
ActionID aura_id = 1;
Expand Down
4 changes: 4 additions & 0 deletions sim/core/apl_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue {
return rot.newValueSpellTimeToReady(config.GetSpellTimeToReady())
case *proto.APLValue_SpellCastTime:
return rot.newValueSpellCastTime(config.GetSpellCastTime())
case *proto.APLValue_SpellChannelTime:
return rot.newValueSpellChannelTime(config.GetSpellChannelTime())
case *proto.APLValue_SpellTravelTime:
return rot.newValueSpellTravelTime(config.GetSpellTravelTime())

// Auras
case *proto.APLValue_AuraIsActive:
Expand Down
44 changes: 44 additions & 0 deletions sim/core/apl_values_spell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,47 @@ func (value *APLValueSpellCastTime) Type() proto.APLValueType {
func (value *APLValueSpellCastTime) GetDuration(sim *Simulation) time.Duration {
return value.spell.Unit.ApplyCastSpeedForSpell(value.spell.DefaultCast.CastTime, value.spell)
}

type APLValueSpellChannelTime struct {
defaultAPLValueImpl
spell *Spell
}

func (rot *APLRotation) newValueSpellChannelTime(config *proto.APLValueSpellChannelTime) APLValue {
unit := rot.unit
spell := unit.aplGetSpell(config.SpellId)
if spell == nil {
return nil
}
return &APLValueSpellChannelTime{
spell: spell,
}
}
func (value *APLValueSpellChannelTime) Type() proto.APLValueType {
return proto.APLValueType_ValueTypeDuration
}
func (value *APLValueSpellChannelTime) GetDuration(sim *Simulation) time.Duration {
return value.spell.Unit.ApplyCastSpeedForSpell(value.spell.DefaultCast.ChannelTime, value.spell)
}

type APLValueSpellTravelTime struct {
defaultAPLValueImpl
spell *Spell
}

func (rot *APLRotation) newValueSpellTravelTime(config *proto.APLValueSpellTravelTime) APLValue {
unit := rot.unit
spell := unit.aplGetSpell(config.SpellId)
if spell == nil {
return nil
}
return &APLValueSpellTravelTime{
spell: spell,
}
}
func (value *APLValueSpellTravelTime) Type() proto.APLValueType {
return proto.APLValueType_ValueTypeDuration
}
func (value *APLValueSpellTravelTime) GetDuration(sim *Simulation) time.Duration {
return time.Duration(float64(time.Second) * value.spell.Unit.DistanceFromTarget / value.spell.MissileSpeed)
}
24 changes: 22 additions & 2 deletions ui/core/components/individual_sim_ui/apl_values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ import {
APLValueNumberTargets,
APLValueSpellCastTime,
APLValueCurrentNonDeathRuneCount,
APLValueSpellTravelTime,
APLValueSpellChannelTime,
} from '../../proto/apl.js';

import { EventID, TypedEvent } from '../../typed_event.js';
Expand Down Expand Up @@ -464,7 +466,7 @@ const valueTypeFactories: Record<NonNullable<APLValueType>, ValueTypeConfig<any>
],
}),
['currentRuneActive']: inputBuilder({
label: 'Rune Ready',
label: 'Rune Is Ready',
submenu: ['Resources', 'Runes'],
shortDescription: 'Is the rune of a certain slot currently available.',
newValue: APLValueCurrentRuneActive.create,
Expand All @@ -473,7 +475,7 @@ const valueTypeFactories: Record<NonNullable<APLValueType>, ValueTypeConfig<any>
],
}),
['currentRuneDeath']: inputBuilder({
label: 'Rune Death',
label: 'Rune Is Death',
submenu: ['Resources', 'Runes'],
shortDescription: 'Is the rune of a certain slot currently converted to Death.',
newValue: APLValueCurrentRuneDeath.create,
Expand Down Expand Up @@ -556,6 +558,24 @@ const valueTypeFactories: Record<NonNullable<APLValueType>, ValueTypeConfig<any>
AplHelpers.actionIdFieldConfig('spellId', 'castable_spells'),
],
}),
['spellChannelTime']: inputBuilder({
label: 'Channel Time',
submenu: ['Spell'],
shortDescription: 'Amount of time to channel the spell including any haste and spell cast time adjustments.',
newValue: APLValueSpellChannelTime.create,
fields: [
AplHelpers.actionIdFieldConfig('spellId', 'castable_spells'),
],
}),
['spellTravelTime']: inputBuilder({
label: 'Travel Time',
submenu: ['Spell'],
shortDescription: 'Amount of time for the spell to travel to the target.',
newValue: APLValueSpellTravelTime.create,
fields: [
AplHelpers.actionIdFieldConfig('spellId', 'castable_spells'),
],
}),

// Auras
['auraIsActive']: inputBuilder({
Expand Down
Loading