rapid-router 5.18.0__py2.py3-none-any.whl → 7.6.8__py2.py3-none-any.whl

game/static/game/js/blockly/msg/js/ru.js

@@ -433,4 +433,55 @@ Blockly.Msg["VARIABLES_HUE"] = "330";
 Blockly.Msg["TEXTS_HUE"] = "160";
 Blockly.Msg["PROCEDURES_HUE"] = "290";
 Blockly.Msg["COLOUR_HUE"] = "20";
-Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+
+Blockly.Msg["START_TITLE"] = "Начало";
+Blockly.Msg["START_TOOLTIP"] = "Начало программы"
+Blockly.Msg["MOVE_FORWARDS_TITLE"] = "Ехать вперед";
+Blockly.Msg["MOVE_FORWARDS_TOOLTIP"] = "переместить грузовик вперед";
+Blockly.Msg["TURN_LEFT_TITLE"] = "Повернуть налево";
+Blockly.Msg["TURN_LEFT_TOOLTIP"] = "повернуть грузовик налево";
+Blockly.Msg["TURN_RIGHT_TITLE"] = "Повернуть направо";
+Blockly.Msg["TURN_RIGHT_TOOLTIP"] = "повернуть грузовик направо";
+Blockly.Msg["TURN_AROUND_TITLE"] = "Развернуться";
+Blockly.Msg["TURN_AROUND_TOOLTIP"] = "развернуть грузови";
+
+Blockly.Msg["WAIT_TITLE"] = "Подождать";
+Blockly.Msg["WAIT_TOOLTIP"] = "оставить грузовик на месте";
+Blockly.Msg["DELIVER_TITLE"] = "Доставить";
+Blockly.Msg["DELIVER_TOOLTIP"] = "доставить товары из грузовика";
+Blockly.Msg["SOUND_HORN_TITLE"] = "Подать сигнал";
+Blockly.Msg["SOUND_HORN_TOOLTIP"] = "просигналить, чтобы спугнуть коров";
+
+Blockly.Msg["ROAD_EXISTS_FORWARD_TITLE"] = "Есть путь впереди";
+Blockly.Msg["ROAD_EXISTS_LEFT_TITLE"] = "Есть путь слева";
+Blockly.Msg["ROAD_EXISTS_RIGHT_TITLE"] = "Есть путь справа";
+Blockly.Msg["TRAFFIC_LIGHT_RED_TITLE"] = "Светофор красный";
+Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = "Светофор зеленый";
+Blockly.Msg["DEAD_END_TITLE"] = "Тупик";
+Blockly.Msg["AT_DESTINATION_TITLE"] = "В пункте назначения";
+Blockly.Msg["COW_CROSSING_TITLE"] = "Коровы";
+Blockly.Msg["PIGEON_CROSSING_TITLE"] = "Голуби";
+
+Blockly.Msg["CALL_PROC_TITLE"] = "Вызвать";
+Blockly.Msg["CALL_PROC_TOOLTIP"] = "вызывает процедуру";
+Blockly.Msg["DECLARE_PROC_TITLE"] = "Определить";
+Blockly.Msg["DECLARE_PROC_SUBTITLE"] = "выполнять";
+Blockly.Msg["DECLARE_PROC_TOOLTIP"] = "определяет процедуру";
+Blockly.Msg["CONTROLS_REPEAT_WHILE_TITLE"] = "Повторять пока";
+Blockly.Msg["CONTROLS_REPEAT_WHILE_SUBTITLE"] = "выполнять";
+Blockly.Msg["CONTROLS_REPEAT_WHILE_TOOLTIP"] = "пока значение истинно, выполнять инструкции";
+Blockly.Msg["CONTROLS_REPEAT_UNTIL_TITLE"] = "Повторять до тех пор, пока";
+Blockly.Msg["CONTROLS_REPEAT_UNTIL_SUBTITLE"] = "выполнять";
+Blockly.Msg["CONTROLS_REPEAT_UNTIL_TOOLTIP"] = "выполнять инструкции до тех пор, пока";
+
+Blockly.Msg["VARIABLES_GET_TOOLTIP"] = "переменная";
+Blockly.Msg["VARIABLES_SET_TITLE"] = "Присвоить";
+Blockly.Msg["VARIABLES_SET_SUBTITLE"] = "значение";
+Blockly.Msg["VARIABLES_SET_TOOLTIP"] = "присвоить переменной значение";
+Blockly.Msg["VARIABLES_NUMERIC_SET_TOOLTIP"] = "присвоить переменной число";
+Blockly.Msg["VARIABLES_INCREMENT_TITLE"] = "Увеличить";
+Blockly.Msg["VARIABLES_INCREMENT_SUBTITLE"] = "на";
+Blockly.Msg["VARIABLES_INCREMENT_TOOLTIP"] = "увеличить переменную";
+Blockly.Msg["NUMBER_TITLE"] = "Число";
+Blockly.Msg["NUMBER_TOOLTIP"] = "число";

