pxt-common-packages 11.0.1 → 11.1.2

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___P48883(s) {
+function _main___P48898(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___49126 = (undefined);
-    globals._pollEventQueue___49139 = (undefined);
+    globals._intervals___49141 = (undefined);
+    globals._pollEventQueue___49154 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48883.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48883.continuations = [  ]
+_main___P48898.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48898.continuations = [  ]
 
-function _main___P48883_mk(s) {
+function _main___P48898_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48883, depth: s.depth + 1,
+        parent: s, fn: _main___P48898, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48883_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48883
+return _main___P48898
 })

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___P98987(s) {
+function _main___P99032(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___99230 = (undefined);
-    globals._pollEventQueue___99243 = (undefined);
+    globals._intervals___99275 = (undefined);
+    globals._pollEventQueue___99288 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98987.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98987.continuations = [  ]
+_main___P99032.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P99032.continuations = [  ]
 
-function _main___P98987_mk(s) {
+function _main___P99032_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98987, depth: s.depth + 1,
+        parent: s, fn: _main___P99032, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98987_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98987
+return _main___P99032
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P60191(s) {
+function _main___P60206(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___60434 = (undefined);
-    globals._pollEventQueue___60447 = (undefined);
+    globals._intervals___60449 = (undefined);
+    globals._pollEventQueue___60462 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P60191.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P60191.continuations = [  ]
+_main___P60206.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P60206.continuations = [  ]
 
-function _main___P60191_mk(s) {
+function _main___P60206_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P60191, depth: s.depth + 1,
+        parent: s, fn: _main___P60206, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P60191_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P60191
+return _main___P60206
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P192707(s) {
+function _main___P192812(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___192950 = (undefined);
-    globals._pollEventQueue___192963 = (undefined);
+    globals._intervals___193055 = (undefined);
+    globals._pollEventQueue___193068 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P192707.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P192707.continuations = [  ]
+_main___P192812.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P192812.continuations = [  ]
 
-function _main___P192707_mk(s) {
+function _main___P192812_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P192707, depth: s.depth + 1,
+        parent: s, fn: _main___P192812, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P192707_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P192707
+return _main___P192812
 })

package/libs/microphone/sim/state.ts

@@ -1,3 +1,5 @@
+/// <reference path="../../core/sim/analogSensor.ts" />
+
 namespace pxsim {
     export interface MicrophoneBoard {
         microphoneState: MicrophoneState;