Merge branch 'master' into visible_cows

ocadotechnology · Nov 30, 2023 · afd3290 · afd3290
2 parents f114e70 + 0a3c2fe
commit afd3290
Show file tree

Hide file tree

Showing 30 changed files with 38,141 additions and 560 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v5.16.0 (2023-11-30)
+
+### Feature
+
+* Enable automatic Christmas theme in December ([#1538](https://github.com/ocadotechnology/rapid-router/issues/1538)) ([`8cb7edd`](https://github.com/ocadotechnology/rapid-router/commit/8cb7edda3f424bd06745e2042a1fb2ec6aef98bf))
+
 ## v5.15.13 (2023-11-28)
 
 ### Fix

diff --git a/game/__init__.py b/game/__init__.py
@@ -1 +1 @@
-__version__ = "5.15.13"
+__version__ = "5.16.0"
diff --git a/game/character.py b/game/character.py
@@ -19,51 +19,51 @@ def __init__(self, pk, name, en_face, top_down, width, height):
 CHARACTER_DATA = {
     "Van": Character(
         pk=1,
-        name=u"Van",
+        name="Van",
         # FUTURE: add external branding option
-        en_face=u"characters/front_view/Van.svg",
-        top_down=u"characters/top_view/Van.svg",
+        en_face="characters/front_view/Van.svg",
+        top_down="characters/top_view/Van.svg",
         height="20",
         width="40",
     ),
     "Dee": Character(
         pk=2,
-        name=u"Dee",
+        name="Dee",
         # FUTURE: add external branding option
-        en_face=u"characters/front_view/Dee.svg",
-        top_down=u"characters/top_view/Dee.svg",
+        en_face="characters/front_view/Dee.svg",
+        top_down="characters/top_view/Dee.svg",
         height="28",
         width="52",
     ),
     "Nigel": Character(
         pk=3,
-        name=u"Nigel",
-        en_face=u"characters/front_view/Nigel.svg",
-        top_down=u"characters/top_view/Nigel.svg",
+        name="Nigel",
+        en_face="characters/front_view/Nigel.svg",
+        top_down="characters/top_view/Nigel.svg",
         height="32",
         width="56",
     ),
     "Kirsty": Character(
         pk=4,
-        name=u"Kirsty",
-        en_face=u"characters/front_view/Kirsty.svg",
-        top_down=u"characters/top_view/Kirsty.svg",
+        name="Kirsty",
+        en_face="characters/front_view/Kirsty.svg",
+        top_down="characters/top_view/Kirsty.svg",
         height="32",
         width="60",
     ),
     "Wes": Character(
         pk=5,
-        name=u"Wes",
-        en_face=u"characters/front_view/Wes.svg",
-        top_down=u"characters/top_view/Wes.svg",
+        name="Wes",
+        en_face="characters/front_view/Wes.svg",
+        top_down="characters/top_view/Wes.svg",
         height="20",
         width="40",
     ),
     "Phil": Character(
         pk=6,
-        name=u"Phil",
-        en_face=u"characters/front_view/Phil.svg",
-        top_down=u"characters/top_view/Phil.svg",
+        name="Phil",
+        en_face="characters/front_view/Phil.svg",
+        top_down="characters/top_view/Phil.svg",
         height="40",
         width="40",
     ),