game/static/game/js/blockly/msg/js/ur.js

@@ -433,4 +433,55 @@ Blockly.Msg["VARIABLES_HUE"] = "330";
 Blockly.Msg["TEXTS_HUE"] = "160";
 Blockly.Msg["PROCEDURES_HUE"] = "290";
 Blockly.Msg["COLOUR_HUE"] = "20";
-Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+
+Blockly.Msg["START_TITLE"] = "شروع کریں";
+Blockly.Msg["START_TOOLTIP"] = "پروگرام کا آغاز"
+Blockly.Msg["MOVE_FORWARDS_TITLE"] = "آگے بڑھیں";
+Blockly.Msg["MOVE_FORWARDS_TOOLTIP"] = "وین کو آگے بڑھائیں";
+Blockly.Msg["TURN_LEFT_TITLE"] = "بائیں مڑیں";
+Blockly.Msg["TURN_LEFT_TOOLTIP"] = "وین بائیں مڑیں";
+Blockly.Msg["TURN_RIGHT_TITLE"] = "دائیں مڑیں";
+Blockly.Msg["TURN_RIGHT_TOOLTIP"] = "وین کو دائیں مڑیں";
+Blockly.Msg["TURN_AROUND_TITLE"] = "مڑیں";
+Blockly.Msg["TURN_AROUND_TOOLTIP"] = "وین کو گھمایں";
+
+Blockly.Msg["WAIT_TITLE"] = "انتظار کریں";
+Blockly.Msg["WAIT_TOOLTIP"] = "وین کو روکے رکھیں";
+Blockly.Msg["DELIVER_TITLE"] = "سامان پہنچایں";
+Blockly.Msg["DELIVER_TOOLTIP"] = "وین سے سامان پہنچایں";
+Blockly.Msg["SOUND_HORN_TITLE"] = "ہارن بجایں";
+Blockly.Msg["SOUND_HORN_TOOLTIP"] = "گائے بھینسوں";
+
+Blockly.Msg["ROAD_EXISTS_FORWARD_TITLE"] = ""; // ?
+Blockly.Msg["ROAD_EXISTS_LEFT_TITLE"] = ""; // ?
+Blockly.Msg["ROAD_EXISTS_RIGHT_TITLE"] = ""; // ?
+Blockly.Msg["TRAFFIC_LIGHT_RED_TITLE"] = ""; // ?
+Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = ""; // ?
+Blockly.Msg["DEAD_END_TITLE"] = "ٹریفک لائٹ سرخ/سبز";
+Blockly.Msg["AT_DESTINATION_TITLE"] = "آگے راستہ بند ہے";
+Blockly.Msg["COW_CROSSING_TITLE"] = "منزل پر پہنچ گئے";
+Blockly.Msg["PIGEON_CROSSING_TITLE"] = ""; // untranslated
+
+Blockly.Msg["CALL_PROC_TITLE"] = ""; // ?
+Blockly.Msg["CALL_PROC_TOOLTIP"] = ""; // ?
+Blockly.Msg["DECLARE_PROC_TITLE"] = "";
+Blockly.Msg["DECLARE_PROC_SUBTITLE"] = ""; // ?
+Blockly.Msg["DECLARE_PROC_TOOLTIP"] = ""; // ?
+Blockly.Msg["CONTROLS_REPEAT_WHILE_TITLE"] = ""; // ?
+Blockly.Msg["CONTROLS_REPEAT_WHILE_SUBTITLE"] = ""; // ?
+Blockly.Msg["CONTROLS_REPEAT_WHILE_TOOLTIP"] = ""; // ?
+Blockly.Msg["CONTROLS_REPEAT_UNTIL_TITLE"] = ""; // ?
+Blockly.Msg["CONTROLS_REPEAT_UNTIL_SUBTITLE"] = ""; // ?
+Blockly.Msg["CONTROLS_REPEAT_UNTIL_TOOLTIP"] = ""; // ?
+
+Blockly.Msg["VARIABLES_GET_TOOLTIP"] = "";  // ?
+Blockly.Msg["VARIABLES_SET_TITLE"] = ""; // ?
+Blockly.Msg["VARIABLES_SET_SUBTITLE"] = ""; // ?
+Blockly.Msg["VARIABLES_SET_TOOLTIP"] = ""; // ?
+Blockly.Msg["VARIABLES_NUMERIC_SET_TOOLTIP"] = ""; // ?
+Blockly.Msg["VARIABLES_INCREMENT_TITLE"] = ""; // ?
+Blockly.Msg["VARIABLES_INCREMENT_SUBTITLE"] = ""; // ?
+Blockly.Msg["VARIABLES_INCREMENT_TOOLTIP"] = ""; // ?
+Blockly.Msg["NUMBER_TITLE"] = ""; // ?
+Blockly.Msg["NUMBER_TOOLTIP"] = ""; // ?

