Most tiers done. The star ones still need some work.

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
index 9a9e3e2..d129b3f 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier01.xml
@@ -1,185 +1,32 @@
-<ActorFrame>
-<children>
-
-<ActorFrame 
-OnCommand="zoom,0.3;x,-2;y,6;wag;EffectMagnitude,0,0,2;" 
-InitCommand="%function(self) self:hibernate(0.01); self:queuecommand('PlaySound') end"
-PlaySoundCommand="%function(self) self:hibernate(gnOnScreenSeconds); end">
-<children>
-
-<ActorFrame OnCommand="%function(self) self:zoom(0.7); self:y(-24); InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="draworder,20000;diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(1);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-       self:queuecommand('PlaySound2');
-end" 
-
-PlaySound2Command="%function(self)
-       local Path = GradeSound(2);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-self:accelerate(0.25);
-self:diffusealpha(0);
-self:queuecommand('PlaySound3');
-end" 
-
-PlaySound3Command="%function(self)
-       local Path = GradeSound(3);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-self:accelerate(0.25);
-self:diffusealpha(0);
-self:queuecommand('PlaySound4');
-end" 
-
-PlaySound4Command="%function(self)
-       local Path = GradeSound(4);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.275);
-self:accelerate(0.35);
-self:diffusealpha(0);
-end" 
-/>
-<!--Grade Graphics-->
-<Layer
-       File="@getResultStars('0001')"
-       InitCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,-90;addy,80;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;"
-/>
-<Layer
-       File="@getResultStars('0001')"
-       InitCommand="hibernate,0.25;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,-90;addy,-80;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;"
-/>
-<Layer
-       File="@getResultStars('0001')"
-       InitCommand="hibernate,0.5;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,85;addy,-80;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;"
-/>
-<Layer
-       File="@getResultStars('0001')"
-       InitCommand="hibernate,0.75;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,85;addy,80;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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-0;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
-
-
-<!--Fireworks-->
-       <ActorFrame
-               OnCommand="hibernate,1.4;zoom,6;x,-6;y,6;draworder,-2000;"
-       >
-               <children>
-       <ActorFrame
-               OnCommand="x,-20;y,20;sleep,1.4;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;"
-       >
-               <children>
-                       <Layer
-                               File="fworkgreen1.sprite"
-                               InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                               OnCommand="sleep,0.2;rainbow;"
-                       />
-               </children>
-       </ActorFrame>
-       <ActorFrame
-               OnCommand="hibernate,0.3;x,-20;y,-20;sleep,1.4;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;"
-       >
-               <children>
-                       <Layer
-                               File="fworkred1.sprite"
-                               InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                               OnCommand="sleep,0.4;rainbow;"
-                       />
-               </children>
-       </ActorFrame>
-       <ActorFrame
-               OnCommand="hibernate,0.6;x,20;y,-20;sleep,1.4;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;"
-       >
-               <children>
-                       <Layer
-                               File="fworkyellow1.sprite"
-                               InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                               OnCommand="sleep,0.6;rainbow;"
-                       />
-               </children>
-       </ActorFrame>
-       <ActorFrame
-               OnCommand="hibernate,0.9;x,20;y,20;sleep,1.4;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;"
-       >
-               <children>
-                       <Layer
-                               File="fworkgreen2.sprite"
-                               InitCommand="diffusealpha,0;sleep,0.2;queuecommand,GradeSound;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
-                               OnCommand="sleep,0.8;rainbow;"
-                       />
-               </children>
-       </ActorFrame>
-</children>
-</ActorFrame>
-</children></ActorFrame>
-
-
-
-</children></ActorFrame>
+<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"/>
+
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <Layer File="_Fireworks"/>
+    
+    <!--Grade Graphics-->
+    <Layer
+            File="@getResultStars('0001')"
+            InitCommand="diffusealpha,0;zoom,0;x,-90;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;"
+    />
+    <Layer
+            File="@getResultStars('0001')"
+            InitCommand="hibernate,0.25;diffusealpha,0;zoom,0;x,-90;y,-130;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;"
+    />
+    <Layer
+            File="@getResultStars('0001')"
+            InitCommand="hibernate,0.5;diffusealpha,0;zoom,0;x,85;y,-130;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;"
+    />
+    <Layer
+            File="@getResultStars('0001')"
+            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;"
+    />
 </children></ActorFrame>
