Tier16 done

diff --git a/Themes/GrooveNights/.gitignore b/Themes/GrooveNights/.gitignore
index d67f2c4..7af00ac 100644 (file)
--- a/Themes/GrooveNights/.gitignore
+++ b/Themes/GrooveNights/.gitignore
@@ -6,3 +6,7 @@
 
 #ignore netbeans crap
 nbproject
+
+#ignore ldt crap
+.buildpath
+.project

diff --git a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
index 6229d13..c7e4d11 100644 (file)
--- a/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
+++ b/Themes/GrooveNights/Graphics/_grade models/Tier16.xml
@@ -1,75 +1,19 @@
-<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="GradeTier0016"
-       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 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-->
+    <!--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;"/>
 </children></ActorFrame>

diff --git a/Themes/GrooveNights/Scripts/gnSystem.lua b/Themes/GrooveNights/Scripts/gnSystem.lua
index 7c075ce..4293d97 100644 (file)
--- a/Themes/GrooveNights/Scripts/gnSystem.lua
+++ b/Themes/GrooveNights/Scripts/gnSystem.lua
@@ -506,7 +506,7 @@ local function QuadAwardEasterEgg(Params)
     end
 
     -- XXX: Temporary for testing at work as I can't use a memory card
-    --AwardFile = GetQuadAwardFile(PLAYER_1)
+    AwardFile = GetQuadAwardFile(PLAYER_1)
 
     if AwardFile then
         if Params.Layer == "Dimmer" then