rapid-router 7.5.16__py2.py3-none-any.whl → 7.5.18__py2.py3-none-any.whl

game/__init__.py

@@ -1 +1 @@
-__version__ = "7.5.16"
+__version__ = "7.5.18"

game/messages.py

@@ -5,9 +5,7 @@ def video_link(url):
     return (
         "<div class='popup_video'>"
         "<video controls name='media'>"
-        "<source src="
-        + str(url)
-        + "type='video/mp4'></video><br></div>"
+        "<source src=" + str(url) + "type='video/mp4'></video><br></div>"
     )
 
 
@@ -804,8 +802,8 @@ def description_level34():
     message = (
         "It can be handy to use <b>If</b> to give your van choices, so you don't "
         "have to give the van new instructions at every step. <br> For "
-        "example: Tell the van <b>If</b> the <b>road exists forwards do Move "
-        "forwards,</b> but <b>If</b> the <b>road exists left do Turn left</b>. "
+        "example: Tell the van <b>If</b> the <b>road exists forwards</b> do <b>Move "
+        "forwards</b>, <b>Else</b> do <b>Turn left</b>. "
         "<br> The van will choose correctly from the <b>Move forwards</b> and "
         "<b>Turn left</b> instructions depending on the road. <br> Use an 'if "
         "statement' in a 'loop' to drive the van down this bendy road."
@@ -816,7 +814,7 @@ def description_level34():
 def hint_level34():
     return (
         "This route looks complicated, but you can solve it without counting blocks. "
-        "You are going to use a <b>Repeat until</b> block again and <b>If</b> blocks "
+        "You are going to use a <b>Repeat until</b> block again and an <b>If</b> block "
         "to help the driver check the road ahead so they can decide which way to go. "
         "What are the possible directions on this route?"
     )
@@ -850,10 +848,7 @@ def title_level36():
 
 
 def description_level36():
-    message = video_link(
-        "https://files.gitbook.com/v0/b/gitbook-x-prod.appspot.com/o/spaces%2FdCZE3FuBgH5fHsGocKGv%2Fuploads%2FsxMatN6zCvgFag8YDvK4%2FHelen%20explains%20if_else%20statements.mp4?alt=media&token=1051ab04-b02d-4b75-8278-2b63216b2985"
-    )
-    message += (
+    message = (
         f"<div class='popup_message'>"
         f"You can change the <b>if</b> block to make more choices. Click on the"
         f" {if_else_icon_url()} to add <b>else if</b>."
@@ -869,9 +864,7 @@ def description_level36():
         f"This is a general algorithm, it can be used for lots of different routes!"
         f"</div>"
     )
-    return build_description(
-        title_level36(), f"<div class='main_popup_container'>{message}</div>"
-    )
+    return build_description(title_level36(), message)
 
 
 def hint_level36():

game/migrations/0117_update_solutions_to_if_else.py

@@ -0,0 +1,61 @@
+from django.apps.registry import Apps
+from django.db import migrations
+
+new_model_solutions_per_level = {
+    34: "[6]",
+    35: "[8]",
+    36: "[8]",
+    37: "[8]",
+    40: "[6]",
+    41: "[8]",
+    44: "[6]",
+    45: "[6]",
+    46: "[8]",
+    48: "[14]",
+    49: "[10]",
+}
+
+old_model_solutions_per_level = {
+    34: "[8,7,6]",
+    35: "[11,9,8]",
+    36: "[11,9,8]",
+    37: "[11,9,8]",
+    40: "[6,7]",
+    41: "[8,9]",
+    44: "[5,6]",
+    45: "[6,7]",
+    46: "[8,9]",
+    48: "[14,15]",
+    49: "[10,11,12,13,17]",
+}
+
+
+def update_model_solutions(apps, model_solutions_per_level):
+    Level = apps.get_model("game", "Level")
+
+    for level_id, model_solution in model_solutions_per_level.items():
+        level = Level.objects.get(pk=level_id)
+        level.model_solution = model_solution
+        level.save()
+
+
+def update_solutions_to_if_else(apps: Apps, *args):
+    update_model_solutions(apps, new_model_solutions_per_level)
+
+
+def revert_to_old_solutions(apps: Apps, *args):
+    update_model_solutions(apps, old_model_solutions_per_level)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("game", "0116_update_worksheet_video_links"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=update_solutions_to_if_else,
+            reverse_code=revert_to_old_solutions,
+        )
+    ]