pxt-arcade 1.9.8 → 1.9.12

package/built/common-sim.js

@@ -5,11 +5,11 @@ var pxsim;
         function onGesture(gesture, handler) {
             let b = pxsim.accelerometer();
             b.accelerometer.activate();
-            if (gesture == 11 /* ACCELEROMETER_EVT_SHAKE */ && !b.useShake) {
+            if (gesture == 11 /* DAL.ACCELEROMETER_EVT_SHAKE */ && !b.useShake) {
                 b.useShake = true;
                 pxsim.runtime.queueDisplayUpdate();
             }
-            pxsim.pxtcore.registerWithDal(13 /* DEVICE_ID_GESTURE */, gesture, handler);
+            pxsim.pxtcore.registerWithDal(13 /* DAL.DEVICE_ID_GESTURE */, gesture, handler);
         }
         input.onGesture = onGesture;
         function rotation(kind) {
@@ -99,7 +99,7 @@ var pxsim;
             this.shake = { x: false, y: false, z: false, count: 0, shaken: 0, timer: 0 }; // State information needed to detect shake events.
             this.isActive = false;
             this.sampleRange = 2;
-            this.id = 5 /* DEVICE_ID_ACCELEROMETER */;
+            this.id = 5 /* DAL.DEVICE_ID_ACCELEROMETER */;
         }
         setSampleRange(range) {
             this.activate();
@@ -123,7 +123,7 @@ var pxsim;
             // Update gesture tracking
             this.updateGesture();
             // Indicate that a new sample is available
-            pxsim.board().bus.queue(this.id, 1 /* ACCELEROMETER_EVT_DATA_UPDATE */);
+            pxsim.board().bus.queue(this.id, 1 /* DAL.ACCELEROMETER_EVT_DATA_UPDATE */);
         }
         instantaneousAccelerationSquared() {
             // Use pythagoras theorem to determine the combined force acting on the device.
@@ -144,21 +144,21 @@ var pxsim;
             //
             // If we see enough zero crossings in succession (MICROBIT_ACCELEROMETER_SHAKE_COUNT_THRESHOLD), then we decide that the device
             // has been shaken.
-            if ((this.getX() < -400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.x) || (this.getX() > 400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.x)) {
+            if ((this.getX() < -400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.x) || (this.getX() > 400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.x)) {
                 shakeDetected = true;
                 this.shake.x = !this.shake.x;
             }
-            if ((this.getY() < -400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.y) || (this.getY() > 400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.y)) {
+            if ((this.getY() < -400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.y) || (this.getY() > 400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.y)) {
                 shakeDetected = true;
                 this.shake.y = !this.shake.y;
             }
-            if ((this.getZ() < -400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.z) || (this.getZ() > 400 /* ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.z)) {
+            if ((this.getZ() < -400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && this.shake.z) || (this.getZ() > 400 /* DAL.ACCELEROMETER_SHAKE_TOLERANCE */ && !this.shake.z)) {
                 shakeDetected = true;
                 this.shake.z = !this.shake.z;
             }
-            if (shakeDetected && this.shake.count < 4 /* ACCELEROMETER_SHAKE_COUNT_THRESHOLD */ && ++this.shake.count == 4 /* ACCELEROMETER_SHAKE_COUNT_THRESHOLD */)
+            if (shakeDetected && this.shake.count < 4 /* DAL.ACCELEROMETER_SHAKE_COUNT_THRESHOLD */ && ++this.shake.count == 4 /* DAL.ACCELEROMETER_SHAKE_COUNT_THRESHOLD */)
                 this.shake.shaken = 1;
-            if (++this.shake.timer >= 10 /* ACCELEROMETER_SHAKE_DAMPING */) {
+            if (++this.shake.timer >= 10 /* DAL.ACCELEROMETER_SHAKE_DAMPING */) {
                 this.shake.timer = 0;
                 if (this.shake.count > 0) {
                     if (--this.shake.count == 0)
@@ -166,29 +166,29 @@ var pxsim;
                 }
             }
             if (this.shake.shaken)
-                return 11 /* ACCELEROMETER_EVT_SHAKE */;
+                return 11 /* DAL.ACCELEROMETER_EVT_SHAKE */;
             let sq = (n) => n * n;
-            if (force < sq(400 /* ACCELEROMETER_FREEFALL_TOLERANCE */))
-                return 7 /* ACCELEROMETER_EVT_FREEFALL */;
-            if (force > sq(3072 /* ACCELEROMETER_3G_TOLERANCE */))
-                return 8 /* ACCELEROMETER_EVT_3G */;
-            if (force > sq(6144 /* ACCELEROMETER_6G_TOLERANCE */))
-                return 9 /* ACCELEROMETER_EVT_6G */;
-            if (force > sq(8192 /* ACCELEROMETER_8G_TOLERANCE */))
-                return 10 /* ACCELEROMETER_EVT_8G */;
+            if (force < sq(400 /* DAL.ACCELEROMETER_FREEFALL_TOLERANCE */))
+                return 7 /* DAL.ACCELEROMETER_EVT_FREEFALL */;
+            if (force > sq(3072 /* DAL.ACCELEROMETER_3G_TOLERANCE */))
+                return 8 /* DAL.ACCELEROMETER_EVT_3G */;
+            if (force > sq(6144 /* DAL.ACCELEROMETER_6G_TOLERANCE */))
+                return 9 /* DAL.ACCELEROMETER_EVT_6G */;
+            if (force > sq(8192 /* DAL.ACCELEROMETER_8G_TOLERANCE */))
+                return 10 /* DAL.ACCELEROMETER_EVT_8G */;
             // Determine our posture.
-            if (this.getX() < (-1000 + 200 /* ACCELEROMETER_TILT_TOLERANCE */))
-                return 3 /* ACCELEROMETER_EVT_TILT_LEFT */;
-            if (this.getX() > (1000 - 200 /* ACCELEROMETER_TILT_TOLERANCE */))
-                return 4 /* ACCELEROMETER_EVT_TILT_RIGHT */;
-            if (this.getY() < (-1000 + 200 /* ACCELEROMETER_TILT_TOLERANCE */))
-                return 1 /* ACCELEROMETER_EVT_TILT_UP */;
-            if (this.getY() > (1000 - 200 /* ACCELEROMETER_TILT_TOLERANCE */))
-                return 2 /* ACCELEROMETER_EVT_TILT_DOWN */;
-            if (this.getZ() < (-1000 + 200 /* ACCELEROMETER_TILT_TOLERANCE */))
-                return 5 /* ACCELEROMETER_EVT_FACE_UP */;
-            if (this.getZ() > (1000 - 200 /* ACCELEROMETER_TILT_TOLERANCE */))
-                return 6 /* ACCELEROMETER_EVT_FACE_DOWN */;
+            if (this.getX() < (-1000 + 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
+                return 3 /* DAL.ACCELEROMETER_EVT_TILT_LEFT */;
+            if (this.getX() > (1000 - 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
+                return 4 /* DAL.ACCELEROMETER_EVT_TILT_RIGHT */;
+            if (this.getY() < (-1000 + 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
+                return 1 /* DAL.ACCELEROMETER_EVT_TILT_UP */;
+            if (this.getY() > (1000 - 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
+                return 2 /* DAL.ACCELEROMETER_EVT_TILT_DOWN */;
+            if (this.getZ() < (-1000 + 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
+                return 5 /* DAL.ACCELEROMETER_EVT_FACE_UP */;
+            if (this.getZ() > (1000 - 200 /* DAL.ACCELEROMETER_TILT_TOLERANCE */))
+                return 6 /* DAL.ACCELEROMETER_EVT_FACE_DOWN */;
             return 0;
         }
         updateGesture() {
@@ -196,7 +196,7 @@ var pxsim;
             let g = this.instantaneousPosture();
             // Perform some low pass filtering to reduce jitter from any detected effects
             if (g == this.currentGesture) {
-                if (this.sigma < 5 /* ACCELEROMETER_GESTURE_DAMPING */)
+                if (this.sigma < 5 /* DAL.ACCELEROMETER_GESTURE_DAMPING */)
                     this.sigma++;
             }
             else {
@@ -204,9 +204,9 @@ var pxsim;
                 this.sigma = 0;
             }
             // If we've reached threshold, update our record and raise the relevant event...
-            if (this.currentGesture != this.lastGesture && this.sigma >= 5 /* ACCELEROMETER_GESTURE_DAMPING */) {
+            if (this.currentGesture != this.lastGesture && this.sigma >= 5 /* DAL.ACCELEROMETER_GESTURE_DAMPING */) {
                 this.lastGesture = this.currentGesture;
-                pxsim.board().bus.queue(13 /* DEVICE_ID_GESTURE */, this.lastGesture);
+                pxsim.board().bus.queue(13 /* DAL.DEVICE_ID_GESTURE */, this.lastGesture);
             }
         }
         /**
@@ -728,21 +728,21 @@ var pxsim;
             this.pressed = p;
             if (p) {
                 this._wasPressed = true;
-                pxsim.board().bus.queue(this.id, 1 /* DEVICE_BUTTON_EVT_DOWN */);
+                pxsim.board().bus.queue(this.id, 1 /* DAL.DEVICE_BUTTON_EVT_DOWN */);
                 this._pressedTime = pxsim.runtime.runningTime();
             }
             else if (this._pressedTime !== -1) {
-                pxsim.board().bus.queue(this.id, 2 /* DEVICE_BUTTON_EVT_UP */);
+                pxsim.board().bus.queue(this.id, 2 /* DAL.DEVICE_BUTTON_EVT_UP */);
                 const current = pxsim.runtime.runningTime();
-                if (current - this._pressedTime >= 1000 /* DEVICE_BUTTON_LONG_CLICK_TIME */) {
-                    pxsim.board().bus.queue(this.id, 4 /* DEVICE_BUTTON_EVT_LONG_CLICK */);
+                if (current - this._pressedTime >= 1000 /* DAL.DEVICE_BUTTON_LONG_CLICK_TIME */) {
+                    pxsim.board().bus.queue(this.id, 4 /* DAL.DEVICE_BUTTON_EVT_LONG_CLICK */);
                 }
                 else {
-                    pxsim.board().bus.queue(this.id, 3 /* DEVICE_BUTTON_EVT_CLICK */);
+                    pxsim.board().bus.queue(this.id, 3 /* DAL.DEVICE_BUTTON_EVT_CLICK */);
                 }
                 if (this._clickedTime !== -1) {
                     if (current - this._clickedTime <= DOUBLE_CLICK_TIME) {
-                        pxsim.board().bus.queue(this.id, 6 /* DEVICE_BUTTON_EVT_DOUBLE_CLICK */);
+                        pxsim.board().bus.queue(this.id, 6 /* DAL.DEVICE_BUTTON_EVT_DOUBLE_CLICK */);
                     }
                 }
                 this._clickedTime = current;
@@ -767,9 +767,9 @@ var pxsim;
             this.usesButtonAB = false;
             this.buttonsByPin = {};
             this.buttons = buttons || [
-                new CommonButton(1 /* DEVICE_ID_BUTTON_A */),
-                new CommonButton(2 /* DEVICE_ID_BUTTON_B */),
-                new CommonButton(3 /* DEVICE_ID_BUTTON_AB */)
+                new CommonButton(1 /* DAL.DEVICE_ID_BUTTON_A */),
+                new CommonButton(2 /* DAL.DEVICE_ID_BUTTON_B */),
+                new CommonButton(3 /* DAL.DEVICE_ID_BUTTON_AB */)
             ];
             this.buttons.forEach(btn => this.buttonsByPin[btn.id] = btn);
         }
@@ -966,10 +966,10 @@ var pxsim;
             this.state = state;
             switch (state) {
                 case ThresholdState.High:
-                    pxsim.board().bus.queue(this.id, 2 /* SENSOR_THRESHOLD_HIGH */);
+                    pxsim.board().bus.queue(this.id, 2 /* DAL.SENSOR_THRESHOLD_HIGH */);
                     break;
                 case ThresholdState.Low:
-                    pxsim.board().bus.queue(this.id, 1 /* SENSOR_THRESHOLD_LOW */);
+                    pxsim.board().bus.queue(this.id, 1 /* DAL.SENSOR_THRESHOLD_LOW */);
                     break;
                 case ThresholdState.Normal:
                     break;
@@ -1189,8 +1189,8 @@ var pxsim;
             const old = this.value;
             this.value = value;
             const b = pxsim.board();
-            if (b && this.eventMode == 2 /* DEVICE_PIN_EVENT_ON_EDGE */ && old != this.value)
-                b.bus.queue(this.id, this.value > 0 ? 2 /* DEVICE_PIN_EVT_RISE */ : 3 /* DEVICE_PIN_EVT_FALL */);
+            if (b && this.eventMode == 2 /* DAL.DEVICE_PIN_EVENT_ON_EDGE */ && old != this.value)
+                b.bus.queue(this.id, this.value > 0 ? 2 /* DAL.DEVICE_PIN_EVT_RISE */ : 3 /* DAL.DEVICE_PIN_EVT_FALL */);
         }
         digitalReadPin() {
             this.mode = PinFlags.Digital | PinFlags.Input;
@@ -1251,13 +1251,13 @@ var pxsim;
         onEvent(ev, handler) {
             const b = pxsim.board();
             switch (ev) {
-                case 4 /* DEVICE_PIN_EVT_PULSE_HI */:
-                case 5 /* DEVICE_PIN_EVT_PULSE_LO */:
-                    this.eventMode = 3 /* DEVICE_PIN_EVENT_ON_PULSE */;
+                case 4 /* DAL.DEVICE_PIN_EVT_PULSE_HI */:
+                case 5 /* DAL.DEVICE_PIN_EVT_PULSE_LO */:
+                    this.eventMode = 3 /* DAL.DEVICE_PIN_EVENT_ON_PULSE */;
                     break;
-                case 2 /* DEVICE_PIN_EVT_RISE */:
-                case 3 /* DEVICE_PIN_EVT_FALL */:
-                    this.eventMode = 2 /* DEVICE_PIN_EVENT_ON_EDGE */;
+                case 2 /* DAL.DEVICE_PIN_EVT_RISE */:
+                case 3 /* DAL.DEVICE_PIN_EVT_FALL */:
+                    this.eventMode = 2 /* DAL.DEVICE_PIN_EVENT_ON_EDGE */;
                     break;
                 default:
                     return;
@@ -2056,7 +2056,7 @@ var pxsim;
         */
         function onPulsed(name, high, body) {
             pxsim.pins.markUsed(name);
-            onEvent(name, high ? 4 /* DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DEVICE_PIN_EVT_PULSE_LO */, body);
+            onEvent(name, high ? 4 /* DAL.DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DAL.DEVICE_PIN_EVT_PULSE_LO */, body);
         }
         DigitalInOutPinMethods.onPulsed = onPulsed;
         function onEvent(name, ev, body) {
@@ -2071,7 +2071,7 @@ var pxsim;
         */
         function pulseIn(name, high, maxDuration = 2000000) {
             pxsim.pins.markUsed(name);
-            const pulse = high ? 4 /* DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DEVICE_PIN_EVT_PULSE_LO */;
+            const pulse = high ? 4 /* DAL.DEVICE_PIN_EVT_PULSE_HI */ : 5 /* DAL.DEVICE_PIN_EVT_PULSE_LO */;
             // Always return default value, can't simulate
             return 500;
         }
@@ -3066,10 +3066,10 @@ var pxsim;
             let b = pxsim.lightSensorState();
             b.setUsed();
             switch (condition) {
-                case 1 /* SENSOR_THRESHOLD_LOW */:
+                case 1 /* DAL.SENSOR_THRESHOLD_LOW */:
                     b.setLowThreshold(value);
                     break;
-                case 2 /* SENSOR_THRESHOLD_HIGH */:
+                case 2 /* DAL.SENSOR_THRESHOLD_HIGH */:
                     b.setHighThreshold(value);
                     break;
             }
@@ -3101,7 +3101,7 @@ var pxsim;
             if (!b)
                 return;
             b.setUsed();
-            pxsim.pxtcore.registerWithDal(b.id, 2 /* LEVEL_THRESHOLD_HIGH */, body);
+            pxsim.pxtcore.registerWithDal(b.id, 2 /* DAL.LEVEL_THRESHOLD_HIGH */, body);
         }
         input.onLoudSound = onLoudSound;
         function setLoudSoundThreshold(value) {
@@ -4457,7 +4457,7 @@ var pxsim;
             const rd = new Uint32Array(ca.buffer);
             const src = buf.data;
             if (48 != src.length)
-                pxsim.pxtrt.panic(911 /* PANIC_SCREEN_ERROR */);
+                pxsim.pxtrt.panic(911 /* pxsim.PXT_PANIC.PANIC_SCREEN_ERROR */);
             this.palette = new Uint32Array((src.length / 3) | 0);
             for (let i = 0; i < this.palette.length; ++i) {
                 const p = i * 3;
@@ -4810,10 +4810,10 @@ var pxsim;
                 return;
             }
             else if (left) {
-                pxsim.board().bus.queue(SlideSwitchState.id, 2 /* DEVICE_BUTTON_EVT_UP */);
+                pxsim.board().bus.queue(SlideSwitchState.id, 2 /* DAL.DEVICE_BUTTON_EVT_UP */);
             }
             else {
-                pxsim.board().bus.queue(SlideSwitchState.id, 1 /* DEVICE_BUTTON_EVT_DOWN */);
+                pxsim.board().bus.queue(SlideSwitchState.id, 1 /* DAL.DEVICE_BUTTON_EVT_DOWN */);
             }
             this.left = left;
         }
@@ -4951,7 +4951,7 @@ var pxsim;
             const t = unit == pxsim.TemperatureUnit.Celsius
                 ? temperature
                 : (((temperature - 32) * 10) / 18 >> 0);
-            if (condition === 2 /* LEVEL_THRESHOLD_HIGH */) {
+            if (condition === 2 /* DAL.LEVEL_THRESHOLD_HIGH */) {
                 b.setHighThreshold(t);
             }
             else {
@@ -5310,7 +5310,7 @@ var pxsim;
         }
         _wifi.eventID = eventID;
         function scanStart() {
-            _raiseEvent(1 /* ScanDone */);
+            _raiseEvent(1 /* WifiEvent.ScanDone */);
         }
         _wifi.scanStart = scanStart;
         function startLoginServer() {
@@ -5325,7 +5325,7 @@ var pxsim;
         }
         _wifi.scanResults = scanResults;
         function connect(ssid, pass) {
-            _raiseEvent(2 /* GotIP */);
+            _raiseEvent(2 /* WifiEvent.GotIP */);
             return 0;
         }
         _wifi.connect = connect;

package/built/sim.js

@@ -1,8 +1,10 @@
 var pxsim;
 (function (pxsim) {
+    // Keep in sync with pxt-common-packages/libs/game/keymap.ts
     let Key;
     (function (Key) {
         Key[Key["None"] = 0] = "None";
+        // Player 1
         Key[Key["Left"] = 1] = "Left";
         Key[Key["Up"] = 2] = "Up";
         Key[Key["Right"] = 3] = "Right";
@@ -10,58 +12,22 @@ var pxsim;
         Key[Key["A"] = 5] = "A";
         Key[Key["B"] = 6] = "B";
         Key[Key["Menu"] = 7] = "Menu";
-        // Player 2 keys here too
+        // Player 2 = Player 1 + 7
+        // Player 3 = Player 2 + 7
+        // Player 4 = Player 3 + 7
         // system keys
         Key[Key["Screenshot"] = -1] = "Screenshot";
         Key[Key["Gif"] = -2] = "Gif";
         Key[Key["Reset"] = -3] = "Reset";
         Key[Key["TogglePause"] = -4] = "TogglePause";
     })(Key = pxsim.Key || (pxsim.Key = {}));
-    function mapKey(which) {
-        switch (which) {
-            case 65: // A
-            case 37: // Left arrow
-                return Key.Left;
-            case 87: // W
-            case 38: // Up arrow
-                return Key.Up;
-            case 68: // D
-            case 39: // right arrow
-                return Key.Right;
-            case 83: // S
-            case 40: // down arrow
-                return Key.Down;
-            case 32: // Space
-            case 81: // Q
-            case 90: // Z
-                return Key.A;
-            case 13: // Enter
-            case 88: // X
-            case 69: // E
-                return Key.B;
-            // Player two (see the local-multiplayer package)
-            case 74: // J
-                return Key.Left + 7;
-            case 73: // I
-                return Key.Up + 7;
-            case 76: // L
-                return Key.Right + 7;
-            case 75: // K
-                return Key.Down + 7;
-            case 85: // U
-                return Key.A + 7;
-            case 79: // O
-                return Key.B + 7;
-            // system keys
-            // screenshot
-            case 80: // P
-                return Key.Screenshot;
-            case 82: // R
-                return Key.Gif;
-            default: return Key.None;
-        }
-    }
-    pxsim.mapKey = mapKey;
+    // Map of MouseEvent.button to keymap.KeyCode
+    // Values are from the `KeyCode` enum in pxt-common-packages/libs/game/keymap.ts
+    pxsim.MouseButtonToKeyCode = {
+        0: -1,
+        1: -3,
+        2: -2, // Right button
+    };
     function pauseAsync(ms) {
         return pxsim.U.delay(ms);
     }
@@ -230,6 +196,24 @@ var pxsim;
                 if (!document.hasFocus())
                     window.focus();
             };
+            window.onmousedown = function (e) {
+                const b = board();
+                if (b) {
+                    const keyCode = pxsim.MouseButtonToKeyCode[e.button];
+                    if (keyCode) {
+                        b.setKey(keyCode, true, e);
+                    }
+                }
+            };
+            window.onmouseup = function (e) {
+                const b = board();
+                if (b) {
+                    const keyCode = pxsim.MouseButtonToKeyCode[e.button];
+                    if (keyCode) {
+                        b.setKey(keyCode, false, e);
+                    }
+                }
+            };
             window.addEventListener("message", ev => {
                 if (ev.data.button !== undefined) {
                     let key;
@@ -339,6 +323,7 @@ var pxsim;
                 RADIO_EVT_DATAGRAM: DAL.DEVICE_RADIO_EVT_DATAGRAM
             });
             this.multiplayerState = new pxsim.MultiplayerState();
+            this.keymapState = new pxsim.KeymapState();
             const scale = (isEdge() || isIE()) ? 10 : 1;
             this.gameplayer = new pxsim.visuals.GamePlayer(scale);
             throttleAnimation(cb => this.screenState.onChange = cb, () => this.gameplayer.draw(this.screenState));
@@ -347,7 +332,7 @@ var pxsim;
             return undefined;
         }
         setKey(which, isPressed, e) {
-            let k = pxsim.mapKey(which);
+            let k = this.keymapState.getKey(which);
             if (k) {
                 this.setButton(k, isPressed);
                 e.preventDefault();
@@ -540,10 +525,10 @@ var pxsim;
             }
             buttonChanged(button, isPressed) {
                 switch (button) {
-                    case visuals.SimulatorButton.A:
+                    case pxsim.Key.A:
                         this.setButtonState(button, isPressed, true);
                         break;
-                    case visuals.SimulatorButton.B:
+                    case pxsim.Key.B:
                         this.setButtonState(button, isPressed, true);
                         break;
                     default:
@@ -570,16 +555,16 @@ var pxsim;
                 const dy = ((y - bounds.top) * (SVG_WIDTH / bounds.height));
                 const aDistance = Math.sqrt(Math.pow(dx - 30, 2) + Math.pow(dy - 15, 2));
                 const bDistance = Math.sqrt(Math.pow(dx - 15, 2) + Math.pow(dy - 28, 2));
-                this.setButtonState(visuals.SimulatorButton.A, aDistance < 8);
-                this.setButtonState(visuals.SimulatorButton.B, bDistance < 8);
+                this.setButtonState(pxsim.Key.A, aDistance < 8);
+                this.setButtonState(pxsim.Key.B, bDistance < 8);
                 pxsim.indicateFocus(true);
             }
             clearButtonPresses() {
-                this.setButtonState(visuals.SimulatorButton.A, false);
-                this.setButtonState(visuals.SimulatorButton.B, false);
+                this.setButtonState(pxsim.Key.A, false);
+                this.setButtonState(pxsim.Key.B, false);
             }
             setButtonState(button, pressed, quiet = false) {
-                const isAButton = button === visuals.SimulatorButton.A;
+                const isAButton = button === pxsim.Key.A;
                 const circle = isAButton ? this.aButton : this.bButton;
                 const label = isAButton ? this.aLabel : this.bLabel;
                 if (circle && label) {
@@ -589,9 +574,9 @@ var pxsim;
                 }
                 if (!quiet) {
                     if (pressed) {
-                        if (!this.buttonPressCount[visuals.SimulatorButton[button]])
-                            this.buttonPressCount[visuals.SimulatorButton[button]] = 0;
-                        this.buttonPressCount[visuals.SimulatorButton[button]] += 1;
+                        if (!this.buttonPressCount[pxsim.Key[button]])
+                            this.buttonPressCount[pxsim.Key[button]] = 0;
+                        this.buttonPressCount[pxsim.Key[button]] += 1;
                         visuals.pressButton(button);
                     }
                     else
@@ -721,15 +706,15 @@ var pxsim;
                 this.reset = document.getElementsByClassName("game-reset-button")[0];
                 if (this.menu) {
                     this.menu.onclick = () => {
-                        visuals.pressButton(visuals.SimulatorButton.Menu);
-                        visuals.releaseButton(visuals.SimulatorButton.Menu);
+                        visuals.pressButton(pxsim.Key.Menu);
+                        visuals.releaseButton(pxsim.Key.Menu);
                         pxsim.indicateFocus(true);
                     };
                 }
                 if (this.reset) {
                     this.reset.onclick = () => {
-                        visuals.pressButton(visuals.SimulatorButton.Reset);
-                        visuals.releaseButton(visuals.SimulatorButton.Reset);
+                        visuals.pressButton(pxsim.Key.Reset);
+                        visuals.releaseButton(pxsim.Key.Reset);
                     };
                 }
             }
@@ -860,16 +845,16 @@ var pxsim;
             }
             buttonChanged(button, isPressed) {
                 switch (button) {
-                    case visuals.SimulatorButton.Down:
+                    case pxsim.Key.Down:
                         this.updateDirection(this.dPadDown, isPressed);
                         break;
-                    case visuals.SimulatorButton.Up:
+                    case pxsim.Key.Up:
                         this.updateDirection(this.dPadUp, isPressed);
                         break;
-                    case visuals.SimulatorButton.Left:
+                    case pxsim.Key.Left:
                         this.updateDirection(this.dPadLeft, isPressed);
                         break;
-                    case visuals.SimulatorButton.Right:
+                    case pxsim.Key.Right:
                         this.updateDirection(this.dPadRight, isPressed);
                         break;
                     default:
@@ -1076,21 +1061,21 @@ var pxsim;
                                     break;
                             }
                             if (down)
-                                visuals.pressButton(visuals.SimulatorButton.Down);
+                                visuals.pressButton(pxsim.Key.Down);
                             else
-                                visuals.releaseButton(visuals.SimulatorButton.Down);
+                                visuals.releaseButton(pxsim.Key.Down);
                             if (up)
-                                visuals.pressButton(visuals.SimulatorButton.Up);
+                                visuals.pressButton(pxsim.Key.Up);
                             else
-                                visuals.releaseButton(visuals.SimulatorButton.Up);
+                                visuals.releaseButton(pxsim.Key.Up);
                             if (left)
-                                visuals.pressButton(visuals.SimulatorButton.Left);
+                                visuals.pressButton(pxsim.Key.Left);
                             else
-                                visuals.releaseButton(visuals.SimulatorButton.Left);
+                                visuals.releaseButton(pxsim.Key.Left);
                             if (right)
-                                visuals.pressButton(visuals.SimulatorButton.Right);
+                                visuals.pressButton(pxsim.Key.Right);
                             else
-                                visuals.releaseButton(visuals.SimulatorButton.Right);
+                                visuals.releaseButton(pxsim.Key.Right);
                         }
                     }
                 }
@@ -1103,10 +1088,10 @@ var pxsim;
                 return Math.sqrt(Math.pow(this.handleX - HALF_WIDTH, 2) + Math.pow(this.handleY - HALF_WIDTH, 2));
             }
             clearButtonPresses() {
-                visuals.releaseButton(visuals.SimulatorButton.Down);
-                visuals.releaseButton(visuals.SimulatorButton.Up);
-                visuals.releaseButton(visuals.SimulatorButton.Left);
-                visuals.releaseButton(visuals.SimulatorButton.Right);
+                visuals.releaseButton(pxsim.Key.Down);
+                visuals.releaseButton(pxsim.Key.Up);
+                visuals.releaseButton(pxsim.Key.Left);
+                visuals.releaseButton(pxsim.Key.Right);
                 this.lastOctet = undefined;
             }
             bindEvent(element, event, callback) {
@@ -1125,19 +1110,6 @@ var pxsim;
 (function (pxsim) {
     var visuals;
     (function (visuals) {
-        let SimulatorButton;
-        (function (SimulatorButton) {
-            SimulatorButton[SimulatorButton["Left"] = 1] = "Left";
-            SimulatorButton[SimulatorButton["Up"] = 2] = "Up";
-            SimulatorButton[SimulatorButton["Right"] = 3] = "Right";
-            SimulatorButton[SimulatorButton["Down"] = 4] = "Down";
-            SimulatorButton[SimulatorButton["A"] = 5] = "A";
-            SimulatorButton[SimulatorButton["B"] = 6] = "B";
-            SimulatorButton[SimulatorButton["Menu"] = 7] = "Menu";
-            // system keys
-            SimulatorButton[SimulatorButton["Reset"] = -3] = "Reset";
-            SimulatorButton[SimulatorButton["TogglePause"] = -4] = "TogglePause";
-        })(SimulatorButton = visuals.SimulatorButton || (visuals.SimulatorButton = {}));
         function pressButton(button) {
             pxsim.board().handleKeyEvent(button, true);
         }
@@ -2107,7 +2079,7 @@ var pxsim;
             const rd = new Uint32Array(ca.buffer);
             const src = buf.data;
             if (48 != src.length)
-                pxsim.pxtrt.panic(911 /* PANIC_SCREEN_ERROR */);
+                pxsim.pxtrt.panic(911 /* pxsim.PXT_PANIC.PANIC_SCREEN_ERROR */);
             this.palette = new Uint32Array((src.length / 3) | 0);
             for (let i = 0; i < this.palette.length; ++i) {
                 const p = i * 3;