From 050ce57e24a09aa8e87b4a40604d08d9b0f7e4f0 Mon Sep 17 00:00:00 2001
From: Tleety <dahltobbe@hotmail.com>
Date: Thu, 3 Mar 2016 00:32:07 +0100
Subject: [PATCH] Fixed AbilityUI for player and changed so the AbilityCooldown
 system wont need a child with text, instead just write if it has one.

---
 resources/Schema/Entities/Player.xml          | 105 ++++++++++++------
 src/Game/Systems/AbilityCooldownHUDSystem.cpp |  14 ++-
 2 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/resources/Schema/Entities/Player.xml b/resources/Schema/Entities/Player.xml
index 34692605..c93989d8 100644
--- a/resources/Schema/Entities/Player.xml
+++ b/resources/Schema/Entities/Player.xml
@@ -12,6 +12,9 @@
       </Slot>
     </c:AssaultWeapon>
     <c:Collidable/>
+    <c:DashAbility>
+      <CoolDownMaxTimer>3</CoolDownMaxTimer>
+    </c:DashAbility>
     <c:DefenderWeapon>
       <TimeSinceLastFire>52.867678870419283</TimeSinceLastFire>
     </c:DefenderWeapon>
@@ -70,8 +73,8 @@
               <Components>
                 <c:Sprite>
                   <DiffuseTexture>Textures/Weapons/Crosshair/SmallThickHoleDot.png</DiffuseTexture>
-                  <DepthSort>false</DepthSort>
                   <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
                 </c:Sprite>
                 <c:Transform>
                   <Position X="0" Y="0" Z="0.200000003"/>
@@ -94,42 +97,22 @@
                 <c:Transform/>
               </Components>
               <Children>
-                <Entity name="HealthText">
-                  <Components>
-                    <c:Fill>
-                      <Percentage>1</Percentage>
-                      <Color A="1" B="1" G="0" R="0"/>
-                    </c:Fill>
-                    <c:Text>
-                      <Content>100/100</Content>
-                      <Resource>Fonts/DroidSans.ttf,64</Resource>
-                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
-                    </c:Text>
-                    <c:HealthHUD/>
-                    <c:Transform>
-                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
-                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
-                      <Orientation X="0" Y="0.410000026" Z="0"/>
-                    </c:Transform>
-                  </Components>
-                  <Children/>
-                </Entity>
                 <Entity name="HealthBar">
                   <Components>
                     <c:Fill>
                       <Percentage>1</Percentage>
                       <Color A="0.301960796" B="1" G="0" R="0"/>
                     </c:Fill>
+                    <c:HealthHUD/>
                     <c:Sprite>
                       <DiffuseTexture>Textures/HealthHUD3.png</DiffuseTexture>
                       <GlowMap></GlowMap>
                       <Color A="0.588235319" B="0" G="0" R="0"/>
                     </c:Sprite>
-                    <c:HealthHUD/>
                     <c:Transform>
                       <Position X="-0.263000011" Y="-0.185000002" Z="0"/>
-                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
                       <Orientation X="5.87300014" Y="0" Z="4.71200037"/>
+                      <Scale X="0.106000006" Y="0.333000004" Z="0.150000006"/>
                     </c:Transform>
                   </Components>
                   <Children>
@@ -146,8 +129,8 @@
                             </c:Fill>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <DepthSort>false</DepthSort>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                               <Color A="0.588235319" B="0.0392156877" G="0.184313729" R="0"/>
                             </c:Sprite>
                             <c:Transform>
@@ -164,8 +147,8 @@
                             </c:Fill>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <DepthSort>false</DepthSort>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                               <Color A="0.588235319" B="0.34117648" G="0.192156866" R="0"/>
                             </c:Sprite>
                             <c:Transform>
@@ -182,8 +165,8 @@
                             </c:Fill>
                             <c:Sprite>
                               <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
-                              <DepthSort>false</DepthSort>
                               <GlowMap></GlowMap>
+                              <DepthSort>false</DepthSort>
                               <Color A="0.588235319" B="0.121568628" G="0" R="0.443137258"/>
                             </c:Sprite>
                             <c:Transform>
@@ -195,8 +178,62 @@
                         </Entity>
                       </Children>
                     </Entity>
