pxt-common-packages 13.2.1 → 13.2.2

package/libs/game/physics.ts

@@ -45,6 +45,7 @@ class MovingSprite {
     ) { }
 }
 
+
 /**
  * A physics engine that does simple AABB bounding box check
  */
@@ -626,7 +627,8 @@ class ArcadePhysicsEngine extends PhysicsEngine {
 
                     // if the sprite can move through walls, it can overlap the underlying tile.
                     if (!tm.isObstacle(x0, y0) || !!(s.flags & sprites.Flag.GhostThroughWalls)) {
-                        overlappedTiles.push(tm.getTile(x0, y0));
+                        const location = tm.getTile(x0, y0);
+                        overlappedTiles.push(location);
                     }
                 }
             }
@@ -655,7 +657,7 @@ class ArcadePhysicsEngine extends PhysicsEngine {
             const tileOverlapHandlers = game.currentScene().tileOverlapHandlers;
             if (tileOverlapHandlers) {
                 tileOverlapHandlers
-                    .filter(h => h.spriteKind == sprite.kind() && h.tileKind.equals(tiles.getTileImage(tile)))
+                    .filter(h => h.spriteKind == sprite.kind() && h.tileKind.equals(tile._getOriginalImage()))
                     .forEach(h => h.handler(sprite, tile));
             }
         }

package/libs/game/pxt.json

@@ -59,6 +59,9 @@
         "keymap.cpp",
         "keymap.ts"
     ],
+    "testFiles": [
+        "test.ts"
+    ],
     "public": true,
     "dependencies": {
         "settings": "file:../settings",
@@ -66,4 +69,4 @@
         "mixer": "file:../mixer",
         "power": "file:../power"
     }
-}
+}

package/libs/game/test.ts

@@ -0,0 +1,60 @@
+namespace SpriteKind {
+    export const TestPlayer = SpriteKind.create();
+}
+
+const overlapTile = img`
+    1
+`;
+const neutralTile = img`
+    2
+`;
+const dangerTile = img`
+    3
+`;
+const emptyTile = img`
+    .
+`;
+
+const baseLayer = img`
+    . .
+    . .
+`;
+
+const beforeSwap = tiles.createTilemap(
+    hex`0200020001020202`,
+    baseLayer,
+    [emptyTile, overlapTile, neutralTile, dangerTile],
+    TileScale.Eight
+);
+
+const afterSwap = tiles.createTilemap(
+    hex`0200020002030202`,
+    baseLayer,
+    [emptyTile, overlapTile, neutralTile, dangerTile],
+    TileScale.Eight
+);
+
+let overlapSwapped = 0;
+let dangerHits = 0;
+
+scene.onOverlapTile(SpriteKind.TestPlayer, overlapTile, function (sprite: Sprite, location: tiles.Location) {
+    overlapSwapped++;
+    tiles.setCurrentTilemap(afterSwap);
+    sprite.setPosition(100, 100);
+});
+
+scene.onOverlapTile(SpriteKind.TestPlayer, dangerTile, function (sprite: Sprite, location: tiles.Location) {
+    dangerHits++;
+});
+
+tiles.setCurrentTilemap(beforeSwap);
+
+const spriteImage = image.create(16, 16);
+spriteImage.fill(1);
+const sprite = sprites.create(spriteImage, SpriteKind.TestPlayer);
+sprite.setPosition(8, 8);
+
+pause(100);
+
+control.assert(overlapSwapped == 1, 0x200);
+control.assert(dangerHits == 0, 0x201);

package/libs/game/tilemap.ts

@@ -18,10 +18,12 @@ namespace tiles {
     export class Location {
         protected _row: number;
         protected _col: number;
+        protected _originalMap: TileMap;
 
         constructor(col: number, row: number, map: TileMap) {
             this._col = col;
             this._row = row;
+            this._originalMap = map;
         }
 
         get tileMap() {
@@ -103,6 +105,10 @@ namespace tiles {
             return this.tileMap.getTileImage(this.tileSet);
         }
 
+        _getOriginalImage(): Image {
+            return this._originalMap.getTileImage(this._originalMap.getTileIndex(this._col, this._row));
+        }
+
         /**
          * Returns the neighboring location in a specifc direction from a location in a tilemap
          * @param direction The direction to fetch the location in

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P49369(s) {
+function _main___P49365(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___49613 = (undefined);
-    globals._pollEventQueue___49626 = (undefined);
+    globals._intervals___49609 = (undefined);
+    globals._pollEventQueue___49622 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P49369.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P49369.continuations = [  ]
+_main___P49365.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P49365.continuations = [  ]
 
-function _main___P49369_mk(s) {
+function _main___P49365_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P49369, depth: s.depth + 1,
+        parent: s, fn: _main___P49365, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -87,5 +87,5 @@ function _main___P49369_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P49369
+return _main___P49365
 })

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___P100630(s) {
+function _main___P100618(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___100874 = (undefined);
-    globals._pollEventQueue___100887 = (undefined);
+    globals._intervals___100862 = (undefined);
+    globals._pollEventQueue___100875 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P100630.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P100630.continuations = [  ]
+_main___P100618.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P100618.continuations = [  ]
 
-function _main___P100630_mk(s) {
+function _main___P100618_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P100630, depth: s.depth + 1,
+        parent: s, fn: _main___P100618, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -87,5 +87,5 @@ function _main___P100630_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P100630
+return _main___P100618
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P60652(s) {
+function _main___P60648(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___60896 = (undefined);
-    globals._pollEventQueue___60909 = (undefined);
+    globals._intervals___60892 = (undefined);
+    globals._pollEventQueue___60905 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P60652.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
-_main___P60652.continuations = [  ]
+_main___P60648.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"lora.ts","functionName":"<main>","argumentNames":[]}
+_main___P60648.continuations = [  ]
 
-function _main___P60652_mk(s) {
+function _main___P60648_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P60652, depth: s.depth + 1,
+        parent: s, fn: _main___P60648, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -87,5 +87,5 @@ function _main___P60652_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P60652
+return _main___P60648
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P196988(s) {
+function _main___P196960(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___197232 = (undefined);
-    globals._pollEventQueue___197245 = (undefined);
+    globals._intervals___197204 = (undefined);
+    globals._pollEventQueue___197217 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P196988.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
-_main___P196988.continuations = [  ]
+_main___P196960.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"keypad.ts","functionName":"<main>","argumentNames":[]}
+_main___P196960.continuations = [  ]
 
-function _main___P196988_mk(s) {
+function _main___P196960_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P196988, depth: s.depth + 1,
+        parent: s, fn: _main___P196960, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -87,5 +87,5 @@ function _main___P196988_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P196988
+return _main___P196960
 })

package/libs/mixer/instrument.ts

@@ -135,6 +135,11 @@ namespace music.sequencer {
         play(playbackMode: PlaybackMode) {
             if (control.deviceDalVersion() === "sim") {
                 const seq = new _SimulatorSequencer();
+                seq.onStateChange(state => {
+                    if (state === "stop") {
+                        seq.dispose();
+                    }
+                });
 
                 if (playbackMode === PlaybackMode.UntilDone) {
                     seq.play(this.buf, false);