game/static/game/js/blocklyCustomBlocks.js

@@ -16,14 +16,15 @@ function initCustomBlocksDescription() {
       this.setColour(50);
       this.appendDummyInput()
         .appendField(Blockly.Msg.START_TITLE)
-        .appendField(new Blockly.FieldImage(
-          new Date().getMonth() === 11 && CHARACTER_NAME === "Van"
-            ? ocargo.Drawing.imageDir + "characters/top_view/Sleigh.svg"
-            : ocargo.Drawing.imageDir + CHARACTER_EN_FACE_URL,
-          ocargo.BlocklyControl.BLOCK_CHARACTER_HEIGHT,
-          ocargo.BlocklyControl.BLOCK_CHARACTER_WIDTH
-        )
-      );
+        .appendField(
+          new Blockly.FieldImage(
+            new Date().getMonth() === 11 && CHARACTER_NAME === "Van"
+              ? ocargo.Drawing.imageDir + "characters/top_view/Sleigh.svg"
+              : ocargo.Drawing.imageDir + CHARACTER_EN_FACE_URL,
+            ocargo.BlocklyControl.BLOCK_CHARACTER_HEIGHT,
+            ocargo.BlocklyControl.BLOCK_CHARACTER_WIDTH
+          )
+        );
       this.setNextStatement(true, "Action");
       this.setTooltip(Blockly.Msg.START_TOOLTIP);
       this.setDeletable(false);
@@ -183,22 +184,30 @@ function initCustomBlocksDescription() {
     },
   };
 
