pxt-common-packages 10.3.9 → 10.3.11

package/libs/game/controller.ts

@@ -169,6 +169,11 @@ namespace controller {
             this._moveSpriteInternal(sprite, vx, vy);
         }
 
+        stopControllingSprite(sprite: Sprite) {
+            if (!sprite) return;
+            this._controlledSprites = this._controlledSprites.filter(s => s.s.id !== sprite.id);
+        }
+
         // use this instead of movesprite internally to avoid adding the "multiplayer" part
         // to the compiled program
         _moveSpriteInternal(sprite: Sprite, vx: number = 100, vy: number = 100) {

package/libs/game/game.ts

@@ -21,8 +21,10 @@ namespace game {
         scoringType: ScoringType;
         winEffect: effects.BackgroundEffect;
         loseEffect: effects.BackgroundEffect;
-        loseSound: music.Melody;
-        winSound: music.Melody;
+        loseSound: music.Playable;
+        winSound: music.Playable;
+        loseSoundLooping: boolean;
+        winSoundLooping: boolean;
         winMessage: string;
         winMessageMultiplayer: string;
         loseMessage: string;
@@ -39,8 +41,10 @@ namespace game {
             this.scoringType = ScoringType.HighScore;
             this.winEffect = effects.confetti;
             this.loseEffect = effects.melt;
-            this.winSound = music.powerUp;
-            this.loseSound = music.wawawawaa;
+            this.winSound = music.melodyPlayable(music.powerUp);
+            this.loseSound = music.melodyPlayable(music.wawawawaa);
+            this.winSoundLooping = false;
+            this.loseSoundLooping  = false;
             this.winMessage = "YOU WIN!";
             this.winMessageMultiplayer = "${WINNER} WINS!";
             this.loseMessage = "GAME OVER";
@@ -50,13 +54,13 @@ namespace game {
             this.scoringTypeSetByUser = false;
         }
 
-        setScoringType(type: ScoringType, explicit?: boolean) {
+        setScoringType(type: ScoringType, explicit: boolean) {
             if (!explicit && this.scoringTypeSetByUser) return;
             this.scoringType = type;
             if (explicit) this.scoringTypeSetByUser = true;
         }
 
-        setEffect(win: boolean, effect: effects.BackgroundEffect, explicit?: boolean) {
+        setEffect(win: boolean, effect: effects.BackgroundEffect, explicit: boolean) {
             if (!explicit && this.effectSetByUser) return;
             if (win) this.winEffect = effect;
             else this.loseEffect = effect;
@@ -66,17 +70,25 @@ namespace game {
             return win ? this.winEffect : this.loseEffect;
         }
 
-        setSound(win: boolean, sound: music.Melody, explicit?: boolean) {
+        setSound(win: boolean, sound: music.Playable, looping: boolean, explicit: boolean) {
             if (!explicit && this.soundSetByUser) return;
-            if (win) this.winSound = sound;
-            else this.loseSound = sound;
+            if (win) {
+                this.winSound = sound;
+                this.winSoundLooping = looping;
+            } else {
+                this.loseSound = sound;
+                this.loseSoundLooping = looping;
+            }
             if (explicit) this.soundSetByUser = true;
         }
         getSound(win: boolean) {
             return win ? this.winSound : this.loseSound;
         }
+        getSoundLooping(win: boolean) {
+            return win ? this.winSoundLooping : this.loseSoundLooping;
+        }
 
-        setMessage(win: boolean, message: string, explicit?: boolean) {
+        setMessage(win: boolean, message: string, explicit: boolean) {
             if (!explicit && this.messageSetByUser) return;
             if (win) this.winMessage = message;
             else this.loseMessage = message;
@@ -222,7 +234,7 @@ namespace game {
     //% win.shadow=toggleWinLose
     //% win.defl=true
     //% group="Game Over"
-    //% weight=80
+    //% weight=90
     //% blockGap=8
     //% help=game/set-game-over-effect
     export function setGameOverEffect(win: boolean, effect: effects.BackgroundEffect) {
@@ -237,18 +249,21 @@ namespace game {
      * @param effect
      */
     //% blockId=game_setgameoversound
-    //% block="use sound $sound for $win"
+    //% block="use $sound looping $looping for $win"
+    //% sound.shadow=music_melody_playable
     //% sound.defl=music.powerUp
+    //% looping.shadow=toggleOnOff
+    //% looping.defl=false
     //% win.shadow=toggleWinLose
     //% win.defl=true
     //% group="Game Over"
     //% weight=80
     //% blockGap=8
     //% help=game/set-game-over-sound
-    export function setGameOverSound(win: boolean, sound: music.Melody) {
+    export function setGameOverSound(win: boolean, sound: music.Playable, looping: boolean) {
         init();
         const goc = game.gameOverConfig();
-        goc.setSound(win, sound, true);
+        goc.setSound(win, sound, looping, true);
     }
 
     /**
@@ -262,7 +277,7 @@ namespace game {
     //% win.shadow=toggleWinLose
     //% win.defl=true
     //% group="Game Over"
-    //% weight=80
+    //% weight=70
     //% blockGap=8
     //% help=game/set-game-over-message
     export function setGameOverMessage(win: boolean, message: string) {
@@ -279,7 +294,7 @@ namespace game {
     //% block="use $type as best score"
     //% type.defl=ScoringType.HighScore
     //% group="Game Over"
-    //% weight=80
+    //% weight=60
     //% blockGap=8
     //% help=game/set-game-over-scoring-type
     export function setGameOverScoringType(type: ScoringType) {
@@ -314,7 +329,7 @@ namespace game {
     //% blockId=gameOver2 block="game over $win"
     //% win.shadow=toggleWinLose
     //% win.defl=true
-    //% weight=80
+    //% weight=100
     //% blockGap=8
     //% help=game/over
     //% group="Game Over"
@@ -352,6 +367,8 @@ namespace game {
             const message = goc.getMessage(win, preferMultiplayer);
             const effect = goc.getEffect(win);
             const sound = goc.getSound(win);
+            const looping = goc.getSoundLooping(win);
+            const playbackMode = looping ? music.PlaybackMode.LoopingInBackground : music.PlaybackMode.InBackground;
 
             // releasing memory and clear fibers. Do not add anything that releases the fiber until background is set below,
             // or screen will be cleared on the new frame and will not appear as background in the game over screen.
@@ -362,7 +379,7 @@ namespace game {
             pushScene();
             scene.setBackgroundImage(screen.clone());
 
-            if (sound) sound.play();
+            if (sound) music.play(sound, playbackMode);
             if (effect) effect.startScreenEffect();
 
             pause(400);

package/libs/game/info.ts

@@ -161,7 +161,7 @@ namespace info {
                                 // Clear effect and sound, unless set by user
                                 const goc = game.gameOverConfig();
                                 goc.setEffect(false, null, false);
-                                goc.setSound(false, null, false);
+                                goc.setSound(false, null, false, false);
                                 game.gameOver(false);
                             }
                         }
@@ -779,7 +779,7 @@ namespace info {
                     // Clear effect and sound, unless set by user
                     const goc = game.gameOverConfig();
                     goc.setEffect(false, null, false);
-                    goc.setSound(false, null, false);
+                    goc.setSound(false, null, false, false);
                     game.gameOver(false);
                 }
             }

package/libs/game/sim/multiplayer.ts

@@ -17,8 +17,6 @@ namespace pxsim.multiplayer {
     }
 
     export function postIcon(iconType: IconType, slot: number, im: pxsim.RefImage) {
-        if (getMultiplayerState().origin !== "server")
-            return;
         if (im._width * im._height > 64 * 64) {
             // setting 64x64 as max size for icon for now
             return;

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

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

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___P98387(s) {
+function _main___P98441(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___98630 = (undefined);
-    globals._pollEventQueue___98643 = (undefined);
+    globals._intervals___98684 = (undefined);
+    globals._pollEventQueue___98697 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P98387.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
-_main___P98387.continuations = [  ]
+_main___P98441.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tsl2591.ts","functionName":"<main>","argumentNames":[]}
+_main___P98441.continuations = [  ]
 
-function _main___P98387_mk(s) {
+function _main___P98441_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P98387, depth: s.depth + 1,
+        parent: s, fn: _main___P98441, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P98387_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P98387
+return _main___P98441
 })

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

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

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

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

package/libs/mixer/melody.ts

@@ -590,13 +590,13 @@ namespace music {
         }
     }
 
-    //% shim=TD_ID
     //% blockId=music_song_field_editor
     //% block="song $song"
     //% song.fieldEditor=musiceditor
     //% toolboxParent=music_playable_play
     //% toolboxParentArgument=toPlay
     //% group="Songs"
+    //% duplicateShadowOnDrag
     export function createSong(song: Buffer): Playable {
         return new sequencer.Song(song);
     }

package/libs/mixer/soundEffect.ts

@@ -158,6 +158,7 @@ namespace music {
     //% toolboxParentArgument=toPlay
     //% weight=20
     //% group="Sounds"
+    //% duplicateShadowOnDrag
     export function createSoundEffect(waveShape: WaveShape, startFrequency: number, endFrequency: number, startVolume: number, endVolume: number, duration: number, effect: SoundExpressionEffect, interpolation: InterpolationCurve): SoundEffect {
         const result = new SoundEffect();