pxt-common-packages 10.3.5 → 10.3.6

package/libs/game/controller.ts

@@ -165,6 +165,7 @@ namespace controller {
         //% vx.shadow="spriteSpeedPicker"
         //% vy.shadow="spriteSpeedPicker"
         //% parts="multiplayer"
+        //% deprecated=true
         moveSprite(sprite: Sprite, vx: number = 100, vy: number = 100) {
             this._moveSpriteInternal(sprite, vx, vy);
         }
@@ -201,6 +202,7 @@ namespace controller {
         //% group="Multiplayer"
         //% help=controller/on-button-event
         //% parts="multiplayer"
+        //% deprecated=true
         onButtonEvent(btn: ControllerButton, event: ControllerButtonEvent, handler: () => void) {
             this.button(btn).onEvent(event, handler);
         }
@@ -215,6 +217,7 @@ namespace controller {
         //% group="Multiplayer"
         //% help=controller/on-event
         //% parts="multiplayer"
+        //% deprecated=true
         onEvent(event: ControllerEvent, handler: () => void) {
             control.onEvent(this.id, event, handler);
         }
@@ -237,6 +240,7 @@ namespace controller {
         //% blockId=ctrlispressed block="is %controller %button **button** pressed"
         //% group="Multiplayer"
         //% parts="multiplayer"
+        //% deprecated=true
         isPressed(btn: ControllerButton): boolean {
             return this.button(btn).isPressed();
         }
@@ -250,6 +254,7 @@ namespace controller {
         //% step.defl=100
         //% group="Multiplayer"
         //% parts="multiplayer"
+        //% deprecated=true
         dx(step: number = 100) {
             return this._dxInternal(step);
         }
@@ -279,6 +284,7 @@ namespace controller {
         //% step.defl=100
         //% group="Multiplayer"
         //% parts="multiplayer"
+        //% deprecated=true
         dy(step: number = 100) {
             return this._dyInternal(step);
         }

package/libs/game/info.ts

@@ -858,6 +858,7 @@ namespace info {
         //% blockId=piscore block="%player score"
         //% help=info/score
         //% parts="multiplayer"
+        //% deprecated=true
         score(): number {
             return this.impl.score();
         }
@@ -870,6 +871,7 @@ namespace info {
         //% value.defl=0
         //% help=info/set-score
         //% parts="multiplayer"
+        //% deprecated=true
         setScore(value: number) {
             this.impl.setScore(value);
         }
@@ -883,6 +885,7 @@ namespace info {
         //% value.defl=1
         //% help=info/change-score-by
         //% parts="multiplayer"
+        //% deprecated=true
         changeScoreBy(value: number): void {
             this.impl.changeScoreBy(value);
         }
@@ -898,6 +901,7 @@ namespace info {
         //% blockid=piflife block="%player life"
         //% help=info/life
         //% parts="multiplayer"
+        //% deprecated=true
         life(): number {
             return this.impl.life();
         }
@@ -910,6 +914,7 @@ namespace info {
         //% value.defl=3
         //% help=info/set-life
         //% parts="multiplayer"
+        //% deprecated=true
         setLife(value: number): void {
             this.impl.setLife(value);
         }
@@ -923,6 +928,7 @@ namespace info {
         //% value.defl=-1
         //% help=info/change-life-by
         //% parts="multiplayer"
+        //% deprecated=true
         changeLifeBy(value: number): void {
             this.impl.changeLifeBy(value);
         }
@@ -936,6 +942,7 @@ namespace info {
         //% blockId=pihaslife block="%player has life"
         //% help=info/has-life
         //% parts="multiplayer"
+        //% deprecated=true
         hasLife(): boolean {
             return this.impl.hasLife();
         }
@@ -948,6 +955,7 @@ namespace info {
         //% blockId=playerinfoonlifezero block="on %player life zero"
         //% help=info/on-life-zero
         //% parts="multiplayer"
+        //% deprecated=true
         onLifeZero(handler: () => void) {
             this.impl.onLifeZero(handler);
         }
@@ -966,6 +974,7 @@ namespace info {
         //% help=info/on-score
         //% group="Multiplayer"
         //% parts="multiplayer"
+        //% deprecated=true
         onScore(score: number, handler: () => void) {
             this.impl.onScore(score, handler);
         }

package/libs/game/physics.ts

@@ -466,7 +466,7 @@ class ArcadePhysicsEngine extends PhysicsEngine {
 
                     if (s.flags & sprites.Flag.DestroyOnWall) {
                         s.destroy();
-                    } else if (s._vx === movingSprite.cachedVx) {
+                    } else if (s._vx === movingSprite.cachedVx && !(s.flags & SPRITE_NO_WALL_COLLISION)) {
                         // sprite collision event didn't change velocity in this direction;
                         // apply normal updates
                         if (s.flags & sprites.Flag.BounceOnWall) {
@@ -547,7 +547,7 @@ class ArcadePhysicsEngine extends PhysicsEngine {
 
                     if (s.flags & sprites.Flag.DestroyOnWall) {
                         s.destroy();
-                    } else if (s._vy === movingSprite.cachedVy) {
+                    } else if (s._vy === movingSprite.cachedVy && !(s.flags & SPRITE_NO_WALL_COLLISION)) {
                         // sprite collision event didn't change velocity in this direction;
                         // apply normal updates
                         if (s.flags & sprites.Flag.BounceOnWall) {

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P48577(s) {
+function _main___P48571(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___48820 = (undefined);
-    globals._pollEventQueue___48833 = (undefined);
+    globals._intervals___48814 = (undefined);
+    globals._pollEventQueue___48827 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P48577.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
-_main___P48577.continuations = [  ]
+_main___P48571.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"characterlcd.ts","functionName":"<main>","argumentNames":[]}
+_main___P48571.continuations = [  ]
 
-function _main___P48577_mk(s) {
+function _main___P48571_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P48577, depth: s.depth + 1,
+        parent: s, fn: _main___P48571, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P48577_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P48577
+return _main___P48571
 })

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___P98063(s) {
+function _main___P98045(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___98306 = (undefined);
-    globals._pollEventQueue___98319 = (undefined);
+    globals._intervals___98288 = (undefined);
+    globals._pollEventQueue___98301 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98063.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98063.continuations = [  ]
+_main___P98045.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98045.continuations = [  ]
 
-function _main___P98063_mk(s) {
+function _main___P98045_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98063, depth: s.depth + 1,
+        parent: s, fn: _main___P98045, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98063_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98063
+return _main___P98045
 })

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

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

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

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

package/libs/mixer/instrument.ts

@@ -22,7 +22,7 @@ namespace music.sequencer {
      *     notes byte length
      *     ...note events
      *
-     * instrument(27 bytes)
+     * instrument(28 bytes)
      *     0 waveform
      *     1 amp attack
      *     3 amp decay
@@ -38,6 +38,7 @@ namespace music.sequencer {
      *     22 amp lfo amp
      *     24 pitch lfo freq
      *     25 pitch lfo amp
+     *     27 octave
      *
      * drum(5 + 7 * steps bytes)
      *     0 steps
@@ -57,6 +58,12 @@ namespace music.sequencer {
      *     4 polyphony
      *     5...notes(1 byte each)
      *
+     * note (1 byte)
+     *     lower six bits = note - (instrumentOctave - 2) * 12
+     *     upper two bits are the enharmonic spelling:
+     *          0 = normal
+     *          1 = flat
+     *          2 = sharp
      */
 
     export class Song {
@@ -239,8 +246,12 @@ namespace music.sequencer {
             return this.polyphony + 5;
         }
 
-        getNote(offset: number) {
-            return this.buf[this.offset + offset + 5];
+        getNote(offset: number, octave?: number) {
+            const value = this.buf[this.offset + offset + 5] & 0x3f;
+            if (octave !== undefined) {
+                return value + (octave - 2) * 12
+            }
+            return value
         }
 
         protected getValue(offset: number) {
@@ -366,6 +377,14 @@ namespace music.sequencer {
         set waveform(value: number) {
             this.buf[this.offset] = value;
         }
+
+        get octave(): number {
+            return this.buf[this.offset + 27]
+        }
+
+        set octave(value: number) {
+            this.buf[this.offset + 27] = value;
+        }
     }
 
     export class DrumInstrument {

package/libs/mixer/sequencer.ts

@@ -65,7 +65,7 @@ namespace music.sequencer {
                     0,
                     renderInstrument(
                         track.instrument,
-                        lookupFrequency(track.currentNoteEvent.getNote(i)),
+                        lookupFrequency(track.currentNoteEvent.getNote(i, track.instrument.octave)),
                         this.tickToMs(track.currentNoteEvent.endTick - track.currentNoteEvent.startTick),
                         music.volume()
                     )
@@ -78,7 +78,7 @@ namespace music.sequencer {
                 playInstructions(
                     0,
                     renderDrumInstrument(
-                        track.drums[track.currentNoteEvent.getNote(i)],
+                        track.drums[track.currentNoteEvent.getNote(i, undefined)],
                         music.volume()
                     )
                 );