From e7324b7704cbb4824488132d9bb593e2691c2795 Mon Sep 17 00:00:00 2001 From: Eve Martin Date: Tue, 3 Sep 2024 14:41:25 +0000 Subject: [PATCH] tidy up, add pigeon translations --- game/static/game/js/blockly/msg/js/ca.js | 1 + game/static/game/js/blockly/msg/js/en-gb.js | 1 + game/static/game/js/blockly/msg/js/en.js | 1 + game/static/game/js/blockly/msg/js/es.js | 1 + game/static/game/js/blockly/msg/js/fr.js | 1 + game/static/game/js/blockly/msg/js/hi.js | 1 + game/static/game/js/blocklyCustomBlocks.js | 4 ++-- game/static/game/js/drawing.js | 7 +------ game/static/game/js/level_editor.js | 10 +++------- game/templates/game/level_editor.html | 3 --- 10 files changed, 12 insertions(+), 18 deletions(-) diff --git a/game/static/game/js/blockly/msg/js/ca.js b/game/static/game/js/blockly/msg/js/ca.js index 8c21ea6b6..26f030b54 100755 --- a/game/static/game/js/blockly/msg/js/ca.js +++ b/game/static/game/js/blockly/msg/js/ca.js @@ -461,6 +461,7 @@ Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = "semàfor verd"; Blockly.Msg["DEAD_END_TITLE"] = "és carrer sense sortida"; Blockly.Msg["AT_DESTINATION_TITLE"] = "a destí"; Blockly.Msg["COW_CROSSING_TITLE"] = "vaques"; +Blockly.Msg["PIGEON_CROSSING_TITLE"] = "coloms"; Blockly.Msg["CALL_PROC_TITLE"] = "Crida"; Blockly.Msg["CALL_PROC_TOOLTIP"] = "Crida un procediment"; diff --git a/game/static/game/js/blockly/msg/js/en-gb.js b/game/static/game/js/blockly/msg/js/en-gb.js index fb9e42f7f..86fa64048 100755 --- a/game/static/game/js/blockly/msg/js/en-gb.js +++ b/game/static/game/js/blockly/msg/js/en-gb.js @@ -461,6 +461,7 @@ Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = "traffic light green"; Blockly.Msg["DEAD_END_TITLE"] = "is dead end"; Blockly.Msg["AT_DESTINATION_TITLE"] = "at destination"; Blockly.Msg["COW_CROSSING_TITLE"] = "cows"; +Blockly.Msg["PIGEON_CROSSING_TITLE"] = "pigeons"; Blockly.Msg["CALL_PROC_TITLE"] = "Call"; Blockly.Msg["CALL_PROC_TOOLTIP"] = "Calls a procedure"; diff --git a/game/static/game/js/blockly/msg/js/en.js b/game/static/game/js/blockly/msg/js/en.js index 584b42dd6..108f16c82 100755 --- a/game/static/game/js/blockly/msg/js/en.js +++ b/game/static/game/js/blockly/msg/js/en.js @@ -461,6 +461,7 @@ Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = "traffic light green"; Blockly.Msg["DEAD_END_TITLE"] = "is dead end"; Blockly.Msg["AT_DESTINATION_TITLE"] = "at destination"; Blockly.Msg["COW_CROSSING_TITLE"] = "cows"; +Blockly.Msg["PIGEON_CROSSING_TITLE"] = "pigeons"; Blockly.Msg["CALL_PROC_TITLE"] = "Call"; Blockly.Msg["CALL_PROC_TOOLTIP"] = "Calls a procedure"; diff --git a/game/static/game/js/blockly/msg/js/es.js b/game/static/game/js/blockly/msg/js/es.js index 08bf8fc25..a40936c00 100755 --- a/game/static/game/js/blockly/msg/js/es.js +++ b/game/static/game/js/blockly/msg/js/es.js @@ -461,6 +461,7 @@ Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = "semáforo en verde"; Blockly.Msg["DEAD_END_TITLE"] = "es un callejón sin salida"; Blockly.Msg["AT_DESTINATION_TITLE"] = "en destino"; Blockly.Msg["COW_CROSSING_TITLE"] = "vacas"; +Blockly.Msg["PIGEON_CROSSING_TITLE"] = "palomas"; Blockly.Msg["CALL_PROC_TITLE"] = "Llamar"; Blockly.Msg["CALL_PROC_TOOLTIP"] = "Llamar a una función"; diff --git a/game/static/game/js/blockly/msg/js/fr.js b/game/static/game/js/blockly/msg/js/fr.js index decee21fb..e8991aa0f 100755 --- a/game/static/game/js/blockly/msg/js/fr.js +++ b/game/static/game/js/blockly/msg/js/fr.js @@ -461,6 +461,7 @@ Blockly.Msg["TRAFFIC_LIGHT_GREEN_TITLE"] = "feu vert"; Blockly.Msg["DEAD_END_TITLE"] = "cul-de-sac"; Blockly.Msg["AT_DESTINATION_TITLE"] = "arrivé à destination"; Blockly.Msg["COW_CROSSING_TITLE"] = "vaches"; +Blockly.Msg["PIGEON_CROSSING_TITLE"] = "pigeons"; Blockly.Msg["CALL_PROC_TITLE"] = "Appeler"; Blockly.Msg["CALL_PROC_TOOLTIP"] = "Appeler une fonction"; diff --git a/game/static/game/js/blockly/msg/js/hi.js b/game/static/game/js/blockly/msg/js/hi.js index 5555386a3..9d998dc39 100755 --- a/game/static/game/js/blockly/msg/js/hi.js +++ b/game/static/game/js/blockly/msg/js/hi.js @@ -461,6 +461,7 @@ 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"] = "एक प्रक्रिया बुलाना"; diff --git a/game/static/game/js/blocklyCustomBlocks.js b/game/static/game/js/blocklyCustomBlocks.js index 16a20f922..2ca5c950f 100644 --- a/game/static/game/js/blocklyCustomBlocks.js +++ b/game/static/game/js/blocklyCustomBlocks.js @@ -281,9 +281,9 @@ function initCustomBlocksDescription() { init: function() { this.setColour(210); this.setOutput(true, 'Boolean'); - let imageUrl = ocargo.Drawing.animalType == "pigeon" ? ocargo.Drawing.pigeonUrl : ocargo.Drawing.whiteCowUrl + let imageUrl = ocargo.Drawing.animalType == ocargo.Cow.PIGEON ? ocargo.Drawing.pigeonUrl : ocargo.Drawing.whiteCowUrl this.appendDummyInput() - .appendField(ocargo.Drawing.animalType == "pigeon" ? "pigeons": Blockly.Msg.COW_CROSSING_TITLE) + .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'); diff --git a/game/static/game/js/drawing.js b/game/static/game/js/drawing.js index 5a88dc393..c7b4ddcd6 100644 --- a/game/static/game/js/drawing.js +++ b/game/static/game/js/drawing.js @@ -1236,20 +1236,15 @@ ocargo.Drawing.renderCoins = function (coins) { } ocargo.Drawing.cowUrl = function (type) { - console.log(ocargo.Drawing.animalType) - //ocargo.Drawing.animalType = type; + ocargo.Drawing.animalType = type; switch (type) { case ocargo.Cow.WHITE: - ocargo.Drawing.animalType = "white" return ocargo.Drawing.whiteCowUrl case ocargo.Cow.BROWN: - ocargo.Drawing.animalType = "brown" return ocargo.Drawing.brownCowUrl case ocargo.Cow.PIGEON: - ocargo.Drawing.animalType = "pigeon" return ocargo.Drawing.pigeonUrl default: - ocargo.Drawing.animalType = "white" return ocargo.Drawing.whiteCowUrl } } diff --git a/game/static/game/js/level_editor.js b/game/static/game/js/level_editor.js index a183fa7f6..05f022af6 100644 --- a/game/static/game/js/level_editor.js +++ b/game/static/game/js/level_editor.js @@ -126,16 +126,13 @@ ocargo.LevelEditor = function(levelId) { // Initialise the grid initialiseGrid(); - //setTheme(THEMES.grass); + setTheme(THEMES.grass); // Setup the toolbox setupToolbox(); if (levelId !== null) { loadLevel(levelId); - console.log(currentTheme); - } else { - setTheme(THEMES.grass); } setupTrashcan(); @@ -2707,8 +2704,8 @@ ocargo.LevelEditor = function(levelId) { } } - async function loadLevel(levelID) { - await saving.retrieveLevel(levelID, function(err, level, owned) { + function loadLevel(levelID) { + saving.retrieveLevel(levelID, function(err, level, owned) { if (err !== null) { console.error(err); return; @@ -2718,7 +2715,6 @@ ocargo.LevelEditor = function(levelId) { saveState.loaded(owned, extractState(), level.id); }); - console.log(currentTheme); } function saveLevel(name, levelId, callback) { diff --git a/game/templates/game/level_editor.html b/game/templates/game/level_editor.html index 7028d614a..f2a36eca7 100644 --- a/game/templates/game/level_editor.html +++ b/game/templates/game/level_editor.html @@ -424,9 +424,6 @@