Changeset 338:0da3d9af277f

Timestamp:

09/06/13 10:42:18 (9 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Phase:

public

Message:

Better change sequence.

File:

• nagslang/protagonist.py (modified) (3 diffs)

nagslang/protagonist.py

@@ -37 +37 @@
 
 
+def _make_change_sequence(old, new):
+    return (
+        new, new, old, old, old, old,
+        new, new, old, old, old,
+        new, new, old, old,
+        new, new, new, old, old,
+        new, new, new, new, old, old,
+        new)
+
+
 class Protagonist(GameObject):
     """Representation of our fearless protagonist.
@@ -48 +58 @@
     CHANGING_SEQUENCE = {
         # The key is the form we're changing *from*.
-        HUMAN_FORM: (
-            WOLF_FORM, HUMAN_FORM, HUMAN_FORM,
-            WOLF_FORM, HUMAN_FORM, WOLF_FORM,
-            HUMAN_FORM, WOLF_FORM, HUMAN_FORM,
-            WOLF_FORM, HUMAN_FORM, WOLF_FORM,
-            HUMAN_FORM, WOLF_FORM, WOLF_FORM,
-        ),
-        WOLF_FORM: (
-            HUMAN_FORM, WOLF_FORM, WOLF_FORM,
-            HUMAN_FORM, WOLF_FORM, HUMAN_FORM,
-            WOLF_FORM, HUMAN_FORM, WOLF_FORM,
-            HUMAN_FORM, WOLF_FORM, HUMAN_FORM,
-            WOLF_FORM, HUMAN_FORM, HUMAN_FORM,
-        ),
+        HUMAN_FORM: _make_change_sequence(HUMAN_FORM, WOLF_FORM),
+        WOLF_FORM: _make_change_sequence(WOLF_FORM, HUMAN_FORM),
     }
 
@@ -253 +251 @@
 
     def toggle_form(self):
-        for form in self.CHANGING_SEQUENCE[self.form]:
-            self.changing_sequence.extend([form] * 3)
+        self.changing_sequence.extend(self.CHANGING_SEQUENCE[self.form])
 
     def _go_to_next_form(self):