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

game/static/game/js/blocklyCustomisations.js

@@ -5,6 +5,7 @@ var ocargo = ocargo || {};
 ocargo.BlocklyCustomisations = function () {
 
     const TOOLBOX_REMAINING_CAPACITY_TEXT_COLUMN_WIDTH = 50;
+    const QUANTITY_TEXT_OFFSET = 35;
 
     var limitedBlocks = false;
     var blockCount = {};
@@ -94,6 +95,7 @@ ocargo.BlocklyCustomisations = function () {
             flyoutWidth *= this.workspace_.scale;
             flyoutWidth += Blockly.Scrollbar.scrollbarThickness;
             flyoutWidth += TOOLBOX_REMAINING_CAPACITY_TEXT_COLUMN_WIDTH;
+            flyoutWidth += 50;
 
             if (this.width_ != flyoutWidth) {
                 for (var i = 0, block; block = blocks[i]; i++) {
@@ -173,7 +175,7 @@ ocargo.BlocklyCustomisations = function () {
                         var attributes = {
                             'width': 30,
                             'height': 30,
-                            'x': this.width_ - TOOLBOX_REMAINING_CAPACITY_TEXT_COLUMN_WIDTH,
+                            'x': blockHW.width + QUANTITY_TEXT_OFFSET,
                             'y': cursorY + 22,
                             'class': 'quantity_text',
                             'value': block.type

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,163 +8,48 @@ 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);
-        this.potentialNodes.push(ocargo.Node.findNodeByCoordinate(coordinate, nodes));
-    }
-
-    if ('minCows' in data) {
-        this.minCows = data.minCows; // Minimum number of cows to appear on the potential nodes during a run
-    }
-
-    if ('maxCows' in data) {
-        this.maxCows = data.maxCows; // Maximum number of cows to appear on the potential nodes during a run
-    }
-
-    this.chooseNewCowPositions(); // init simulation fields
-};
-
-ocargo.Cow.prototype.pickRandom = function (count, arr) {
-    var out = [], i, pick, clone = arr.slice(0, arr.length);
-    for (i = 0; i < count; i ++) {
-        pick = Math.floor(Math.random() * clone.length);
-        if (clone[pick] !== undefined) {
-            out.push(clone[pick]);
-            clone.splice(pick, 1);
-        }
+        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);
     }
-    return out;
 };
-
 ocargo.Cow.prototype.reset = function() {
-    this.activeNodeTimers = {};     // Stores time of appearance of cows on each activeNode.
 
     for (var jsonCoordinate in this.activeNodes) {
         this.activeNodes[jsonCoordinate] = ocargo.Cow.READY;
-        this.activeNodeTimers[jsonCoordinate] = 0;
     }
 };
 
-function arraysIdentical(a, b) {
-    var i = a.length;
-    if (i != b.length) return false;
-    while (i--) {
-        if (a[i] !== b[i]) return false;
-    }
-    return true;
-}
-
-ocargo.Cow.prototype.chooseNewCowPositions = function() {
-    var numCows = Math.round(this.minCows+Math.random()*(this.maxCows-this.minCows));
-
-    var previousActiveNodes = [];   // Actual nodes during last run
-    for (var jsonCoordinate in this.activeNodes) {
-        var node = ocargo.Node.findNodeByCoordinate(JSON.parse(jsonCoordinate), this.nodes);
-        previousActiveNodes.push(node);
-    }
-
-    this.activeNodes = {};
-
-    // at least one node in the new active nodes should be a different one from previous run
-    // (Unless minCows is equal to the number of potential nodes)
-    var activeNodesArray;
-    // No previous run
-    if(previousActiveNodes.length == 0) {
-        activeNodesArray = this.pickRandom(numCows, this.potentialNodes);
-        // New run, choose different nodes if possible
-    } else {
-        activeNodesArray = previousActiveNodes;
-        while (this.minCows < this.potentialNodes.length && arraysIdentical(previousActiveNodes, activeNodesArray)) {
-            activeNodesArray = this.pickRandom(numCows, this.potentialNodes);
-        }
-    }
-
-    for (var i = 0; i < activeNodesArray.length; i++) {
-        var jsonCoordinate = JSON.stringify(activeNodesArray[i].coordinate);
-        this.activeNodes[jsonCoordinate] = ocargo.Cow.READY;
-    }
-
-    this.reset();
-};
-
-ocargo.Cow.prototype.queueAnimation = function(model, node) {
-    ocargo.animation.appendAnimation({
-        type: 'cow',
-        id: this.id,
-        node: node,
-        cowType: this.type,
-        coordinate: node.coordinate,
-        description: 'Cow'
-    });
-};
-
 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'
     });
 };
 
