Implement time scaling

.github/workflows/main.yml

@@ -44,6 +44,8 @@ jobs:
         run: docker build -t test1 .
       - name: Build GBA ROM 
         run: docker run -v $PWD/build:/mydata --rm test1 ./build.sh -f wasm2c /mydata/cart.wasm gba /mydata/cart
+      - name: Build GBA ROM Time Scale
+        run: docker run -v $PWD/build:/mydata --rm test1 ./build.sh -f wasm2c /mydata/cart.timescale.wasm gba /mydata/cart.timescale
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:

README.md

@@ -1,3 +1,3 @@
 # arvaders
 
-See the [web version](https://rajsite.github.io/arvaders/). Or the GBA ROM running in a [web GBA emulator](https://gba.ninja/?autorun=https://rajsite.github.io/arvaders/cart.gba) (click "Run it anyway"). Or download the [GBA ROM](https://rajsite.github.io/arvaders/cart.gba).
+See the [web version](https://rajsite.github.io/arvaders/). Or the GBA ROM running in a [web GBA emulator](https://gba.ninja/?autorun=https://rajsite.github.io/arvaders/cart.timescale.gba) (click "Run it anyway"). Or download the [GBA ROM](https://rajsite.github.io/arvaders/cart.timescale.gba).

asconfig.json

@@ -23,6 +23,16 @@
       "noAssert": true,
       "use": "abort="
     },
+    "gba": {
+      "optimizeLevel": 3,
+      "shrinkLevel": 1,
+      "noAssert": true,
+      "use": [
+        "abort=",
+        "TIME_SCALE=4"
+      ],
+      "outFile": "build/cart.timescale.wasm"
+    },
     "debug": {
       "debug": true,
       "sourceMap": "http://localhost:4444/cart.wasm.map",

package.json

@@ -3,11 +3,12 @@
   "private": true,
   "version": "1.0.0",
   "scripts": {
-    "build": "asc --target release && w4 bundle --html build/index.html build/cart.wasm",
+    "build": "asc --target release && w4 bundle --html build/index.html build/cart.wasm && asc --target gba",
     "build:debug": "asc --target debug",
     "build:watch": "nodemon",
-    "w4:run": "w4 watch build/cart.wasm",
-    "w4:watch": "w4 watch build/cart.wasm",
+    "w4:run": "w4 run build/cart.wasm",
+    "w4:run:timescale": "w4 run build/cart.timescale.wasm",
+    "w4:watch": "w4 watch",
     "dev": "concurrently \"npm:*:watch\""
   },
   "devDependencies": {

src/scenes/level1.ts

@@ -9,6 +9,7 @@ import { Condition } from '../systems';
 import * as scenes from '.';
 import { Scene } from "./types";
 import { SCREEN_SIZE } from "../utilities/screen";
+import { scaleVelocity } from "../utilities/time";
 
 class Level1Start extends Scene {
     run(): Scene {
@@ -24,8 +25,8 @@ class Level1Start extends Scene {
         initializeVisualPosition(player, images.player);
         player.position!.x = 0;
         player.position!.y = SCREEN_SIZE - player.position!.height;
-        player.position!.vx = 8;
-        player.position!.vy = 0;
+        player.position!.vx = scaleVelocity(4);
+        player.position!.vy = scaleVelocity(0);
         player.position!.movement = movements.gamepadLeftRight;
         player.health!.value = 100;
 
@@ -41,7 +42,8 @@ class Level1Start extends Scene {
             initializeVisualPosition(enemy, images.invader);
             enemy.position!.x = ((enemy.position!.width + 10) * i);  
             enemy.position!.y = 0;
-            enemy.position!.vx = 2;
+            enemy.position!.vx = scaleVelocity(1);
+            enemy.position!.vy = scaleVelocity(0);
             enemy.position!.movement = movements.sideToSide;
             enemy.health!.value = 100;
             enemy.attack!.attackInterval = 50;
@@ -60,7 +62,8 @@ class Level1Start extends Scene {
             bullet.exists = false;
             bullet.position!.movement = movements.forwardToAstral;
             bullet.damage!.value = 50;
-            bullet.position!.vy = -2;
+            bullet.position!.vx = scaleVelocity(0);
+            bullet.position!.vy = scaleVelocity(-2);
         }
 
         for (let i = 0; i < 10; i++) {
@@ -75,7 +78,8 @@ class Level1Start extends Scene {
             bullet.exists = false;
             bullet.position!.movement = movements.forwardToAstral;
             bullet.damage!.value = 50;
-            bullet.position!.vy = 2;
+            bullet.position!.vy = scaleVelocity(0);
+            bullet.position!.vy = scaleVelocity(2);
         }
 
         return scenes.level1Update;

src/scenes/lose.ts

@@ -3,10 +3,11 @@ import * as scenes from './';
 import { Scene } from "./types";
 import * as images from '../images';
 import { SCREEN_SIZE } from '../utilities/screen';
+import { scaleTime } from '../utilities/time';
 
 class Lose extends Scene {
     private ticks: i32 = 0;
-    private readonly maxTicks: i32 = 120;
+    private readonly maxTicks: i32 = scaleTime(60);
 
     run(): Scene {
         this.ticks++;

src/scenes/win.ts

@@ -3,10 +3,11 @@ import * as scenes from './';
 import { Scene } from "./types";
 import * as images from '../images';
 import { SCREEN_SIZE } from '../utilities/screen';
+import { scaleTime } from '../utilities/time';
 
 class Win extends Scene {
     private ticks: i32 = 0;
-    private readonly maxTicks: i32 = 120;
+    private readonly maxTicks: i32 = scaleTime(60);
 
     run(): Scene {
         this.ticks++;

src/utilities/tick.ts

@@ -1,11 +1,12 @@
 import * as w4 from "../wasm4";
 import * as gamepad from './gamepad';
+import { scaleTime } from "./time";
 
 let count = 0;
 export function tick (x: i32, y: i32): void {
     count++;
-    const scaledCount: i32 = count/20;
-    const show: bool = scaledCount % 2 === 0;
+    const seconds: i32 = count/scaleTime(60);
+    const show: bool = seconds % 2 === 0;
 
     store<u16>(w4.DRAW_COLORS, 0x002);
     if (gamepad.is & w4.BUTTON_1) {

src/utilities/time.ts

@@ -0,0 +1,5 @@
+// @ts-expect-error checking global TIME_SCALE
+const timeScale = isDefined(TIME_SCALE) ? TIME_SCALE : 1;
+
+export const scaleTime = (time: i32): i32 => time / timeScale;
+export const scaleVelocity = (velocity: i32): i32 => velocity * timeScale;

src/world.ts

@@ -5,7 +5,7 @@ import { Pool } from './utilities/pool';
 import { Query } from './query';
 import { Attack } from './components/attack';
 
-const MAX_CAPACITY = 200;
+const MAX_CAPACITY = 150;
 
 const entityPool = new Pool<Entity>(MAX_CAPACITY, Entity.create, Entity.reset);
 const attackPool = new Pool<Attack>(MAX_CAPACITY, Attack.create, Attack.reset);