\ No newline at end of file

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier02.xml b/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
index 28932ab..3634f08 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier02.xml
@@ -1,117 +1,25 @@
-<ActorFrame>
-<children>
-
-<ActorFrame 
-OnCommand="zoom,0.3;x,-2;y,6;wag;EffectMagnitude,0,0,2;" 
-InitCommand="%function(self) self:hibernate(0.01); self:queuecommand('PlaySound') end"
-PlaySoundCommand="%function(self) self:hibernate(gnOnScreenSeconds); end">
-<children>
-
-<ActorFrame OnCommand="%function(self) self:zoom(0.75); self:y(-24); InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(1);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-       self:queuecommand('PlaySound2');
-end" 
-
-PlaySound2Command="%function(self)
-       local Path = GradeSound(2);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-self:accelerate(0.25);
-self:diffusealpha(0);
-self:queuecommand('PlaySound3');
-end" 
-
-PlaySound3Command="%function(self)
-       local Path = GradeSound(3);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.175);
-self:accelerate(0.35);
-self:diffusealpha(0);
-end" 
-/>
-<!--Grade Graphics-->
-<Layer
-       File="@getResultStars('0002')"
-       InitCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,-90;addy,60;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;"
-/>
-<Layer
-       File="@getResultStars('0002')"
-       InitCommand="hibernate,0.25;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,0;addy,-60;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;"
-/>
-<Layer
-       File="@getResultStars('0002')"
-       InitCommand="hibernate,0.5;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,85;addy,60;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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-0;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
-
-</children></ActorFrame>
-
-
-</children></ActorFrame>
-
-
-
+<ActorFrame InitCommand="zoom,0.75;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, 2 ) end"/>
+
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer
+            File="@getResultStars('0002')"
+            InitCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,-90;addy,60;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;"
+    />
+    <Layer
+            File="@getResultStars('0002')"
+            InitCommand="hibernate,0.25;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,0;addy,-60;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;"
+    />
+    <Layer
+            File="@getResultStars('0002')"
+            InitCommand="hibernate,0.5;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,85;addy,60;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;"
+    />
 </children></ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier03.xml b/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
index be81fef..f9fe998 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier03.xml
@@ -1,102 +1,20 @@
-<ActorFrame>
-<children>
-
-<ActorFrame 
-OnCommand="zoom,0.3;x,-2;y,6;wag;EffectMagnitude,0,0,2;" 
-InitCommand="%function(self) self:hibernate(0.01); self:queuecommand('PlaySound') end"
-PlaySoundCommand="%function(self) self:hibernate(gnOnScreenSeconds); end">
-<children>
-
-<ActorFrame OnCommand="%function(self) self:zoom(0.75); self:y(-32); InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(1);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-       self:queuecommand('PlaySound2');
-end" 
-
-PlaySound2Command="%function(self)
-       local Path = GradeSound(2);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.1);
-self:accelerate(0.35);
-self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-<Layer
-       File="@getResultStars('0003')"
-       InitCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,-55;addy,60;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;"
-/>
-<Layer
-       File="@getResultStars('0003')"
-       InitCommand="hibernate,0.25;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,55;addy,-50;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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-0;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
-</children></ActorFrame>
-
-
-</children></ActorFrame>
-
-
-
+<ActorFrame InitCommand="zoom,0.75;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, 3 ) end"/>
+
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+        
+    <!--Grade Graphics-->
+    <Layer
+            File="@getResultStars('0003')"
+            InitCommand="diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,-55;addy,60;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;"
+    />
+    <Layer
+            File="@getResultStars('0003')"
+            InitCommand="hibernate,0.25;diffusealpha,0;zoom,0;sleep,0.2;decelerate,0.2;zoom,1.5;addx,55;addy,-50;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;"
+    />
 </children></ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier04.xml b/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