-ocargo.Cow.prototype.incrementTime = function(model) {
-    // Do not hide cow(s) if van has crashed
-    if(model.van.crashStatus === 'CRASHED') {
-        return;
-    }
-    // check if any active cows should be removed (if van has taken any action to scare them away)
-    for (var jsonCoordinate in this.activeNodes) {
-        if (this.activeNodes[jsonCoordinate] == ocargo.Cow.ACTIVE) {
-            var coordinate = JSON.parse(jsonCoordinate);
-            var cowTimestamp = this.activeNodeTimers[jsonCoordinate];
-            if (this.scaredAwayByHorn(model, cowTimestamp, coordinate) || this.scaredAwayByPuffUp(model, cowTimestamp, coordinate)) {
-                // Deactivate and remove cow from map
-                this.activeNodes[jsonCoordinate] = ocargo.Cow.INACTIVE;
-                this.activeNodeTimers[jsonCoordinate] = 0;
-                var node = ocargo.Node.findNodeByCoordinate(coordinate, this.nodes);
-                this.queueLeaveAnimation(model, node);
-            }
-        }
-    }
-};
-
-// White cows are scared away if horn was sounded after the cow appeared and within hearing distance
-ocargo.Cow.prototype.scaredAwayByHorn = function(model, coordinateTime, coordinate){
-    if(jQuery.isEmptyObject(model.soundedHorn)){
-        return false;
-    }
-    return this.type == ocargo.Cow.WHITE && coordinateTime < model.soundedHorn.timestamp && this.withinRadius(coordinate, model.soundedHorn.coordinates) ;
-
-};
-
-// Brown cows are scared away if the van was puffed up at the time of checking
-ocargo.Cow.prototype.scaredAwayByPuffUp = function(model, coordinateTime, coordinate){
-    if(jQuery.isEmptyObject(model.puffedUp)){
-        return false;
-    }
-    return this.type == ocargo.Cow.BROWN && this.withinRadius(coordinate, model.puffedUp.coordinates) ;
-
-};
-
-ocargo.Cow.prototype.withinRadius = function(coordinate1, coordinate2){
-    return Math.abs(coordinate1.x-coordinate2.x)+ Math.abs(coordinate1.y-coordinate2.y) <= 2;
-};
-
-ocargo.Cow.prototype.setActive = function(model, node) {
+ocargo.Cow.prototype.setInactive = function(model, node) {
     var jsonCoordinate = JSON.stringify(node.coordinate); //get node coordinates
-    this.activeNodes[jsonCoordinate] = ocargo.Cow.ACTIVE; //set cow state to active
-    this.activeNodeTimers[jsonCoordinate] = model.movementTimestamp; //initialize cow timer.
+    this.activeNodes[jsonCoordinate] = ocargo.Cow.INACTIVE; //set cow state to inactive
     this.triggerEvent = true;
-    this.queueAnimation(model, node);
+    this.queueLeaveAnimation(model, node);
 };
 
 ocargo.Cow.READY = 'READY';
 ocargo.Cow.ACTIVE = 'ACTIVE';
 ocargo.Cow.INACTIVE = 'INACTIVE';
 ocargo.Cow.WHITE = 'WHITE';
-ocargo.Cow.BROWN = 'BROWN';
+ocargo.Cow.BROWN = 'BROWN';
+ocargo.Cow.PIGEON = 'PIGEON';