From f155bef4667eb341122e69fffffa1b6b98560308 Mon Sep 17 00:00:00 2001
From: bee-Michi <96332875+bee-Michi@users.noreply.github.com>
Date: Sat, 18 Dec 2021 21:36:57 +0100
Subject: [PATCH 1/2] hello
---
background.py | 2 +-
main.py | 29 +++++++++++++++++++++++------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/background.py b/background.py
index 097a092..a8a62ea 100644
--- a/background.py
+++ b/background.py
@@ -1,4 +1,4 @@
-import pygame
+import pygame, colorsy
class Background:
def __init__(self):
self.sprite = pygame.image.load('data/gfx/bg.png')
diff --git a/main.py b/main.py
index a4256fa..a9c1436 100644
--- a/main.py
+++ b/main.py
@@ -1,12 +1,29 @@
+#Copyright (C) 2021 polymars
+#
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 3 of the License, or
+#(at your option) any later version.
+
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License
+#along with this program. If not, see .
+
+#We import the required modules
import pygame, sys, time, random, colorsys, math
from pygame.math import Vector2
from pygame.locals import *
-from .player import Player
-from .background import Background
-from .button import Button
-from .bean import Bean
-from .utils import clamp
-from .utils import checkCollisions
+#Import external classes
+from player import Player
+from background import Background
+from button import Button
+from bean import Bean
+from utils import clamp
+from utils import checkCollisions
def main():
From 85ebabdd626f2667db1e48fced50e03584166b79 Mon Sep 17 00:00:00 2001
From: bee-Michi <96332875+bee-Michi@users.noreply.github.com>
Date: Wed, 22 Dec 2021 14:37:42 +0100
Subject: [PATCH 2/2] Update main.py
---
main.py | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/main.py b/main.py
index a9c1436..54abcfd 100644
--- a/main.py
+++ b/main.py
@@ -1,17 +1,3 @@
-#Copyright (C) 2021 polymars
-#
-#This program is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-
-#This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program. If not, see .
#We import the required modules
import pygame, sys, time, random, colorsys, math