Fix few bugs & add basic refresh button

packages-dev/eslint-config-custom/index.js

@@ -21,6 +21,7 @@ module.exports = {
         project: true,
     },
     rules: {
+        "@typescript-eslint/ban-types": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/unbound-method": "off",
@@ -34,15 +35,15 @@ module.exports = {
         "@typescript-eslint/no-unused-vars": [
             "error",
             {
-                "args": "all",
-                "argsIgnorePattern": "^_",
-                "caughtErrors": "all",
-                "caughtErrorsIgnorePattern": "^_",
-                "destructuredArrayIgnorePattern": "^_",
-                "varsIgnorePattern": "^_",
-                "ignoreRestSiblings": true
-            }
-        ]
+                args: "all",
+                argsIgnorePattern: "^_",
+                caughtErrors: "all",
+                caughtErrorsIgnorePattern: "^_",
+                destructuredArrayIgnorePattern: "^_",
+                varsIgnorePattern: "^_",
+                ignoreRestSiblings: true,
+            },
+        ],
     },
     ignorePatterns: ["*.cjs", "vite.config.ts", "rollup.config.mjs"],
 }

packages/game/src/framework/entity.base.test.ts

@@ -945,6 +945,20 @@ describe("EntityStore", () => {
         expect(added).toHaveBeenCalledTimes(1)
     })
 
