diff --git a/data/data.png b/data/data.png index 4a40797ad837a757363f16ac3dd28b0f5e82d32c..21ae076441b7e67e6505eed90bfde368b46357fa 100644 Binary files a/data/data.png and b/data/data.png differ diff --git a/data/options.json b/data/options.json index 3d68da4eb3137b6f8a7e0edf078c036b26c6a36d..4daf3514d045a01b50abb1d7ed620290196dabab 100644 --- a/data/options.json +++ b/data/options.json @@ -1 +1 @@ -{"asf": 2.0, "master_volume": 50, "music_volume": 21, "sfx_volume": 58, "user_name": "Player"} \ No newline at end of file +{"asf": 1.0, "master_volume": 50, "music_volume": 21, "sfx_volume": 58, "user_name": "Player"} \ No newline at end of file diff --git a/source/api/management/background_manager.py b/source/api/management/background_manager.py index 20d403a0a49f6bb6462d3170172df92614d1e518..adc780c71fc6a582d36ff32b833519d64bf5bddb 100644 --- a/source/api/management/background_manager.py +++ b/source/api/management/background_manager.py @@ -30,13 +30,14 @@ class BackgroundManager: screen (pygame.Surface): The screen to draw the image on. """ # Load the images and scale them to the screen size - self.load_images() - self.image_dir = image_dir - self.delay = delay self.screen = screen + + self.delay = delay self.current_image = 0 self.last_update = 0 + + self.load_images() def update(self, delta_time) -> None: """ diff --git a/source/game/scenes/main_pinball.py b/source/game/scenes/main_pinball.py index 0d33567e8adc85edac8660124fb693b9829f63c4..daf5742f8c7f4b47a40b67680744d5fcd0c9b013 100644 --- a/source/game/scenes/main_pinball.py +++ b/source/game/scenes/main_pinball.py @@ -114,7 +114,7 @@ class MainPinball(Scene): scale_strength = .25 self.add_gameobject(Plunger(self, V2(width - self.ball_radius*3, height), - V2(width, height), impuls_range=(int(1400*asf), int(1600*asf)))) + V2(width, height), impuls_range=(int(1500*asf**(2/3)), int(1700*asf**(2/3))))) self.left_flipper = Flipper(self, V2(300*asf - 130 * asf, height - 125*asf), 30) self.right_flipper = Flipper(self, V2(300*asf + 130 * asf, height - 125*asf), 150)