WinColl 0.9.7__tar.gz → 0.9.8__tar.gz

{wincoll-0.9.7 → wincoll-0.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WinColl
-Version: 0.9.7
+Version: 0.9.8
 Summary: Simple rocks-and-diamonds game
 Author-email: Reuben Thomas <rrt@sc3d.org>
 License: GPL v3 or later

{wincoll-0.9.7 → wincoll-0.9.8}/WinColl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WinColl
-Version: 0.9.7
+Version: 0.9.8
 Summary: Simple rocks-and-diamonds game
 Author-email: Reuben Thomas <rrt@sc3d.org>
 License: GPL v3 or later

{wincoll-0.9.7 → wincoll-0.9.8}/WinColl.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ wincoll/levels/03.tmx
 wincoll/levels/04.tmx
 wincoll/levels/05.tmx
 wincoll/levels/06.tmx
+wincoll/levels/07.tmx
 wincoll/levels/Blob.png
 wincoll/levels/Brick.png
 wincoll/levels/Diamond.png

{wincoll-0.9.7 → wincoll-0.9.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "WinColl"
-version = "0.9.7"
+version = "0.9.8"
 description = "Simple rocks-and-diamonds game"
 license = {text = "GPL v3 or later"}
 authors = [

{wincoll-0.9.7 → wincoll-0.9.8}/wincoll/__init__.py

@@ -346,9 +346,9 @@ class WincollGame:
         ):
             return True
         if block == self.gids[TilesetGids.ROCK]:
-            new_rockpos = self.hero.position + (self.hero.velocity * 2)
+            new_rockpos = self.hero.position + velocity * 2
             return (
-                self.hero.velocity.y == 0
+                velocity.y == 0
                 and self.get(new_rockpos) == self.gids[TilesetGids.GAP]
             )
         return False
@@ -502,7 +502,8 @@ class WincollGame:
                     self.show_screen()
                     pygame.time.wait(1000)
                     self.dead = False
-            self.level += 1
+            if self.diamonds == 0:
+                self.level += 1
         if self.level > levels:
             self.splurge(Win().image)
 
@@ -526,19 +527,6 @@ def clear_keys() -> None:
         pass
 
 
-def get_key() -> int:
-    """Return first key press."""
-    while True:
-        handle_quit_event()
-        for event in pygame.event.get(pygame.KEYDOWN):
-            if event.key == pygame.K_ESCAPE:
-                quit_game()
-            else:
-                handle_global_keys(event)
-            key: int = event.key
-            return key
-
-
 DIGIT_KEYS = {
     pygame.K_0: 0,
     pygame.K_1: 1,
@@ -590,7 +578,8 @@ Avoid falling rocks!
     start_level_y = (
         instructions_y + len(instructions.split("\n\n\n")[0].split("\n")) + 1
     )
-    while True:
+    play = False
+    while not play:
         reinit_screen()
         screen.blit(
             scale_surface(TITLE_IMAGE.convert()),
@@ -604,18 +593,22 @@ Avoid falling rocks!
             align="center",
         )
         pygame.display.flip()
-        key = get_key()
+        handle_quit_event()
+        for event in pygame.event.get(pygame.KEYDOWN):
+            if event.key == pygame.K_ESCAPE:
+                quit_game()
+            if event.key == pygame.K_SPACE:
+                play = True
+            if event.key in (pygame.K_z, pygame.K_LEFT, pygame.K_SLASH, pygame.K_DOWN):
+                level = max(1, level - 1)
+            elif event.key in (pygame.K_x, pygame.K_RIGHT, pygame.K_QUOTE, pygame.K_UP):
+                level = min(levels, level + 1)
+            elif event.key in DIGIT_KEYS:
+                level = min(levels, level * 10 + DIGIT_KEYS[event.key])
+            else:
+                level = 0
+            handle_global_keys(event)
         clock.tick(FRAMES_PER_SECOND)
-        if key == pygame.K_SPACE:
-            break
-        if key in (pygame.K_z, pygame.K_LEFT, pygame.K_SLASH, pygame.K_DOWN):
-            level = max(1, level - 1)
-        elif key in (pygame.K_x, pygame.K_RIGHT, pygame.K_QUOTE, pygame.K_UP):
-            level = min(levels, level + 1)
-        elif key in DIGIT_KEYS:
-            level = min(levels, level * 10 + DIGIT_KEYS[key])
-        else:
-            level = 0
     return max(min(level, levels), 1)
 
 

wincoll-0.9.8/wincoll/levels/01.tmx

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1">
+ <properties>
+  <property name="Title" value="A gentle introduction"/>
+ </properties>
+ <tileset firstgid="1" source="WinColl.tsx"/>
+ <layer id="1" name="Tile Layer 1" width="50" height="50">
+  <data encoding="csv">
+15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,12,16,11,11,11,11,11,11,11,11,11,11,11,11,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,
+15,16,15,15,15,15,15,13,15,15,16,15,15,11,15,15,10,15,15,12,16,16,16,10,10,10,10,10,10,10,10,10,10,11,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,
+15,15,16,13,15,11,15,15,10,15,15,15,15,16,15,15,15,15,15,12,13,14,11,11,11,11,11,11,11,11,11,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,
+15,15,15,15,17,15,15,15,15,16,15,15,15,15,16,15,13,15,14,12,11,17,11,10,11,11,11,11,10,11,17,11,10,11,11,10,11,10,11,10,11,10,11,10,11,10,11,10,11,10,
+11,15,15,16,15,15,14,15,11,15,15,10,11,15,11,15,15,14,11,12,11,11,10,11,11,11,11,11,11,10,11,11,10,11,11,11,11,11,16,11,11,11,16,11,11,11,16,11,11,11,
+15,15,14,15,15,15,15,15,15,15,15,13,15,16,15,15,14,11,11,12,11,10,11,11,11,15,15,11,11,11,10,11,10,11,13,10,10,10,15,13,13,13,15,13,13,13,15,13,13,11,
+15,15,15,15,16,15,10,15,15,15,15,15,15,15,15,14,11,11,11,12,11,11,11,15,15,10,10,15,15,11,11,11,10,11,11,11,11,11,15,11,15,11,15,11,15,11,15,11,15,11,
+15,16,15,15,11,15,15,15,14,15,16,17,15,15,14,11,11,11,16,12,11,11,15,10,10,10,10,10,10,15,11,11,10,11,11,10,11,11,15,11,15,11,15,11,15,11,15,11,15,11,
+15,15,15,10,15,14,15,15,15,15,15,15,15,14,11,11,11,11,17,12,11,11,15,10,13,10,10,13,10,15,11,11,13,11,10,11,11,11,15,11,15,11,15,11,15,11,15,11,15,11,
+10,15,14,15,15,15,15,16,11,15,15,15,14,11,11,11,11,11,11,12,11,15,10,10,10,10,10,10,10,10,15,10,10,11,11,11,10,10,13,13,15,13,13,13,15,13,13,13,15,11,
+15,15,16,15,15,15,15,15,15,15,16,15,14,11,11,11,11,11,11,12,16,15,10,10,14,10,10,14,10,10,15,11,11,11,11,13,10,11,11,11,16,11,11,11,16,11,11,11,16,11,
+13,15,15,15,15,14,15,10,15,14,15,15,14,11,11,17,17,11,11,12,14,11,15,10,10,14,14,10,10,15,11,11,11,10,11,10,11,16,11,16,11,16,11,16,11,16,11,16,11,11,
+15,14,15,13,15,15,15,15,16,15,15,15,14,11,17,11,11,17,11,12,11,11,15,10,10,10,10,10,10,15,11,11,10,11,11,10,11,11,16,11,11,11,16,11,11,11,16,11,11,11,
+15,15,10,15,17,15,16,15,15,15,15,16,14,11,17,11,11,17,11,12,11,11,11,15,15,10,10,15,15,11,11,11,11,11,10,13,11,13,11,16,11,16,11,16,11,16,11,16,11,11,
+15,15,15,16,15,14,15,15,15,13,15,15,14,11,11,17,17,11,11,12,11,10,11,11,11,15,15,11,11,11,10,11,11,10,10,11,16,16,16,11,16,11,11,11,16,11,11,11,16,11,
+16,15,15,15,15,15,15,15,14,15,15,15,14,11,11,11,17,11,11,12,11,11,10,11,11,10,11,11,11,10,11,11,11,10,11,16,16,16,16,16,11,16,11,16,11,16,11,16,11,11,
+11,15,14,15,15,15,16,15,15,11,15,14,14,11,11,11,17,11,11,12,11,17,11,10,11,10,11,11,10,11,17,11,11,10,11,16,16,16,16,16,11,11,16,11,11,11,16,11,11,11,
+15,15,15,10,16,14,15,15,15,16,15,15,14,11,17,17,17,11,11,12,11,11,11,11,11,13,11,11,11,11,11,11,11,10,11,13,16,16,16,13,11,16,13,16,11,16,13,16,11,11,
+15,16,15,15,15,15,15,14,15,15,15,15,14,11,11,11,17,11,11,12,16,11,11,11,13,10,13,11,11,11,11,11,11,10,11,11,13,16,13,11,16,13,13,13,16,13,13,13,16,11,
+15,15,15,14,15,15,15,15,15,15,15,14,11,11,17,17,17,11,11,12,13,11,11,13,10,10,10,13,11,11,11,11,10,10,10,11,11,16,11,11,11,16,13,16,13,16,13,16,13,11,
+15,11,15,17,15,14,15,15,16,15,14,11,11,11,11,11,11,11,11,12,11,11,13,10,10,13,10,10,13,10,10,10,10,13,10,10,10,13,13,14,11,11,16,13,13,13,16,13,13,11,
+15,16,15,15,15,15,11,10,15,14,11,11,11,11,11,11,11,11,16,12,11,11,11,13,10,10,10,13,11,11,11,11,10,10,10,11,11,14,13,13,14,11,11,16,13,16,13,16,13,11,
+15,15,10,15,13,15,15,15,14,14,11,11,11,16,16,11,11,11,15,12,11,11,11,11,13,10,13,11,11,11,11,11,11,10,11,11,11,11,14,13,13,14,11,11,16,13,13,13,16,11,
+15,15,14,15,15,15,16,15,15,14,11,11,16,16,16,16,11,11,11,12,16,11,11,11,11,13,11,11,11,11,17,11,11,10,11,11,17,11,11,14,13,13,14,11,11,16,13,16,13,11,
+10,15,15,15,16,15,15,17,15,14,11,16,16,16,16,16,16,11,11,12,11,11,11,11,11,11,11,11,11,11,11,11,16,15,16,11,11,11,11,11,14,13,13,14,11,11,16,13,13,11,
+13,15,15,15,15,10,15,14,15,14,11,16,16,16,16,16,16,11,11,12,16,10,10,10,10,10,10,10,10,10,10,10,16,15,16,11,11,11,11,10,11,14,13,13,14,11,11,16,13,11,
+15,14,15,14,15,15,15,15,15,14,11,11,16,16,16,16,11,11,10,12,11,11,11,11,11,11,11,11,11,11,11,11,16,15,16,11,11,11,10,10,11,11,14,13,13,14,11,11,16,11,
+15,15,15,15,16,14,14,14,14,14,11,11,11,16,16,11,11,10,10,12,11,16,16,16,16,16,16,16,11,11,11,11,16,15,16,11,11,11,10,10,10,11,11,14,13,13,14,15,15,11,
+17,16,10,15,14,16,16,16,16,16,14,11,11,11,11,11,10,10,10,12,11,11,11,11,15,11,11,11,16,11,16,11,16,15,16,11,11,10,11,10,10,11,11,11,14,13,10,10,10,11,
+15,15,15,15,14,13,16,16,16,13,14,12,12,13,12,12,12,12,12,12,11,11,11,11,15,11,11,11,11,16,11,11,16,15,16,11,11,10,11,10,10,10,11,11,11,10,11,10,10,11,
+15,16,15,14,15,14,14,16,14,14,11,12,11,15,11,11,16,11,11,11,11,11,11,11,15,11,11,11,16,11,11,11,13,15,16,11,10,11,11,11,10,10,11,11,11,10,11,10,10,11,
+10,15,15,15,15,14,10,13,15,15,15,15,15,15,15,15,13,10,10,10,10,10,16,16,15,16,16,11,11,16,11,10,15,16,11,11,10,10,10,10,10,10,10,11,11,10,11,10,10,11,
+15,15,15,15,14,10,10,14,11,11,16,12,16,11,11,11,10,11,11,11,11,11,14,16,16,16,14,11,16,11,11,10,14,11,11,10,10,11,11,11,11,10,10,11,11,10,11,10,10,11,
+15,14,13,14,10,10,14,11,16,11,16,12,16,11,11,13,11,16,11,16,16,16,11,14,16,14,11,11,11,16,11,10,10,11,10,10,10,10,11,11,10,10,10,10,11,10,11,10,10,11,
+15,13,14,10,10,14,13,11,16,11,16,12,16,11,13,13,11,11,11,11,11,16,11,11,15,15,11,11,16,11,11,10,10,10,11,11,11,11,11,11,11,11,11,11,11,10,11,10,10,11,
+13,14,10,10,14,11,13,11,16,11,16,12,16,13,13,13,13,13,13,13,11,16,11,11,15,11,11,16,11,16,11,10,10,10,10,11,11,11,11,11,11,11,11,11,11,10,11,10,10,11,
+14,10,10,14,16,11,13,11,16,11,16,12,16,11,13,13,11,11,11,11,11,16,11,11,15,11,16,11,11,11,16,11,10,10,10,10,11,11,11,11,11,11,17,11,11,10,11,10,10,11,
+11,10,14,11,11,11,13,15,15,15,16,12,11,16,11,13,11,16,11,16,16,16,11,11,16,11,11,16,11,16,11,16,11,10,10,10,10,11,11,11,11,11,11,11,11,10,11,10,10,11,
+11,10,10,14,13,13,13,13,13,11,16,12,11,17,16,11,11,11,11,11,11,11,11,15,15,15,11,11,16,11,11,11,16,11,10,10,10,11,11,11,11,11,11,11,11,10,11,10,10,11,
+11,13,10,10,14,13,13,13,11,11,16,12,11,17,17,16,11,11,11,11,11,11,15,15,15,15,15,11,11,16,11,16,11,11,11,14,10,11,11,11,13,16,16,16,11,10,11,10,10,11,
+11,10,13,10,10,14,13,11,17,11,11,10,11,17,17,17,16,17,17,17,11,15,15,15,15,15,15,15,11,11,16,11,16,11,11,10,10,11,11,11,16,16,16,16,11,10,11,10,10,11,
+11,10,10,10,10,10,14,17,17,11,16,16,16,11,11,11,11,16,17,17,11,15,15,15,13,15,15,15,11,16,11,11,11,10,10,10,10,11,11,11,15,15,15,15,15,15,11,10,10,11,
+11,10,12,13,10,10,10,14,17,11,12,15,12,11,16,11,13,11,16,17,11,15,15,15,10,15,15,15,11,11,11,10,10,10,10,10,11,11,11,13,10,10,10,10,11,10,10,10,10,11,
+11,10,11,12,13,10,10,10,14,11,10,10,10,11,11,11,13,13,11,16,11,15,15,15,10,15,15,15,11,11,11,10,10,10,10,11,11,11,13,10,10,10,11,11,11,10,11,11,11,11,
+11,10,11,11,12,12,10,10,10,11,10,15,13,13,13,13,13,13,13,11,15,15,15,10,10,10,15,15,11,11,10,10,10,14,11,11,11,11,13,10,10,11,11,11,11,10,11,11,11,11,
+11,10,11,11,11,12,13,10,10,11,10,12,14,11,11,11,13,13,11,15,15,15,10,10,10,10,10,11,11,11,10,10,10,10,11,11,11,13,10,10,11,11,11,11,10,10,10,11,11,11,
+11,17,12,12,12,12,12,13,10,11,11,10,16,11,16,11,13,11,15,15,15,13,10,10,10,10,11,11,11,10,10,10,10,10,10,10,10,10,10,10,11,11,11,10,10,10,10,10,11,11,
+11,11,11,16,11,11,11,11,11,11,11,16,14,11,11,11,11,15,15,15,10,10,10,10,10,11,11,17,11,10,10,10,10,10,10,10,10,10,10,11,11,11,10,10,10,10,10,10,10,11,
+11,18,15,15,15,15,15,15,15,15,10,13,10,15,15,15,15,15,15,10,10,10,10,10,11,11,17,17,11,13,13,13,13,13,13,13,11,11,11,11,11,11,10,10,10,13,10,10,10,11,
+11,11,10,14,11,11,11,11,11,11,10,16,10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11
+</data>
+ </layer>
+</map>