+    it("should show new entity in single", () => {
+        store.create({ position: { x: 0, y: 0 } })
+        const single = store.single("position")
+
+        for (const retrieved of store.multipleCopy("position")) {
+            store.remove(retrieved)
+        }
+
+        const newEntity = store.create({ position: { x: 1, y: 1 } })
+        const retrieved = single()
+
+        expect(retrieved.id).toBe(newEntity.id)
+    })
+
     it("should handle multiple listeners with different requirements", () => {
         const entity = store.create({ position: { x: 0, y: 0 } })
 

packages/game/src/framework/entity.ts

@@ -75,31 +75,6 @@ export interface EntityStoreScoped<Components extends object> extends EntityStor
     clear(): void
 }
 
-class WeakLookup<K, T extends WeakKey> {
-    private map = new Map<K, WeakRef<T>>()
-    private inUse = false
-
-    set(key: K, value: any) {
-        this.map.set(key, new WeakRef(value))
-    }
-
-    get(key: K) {
-        const value = this.map.get(key)
-
-        if (value === undefined) {
-            return undefined
-        }
-
-        const result = value.deref()
-
-        if (result === undefined) {
-            this.map.delete(key)
-        }
-
-        return result
-    }
-}
-
 export function newEntityStore<Components extends object>(): EntityStore<Components> {
     function componentsToKey(components: string[]) {
         return components.sort().join(",")
@@ -484,7 +459,7 @@ export function newEntityStore<Components extends object>(): EntityStore<Compone
         return () => void newListener.remove(symbol)
     }
 
-    const multiples = new WeakLookup<string, readonly Entity<any, Components>[]>()
+    const multiples = new Map<string, readonly Entity<any, Components>[]>()
 
     function multiple<C extends ComponentsWithModifier<Components>[]>(
         ...requirements: string[]
@@ -497,29 +472,14 @@ export function newEntityStore<Components extends object>(): EntityStore<Compone
         }
 
         const entityList = new EntityList(requirements)
-        const entityListRef = new WeakRef(entityList)
 
-        const unlisten = listen(
+        listen(
             requirements,
             entity => {
-                const entityList = entityListRef.deref()
-
-                if (entityList === undefined) {
-                    unlisten()
-                    return
-                }
-
                 entityList.push(entity)
             },
             entity => {
-                const result = entityListRef.deref()
-
-                if (result === undefined) {
-                    unlisten()
-                    return
-                }
-
-                result.remove(entity)
+                entityList.remove(entity)
             },
         )
 
@@ -534,7 +494,7 @@ export function newEntityStore<Components extends object>(): EntityStore<Compone
         return [...multiple(...requirements)]
     }
 
-    const keyToSingle = new WeakLookup<string, any>()
+    const keyToSingle = new Map<string, any>()
 
     function single<C extends ComponentsWithModifier<Components>[]>(
         ...requirements: string[]

packages/game/src/game.ts

@@ -49,12 +49,18 @@ export class Game {
 
                 if (summary.flags === 0) {
                     this.reset = true
+                    this.started = false
                 }
             },
         })
     }
 
     public onUpdate(input: GameInput) {
+        if (this.reset) {
+            this.onReset()
+            this.reset = false
+        }
+
         if (this.started === false) {
             if (input.thrust === false) {
                 return
@@ -63,11 +69,6 @@ export class Game {
             this.started = true
         }
 
-        if (this.reset) {
-            this.onReset()
-            this.reset = false
-        }
-
         this.moduleLevel.onUpdate(input)
         this.moduleRocket.onUpdate(input)
         this.moduleWorld.onUpdate(input)

packages/game/src/modules/module-level.ts

@@ -70,7 +70,7 @@ export class ModuleLevel {
     }
 
     onUpdate(_input: GameInput) {
-        if (this.progress && this.progressLevel) {
+        if (this.progress !== undefined && this.progressLevel) {
             this.progress -= 1
 
             if (this.progress <= 0) {
@@ -87,9 +87,12 @@ export class ModuleLevel {
             Math.abs(rocketVelocity.x) > ROCKET_SPEED_TOLERANCE ||
             Math.abs(rocketVelocity.y) > ROCKET_SPEED_TOLERANCE
         ) {
+            console.log("Rocket is moving too fast to capture the flag")
             return
         }
 
+        console.log("Captured flag")
+
         const captured = level
         this.progressLevel = undefined
 

packages/game/src/modules/module-rocket.ts

@@ -53,25 +53,27 @@ export class ModuleRocket {
         })
     }
 
-    onUpdate({ thrust, rotation }: GameInput) {
+    onUpdate(input: GameInput) {
+        this.previousInput = input
+
         const rocket = this.getRocket()
 
         const rocketComponent = rocket.get("rocket")
         const body = rocket.get("body")
 
         if (this.firstInput) {
             this.firstInput = false
-            rocketComponent.rotationWithoutInput = -rotation
+            rocketComponent.rotationWithoutInput = -input.rotation
         }
 
         rocketComponent.framesSinceLastDeath++
-        rocketComponent.thrust = thrust
+        rocketComponent.thrust = input.thrust
 
         if (rocketComponent.collisionCount === 0) {
-            body.setRotation(rotation + rocketComponent.rotationWithoutInput, true)
+            body.setRotation(input.rotation + rocketComponent.rotationWithoutInput, true)
         }
 
-        if (thrust) {
+        if (input.thrust) {
             const rapier = this.store.resources.get("rapier")
             const world = this.store.resources.get("world")
 
@@ -191,9 +193,8 @@ export class ModuleRocket {
             rocketComponent.collisionCount--
         }
 
-        if (rocketComponent.collisionCount === 0 && this.previousInput) {
-            rocketComponent.rotationWithoutInput =
-                rocket.get("body").rotation() - this.previousInput.rotation
+        if (rocketComponent.collisionCount === 0) {
+            this.resetRotation(rocket)
         }
     }
 
@@ -293,6 +294,17 @@ export class ModuleRocket {
 
         body.setLinvel({ x: 0, y: 0 }, false)
         body.setAngvel(0, true)
+
+        this.resetRotation(rocket)
+    }
+
+    private resetRotation(rocket: RocketEntity) {
+        if (this.previousInput) {
+            const rocketComponent = rocket.get("rocket")
+
+            rocketComponent.rotationWithoutInput =
+                rocket.get("body").rotation() - this.previousInput.rotation
+        }
     }
 }