-    Blockly.Blocks['sound_horn'] = {
-        init: function() {
-            this.setColour(160);
-            this.appendDummyInput()
-                .appendField(Blockly.Msg.SOUND_HORN_TITLE)
-                .appendField(new Blockly.FieldImage(ocargo.Drawing.imageDir + 'empty.svg',
-                    43,
-                    ocargo.BlocklyControl.BLOCK_HEIGHT))
-                .appendField(new Blockly.FieldImage(ocargo.Drawing.imageDir + 'empty.svg',
-                    ocargo.BlocklyControl.IMAGE_WIDTH,
-                    ocargo.BlocklyControl.BLOCK_HEIGHT));
-            this.setPreviousStatement(true, 'Action');
-            this.setNextStatement(true, 'Action');
-            this.setTooltip(Blockly.Msg.SOUND_HORN_TOOLTIP);
-        }
-    };
+  Blockly.Blocks["sound_horn"] = {
+    init: function () {
+      this.setColour(160);
+      this.appendDummyInput()
+        .appendField(Blockly.Msg.SOUND_HORN_TITLE)
+        .appendField(
+          new Blockly.FieldImage(
+            ocargo.Drawing.imageDir + "empty.svg",
+            43,
+            ocargo.BlocklyControl.BLOCK_HEIGHT
+          )
+        )
+        .appendField(
+          new Blockly.FieldImage(
+            ocargo.Drawing.imageDir + "empty.svg",
+            ocargo.BlocklyControl.IMAGE_WIDTH,
+            ocargo.BlocklyControl.BLOCK_HEIGHT
+          )
+        );
+      this.setPreviousStatement(true, "Action");
+      this.setNextStatement(true, "Action");
+      this.setTooltip(Blockly.Msg.SOUND_HORN_TOOLTIP);
+    },
+  };
 
   /*****************/
   /*   Conditions  */
@@ -277,20 +286,50 @@ function initCustomBlocksDescription() {
     },
   };
 
