pxt-common-packages 10.3.21 → 10.3.23

package/libs/game/info.ts

@@ -33,7 +33,7 @@ namespace info {
         // null: reached 0 and callback was invoked
         public life: number;
         public lifeZeroHandler: () => void;
-        public scoreReachedHandler: ScoreReachedHandler
+        public scoreReachedHandlers: ScoreReachedHandler[];
 
         public showScore?: boolean;
         public showLife?: boolean;
@@ -45,6 +45,7 @@ namespace info {
             this.showScore = undefined;
             this.showLife = undefined;
             this.showPlayer = undefined;
+            this.scoreReachedHandlers = [];
         }
     }
 
@@ -711,12 +712,12 @@ namespace info {
             const oldScore = state.score || 0;
             state.score = (value | 0);
 
-            if (state.scoreReachedHandler && (
-                (oldScore < state.scoreReachedHandler.score && state.score >= state.scoreReachedHandler.score) ||
-                (oldScore > state.scoreReachedHandler.score && state.score <= state.scoreReachedHandler.score)
-            )) {
-                state.scoreReachedHandler.handler();
-            }
+            state.scoreReachedHandlers.forEach(srh => {
+                if ((oldScore < srh.score && state.score >= srh.score) ||
+                    (oldScore > srh.score && state.score <= srh.score)) {
+                    srh.handler();
+                }
+            });
         }
 
         changeScoreBy(value: number): void {
@@ -766,7 +767,16 @@ namespace info {
 
         onScore(score: number, handler: () => void) {
             const state = this.getState();
-            state.scoreReachedHandler = new ScoreReachedHandler(score, handler);
+
+            for (const element of state.scoreReachedHandlers) {
+                if (element.score === score) {
+                    // Score handlers are implemented as "last one wins."
+                    element.handler = handler;
+                    return;
+                }
+            }
+
+            state.scoreReachedHandlers.push(new ScoreReachedHandler(score, handler));
         }
 
         raiseLifeZero(gameOver: boolean) {

package/libs/game/sprite.ts

@@ -694,6 +694,8 @@ class Sprite extends sprites.BaseSprite {
             return false
         if (other.flags & SPRITE_NO_SPRITE_OVERLAPS)
             return false
+        if (this.flags & sprites.Flag.HitboxOverlaps || other.flags & sprites.Flag.HitboxOverlaps)
+            return other._hitbox.overlapsWith(this._hitbox);
         if (!other._hitbox.overlapsWith(this._hitbox))
             return false;
         if (!this.isScaled() && !other.isScaled()) {

package/libs/game/sprites.ts

@@ -196,6 +196,7 @@ namespace sprites {
         GhostThroughTiles = 1 << 10, // No overlaps with tiles
         GhostThroughWalls = 1 << 11, // No collisions with walls
         GhostThroughSprites = 1 << 12, // No overlaps with other sprites
+        HitboxOverlaps = 1 << 13, // If set, overlaps with this sprite are based off of both sprites' hitboxes and not pixel perfect
         Ghost = sprites.Flag.GhostThroughSprites | sprites.Flag.GhostThroughWalls | sprites.Flag.GhostThroughTiles, // doesn't collide with other sprites or walls
     }
 }

package/libs/lcd/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48866(s) {
+function _main___P48881(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___49109 = (undefined);
-    globals._pollEventQueue___49122 = (undefined);
+    globals._intervals___49124 = (undefined);
+    globals._pollEventQueue___49137 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48866.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48866.continuations = [  ]
+_main___P48881.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48881.continuations = [  ]
 
-function _main___P48866_mk(s) {
+function _main___P48881_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48866, depth: s.depth + 1,
+        parent: s, fn: _main___P48881, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48866_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48866
+return _main___P48881
 })

package/libs/light-spectrum-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P98936(s) {
+function _main___P98981(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___99179 = (undefined);
-    globals._pollEventQueue___99192 = (undefined);
+    globals._intervals___99224 = (undefined);
+    globals._pollEventQueue___99237 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98936.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98936.continuations = [  ]
+_main___P98981.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98981.continuations = [  ]
 
-function _main___P98936_mk(s) {
+function _main___P98981_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98936, depth: s.depth + 1,
+        parent: s, fn: _main___P98981, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98936_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98936
+return _main___P98981
 })

package/libs/lora/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P60174(s) {
+function _main___P60189(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___60417 = (undefined);
-    globals._pollEventQueue___60430 = (undefined);
+    globals._intervals___60432 = (undefined);
+    globals._pollEventQueue___60445 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P60174.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P60174.continuations = [  ]
+_main___P60189.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P60189.continuations = [  ]
 
-function _main___P60174_mk(s) {
+function _main___P60189_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P60174, depth: s.depth + 1,
+        parent: s, fn: _main___P60189, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P60174_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P60174
+return _main___P60189
 })

package/libs/matrix-keypad/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P192588(s) {
+function _main___P192693(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___192831 = (undefined);
-    globals._pollEventQueue___192844 = (undefined);
+    globals._intervals___192936 = (undefined);
+    globals._pollEventQueue___192949 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P192588.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P192588.continuations = [  ]
+_main___P192693.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P192693.continuations = [  ]
 
-function _main___P192588_mk(s) {
+function _main___P192693_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P192588, depth: s.depth + 1,
+        parent: s, fn: _main___P192693, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P192588_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P192588
+return _main___P192693
 })

package/libs/microphone/sim/state.ts

@@ -1,6 +1,29 @@
+/// <reference path="../../core/sim/analogSensor.ts" />
+
 namespace pxsim {
     export interface MicrophoneBoard {
-        microphoneState: AnalogSensorState;
+        microphoneState: MicrophoneState;
+    }
+
+    export class MicrophoneState extends AnalogSensorState {
+        public onSoundRegistered: boolean = false;
+        public soundLevelRequested: boolean = false;
+        private pingUsed: ReturnType<typeof setTimeout>;
+
+        public pingSoundLevel = () => {
+            if (this.onSoundRegistered) {
+                return;
+            }
+            this.soundLevelRequested = true;
+            runtime.queueDisplayUpdate();
+            clearTimeout(this.pingUsed);
+            this.pingUsed = setTimeout(() => {
+                this.soundLevelRequested = false;
+                runtime.queueDisplayUpdate();
+                this.pingUsed = undefined;
+            }, 100);
+        }
+
     }
 
     export function microphoneState() {