add conditions to templates #587

mrbuds · 2018-08-03T07:38:20Z

Add support for condition in templates

Added some template types and changed how some are show

abilitybuff & abilitydebuff :
aura trigger+cooldown spell trigger, default unit is: player for buff, target for debuff
show buff when active, otherwise show cooldown, and desaturate on cooldown
abilitytarget :
cooldown spell trigger
show always, turn red if out of range and have target, desaturate on cooldown or insufficientResources
ability :
show always, desaturate on cooldown or insufficientResources
item :
show always, desaturate on cooldown
debuff :
show always, desaturate if not active

I only used the new templates types on some spells for disc priest for now

ps: There is a bug with "aura - debuff - show always" template, the visibility is changed to "on active" by WeakAuras.Modernize().
Infus have a patch close to be ready for this.

mrbuds · 2018-08-03T15:15:01Z

abilitycharge
cooldown spell trigger
show always, desaturate if charge=0

mrbuds · 2018-08-05T02:35:48Z

It's now possible to use more than one type of template per ability/item/buffs/..
The "type" field was changed to "types" and is now a list.
GUI was updated to show a new panel when there is more than one template available.

Templates titles and descriptions needs to be improved.
The GUI code can certainly be improved

demo: https://cdn.discordapp.com/attachments/273144328447197186/475487920275456009/2018-08-05_04-16-47.gif

mrbuds · 2018-08-05T14:16:52Z

Fixed "back button"

New templates:

abilityChargeBuff : show charges or buff if active
abilityChargeDebuff : show charges or debuff if active
abilityChargeTarget : show charges and rangecheck

Updated templates for paladin and priest using them

In many case there are 3 options for type of template now

show when on cooldown
show always + desaturate when on cooldown
show always + desaturate when on cooldown + show buff/debuff and/or rangecheck

exemple:

mrbuds · 2018-08-06T16:04:30Z

I made a table to have a better overview on what the templates types are doing, this will help avoid inconsistency between them.

https://docs.google.com/spreadsheets/d/1XYmpwUdF_TzPyq5tJp8YSrNUuCkp1xty_f8zs6kpvcw/edit#gid=0

Things that needs improvement:

~~conditions with range (red) + resource (blue) will conflict when both are true~~ fixed with better ordering
conditions with aura + cooldown doesn't have good visual when aura is active, i avoided to use glow, maybe it is still the best solution ?
when first testing a basic UI made only from templates, the way icons where changing color too much was overwhelming, so i removed the use of desaturate on cooldown.
The result is better, but i'm not sure what to do of spells with charges=0, to differentiate "spell cooldown" of "spell not usable".
Making them blue when charges=0 seems good to me, but then what to do with spells with charges that use resource, to differentiate no resource from no charge.

btw, just a though, the need for a table to have a good overview on what these templates are doing is showing that the function "createConditionsFor" could use a big refactor.

Stanzilla · 2018-08-06T19:00:18Z

I like it sans the active thing, maybe should leave that out for now?

In my own UI I set charges=0 the same as on cooldown

mrbuds · 2018-08-06T19:24:34Z

So delete these types :
abilityBuff
abilityDebuff
abilityChargeBuff
abilityChargeDebuff

And what do you suggest for "on cooldown" / "charges=0" ?

Stanzilla · 2018-08-06T19:41:44Z

I don't want to have the final say about the active thing, wait for what the others have to say, please.

For on cooldown and charges=0 I use color #7f7f7f (127,127,127) and no desaturate at all

mrbuds · 2018-08-07T17:43:52Z

Last commit added possibility to use a table in the "talent" field for multi-talents
This open possibility to have 2 (or more) sets of templates for a same spell, which is useful if a talent add charges to a spell for example.

mrbuds · 2018-08-09T11:06:25Z

last commit fix the template button in the trigger tab
add trigger template will add conditions using correct trigger position

New templates for all classes is not finished yet, it takes much more time to do it with zero knowledge of a spec.

I think it's ready for review now

rename types types description

for every "ability" template, added "abilityShowAlways" or "abilityCharge" template abilityChargeBuff and abilityChargeDebuff for spell with charge + show buff/debuff when active abilityChargeTarget for spell with charge + rangecheck Priest and Paladin templates updated

"Has Target" condition added to "debuffShowAlways" added "debuffShowAlways" to every "debuff" template, same for buffs and items

new template abilityUsable made conditions use less desaturate icons cooldown inverse by default

…rom spell cooldown instead add more abilityUsable template types + update shadow priest

Instead of the last trigger.

Looks imho nicer

Otherwise auras are hidden if the target doesn't exist

The basic concept is, the database describes what a spell is. There are a few new flags for that: - charges: If the spell has charges - usable: If a usable check can be useful - requiresTarget: If the spell requires a target - buff: If the ability buffs the player - debuff: If the ability debuffs the target - totem: If the ability places down a totem The third trigger page now selects the "subtype". A subtype can decide how exactly the triggers and conditions are setup. A subtype has two functions: createTriggers and createConditions which do that, and builts its conditions from a list of common changes. The mapping between spell properties and subtypes is done via subTypesFor. (Which can properly be refactored a bit.)

use spellInRangeRed for abilities with requiresTarget moved isUsableBlue on top of the condition list for avoid flickering between grey and blue moved isBuffedGlow at the bottom of the condition list charge+totem triggers used same trigger index type=buff and type=debuff: re-add "Greyed if Buff/Debuff not active" replaceCondition() did overwrite conditions without erase old data

… spellId updated monk's refreshing jade wind, black ox statue and jade serpent statue

