From 952832745d8b2d2a61b2e184a65d52280a202cdf Mon Sep 17 00:00:00 2001 From: Eveldee Date: Mon, 18 Mar 2019 19:30:03 +0100 Subject: [PATCH] Add difficulty --- game/fall.py | 2 +- game/osu.py | 3 ++- game/pong.py | 2 +- game/space.py | 2 +- main.py | 29 ++++++++++++++++++++--------- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/game/fall.py b/game/fall.py index 26a9ef3..08a9798 100644 --- a/game/fall.py +++ b/game/fall.py @@ -5,5 +5,5 @@ def main(canvas: Canvas): pass # Loop -def loop(deltatime: float): +def loop(deltatime: float, difficulty: float): pass diff --git a/game/osu.py b/game/osu.py index f2b454f..d99f788 100644 --- a/game/osu.py +++ b/game/osu.py @@ -46,10 +46,11 @@ def main(c: tk.Canvas): circle.decrement() # Loop -def loop(deltatime: float): +def loop(deltatime: float, difficulty: float): global tick print(circle.isInside(mouse_x, mouse_y)) + print(difficulty) tick += 1 diff --git a/game/pong.py b/game/pong.py index 26a9ef3..08a9798 100644 --- a/game/pong.py +++ b/game/pong.py @@ -5,5 +5,5 @@ def main(canvas: Canvas): pass # Loop -def loop(deltatime: float): +def loop(deltatime: float, difficulty: float): pass diff --git a/game/space.py b/game/space.py index 26a9ef3..08a9798 100644 --- a/game/space.py +++ b/game/space.py @@ -5,5 +5,5 @@ def main(canvas: Canvas): pass # Loop -def loop(deltatime: float): +def loop(deltatime: float, difficulty: float): pass diff --git a/main.py b/main.py index abdfd86..ffc8a4c 100644 --- a/main.py +++ b/main.py @@ -18,25 +18,35 @@ image_center = ImageTk.PhotoImage(Image.open('res/logo/main.png')) # Time time = None delta = None -iter = 0 +tick = 0 score = tk.IntVar(win, 0) +difficulty = 1.0 +MAX_DIFFICULTY = 3.0 +DIFFICULTY_STEP = (MAX_DIFFICULTY - difficulty) / 5000 def loop(deltaTime): - global time, delta, iter, score + global time, delta, tick, score, difficulty # Start delta = dt.datetime.now() deltatime = (delta - time).microseconds * 1e-6 # Loop - if iter > 2: - fall.loop(deltatime) - osu.loop(deltatime) - pong.loop(deltatime) - space.loop(deltatime) + if tick > 2: + fall.loop(deltatime, difficulty) + osu.loop(deltatime, difficulty) + pong.loop(deltatime, difficulty) + space.loop(deltatime, difficulty) - score.set(int(iter / 5)) - iter += 1 + # Step tick + tick += 1 + score.set(int(tick / 5)) + + # Step difficulty + if difficulty < MAX_DIFFICULTY: + difficulty += DIFFICULTY_STEP + elif difficulty > MAX_DIFFICULTY: + difficulty = MAX_DIFFICULTY # End time = delta @@ -73,6 +83,7 @@ def main(): time = dt.datetime.now() loop(1000 / 60) + print('Bienvenue dans le jeu QuadraLudi') main() win.mainloop() \ No newline at end of file