+                    <Entity name="ShiftAbility">
+                      <Components>
+                        <c:AbilityCooldownHUD/>
+                        <c:Fill>
+                          <Color A="1" B="0.392156869" G="0.392156869" R="0.392156869"/>
+                        </c:Fill>
+                        <c:Sprite>
+                          <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                          <GlowMap></GlowMap>
+                          <DepthSort>false</DepthSort>
+                        </c:Sprite>
+                        <c:Transform>
+                          <Position X="0.224999994" Y="0.00400000019" Z="0"/>
+                          <Scale X="0.27700001" Y="0.190000013" Z="1"/>
+                        </c:Transform>
+                      </Components>
+                      <Children>
+                        <Entity name="Cooldown">
+                          <Components>
+                            <c:Text>
+                              <Content>0.0</Content>
+                              <Resource>Fonts/DroidSans.ttf,64</Resource>
+                              <Color A="1" B="0" G="0" R="0"/>
+                            </c:Text>
+                            <c:Transform>
+                              <Position X="0.146000013" Y="0.00900000054" Z="0.0560000017"/>
+                              <Orientation X="0" Y="0" Z="1.57099998"/>
+                              <Scale X="0.515000045" Y="0.704000056" Z="0.431000024"/>
+                            </c:Transform>
+                          </Components>
+                          <Children/>
+                        </Entity>
+                      </Children>
+                    </Entity>
                   </Children>
                 </Entity>
+                <Entity name="HealthText">
+                  <Components>
+                    <c:Fill>
+                      <Percentage>1</Percentage>
+                      <Color A="1" B="1" G="0" R="0"/>
+                    </c:Fill>
+                    <c:Text>
+                      <Content>100/100</Content>
+                      <Resource>Fonts/DroidSans.ttf,64</Resource>
+                      <Color A="0.505882382" B="3.92156863" G="1.17647064" R="0"/>
+                    </c:Text>
+                    <c:HealthHUD/>
+                    <c:Transform>
+                      <Position X="-0.355000019" Y="-0.203000009" Z="0.0410000011"/>
+                      <Orientation X="0" Y="0.410000026" Z="0"/>
+                      <Scale X="0.0350000001" Y="0.0350000001" Z="0.0350000001"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
               </Children>
             </Entity>
             <Entity name="CapturePointHUD">
@@ -233,8 +270,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -267,8 +304,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -302,8 +339,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -336,8 +373,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="1.57079637"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -369,8 +406,8 @@
                         </c:Sprite>
                         <c:Transform>
                           <Position X="0" Y="0" Z="0.00999999978"/>
-                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                           <Orientation X="0" Y="0" Z="4.71238899"/>
+                          <Scale X="0.800000012" Y="0.800000012" Z="0.800000012"/>
                         </c:Transform>
                       </Components>
                       <Children/>
@@ -446,8 +483,8 @@
                 </c:Team>
                 <c:Transform>
                   <Position X="0" Y="0.714000046" Z="-1.30000007"/>
+                  <Orientation X="-0.0666666627" Y="-1.95069385" Z="0"/>
                   <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-                  <Orientation X="0.405680239" Y="0.369605929" Z="0"/>
                 </c:Transform>
               </Components>
               <Children/>
@@ -605,8 +642,8 @@
         </c:Text>
         <c:Transform>
           <Position X="0.100000001" Y="1.50176644" Z="-0.248000011"/>
-          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
           <Orientation X="0" Y="3.14199996" Z="0"/>
+          <Scale X="0.100000001" Y="0.113000005" Z="0.5"/>
         </c:Transform>
       </Components>
       <Children/>
@@ -615,8 +652,8 @@
       <Components>
         <c:Sprite>
           <DiffuseTexture>Textures/Icons/Arrow.png</DiffuseTexture>
-          <DepthSort>false</DepthSort>
           <GlowMap></GlowMap>
+          <DepthSort>false</DepthSort>
           <Color A="1" B="1" G="0.309803933" R="0"/>
         </c:Sprite>
         <c:HiddenForLocalPlayer/>
diff --git a/src/Game/Systems/AbilityCooldownHUDSystem.cpp b/src/Game/Systems/AbilityCooldownHUDSystem.cpp
index 44180a62..7226019f 100644
--- a/src/Game/Systems/AbilityCooldownHUDSystem.cpp
+++ b/src/Game/Systems/AbilityCooldownHUDSystem.cpp
@@ -14,17 +14,19 @@ void AbilityCooldownHUDSystem::Update(double dt)
         if (!abilityEntity.Valid())
             return;
         EntityWrapper cooldownTextEntity = entity.FirstChildByName("Cooldown");
+
+        double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
+        double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
+
         if(cooldownTextEntity.Valid()) {
             if(cooldownTextEntity.HasComponent("Text"))
             {
-                double maxAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownMaxTimer"];
-                double currentAbilityCD = (double)abilityEntity["DashAbility"]["CoolDownTimer"];
-                currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
                 std::string t = (std::string&)cooldownTextEntity["Text"]["Content"] = std::to_string(currentAbilityCD).substr(0, 3);
-                if(entity.HasComponent("Fill")) {
-                    entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD; //TODO: current time needs to be in the component.
-                }
             }
         }
+        if (entity.HasComponent("Fill")) {
+            currentAbilityCD = currentAbilityCD >= 0.0 ? currentAbilityCD : 0.0;
+            entity["Fill"]["Percentage"] = currentAbilityCD/maxAbilityCD;
+        }
     }
 }