…ec, talent, pvptalent and race

Stanzilla · 2018-08-20T17:09:18Z

WeakAurasTemplates/TriggerTemplates.lua

@@ -23,6 +23,560 @@ AceGUI:RegisterLayout("WATemplateTriggerLayoutFlyout", function(content, childre
  flowLayout(content, children);
 end);

+local changes =
+{


move the { to the same line as = please

Stanzilla · 2018-08-20T17:09:34Z

WeakAurasTemplates/TriggerTemplates.lua

+}
+
+local checks =
+{


same as above

emptyrivers added 🎨 Enhancement This pull request implements a new feature. ⏱ Awaiting Review This pull request needs to be reviewed. labels Aug 3, 2018

mrbuds force-pushed the templates branch 3 times, most recently from bbe2a1e to 35c3eeb Compare August 4, 2018 23:58

mrbuds force-pushed the templates branch from 80f76b9 to 3121246 Compare August 6, 2018 10:08

mrbuds force-pushed the templates branch 2 times, most recently from 61d684c to a9a92cd Compare August 10, 2018 23:31

InfusOnWoW force-pushed the templates branch from d96ab88 to 5ec452d Compare August 12, 2018 13:05

mrbuds force-pushed the templates branch 2 times, most recently from 8a9fd89 to 0e4006e Compare August 13, 2018 20:36

mrbuds added 10 commits August 13, 2018 23:08

add conditions to templates

ad15922

template type abilitycharge and default target for abilitybuff

bc50858

minor adjustments on templates conditions

6ddeda8

templates can have multiple types

18a6ef5

rename types types description

GUI support multiple types templates

35dec47

icon templates show cooldown by default (was disabled for auras)

617cf47

"Has Target" condition added to "debuffShowAlways" added "debuffShowAlways" to every "debuff" template, same for buffs and items

monk templates

eef04d5

new template abilityUsable made conditions use less desaturate icons cooldown inverse by default

DH template

204828c

Druid templates

45e9a39

mrbuds and others added 21 commits August 13, 2018 23:08

fix add & replace templates from trigger tab

087f136

fix merge upstream

999ade9

removed ability usable trigger from abilityUsable and use condition f…

199ca8d

…rom spell cooldown instead add more abilityUsable template types + update shadow priest

refactor createConditionsFor

55eccb8

refactor createTriggersFor

c28a4d4

refactored typesDescription

b55f208

mage templates

d7e0514

Templates: Move setting of Icon's inverse option to the right place

e337f82

Don't just check the first type, check all of them

23fabcd

On adding triggers, select the first trigger that was added

fa36668

Instead of the last trigger.

Fix debuff templates

eba04db

Default to 0.5 alpha for not hasTarget

4d0cbea

Looks imho nicer

Set the unitExists option for BuffTriggers

7ca31e4

Otherwise auras are hidden if the target doesn't exist

Don't use global variables

7b3e033

hunter templates

6eaaa6a

rogue template + few fix on priest

fb7db21

dk template

6d8fe26

warlock templates

99ecb5b

remove outdated bloodlust hunter buffs

b67ad41

mrbuds force-pushed the templates branch from 0e4006e to b67ad41 Compare August 13, 2018 21:08

mrbuds added 5 commits August 19, 2018 01:48

small fix for ww monk template

8c95238

removed alpha without target

15c3bd2

added optional totemType option, usefull when totemName doesn't match…

be8411e

… spellId updated monk's refreshing jade wind, black ox statue and jade serpent statue

revert ugly totemType, use totemNumber instead

616da6a

replacing trigger with a template reset load conditions for class, sp…

a7484b8

…ec, talent, pvptalent and race

Stanzilla requested changes Aug 20, 2018

View reviewed changes

fix indentation

455a16e

Stanzilla merged commit ba138d5 into WeakAuras:master Aug 20, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add conditions to templates #587

add conditions to templates #587

mrbuds commented Aug 3, 2018 •

edited

Loading

mrbuds commented Aug 3, 2018

mrbuds commented Aug 5, 2018 •

edited

Loading

mrbuds commented Aug 5, 2018 •

edited

Loading

mrbuds commented Aug 6, 2018 •

edited

Loading

Stanzilla commented Aug 6, 2018

mrbuds commented Aug 6, 2018

Stanzilla commented Aug 6, 2018 •

edited

Loading

mrbuds commented Aug 7, 2018

mrbuds commented Aug 9, 2018

Stanzilla Aug 20, 2018

Stanzilla Aug 20, 2018

add conditions to templates #587

add conditions to templates #587

Conversation

mrbuds commented Aug 3, 2018 • edited Loading

mrbuds commented Aug 3, 2018

mrbuds commented Aug 5, 2018 • edited Loading

mrbuds commented Aug 5, 2018 • edited Loading

mrbuds commented Aug 6, 2018 • edited Loading

Stanzilla commented Aug 6, 2018

mrbuds commented Aug 6, 2018

Stanzilla commented Aug 6, 2018 • edited Loading

mrbuds commented Aug 7, 2018

mrbuds commented Aug 9, 2018

Stanzilla Aug 20, 2018

Choose a reason for hiding this comment

Stanzilla Aug 20, 2018

Choose a reason for hiding this comment

mrbuds commented Aug 3, 2018 •

edited

Loading

mrbuds commented Aug 5, 2018 •

edited

Loading

mrbuds commented Aug 5, 2018 •

edited

Loading

mrbuds commented Aug 6, 2018 •

edited

Loading

Stanzilla commented Aug 6, 2018 •

edited

Loading