-    Blockly.Blocks['cow_crossing'] = {
-        init: function() {
-            this.setColour(210);
-            this.setOutput(true, 'Boolean');
-            this.appendDummyInput()
-                .appendField(Blockly.Msg.COW_CROSSING_TITLE)
-                .appendField(new Blockly.FieldImage(ocargo.Drawing.imageDir + ocargo.Drawing.whiteCowUrl,
-                    ocargo.BlocklyControl.COW_WIDTH,
-                    ocargo.BlocklyControl.BLOCK_HEIGHT), 'IMAGE');
-        }
-    };
-    /****************/
-    /*  Procedures  */
-    /****************/
+  Blockly.Blocks["cow_crossing"] = {
+    init: function () {
+      this.setColour(210);
+      this.setOutput(true, "Boolean");
+      let imageUrl =
+        ocargo.Drawing.animalType == ocargo.Cow.PIGEON
+          ? ocargo.Drawing.pigeonUrl
+          : ocargo.Drawing.whiteCowUrl;
+      this.appendDummyInput()
+        .appendField(
+          ocargo.Drawing.animalType == ocargo.Cow.PIGEON
+            ? Blockly.Msg.PIGEON_CROSSING_TITLE
+            : Blockly.Msg.COW_CROSSING_TITLE
+        )
+        .appendField(
+          new Blockly.FieldImage(
+            ocargo.Drawing.imageDir + imageUrl,
+            ocargo.BlocklyControl.COW_WIDTH,
+            ocargo.BlocklyControl.BLOCK_HEIGHT
+          ),
+          "IMAGE"
+        );
+    },
+  };
+
+  Blockly.Blocks["pigeon_crossing_IMAGE_ONLY"] = {
+    init: function () {
+      this.setColour(210);
+      this.setOutput(true, "Boolean");
+      this.appendDummyInput()
+        .appendField("pigeons")
+        .appendField(
+          new Blockly.FieldImage(
+            ocargo.Drawing.imageDir + ocargo.Drawing.pigeonUrl,
+            ocargo.BlocklyControl.COW_WIDTH,
+            ocargo.BlocklyControl.BLOCK_HEIGHT
+          ),
+          "IMAGE"
+        );
+    },
+  };
+  /****************/
+  /*  Procedures  */
+  /****************/
 
   Blockly.Blocks["call_proc"] = {
     // Block for calling a defined procedure
@@ -323,7 +362,7 @@ function initCustomBlocksDescription() {
         .appendField(new Blockly.FieldTextInput(name), "NAME");
       this.appendStatementInput("DO")
         .setCheck("Action")
-        .appendField(gettext("Do"));
+        .appendField(Blockly.Msg.DECLARE_PROC_SUBTITLE);
       this.setTooltip(Blockly.Msg.DECLARE_PROC_TOOLTIP);
       this.statementConnection_ = null;
     },
@@ -546,22 +585,21 @@ function initCustomBlocksPython() {
     return "my_van.wait()\n";
   };
 
-    Blockly.Python['deliver'] = function(block) {
-        return 'my_van.deliver()\n';
-    };
-
-    Blockly.Python['sound_horn'] = function(block) {
-        return 'my_van.sound_horn()\n';
-    };
+  Blockly.Python["deliver"] = function (block) {
+    return "my_van.deliver()\n";
+  };
 
+  Blockly.Python["sound_horn"] = function (block) {
+    return "my_van.sound_horn()\n";
+  };
 
   Blockly.Python["road_exists"] = function (block) {
     if (block.inputList[0].fieldRow[1].value_ === "FORWARD") {
-      var python = "my_van.is_road('FORWARD')";
+      var python = "my_van.is_road_forward()";
     } else if (block.inputList[0].fieldRow[1].value_ === "LEFT") {
-      var python = "my_van.is_road('LEFT')";
+      var python = "my_van.is_road_left()";
     } else {
-      var python = "my_van.is_road('RIGHT')";
+      var python = "my_van.is_road_right()";
     }
 
     return [python, Blockly.Python.ORDER_NONE];
@@ -571,9 +609,9 @@ function initCustomBlocksPython() {
   Blockly.Python["traffic_light"] = function (block) {
     var python;
     if (block.inputList[0].fieldRow[1].value_ === ocargo.TrafficLight.RED) {
-      python = "my_van.at_traffic_light('RED')";
+      python = "my_van.is_red_traffic_light()";
     } else {
-      python = "my_van.at_traffic_light('GREEN')";
+      python = "my_van.is_green_traffic_light()";
     }
 
     return [python, Blockly.Python.ORDER_NONE]; //TODO: figure out what this ordering relates to
@@ -585,7 +623,7 @@ function initCustomBlocksPython() {
   };
 
   Blockly.Python["cow_crossing"] = function (block) {
-    return ["my_van.cow_crossing()", Blockly.Python.ORDER_NONE];
+    return ["my_van.is_animal_crossing()", Blockly.Python.ORDER_NONE];
     // TODO: figure out what this ordering relates to
   };
 
@@ -615,6 +653,9 @@ function initCustomBlocksPython() {
       "condition",
       Blockly.Python.ORDER_ATOMIC
     );
+
+    condition = condition.replace(/\((.*)\)/, "$1");
+
     var subBlock = Blockly.Python.statementToCode(block, "body");
     var code = "while " + condition + ":\n" + subBlock;
     return code;

game/static/game/js/button.js

@@ -14,6 +14,18 @@ ocargo.button.redirectButtonHtml = function(id, location, label){
     return Handlebars.templates['button-redirect']({id: id, location: location, label: label});
 };
 
+// Returns the html code for a button which redirects to a given episode on the level selection page
+ocargo.button.episodeRedirectButtonHtml = function(id, location, label, next_episode){
+    return `<button id="${id}" class="navigation_button long_button" 
+                onclick="function onClick() {
+                            window.location.href='${location}'; 
+                            localStorage.setItem('currentEpisode', '${next_episode}');
+                        }; 
+                        onClick()">
+                <span>${label}</span>
+            </button>`
+}
+
 // Returns the html code for a button which shows the try again message and closes the popup
 ocargo.button.tryAgainButtonHtml = function(){
     return ocargo.button.dismissButtonHtml('try_again_button', gettext('Try again'));

game/static/game/js/cow.js

@@ -8,12 +8,15 @@ ocargo.Cow = function(id, data, nodes) {
     this.type = data.type;
     this.potentialNodes = [];    // Potential nodes at which a cow could appear
     this.activeNodes = {};       // Actual nodes at which cows will appear during a run.
+    this.coordinates = [];       // coordinates of the cows, some cows may have null nodes that denotes they are outside of road
+
     for(var i = 0; i < data.potentialCoordinates.length; i++) {
         var coordinate = new ocargo.Coordinate(data.potentialCoordinates[i].x, data.potentialCoordinates[i].y);
-        var node = ocargo.Node.findNodeByCoordinate(coordinate, nodes)
-        this.potentialNodes.push(ocargo.Node.findNodeByCoordinate(coordinate, nodes));
-        var coordinate_str = JSON.stringify(node.coordinate)
-        this.activeNodes[coordinate_str] = ocargo.Cow.ACTIVE
+        var node = ocargo.Node.findNodeByCoordinate(coordinate, nodes);
+        this.potentialNodes.push(node);
+        var coordinate_str = JSON.stringify(coordinate);
+        this.activeNodes[coordinate_str] = ocargo.Cow.ACTIVE;
+        this.coordinates.push(coordinate);
     }
 };
 ocargo.Cow.prototype.reset = function() {
@@ -26,14 +29,14 @@ ocargo.Cow.prototype.reset = function() {
 ocargo.Cow.prototype.queueLeaveAnimation = function(model, node) {
     ocargo.animation.appendAnimation({
         type: 'callable',
-        functionCall: ocargo.sound.cow,
-        description: 'cow sound'
+        functionCall: this.type == ocargo.Cow.PIGEON ? ocargo.sound.pigeon : ocargo.sound.cow,
+        description: 'animal sound'
     });
     ocargo.animation.appendAnimation({
         type: 'cow_leave',
         id: this.id,
         coordinate: node.coordinate,
-        description: 'Cow leaving'
+        description: 'animal leaving'
     });
 };
 
@@ -49,3 +52,4 @@ ocargo.Cow.ACTIVE = 'ACTIVE';
 ocargo.Cow.INACTIVE = 'INACTIVE';
 ocargo.Cow.WHITE = 'WHITE';
 ocargo.Cow.BROWN = 'BROWN';
+ocargo.Cow.PIGEON = 'PIGEON';

game/static/game/js/drawing.js

@@ -10,12 +10,15 @@ let PAPER_HEIGHT = GRID_SPACE_SIZE * GRID_HEIGHT
 let PAPER_PADDING = 30
 let EXTENDED_PAPER_WIDTH = PAPER_WIDTH + 2 * PAPER_PADDING
 let EXTENDED_PAPER_HEIGHT = PAPER_WIDTH + 2 * PAPER_PADDING
+let SEMI_EXTENDED_PAPER_HEIGHT = PAPER_HEIGHT + 2 * PAPER_PADDING
 
 let DEFAULT_CHARACTER_WIDTH = 40
 let DEFAULT_CHARACTER_HEIGHT = 20
 
 let COW_WIDTH = 80
 let COW_HEIGHT = 80
+const TRAFFIC_LIGHT_WIDTH = 30
+const TRAFFIC_LIGHT_HEIGHT = 80
 
 let zoom = 15
 
@@ -454,7 +457,7 @@ ocargo.Drawing = function (startingPosition) {
 
     let path = ocargo.Drawing.raphaelImageDir + 'road_tiles/'
 
-    path += CHARACTER_NAME === 'Van' ? 'road/' : 'path/'
+    path += (CHARACTER_NAME === 'Van' || CHARACTER_NAME === "Electric van") ? 'road/' : 'path/'
 
     roadImages = []
     for (let i = 0; i < nodes.length; i++) {
@@ -750,8 +753,11 @@ ocargo.Drawing = function (startingPosition) {
     let xOffset = 0
     let yOffset = 0
     let rotation = 0
-
-    if (node.connectedNodes.length === 1) {
+    if (node == null) { 
+      // the cow is outside of road
+      rotation = 0
+    }
+    else if (node.connectedNodes.length === 1) {
       // Deadends
       let previousNode = node.connectedNodes[0]
       let nextNode = {}
@@ -976,7 +982,7 @@ ocargo.Drawing = function (startingPosition) {
   }
 
   this.wait = function (duration, callback) {
-    character.wait(duration, callback)
+    character.wait(duration, callback);
   }
 
   this.deliver = function (destinationId, duration) {
@@ -1015,10 +1021,10 @@ ocargo.Drawing.translate = function (coordinate) {
 
 // A Function used to stop the iframe video
 function stopVideo() {
-  // https://gist.github.com/cferdinandi/9044694
-  const video = document.getElementsByClassName("video");
-  const iframeSrc = video[0].src;
-  video[0].src = iframeSrc;
+  // // https://gist.github.com/cferdinandi/9044694
+  const video = document.getElementsByTagName("video");
+  const videoSrc = video[0].src;
+  video[0].src = videoSrc;
 }
 
 /*
@@ -1036,28 +1042,31 @@ ocargo.Drawing.startPopup = function (
   title,
   subtitle,
   message,
-  mascot,
+  showMascot,
   buttons
 ) {
   $('#myModal-title').html(title)
   $('#myModal-lead').html(subtitle)
   $('#myModal-mainText').html(message)
 
-  $('#modal-mascot').hide()
-  $('#modal-mascot--brain').hide()
+  const mascot = $('#modal-mascot')
+  const brain = $('#modal-mascot--brain')
+
+  mascot.hide()
+  brain.hide()
 
-  if (mascot) {
+  if (showMascot) {
     if (EPISODE === 9) {
-      $('#modal-mascot--brain').show()
+      brain.show()
     }
     else {
-      $('#modal-mascot').show()
+      mascot.show()
     }
   }
 
-  const youtubeVideo = $("iframe")
-  if (youtubeVideo[0]) {
-    $("#modal-mascot").hide()
+  const video = $("video")
+  if (video) {
+    mascot.hide()
   }
 
   // create a wrapper for the buttons that will be appended
@@ -1081,7 +1090,7 @@ ocargo.Drawing.startPopup = function (
 
     const regexID = /id=\"*\w+_\w+\"/
 
-    // Close the video on pressing the top right close button 
+    // Close the video on pressing the top right close button
     $("#close-modal").click(function () {
       stopVideo();
     });
@@ -1094,11 +1103,13 @@ ocargo.Drawing.startPopup = function (
       let classToBeAdded = currentID === "play_button" ? "navigation_button_portal long_button rapid-router-welcome" : "navigation_button_portal_secondary long_button rapid-router-welcome button--icon"
 
       currentButton.removeClass().addClass(classToBeAdded)
-      if (currentID != "play_button") {
+      if (currentID !== "play_button") {
         // adding links to buttons
         currentButton.append(icons[i])
         let currentLink = links[i] === "" ? "" : `window.location.replace('${links[i]}')`
-        currentButton.attr("onclick", currentLink)
+        if (!(currentID === "next_button" && NEXT_LEVEL_URL === "/pythonden/")) {
+          currentButton.attr("onclick", currentLink);   
+        }
       }
 
       // Close the video on the play button
@@ -1125,6 +1136,14 @@ ocargo.Drawing.startPopup = function (
     editButton.removeClass().addClass("navigation_button_portal long_button rapid-router-welcome")
     buttonDiv.append(editButton)
 
+    let yesButton = $("#yes_button")
+    yesButton.removeClass().addClass("navigation_button_portal long_button rapid-router-welcome")
+    buttonDiv.append(yesButton)
+
+    let noButton = $("#no_button")
+    noButton.removeClass().addClass("navigation_button_portal long_button rapid-router-welcome")
+    buttonDiv.append(noButton)
+
     let nextLevelButton = $("#next_level_button")
     nextLevelButton.removeClass().addClass("navigation_button_portal_secondary long_button rapid-router-welcome button--icon")
     nextLevelButton.append(icons[2])
@@ -1135,6 +1154,10 @@ ocargo.Drawing.startPopup = function (
     playButton.append(icons[2])
     buttonDiv.append(playButton)
 
+    let hintPopupButton = $("#hintPopupBtn")
+    hintPopupButton.removeClass().addClass("navigation_button_portal long_button")
+    buttonDiv.append(hintPopupButton)
+
     $("#modal-buttons").html(buttonDiv)
   } else {
     $('#modal-buttons').html(
@@ -1147,11 +1170,19 @@ ocargo.Drawing.startPopup = function (
     $("#modal-buttons").html(buttonDiv)
   }
   // Show popup
-  $("#myModal").show()
-  $("#ocargo-modal").show()
-  window.location.hash = 'myModal'
+  $("#myModal").addClass("show");
+  $("#ocargo-modal").addClass("show");
+}
+
+var hideModal = function() {
+  $("#myModal").removeClass("show");
+  $("#ocargo-modal").removeClass("show");
 }
 
+$("#close-modal").on('click', function() {
+  hideModal();
+})
+
 // This is the function that starts the pop-up with a yes and a no button
 ocargo.Drawing.startYesNoPopup = function (
   title,
@@ -1159,13 +1190,15 @@ ocargo.Drawing.startYesNoPopup = function (
   message,
   yesFunction,
   noFunction,
-  mascot
+  showMascot
 ) {
-  let buttonHtml =
-    '<button id="modal-yesBtn" class="navigation_button long_button">Yes</button> <button id="modal-noBtn" class="navigation_button long_button">No</button>'
-  ocargo.Drawing.startPopup(title, subtitle, message, mascot, buttonHtml)
-  $('#modal-yesBtn').click(yesFunction)
-  $('#modal-noBtn').click(noFunction)
+  let buttons = '';
+  buttons += ocargo.button.dismissButtonHtml("yes_button", "Yes");
+  buttons += ocargo.button.dismissButtonHtml("no_button", "No");
+
+  ocargo.Drawing.startPopup(title, subtitle, message, showMascot, buttons)
+  $('#yes_button').click(yesFunction)
+  $('#no_button').click(noFunction)
 }
 
 // This is the function that starts the pop-up when there is no internet connection while playing the game
@@ -1214,11 +1247,14 @@ ocargo.Drawing.renderCoins = function (coins) {
 }
 
 ocargo.Drawing.cowUrl = function (type) {
+  ocargo.Drawing.animalType = type;
   switch (type) {
     case ocargo.Cow.WHITE:
       return ocargo.Drawing.whiteCowUrl
     case ocargo.Cow.BROWN:
       return ocargo.Drawing.brownCowUrl
+    case ocargo.Cow.PIGEON:
+      return ocargo.Drawing.pigeonUrl
     default:
       return ocargo.Drawing.whiteCowUrl
   }
@@ -1262,6 +1298,9 @@ ocargo.Drawing.TOP_VIEW = 'top_view'
 
 ocargo.Drawing.whiteCowUrl = 'Clarice.svg'
 ocargo.Drawing.brownCowUrl = 'Clarice_Jersey.svg'
+ocargo.Drawing.pigeonUrl = 'pigeon.svg'
 
 ocargo.Drawing.imageDir = '/static/game/image/'
 ocargo.Drawing.raphaelImageDir = '/static/game/raphael_image/'
+
+ocargo.Drawing.animalType = 'WHITE'

game/static/game/js/editor.js

@@ -0,0 +1,23 @@
+$(document).ready(function () {
+    let shadowRoot = $("editor-wc")[0].shadowRoot;
+
+    // Set editor height and margin
+    $(shadowRoot).find("#root").css("height", "100%");
+    $(shadowRoot).find(".proj-container").css("margin", "0 10px 0 0");
+
+    // Fix project bar height
+    $(shadowRoot).find(".project-bar").css("block-size", "auto");
+
+    // Focus on text output tab
+    $(shadowRoot).find(".react-tabs__tab-text").click();
+
+    // Remove visual output and split view tabs
+    $(shadowRoot).find("#react-tabs-4").hide();
+    $(shadowRoot).find(".output-view-toggle").hide();
+
+    // Make editor font size not small
+    $(shadowRoot).find(".editor").removeClass("editor--small");
+
+    // Ensure window doesn't scroll to bottom of page
+    window.scrollTo(0, 0);
+});