index 2142697..7f96895 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier04.xml
@@ -1,88 +1,15 @@
-<ActorFrame>
-<children>
-
-<ActorFrame 
-OnCommand="zoom,0.45;x,-2;y,6;wag;EffectMagnitude,0,0,2;" 
-InitCommand="%function(self) self:hibernate(0.01); self:queuecommand('PlaySound') end"
-PlaySoundCommand="%function(self) self:hibernate(gnOnScreenSeconds); end">
-<children>
-
-<ActorFrame OnCommand="%function(self) self:zoom(0.75); self:y(-16); InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.25;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(1);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.1);
-       self:accelerate(0.35);
-       self:diffusealpha(0);
-end" 
-/>
-<!--Grade Graphics-->
-<Layer
-       File="@getResultStars('0004')"
-       InitCommand="diffusealpha,0;zoom,0;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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-0;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
-</children></ActorFrame>
-
-
-</children></ActorFrame>
-
-
-
+<ActorFrame InitCommand="zoom,0.75;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"/>
+
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+
+    <!--Grade Graphics-->
+    <Layer
+            File="@getResultStars('0004')"
+            InitCommand="diffusealpha,0;zoom,0;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;"
+    />
 </children></ActorFrame>

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier05.xml b/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
index 5095a1a..ac791dc 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier05.xml
@@ -1,87 +1,11 @@
-<ActorFrame>
-<children>
-
-
-<ActorFrame 
-InitCommand="%function(self) self:hibernate(0.1); self:queuecommand('PlaySound') end"
-PlaySoundCommand="%function(self) self:hibernate(gnOnScreenSeconds); end">
-<children>
-
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0005"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
-
-
-
+<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, 5 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0005" 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/Graphics/_grade models/Tier06.xml b/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
index 8a29651..2a5972e 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier06.xml
@@ -1,87 +1,11 @@
-<ActorFrame>
-<children>
-
-
-<ActorFrame 
-InitCommand="%function(self) self:hibernate(0.1); self:queuecommand('PlaySound') end"
-PlaySoundCommand="%function(self) self:hibernate(gnOnScreenSeconds); end">
-<children>
-
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0006"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
-
-
-
+<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, 6 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0006" 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/Graphics/_grade models/Tier07.xml b/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
index 242e6a5..09c570c 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier07.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0007"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 7 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0007" 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/Graphics/_grade models/Tier08.xml b/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
index 96fc4c0..7b6c02e 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier08.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0008"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 8 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0008" 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/Graphics/_grade models/Tier09.xml b/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
index e512965..afd95e5 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier09.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0009"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 9 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0009" 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/Graphics/_grade models/Tier10.xml b/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
index 7391ff0..4eac18c 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier10.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0010"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 10 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0010" 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/Graphics/_grade models/Tier11.xml b/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
index 9277b41..d804827 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier11.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0011"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 11 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0011" 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/Graphics/_grade models/Tier12.xml b/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
index 1565f69..d13bb7f 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier12.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0012"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 12 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0012" 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/Graphics/_grade models/Tier13.xml b/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
index bd8cd93..8bfa80f 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier13.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0013"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 13 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0013" 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/Graphics/_grade models/Tier14.xml b/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
index b465faa..334dda9 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier14.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0014"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 14 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0014" 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/Graphics/_grade models/Tier15.xml b/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
index 87dd72b..1b947b6 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier15.xml
@@ -1,75 +1,11 @@
-<ActorFrame OnCommand="zoom,0.40;x,-2;y,7;wag;EffectMagnitude,0,0,2;" InitCommand="%function(self) InitScreen('GradeModels'); end"><children>
-<!-- Grade Sound-->
-<Layer Type="Quad" InitCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,PlaySound1"
-PlaySound1Command="%function(self)
-       local Path = GradeSound(0);
-       SOUND:PlayOnce( Path )
-       self:diffusealpha(0.075);
-       self:accelerate(0.25);
-       self:diffusealpha(0);
-end"
-/>
-<!--Grade Graphics-->
-
-<Layer
-       File="GradeTier0015"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="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;"
-/>
-
-<!--Extra Effects-->
-<!--Grade Explosion-->
-<ActorFrame OnCommand="y,-32;x,3;zoom,1.2;"><children>
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;x,30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationy,180;x,-30;y,-20;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addx,-100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,270;y,-30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,-100;diffusealpha,0;"
-/>
-
-<Layer
-       File="../Combo 1000milestone/arrowswoosh"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;rotationz,90;y,30;zoom,2;sleep,0.2;diffusealpha,1;decelerate,0.3;addy,100;diffusealpha,0;"
-/>
-
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,-90;zoom,1;diffusealpha,0"
-/>
-
-<Layer
-       File="../Combo 100milestone/explosion"
-       InitCommand="%function(self)
-       self:queuecommand('Start');
-       end"
-       StartCommand="diffusealpha,0;blend,add;rotationz,0;zoom,2;sleep,0.2;diffusealpha,0.5;linear,0.5;rotationz,90;zoom,1;diffusealpha,0"
-/>
-</children></ActorFrame>
+<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, 15 ) end"/>
+    
+    <!--Extra Effects-->
+    <!--Grade Explosion-->
+    <Layer File="_GradeExplosion"/>
+    
+    <!--Grade Graphics-->
+    <Layer File="GradeTier0015" 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/Graphics/_grade models/Tier16.xml b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
index c7e4d11..125e5ae 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
@@ -1,19 +1,11 @@
-<ActorFrame OnCommand="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,PlaySound1"
-       PlaySound1Command="%function(self)
-                                                       local Path = GradeSound(0);
-                                                       SOUND:PlayOnce( Path )
-                                                       self:diffusealpha(0.075);
-                                                       self:accelerate(0.25);
-                                                       self:diffusealpha(0);
-                                          end"
-       />
-       
-       <!--Extra Effects-->
+<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, 16 ) end"/>
+    
+    <!--Extra Effects-->
     <!--Grade Explosion-->
     <Layer File="_GradeExplosion"/>
     
