diff --git a/project/data/levels/level-01.csv b/project/data/levels/level-01.csv index f87f64e..3acdcf6 100644 --- a/project/data/levels/level-01.csv +++ b/project/data/levels/level-01.csv @@ -1,17 +1,17 @@ #,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,# -,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# #,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# #,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,#,S,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,#,S,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,#,S,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,#,S,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,L,,,,,M,M,,,,,,,,,,,,,,,,,,C,,,# -#,#,S,,,,,,,,,,,,,,,,,,,+,+,+,+,S,S,S,S,S,+,+,+,+,+,S,S,S,S,S,+,+,+,+,+,S,S,S,S,S,+,+,+,+,+,+,+,+,+,# -#,#,S,,,,,,,,,,,,,,,,,,,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,# -#,#,S,,,,,,,,,,,,,,,,,,,,,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,#,S,,,,,,,,,,,,,,,,,,,,,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# +#,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# +#,#,>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# +#,#,>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# +#,#,>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# +#,#,>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,L,,,,,,,,,,,,,,,,,,,,,,,,C,,,# +#,#,>,,,,,,,,,,,,,,,,,,,+,+,+,+,S,S,S,S,S,+,+,+,+,+,S,S,S,S,S,+,+,+,+,+,S,S,S,S,S,+,+,+,+,+,+,+,+,+,# +#,#,>,,,,,,,,,,,,,,,,,,,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,# +#,#,>,,,,,,,,,,,,,,,,,,,,,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# +#,#,>,,,,,,,,,,,,,,,,,,,,,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# #,#,,,,,,,,,,,,,,,,,,,,,,G,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# -#,,,,,,,,,,,,,,,M,,,,,,M,,,,,,,,,,,,,,,,,M,,,,,,M,,,,,,,,,,,,,,,# +#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# #,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# #,,,,,,,,,,,+,+,+,+,+,+,+,+,+,+,+,+,+,+,+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# #,L,,,,,,,,,,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,# diff --git a/project/data/levels/levels.json b/project/data/levels/levels.json index 186d256..bd8517f 100644 --- a/project/data/levels/levels.json +++ b/project/data/levels/levels.json @@ -1,7 +1,7 @@ -[ + [ { "name": "0-tutorial", - "theme": "tutorial", + "theme": "cave", "abilities": [ ], "file": "0-tutorial.csv" diff --git a/project/data/sprites/cave_block_bottom.png b/project/data/sprites/cave_block_bottom.png index 5353e7b..68ea4e5 100644 Binary files a/project/data/sprites/cave_block_bottom.png and b/project/data/sprites/cave_block_bottom.png differ diff --git a/project/data/sprites/cave_block_full.png b/project/data/sprites/cave_block_full.png index 4e3c524..64003d2 100644 Binary files a/project/data/sprites/cave_block_full.png and b/project/data/sprites/cave_block_full.png differ diff --git a/project/data/sprites/cave_block_left.png b/project/data/sprites/cave_block_left.png index 0102480..171554b 100644 Binary files a/project/data/sprites/cave_block_left.png and b/project/data/sprites/cave_block_left.png differ diff --git a/project/data/sprites/cave_block_right.png b/project/data/sprites/cave_block_right.png index c1876bb..8b5cd87 100644 Binary files a/project/data/sprites/cave_block_right.png and b/project/data/sprites/cave_block_right.png differ diff --git a/project/data/sprites/cave_block_top.png b/project/data/sprites/cave_block_top.png index a8c4b5d..e54f6d6 100644 Binary files a/project/data/sprites/cave_block_top.png and b/project/data/sprites/cave_block_top.png differ diff --git a/project/data/sprites/cave_block_top_left.png b/project/data/sprites/cave_block_top_left.png index 0ab465b..6b3dfc1 100644 Binary files a/project/data/sprites/cave_block_top_left.png and b/project/data/sprites/cave_block_top_left.png differ diff --git a/project/data/sprites/cave_block_top_right.png b/project/data/sprites/cave_block_top_right.png index 02a47d5..7a5d9ff 100644 Binary files a/project/data/sprites/cave_block_top_right.png and b/project/data/sprites/cave_block_top_right.png differ diff --git a/project/data/sprites/sprites.json b/project/data/sprites/sprites.json index fc2a709..7987d6a 100644 --- a/project/data/sprites/sprites.json +++ b/project/data/sprites/sprites.json @@ -586,6 +586,22 @@ ], "width": 12, "height": 12 + }, + { + "id": "2", + "delays": [ + 1 + ], + "width": 12, + "height": 12 + }, + { + "id": "3", + "delays": [ + 1 + ], + "width": 12, + "height": 12 } ] }, @@ -599,6 +615,22 @@ ], "width": 12, "height": 12 + }, + { + "id": "2", + "delays": [ + 1 + ], + "width": 12, + "height": 12 + }, + { + "id": "3", + "delays": [ + 1 + ], + "width": 12, + "height": 12 } ] }, @@ -612,6 +644,22 @@ ], "width": 12, "height": 12 + }, + { + "id": "2", + "delays": [ + 1 + ], + "width": 12, + "height": 12 + }, + { + "id": "3", + "delays": [ + 1 + ], + "width": 12, + "height": 12 } ] }, @@ -638,6 +686,22 @@ ], "width": 12, "height": 12 + }, + { + "id": "2", + "delays": [ + 1 + ], + "width": 12, + "height": 12 + }, + { + "id": "3", + "delays": [ + 1 + ], + "width": 12, + "height": 12 } ] }, @@ -651,6 +715,22 @@ ], "width": 12, "height": 12 + }, + { + "id": "2", + "delays": [ + 1 + ], + "width": 12, + "height": 12 + }, + { + "id": "3", + "delays": [ + 1 + ], + "width": 12, + "height": 12 } ] }, @@ -664,6 +744,22 @@ ], "width": 12, "height": 12 + }, + { + "id": "2", + "delays": [ + 1 + ], + "width": 12, + "height": 12 + }, + { + "id": "3", + "delays": [ + 1 + ], + "width": 12, + "height": 12 } ] }, diff --git a/project/physics/sprites/PlayerSprite.py b/project/physics/sprites/PlayerSprite.py index 6e80bab..9e4a971 100644 --- a/project/physics/sprites/PlayerSprite.py +++ b/project/physics/sprites/PlayerSprite.py @@ -16,7 +16,7 @@ class PlayerSprite(DynamicSprite): self.deceleration_horizontal_air = 0.2 self.deceleration_horizontal_ground = 0.4 - self.gravity = 9.81 / 10 + self.gravity = 9.81 / 11 self.max_motion_horizontal_via_input = 5 self.id = 'player' @@ -41,9 +41,9 @@ class PlayerSprite(DynamicSprite): if tick_data.key_manager.is_keymap_down(KeyManager.KEY_UP): if self.jump_time < 0 and self.get_collides_with_direction(CollisionDirection.BOTTOM): self.jump_time = self.allowed_jump_time - self.motion = (self.motion[0], self.motion[1] - 6) + self.motion = (self.motion[0], self.motion[1] - 7) if self.jump_time >= 0: - self.motion = (self.motion[0], self.motion[1] - 0.55) + self.motion = (self.motion[0], self.motion[1] - 0.6) if self.jump_time >= 0: self.jump_time -= 1