Quad tier sounds and stuff are done. Need to do uni, bi and tri stars the same way...

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
index d129b3f..1ed87d0 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
@@ -1,7 +1,10 @@
-<ActorFrame InitCommand="zoom,0.21;wag;EffectMagnitude,0,0,2"><children>  
-    <!-- Grade Sound-->
-    <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,Effects" EffectsCommand="%function(self) DoGradeEffects( self, 4 ) end"/>
-
+<!-- TODO the life graph and some other elements come up above the flash effect
+     if this isn't pushed up to at least 100. Need to find that element and fix
+     the draworder
+-->
+<ActorFrame InitCommand="zoom,0.21;wag;EffectMagnitude,0,0,2;draworder,100;">
+    <children>  
+        
     <!--Extra Effects-->
     <!--Grade Explosion-->
     <Layer File="_GradeExplosion"/>
@@ -29,4 +32,12 @@
             InitCommand="hibernate,0.75;diffusealpha,0;zoom,0;x,85;y,30;sleep,0.2;decelerate,0.2;zoom,1.5;diffusealpha,1;accelerate,0.3;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;queuecommand,Update;"
             UpdateCommand="decelerate,0.3;zoom,1.1;accelerate,0.3;zoom,1;decelerate,0.3;zoom,0.9;diffusealpha,0.9;accelerate,0.3;zoom,1;diffusealpha,1;queuecommand,Update;"
     />
+    
+    <!-- Grade Sound-->
+    <Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,Effects" EffectsCommand="%function(self) DoGradeEffects( self, 1 ) end" 
+            PlaySound1Command="%function(self) SOUND:PlayOnce( GradeSound(1) ) end"
+            PlaySound2Command="%function(self) SOUND:PlayOnce( GradeSound(2) ) end"
+            PlaySound3Command="%function(self) SOUND:PlayOnce( GradeSound(3) ) end"
+            PlaySound4Command="%function(self) SOUND:PlayOnce( GradeSound(4) ) end"
+    />
 </children></ActorFrame>
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
index a920bbf..e955b1c 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
@@ -1,11 +1,11 @@
 <ActorFrame InitCommand="zoom,0.40;wag;EffectMagnitude,0,0,2"><children>
     <!-- Grade Sound-->
-<Layer Type="Quad" OnCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,Effects" EffectsCommand="%function(self) DoGradeEffects( self, 17 ) end"/>
+    <Layer Type="Quad" OnCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,Effects" EffectsCommand="%function(self) DoGradeEffects( self, 16 ) end"/>
     
     <!--Extra Effects-->
     <!--Grade Explosion-->
     <Layer File="_GradeExplosion"/>
     
     <!--Grade Graphics-->
-    <Layer File="GradeTier0017" OnCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;diffusealpha,1;accelerate,0.2;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"/>
+    <Layer File="GradeTier0016" OnCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;diffusealpha,1;accelerate,0.2;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"/>
 </children></ActorFrame>

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 95a7b0a..1e8decc 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -858,18 +858,19 @@ end
 function DoGradeEffects( Actor, Tier )
     -- Star grades
     if Tier <= 4 then
-        for i=i,5-Tier do
-            SOUND:PlayOnce( GradeSound(Tier) )
-
-            if i==Tier then
-                Actor:diffusealpha(0.275);
-                Actor:accelerate(0.35);
-            else
-                Actor:diffusealpha(0.075);
-                Actor:accelerate(0.25);
-            end
-
-            Actor:diffusealpha(0);
+        for i=1,5-Tier do
+            --if i == 4 then
+            --    Actor:queuecommand('PlaySound'..i)
+            --    Actor:diffusealpha(0.25*i)
+            --    Actor:accelerate(0.35)
+            --    Actor:diffusealpha(0);
+            --else
+                Actor:queuecommand('PlaySound'..i)
+                Actor:diffusealpha(0.25*i)
+                Actor:accelerate(0.25)
+                Actor:diffusealpha(0);
+                Actor:sleep(0.05)
+            --end
         end
     else
         SOUND:PlayOnce( GradeSound(0) )