Mercurial > wow > turok
diff Turok/Modules/Timer/Timer.xml @ 9:9400a0ff8540
Ugh
Timer:
- container update directionality
- talent update iterates over a non-volatile table to carry out updates
- index management steps organized
- talentRow status implemented, returns the spell associated with the talent chosen from that row
CombatLog:
- sort out font controls and unbork arguments
| author | Nenue |
|---|---|
| date | Sun, 21 Feb 2016 13:08:30 -0500 |
| parents | a9b8b0866ece |
| children |
line wrap: on
line diff
--- a/Turok/Modules/Timer/Timer.xml Sun Feb 21 08:49:34 2016 -0500 +++ b/Turok/Modules/Timer/Timer.xml Sun Feb 21 13:08:30 2016 -0500 @@ -50,7 +50,7 @@ g.add = true g:Report() --@debug@ - print('Layout', g.cvars.type, 'Intro |cFFFFFF00START', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, 'Intro |cFFFFFF00START', g:GetName())--@end-debug@ g:Show() if g.cvars.sound_active then PlaySoundFile(g.cvars.sound_active) @@ -62,7 +62,7 @@ <OnStop> local g = self:GetParent() --@debug@ - print('Layout', g.cvars.type, 'Intro |cFFFF4400STOP', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, 'Intro |cFFFF4400STOP', g:GetName())--@end-debug@ if g.enableIcon then g.iconIntro:Stop() end @@ -70,7 +70,7 @@ <OnFinished> local g = self:GetParent() --@debug@ - print('Layout', g.cvars.type, 'Intro |cFF00FF00FINISH', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, 'Intro |cFF00FF00FINISH', g:GetName())--@end-debug@ if g.enableIcon then g.iconIntro:Stop() end @@ -91,7 +91,7 @@ g.trash = true g:Report() --@debug@ - print('Layout', g.cvars.type, '|cFF0088FFOutro |cFFFFFF00START', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, '|cFF0088FFOutro |cFFFFFF00START', g:GetName())--@end-debug@ if g.spiral then g.spiral:StopAnimating() g.spiral:Hide() @@ -106,7 +106,7 @@ <OnStop> local g = self:GetParent() --@debug@ - print('Layout', g.cvars.type, '|cFF0088FFOutro |cFFFF4400STOP', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, '|cFF0088FFOutro |cFFFF4400STOP', g:GetName())--@end-debug@ if g.enableIcon then g.iconOutro:Stop() end @@ -115,7 +115,7 @@ local g = self:GetParent() g.trash = false --@debug@ - print('Layout', g.cvars.type, '|cFF0088FFOutro |cFF00FF00Finish', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, '|cFF0088FFOutro |cFF00FF00Finish', g:GetName())--@end-debug@ if g.enableIcon then g.iconOutro:Stop() end @@ -130,7 +130,7 @@ <OnPlay> local g = self:GetParent() --@debug@ - print('Layout', g.cvars.type, '|cFFFFFF00Retro |cFFFFFF00START', g:GetName())--@end-debug@ + --print('Layout', g.cvars.type, '|cFFFFFF00Retro |cFFFFFF00START', g:GetName())--@end-debug@ if g.iconFlash then g.iconFlash:Show() end @@ -138,12 +138,12 @@ <OnStop> local g = self:GetParent() --@debug@ - print('Layout',g.cvars.type, '|cFFFFFF00Retro |cFFFF4400STOP', self:GetParent():GetName())--@end-debug@ + --print('Layout',g.cvars.type, '|cFFFFFF00Retro |cFFFF4400STOP', self:GetParent():GetName())--@end-debug@ </OnStop> <OnFinished> local g = self:GetParent() --@debug@ - print('Layout',g.cvars.type, '|cFFFFFF00Retro |cFF00FF00FINISH', g:GetName())--@end-debug@ + --print('Layout',g.cvars.type, '|cFFFFFF00Retro |cFF00FF00FINISH', g:GetName())--@end-debug@ if g.iconFlash then g.iconFlash:Hide() end @@ -197,8 +197,14 @@ </Scripts> <Frames> <Cooldown name="$parentCooldownSpiral" parentKey="spiral" inherits="CooldownFrameTemplate"> + <EdgeTexture file=""> + <Color r="1" g="0" b="1" a="0" /> + </EdgeTexture> + <BlingTexture file=""> + <Color r="0" g="1" b="1" a="0" /> + </BlingTexture> <SwipeTexture parentKey="spiralTex"> - <Color r="0" g="0" b="0" a="0.6" /> + <Color r="0" g="0" b="0" a="0.8" /> </SwipeTexture> <Anchors> <Anchor relativeKey="$parent.icon" point="TOPLEFT" relativePoint="TOPLEFT" x="0" y="0" /> @@ -206,24 +212,22 @@ </Anchors> <Layers> <Layer level="OVERLAY"> - <FontString inherits="TurokFontMed" name="$parentCounter" parentKey="counter" justifyH="RIGHT" justifyV="BOTTOM"> + <FontString inherits="TurokFontMed" name="$parentCounter" parentKey="counter" justifyH="CENTER" justifyV="MIDDLE"> + <!-- [1] below 6 seconds remaining <KeyValues> - <!-- [1] below 6 seconds remaining --> <KeyValue key="anchor1" value="TOP" /> <KeyValue key="anchor1_rel" value="TOP" /> - <!-- [2] default --> <KeyValue key="anchor2" value="TOP" /> <KeyValue key="anchor2_rel" value="TOP" /> - <!-- [3] > 100 sec remaining --> <KeyValue key="anchor3" value="TOPRIGHT" /> <KeyValue key="anchor3_rel" value="TOP" /> - </KeyValues> - <Size x="40" y="40" /> + </KeyValues> --> <Anchors> - <Anchor point="TOPRIGHT" relativePoint="TOP" relativeKey="$parent.$parent.icon" x="0" y="4" /> + <Anchor point="CENTER" relativePoint="CENTER" relativeKey="$parent.$parent.icon" x="0" y="0" /> </Anchors> </FontString> <FontString inherits="TurokFontDetail" name="$parentSubCounter" parentKey="subCounter" justifyH="LEFT" text="subtext" justifyV="BOTTOM"> + <!-- <KeyValues> <KeyValue key="anchor1" value="LEFT" /> <KeyValue key="anchor1_rel" value="RIGHT" /> @@ -232,10 +236,11 @@ <KeyValue key="anchor3" value="LEFT" /> <KeyValue key="anchor3_rel" value="RIGHT" /> </KeyValues> + --> <Size x="40" y="40" /> <Color r="1" g="1" b="0" a="1" /> <Anchors> - <Anchor point="LEFT" relativePoint="RIGHT" relativeKey="$parent.counter" x="0" y="1" /> + <Anchor point="LEFT" relativePoint="RIGHT" relativeKey="$parent.counter" x="0" y="0" /> </Anchors> </FontString> <FontString inherits="TurokFontDetail" name="$parentCharges" parentKey="charges" justifyH="RIGHT" justifyV="BOTTOM" text="charges">