Merge pull request #3 from racerxdl/Port3

Port3
racerxdl · Nov 1, 2015 · 3d32efe · 3d32efe
2 parents 44cdaec + 8530df1
commit 3d32efe
Show file tree

Hide file tree

Showing 45 changed files with 517 additions and 52 deletions.
diff --git a/datapack/AUDIO.jpak b/datapack/AUDIO.jpak
diff --git a/datapack/BASE.jpak b/datapack/BASE.jpak
diff --git a/datapack/EYE.jpak b/datapack/EYE.jpak
diff --git a/datapack/ITEM.jpak b/datapack/ITEM.jpak
diff --git a/datapack/LEVELBAR.jpak b/datapack/LEVELBAR.jpak
diff --git a/datapack/LICENSE b/datapack/LICENSE
@@ -0,0 +1 @@
+This assets are NOT from my property. These are stuff from Pump It Up Fiesta 2 and their copyrights belongs to Andamiro.
diff --git a/datapack/NS/00.jpak b/datapack/NS/00.jpak
diff --git a/datapack/NS/01.jpak b/datapack/NS/01.jpak
diff --git a/datapack/NS/02.jpak b/datapack/NS/02.jpak
diff --git a/datapack/NS/03.jpak b/datapack/NS/03.jpak
diff --git a/datapack/NS/04.jpak b/datapack/NS/04.jpak
diff --git a/datapack/NS/05.jpak b/datapack/NS/05.jpak
diff --git a/datapack/NS/06.jpak b/datapack/NS/06.jpak
diff --git a/datapack/NS/07.jpak b/datapack/NS/07.jpak
diff --git a/datapack/NS/08.jpak b/datapack/NS/08.jpak
diff --git a/datapack/NS/09.jpak b/datapack/NS/09.jpak
diff --git a/datapack/NS/10.jpak b/datapack/NS/10.jpak
diff --git a/datapack/NS/11.jpak b/datapack/NS/11.jpak
diff --git a/datapack/NS/12.jpak b/datapack/NS/12.jpak
diff --git a/datapack/NS/13.jpak b/datapack/NS/13.jpak
diff --git a/datapack/NS/14.jpak b/datapack/NS/14.jpak
diff --git a/datapack/NS/15.jpak b/datapack/NS/15.jpak
diff --git a/datapack/NS/16.jpak b/datapack/NS/16.jpak
diff --git a/datapack/NS/17.jpak b/datapack/NS/17.jpak
diff --git a/datapack/NS/18.jpak b/datapack/NS/18.jpak
diff --git a/datapack/NS/19.jpak b/datapack/NS/19.jpak
diff --git a/datapack/NS/20.jpak b/datapack/NS/20.jpak
diff --git a/datapack/NS/21.jpak b/datapack/NS/21.jpak
diff --git a/datapack/NS/22.jpak b/datapack/NS/22.jpak
diff --git a/datapack/NS/23.jpak b/datapack/NS/23.jpak
diff --git a/datapack/NS/24.jpak b/datapack/NS/24.jpak
diff --git a/datapack/NS/25.jpak b/datapack/NS/25.jpak
diff --git a/datapack/NS/26.jpak b/datapack/NS/26.jpak
diff --git a/datapack/NS/27.jpak b/datapack/NS/27.jpak
diff --git a/datapack/NS/28.jpak b/datapack/NS/28.jpak
diff --git a/datapack/NS/29.jpak b/datapack/NS/29.jpak
diff --git a/datapack/NS/30.jpak b/datapack/NS/30.jpak
diff --git a/datapack/PREVIEW.jpak b/datapack/PREVIEW.jpak
diff --git a/lib/constants.js b/lib/constants.js
@@ -103,15 +103,16 @@ may have different license including but not limited to JPAK, jQuery and others.
 
   //Mime Types
   PrimeConst.mimepng                  = "image/png";
-  PrimeConst.png                      = ".PNG";
+  PrimeConst.png                      = ".png";
   PrimeConst.mimejpg                  = "image/jpg";
-  PrimeConst.jpg                      = ".JPG";
+  PrimeConst.jpg                      = ".jpg";
 
   //File names to load
   PrimeConst.ItemDataPack             = "datapack/ITEM.jpak";
   PrimeConst.NoteSkinPack             = "datapack/NS/";
   PrimeConst.BaseImage                = "/BASE.PNG";
   PrimeConst.StepFXBase               = "/STEPFX";
+  PrimeConst.BombAudio                = "audio/bomb2";
 
   window.PrimeConst                   = PrimeConst;
 

diff --git a/lib/drawer.js b/lib/drawer.js
@@ -60,7 +60,7 @@ may have different license including but not limited to JPAK, jQuery and others.
         len = 5;
     PrimeLog.d("Initializing "+len+" layers with size ("+width+","+height+")");
     while(i<len) {
-      var lay = new PUMPER.SceneLayer({"width":width,"height":height});
+      var lay = new SceneLayer({"width":width,"height":height});
       lay.InitLayer();
       this.SceneLayers.push(lay);
       ++i;
@@ -74,7 +74,7 @@ may have different license including but not limited to JPAK, jQuery and others.
    */
   Drawer.prototype.AddObj      =   function(obj,layer) {
     layer = layer !== undefined ? layer : 2; 
-    PrimeLog.d("PUMPER::Drawer::Adding AnimObj "+obj.id+" in layer "+layer);
+    PrimeLog.d("Drawer::Adding AnimObj "+obj.id+" in layer "+layer);
     obj.Drawer = this;
     this.SceneLayers[layer].AddObject(obj);
   };
@@ -236,7 +236,7 @@ may have different license including but not limited to JPAK, jQuery and others.
         this.webprime.sounds.Bomb.LastBeatPlay = this.webprime.gameVariables.noteData.CurrentBeat >> 0;
       }
       this.webprime.gameVariables.effectBank.FlashEffect.Start(this.webprime.gameVariables.noteData.CurrentBeat);
-    } else if(attr === 0 && seed === 17 && y <= PUMPER.OffsetY)  {   // Flash Effect
+    } else if(attr === 0 && seed === 17 && y <= this.webprime.gameVariables.offsetY)  {   // Flash Effect
       this.webprime.gameVariables.effectBank.Start(this.webprime.gameVariables.noteData.CurrentBeat);
       /*
        if(this.webprime.gameVariables.noteData.CurrentBeat >> 0 != .LastBeatPlay)   {
@@ -283,7 +283,7 @@ may have different license including but not limited to JPAK, jQuery and others.
       ctx.drawImage(img,-this.webprime.gameVariables.arrowSize/2,-this.webprime.gameVariables.arrowSize/2, this.webprime.gameVariables.arrowSize, this.webprime.gameVariables.arrowSize);
       ctx.globalAlpha = oldAlpha;
       ctx.restore();
-      if(PUMPER.Globals.DrawAnchors)   {
+      if(this.webprime.config.drawAnchors)   {
         ctx.save();
         ctx.beginPath();
         ctx.arc(pos+this.webprime.gameVariables.arrowSize/2,y+this.webprime.gameVariables.arrowSize/2, 4, 0, 2 * Math.PI, false);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This assets are NOT from my property. These are stuff from Pump It Up Fiesta 2 and their copyrights belongs to Andamiro.