diff Modules/ArtifactPower.xml @ 99:74d6d97a2d24 v7.1.5-r100

- artifact progress visualizations, green for current, blue for attainable - force fishing artifact to list last - support for fishing artifact power
author Nenue
date Fri, 20 Jan 2017 19:40:55 -0500
parents dadddb8a551f
children f32b63c93275
line wrap: on
line diff
--- a/Modules/ArtifactPower.xml	Tue Jan 17 09:49:15 2017 -0500
+++ b/Modules/ArtifactPower.xml	Fri Jan 20 19:40:55 2017 -0500
@@ -2,8 +2,28 @@
 ..\FrameXML\UI.xsd">
   <Script file="ArtifactPower.lua" />
 
+  <Button name="VeneerItemButton" parentArray="Tokens" inherits="SecureActionButtonTemplate" virtual="true">
+    <Size x="48" y="48" />
+    <Layers>
+      <Layer level="BACKGROUND">
+        <Texture parentKey="Icon" setAllPoints="true" />
+      </Layer>
+      <Layer level="OVERLAY">
+        <FontString parentKey="Count" inherits="VeneerHeaderFont">
+          <Anchors>
+            <Anchor point="TOP" x="0" y="-4" />
+          </Anchors>
+        </FontString>
+        <FontString parentKey="Label" inherits="VeneerNumberFont">
+          <Anchors>
+            <Anchor point="BOTTOM" x="0" y="4" />
+          </Anchors>
+        </FontString>
+      </Layer>
+    </Layers>
+  </Button>
+
   <Button name="VeneerArtifactButton" parentArray="Artifact" mixin="VeneerArtifactButtonMixin" virtual="true">
-
     <Scripts>
       <OnEnter method="OnEnter" />
       <OnLeave method="OnLeave" />
@@ -20,7 +40,7 @@
 
       <Layer level="OVERLAY">
 
-        <FontString name="$parentName" parentKey="Name" inherits="VeneerNumberFont" text="NAME" wordwrap="false">
+        <FontString name="$parentName" parentKey="Name" inherits="VeneerNumberFont" text="" wordwrap="false">
           <Anchors>
             <Anchor point="TOPLEFT" x="4" y="-16"  />
             <Anchor point="RIGHT" x="-4" />
@@ -39,19 +59,37 @@
           <Color r="1" g="1" b="0" />
         </FontString>
 
-        <Texture parentKey="CurrentProgress" alphaMode="BLEND">
+        <Texture parentKey="CurrentProgress" alphaMode="ADD">
           <Anchors>
             <Anchor point="BOTTOMLEFT" />
             <Anchor point="BOTTOMRIGHT" />
           </Anchors>
-            <Color a="0.5" r="0" g="1" b="0" />
+            <Color a="0.25" r="0" g="1" b="0" />
         </Texture>
-        <Texture parentKey="AdjustedProgress" alphaMode="BLEND">
+        <Texture parentKey="AdjustedProgress" alphaMode="ADD">
           <Anchors>
             <Anchor point="LEFT" />
             <Anchor point="RIGHT" />
           </Anchors>
-          <Color a="0.5" r="0" g="0.5" b="1" />
+          <Color a="0.25" r="0" g="0.5" b="1" />
+        </Texture>
+        <Texture parentKey="AdjustedLine">
+          <Size y="1" />
+          <Anchors>
+            <Anchor point="BOTTOM" relativePoint="TOP" relativeKey="$parent.AdjustedProgress" />
+            <Anchor point="RIGHT" relativeKey="$parent.AdjustedProgress" />
+            <Anchor point="LEFT" relativeKey="$parent.AdjustedProgress" />
+          </Anchors>
+          <Color a="0.25" r="1" g="1" b="1" />
+        </Texture>
+        <Texture parentKey="AdjustedLine">
+          <Size y="1" />
+          <Anchors>
+            <Anchor point="TOP" relativeKey="$parent.CurrentProgress" />
+            <Anchor point="RIGHT" relativeKey="$parent.CurrentProgress" />
+            <Anchor point="LEFT" relativeKey="$parent.CurrentProgress" />
+          </Anchors>
+          <Color a="0.25" r="0" g="1" b="0" />
         </Texture>
       </Layer>
     </Layers>
@@ -80,11 +118,11 @@
       </Layer>
     </Layers>
     <Frames>
-      <Button inherits="VeneerArtifactButton" />
-      <Button inherits="VeneerArtifactButton" />
-      <Button inherits="VeneerArtifactButton" />
-      <Button inherits="VeneerArtifactButton" />
-      <Button inherits="VeneerArtifactButton" />
+      <Button name="$parentArtifactButton1" inherits="VeneerArtifactButton" />
+      <Button name="$parentArtifactButton2" inherits="VeneerArtifactButton" />
+      <Button name="$parentArtifactButton3" inherits="VeneerArtifactButton" />
+      <Button name="$parentArtifactButton4" inherits="VeneerArtifactButton" />
+      <Button name="$parentArtifactButton5" inherits="VeneerArtifactButton" />
     </Frames>
   </Frame>
 </Ui>