diff --git a/__init__.py b/__init__.py index 6d5915c..ae9db71 100644 --- a/__init__.py +++ b/__init__.py @@ -7,20 +7,6 @@ LEFT = 1 DOWN = 2 RIGHT = 3 -def dir_str(dir): - if dir == UP: - return 'back' - elif dir == LEFT: - return 'left' - elif dir == DOWN: - return 'front' - elif dir == RIGHT: - return 'right' - -def image_path(direction, step): - dir = os.path.dirname(__file__) - return f"{dir}/sprites/{dir_str(direction)}{str(step + 1)}.png" - class Random: def __init__(self): @@ -49,15 +35,24 @@ class Quox(Application): LEFT = -90 RIGHT = 70 + @staticmethod + def image_path(direction, step): + dir = os.path.dirname(__file__) + bases = {UP: 'back', LEFT: 'left', DOWN: 'front', RIGHT: 'right'} + base = bases[direction] + return f"{dir}/sprites/{base}{step}.png" + def __init__(self, app_ctx): super().__init__(app_ctx) - self.random = Random() + self.choose_direction() self.choose_turn_delay() + self.step = 0 self.step_delay = Quox.STEP_DELAY self.move_delay = Quox.MOVE_DELAY + self.x = -10 self.y = -10 @@ -72,7 +67,7 @@ class Quox(Application): .fill() def image(self, ctx): - path = image_path(self.direction, self.step) + path = Quox.image_path(self.direction, self.step) ctx.image(path, self.x, self.y, -1, -1) @staticmethod diff --git a/sprites/.directory b/sprites/.directory new file mode 100644 index 0000000..5bc311e --- /dev/null +++ b/sprites/.directory @@ -0,0 +1,3 @@ +[Dolphin] +Timestamp=2023,8,16,15,52,48 +Version=4 diff --git a/sprites/back0.png b/sprites/back0.png new file mode 100644 index 0000000..fafd48e Binary files /dev/null and b/sprites/back0.png differ diff --git a/sprites/back1.png b/sprites/back1.png index fafd48e..9884f11 100644 Binary files a/sprites/back1.png and b/sprites/back1.png differ diff --git a/sprites/back2.png b/sprites/back2.png index 9884f11..02d123c 100644 Binary files a/sprites/back2.png and b/sprites/back2.png differ diff --git a/sprites/back3.png b/sprites/back3.png index 02d123c..a33e060 100644 Binary files a/sprites/back3.png and b/sprites/back3.png differ diff --git a/sprites/back4.png b/sprites/back4.png deleted file mode 100644 index a33e060..0000000 Binary files a/sprites/back4.png and /dev/null differ diff --git a/sprites/front0.png b/sprites/front0.png new file mode 100644 index 0000000..ad0dad1 Binary files /dev/null and b/sprites/front0.png differ diff --git a/sprites/front1.png b/sprites/front1.png index ad0dad1..b2b5338 100644 Binary files a/sprites/front1.png and b/sprites/front1.png differ diff --git a/sprites/front2.png b/sprites/front2.png index b2b5338..ff69054 100644 Binary files a/sprites/front2.png and b/sprites/front2.png differ diff --git a/sprites/front3.png b/sprites/front3.png index ff69054..a87eaa6 100644 Binary files a/sprites/front3.png and b/sprites/front3.png differ diff --git a/sprites/front4.png b/sprites/front4.png deleted file mode 100644 index a87eaa6..0000000 Binary files a/sprites/front4.png and /dev/null differ diff --git a/sprites/left0.png b/sprites/left0.png new file mode 100644 index 0000000..191a0ce Binary files /dev/null and b/sprites/left0.png differ diff --git a/sprites/left1.png b/sprites/left1.png index 191a0ce..f8267a0 100644 Binary files a/sprites/left1.png and b/sprites/left1.png differ diff --git a/sprites/left2.png b/sprites/left2.png index f8267a0..191a0ce 100644 Binary files a/sprites/left2.png and b/sprites/left2.png differ diff --git a/sprites/left3.png b/sprites/left3.png index 191a0ce..fa005c8 100644 Binary files a/sprites/left3.png and b/sprites/left3.png differ diff --git a/sprites/left4.png b/sprites/left4.png deleted file mode 100644 index fa005c8..0000000 Binary files a/sprites/left4.png and /dev/null differ diff --git a/sprites/right0.png b/sprites/right0.png new file mode 100644 index 0000000..470a7f7 Binary files /dev/null and b/sprites/right0.png differ diff --git a/sprites/right1.png b/sprites/right1.png index 470a7f7..c0cccc3 100644 Binary files a/sprites/right1.png and b/sprites/right1.png differ diff --git a/sprites/right2.png b/sprites/right2.png index c0cccc3..a462f82 100644 Binary files a/sprites/right2.png and b/sprites/right2.png differ diff --git a/sprites/right3.png b/sprites/right3.png index a462f82..92e0840 100644 Binary files a/sprites/right3.png and b/sprites/right3.png differ diff --git a/sprites/right4.png b/sprites/right4.png deleted file mode 100644 index 92e0840..0000000 Binary files a/sprites/right4.png and /dev/null differ