Merge branch 'master' into level_36_desc

ocadotechnology · Dec 5, 2023 · 150a7d2 · 150a7d2
2 parents 15da9a9 + 5afe359
commit 150a7d2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v5.16.2 (2023-12-05)
+
+### Fix
+
+* Use sleigh image on start block for xmas theme ([#1549](https://github.com/ocadotechnology/rapid-router/issues/1549)) ([`0b72589`](https://github.com/ocadotechnology/rapid-router/commit/0b725890ad7c1908440fc2d985e028f6335b6963))
+
 ## v5.16.1 (2023-11-30)
 
 ### Fix

diff --git a/game/__init__.py b/game/__init__.py
@@ -1 +1 @@
-__version__ = "5.16.1"
+__version__ = "5.16.2"
diff --git a/game/static/game/js/blocklyCustomBlocks.js b/game/static/game/js/blocklyCustomBlocks.js
@@ -16,13 +16,14 @@ function initCustomBlocksDescription() {
       this.setColour(50);
       this.appendDummyInput()
         .appendField(gettext("Start"))
-        .appendField(
-          new Blockly.FieldImage(
-            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(gettext("The beginning of the program"));
       this.setDeletable(false);