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.

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

add conditions to templates #587

Merged
merged 42 commits into from
Aug 20, 2018
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ad15922
add conditions to templates
mrbuds Aug 3, 2018
bc50858
template type abilitycharge and default target for abilitybuff
mrbuds Aug 3, 2018
6ddeda8
minor adjustments on templates conditions
mrbuds Aug 4, 2018
18a6ef5
templates can have multiple types
mrbuds Aug 4, 2018
35dec47
GUI support multiple types templates
mrbuds Aug 5, 2018
b4ad4dd
back button fixed
mrbuds Aug 5, 2018
617cf47
icon templates show cooldown by default (was disabled for auras)
mrbuds Aug 5, 2018
eef04d5
monk templates
mrbuds Aug 6, 2018
204828c
DH template
mrbuds Aug 6, 2018
45e9a39
Druid templates
mrbuds Aug 6, 2018
21cf365
conditions templates update for consistency
mrbuds Aug 6, 2018
59ffb33
createConditionsFor refactor + update condition templates
mrbuds Aug 6, 2018
7033200
abilityTotem & abilityChargeTotem templates
mrbuds Aug 7, 2018
fe221b3
multi-talents templates
mrbuds Aug 7, 2018
c0c42e0
2 charges talents added for shaman + added title suffix
mrbuds Aug 7, 2018
087f136
fix add & replace templates from trigger tab
mrbuds Aug 9, 2018
999ade9
fix merge upstream
mrbuds Aug 10, 2018
199ca8d
removed ability usable trigger from abilityUsable and use condition f…
mrbuds Aug 11, 2018
55eccb8
refactor createConditionsFor
mrbuds Aug 11, 2018
c28a4d4
refactor createTriggersFor
mrbuds Aug 11, 2018
b55f208
refactored typesDescription
mrbuds Aug 11, 2018
d7e0514
mage templates
mrbuds Aug 11, 2018
e337f82
Templates: Move setting of Icon's inverse option to the right place
InfusOnWoW Aug 11, 2018
23fabcd
Don't just check the first type, check all of them
InfusOnWoW Aug 11, 2018
fa36668
On adding triggers, select the first trigger that was added
InfusOnWoW Aug 11, 2018
eba04db
Fix debuff templates
InfusOnWoW Aug 11, 2018
4d0cbea
Default to 0.5 alpha for not hasTarget
InfusOnWoW Aug 11, 2018
7ca31e4
Set the unitExists option for BuffTriggers
InfusOnWoW Aug 11, 2018
7b3e033
Don't use global variables
InfusOnWoW Aug 11, 2018
fa05da4
Change how conditions and trigger variants are built
InfusOnWoW Aug 11, 2018
6eaaa6a
hunter templates
mrbuds Aug 12, 2018
fb7db21
rogue template + few fix on priest
mrbuds Aug 12, 2018
6d8fe26
dk template
mrbuds Aug 12, 2018
99ecb5b
warlock templates
mrbuds Aug 12, 2018
ad09ae1
use insufficientResourcesBlue for abilities without charges=true
mrbuds Aug 12, 2018
b67ad41
remove outdated bloodlust hunter buffs
mrbuds Aug 13, 2018
8c95238
small fix for ww monk template
mrbuds Aug 18, 2018
15c3bd2
removed alpha without target
mrbuds Aug 18, 2018
be8411e
added optional totemType option, usefull when totemName doesn't match…
mrbuds Aug 19, 2018
616da6a
revert ugly totemType, use totemNumber instead
mrbuds Aug 19, 2018
a7484b8
replacing trigger with a template reset load conditions for class, sp…
mrbuds Aug 20, 2018
455a16e
fix indentation
mrbuds Aug 20, 2018
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
Prev Previous commit
Next Next commit
minor adjustments on templates conditions
  • Loading branch information
mrbuds committed Aug 13, 2018

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 6ddeda8883fbedcc8de51c76e84dd958786b7e02
41 changes: 29 additions & 12 deletions WeakAurasTemplates/TriggerTemplates.lua
Original file line number Diff line number Diff line change
@@ -112,10 +112,15 @@ function WeakAuras.CreateTemplateView(frame)
},
changes = {
[1] = {
value = true,
property = "desaturate",
value = {
[1] = 0.5,
[2] = 0.5,
[3] = 1,
[4] = 1,
},
property = "color",
},
},
}
}
};
return conditions;
@@ -159,10 +164,15 @@ function WeakAuras.CreateTemplateView(frame)
},
changes = {
[1] = {
value = true,
property = "desaturate",
value = {
[1] = 0.5,
[2] = 0.5,
[3] = 1,
[4] = 1,
},
property = "color",
},
},
}
}
};
return conditions;
@@ -220,9 +230,9 @@ function WeakAuras.CreateTemplateView(frame)
changes = {
[1] = {
value = {
[1] = 0.96078431372549,
[2] = 0.48627450980392,
[3] = 0.48627450980392,
[1] = 0.8,
[2] = 0.1,
[3] = 0.1,
[4] = 1,
},
property = "color",
@@ -249,8 +259,13 @@ function WeakAuras.CreateTemplateView(frame)
},
changes = {
[1] = {
value = true,
property = "desaturate",
value = {
[1] = 0.5,
[2] = 0.5,
[3] = 1,
[4] = 1,
},
property = "color",
},
},
},
@@ -501,9 +516,9 @@ function WeakAuras.CreateTemplateView(frame)
templateButton:SetDescription(item.description);
templateButton:SetClick(function()
newView.data = {};
<<<<<<< HEAD
WeakAuras.DeepCopy(item.data, newView.data);
WeakAuras.validate(newView.data, WeakAuras.data_stub);
<<<<<<< HEAD
<<<<<<< HEAD
newView.data.internalVersion = WeakAuras.InternalVersion();
=======
@@ -512,6 +527,8 @@ function WeakAuras.CreateTemplateView(frame)
WeakAuras.tableAdd(newView.data, item.data);
>>>>>>> add conditions to templates
>>>>>>> add conditions to templates
=======
>>>>>>> minor adjustments on templates conditions
newView.data.regionType = regionType;
createButtons();
end);