-       <!--Grade Graphics-->
-       <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;"/>
+    <!--Grade Graphics-->
+    <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/Graphics/_grade models/Tier17.xml b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
index 780fb8f..a920bbf 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier17.xml
@@ -1,14 +1,6 @@
 <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,PlaySound1"
-    PlaySound1Command="%function(self)
-                            local Path = GradeSound(0);
-                            SOUND:PlayOnce( Path )
-                            self:diffusealpha(0.075);
-                            self:accelerate(0.25);
-                            self:diffusealpha(0);
-                       end"
-    />
+<Layer Type="Quad" OnCommand="diffusealpha,0;zoom,SCREEN_WIDTH*20;sleep,0.2;queuecommand,Effects" EffectsCommand="%function(self) DoGradeEffects( self, 17 ) end"/>
     
     <!--Extra Effects-->
     <!--Grade Explosion-->

diff --git a/Themes/GrooveNights/Graphics/_grade models/_Fireworks.xml b/Themes/GrooveNights/Graphics/_grade models/_Fireworks.xml
new file mode 100644 (file)
index 0000000..0016a8c
--- /dev/null
+++ b/Themes/GrooveNights/Graphics/_grade models/_Fireworks.xml
@@ -0,0 +1,29 @@
+<ActorFrame OnCommand="hibernate,1.4;zoom,6"><children>
+    <Layer
+        File="fworkgreen1.sprite"
+        InitCommand="x,-20;y,15;queuecommand,Update"
+        OnCommand="rainbow;diffusealpha,0;sleep,0.2;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
+        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;"
+    />
+    
+    <Layer
+        File="fworkred1.sprite"
+        InitCommand="x,-20;y,-25;queuecommand,Update"
+        OnCommand="rainbow;diffusealpha,0;sleep,0.2;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
+        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;"
+    />
+    
+    <Layer
+        File="fworkyellow1.sprite"
+        InitCommand="x,20;y,-25;queuecommand,Update"
+        OnCommand="rainbow;diffusealpha,0;sleep,0.2;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
+        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;"
+    />
+    
+    <Layer
+        File="fworkgreen2.sprite"
+        InitCommand="x,20;y,25;queuecommand,Update"
+        OnCommand="rainbow;diffusealpha,0;sleep,0.2;decelerate,0.6;zoom,1.5;diffusealpha,1;accelerate,0.4;zoom,1;decelerate,0.1;zoom,0.9;diffusealpha,0.8;accelerate,0.1;zoom,1;diffusealpha,1;"
+        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;"
+    />
+</children></ActorFrame>
\ No newline at end of file

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 4293d97..95a7b0a 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -48,6 +48,7 @@ end
 
 -- ===GRADE SOUNDS===
 -- These sounds play when your grade appears
+-- 
 function GradeSound( snd )
 local Path = THEME:GetPath( EC_SOUNDS, 'gnGradeUp', ''..snd..'')
 return Path
@@ -852,3 +853,28 @@ function CheckPlayerName( nm )
        end
 return false
 end
+
+-- XXX: Find a better place for this
+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);
+        end
+    else
+        SOUND:PlayOnce( GradeSound(0) )
+        Actor:diffusealpha(0.075);
+        Actor:accelerate(0.25);
+        Actor:diffusealpha(0);
+    end
+end
\ No newline at end of file