Some small modifications to movement and graphics interaction

4 files changed, 13 insertions, 14 deletions

diff --git a/cutter.py b/cutter.py
index f228863..77f248f 100644
--- a/cutter.py
+++ b/cutter.py
@@ -12,9 +12,9 @@ class Cutter:
 		self.cut_time = cut_time_left
 		self.image = pygame.image.load(cutter_images[randint(0, cutter_images_number - 1)])
 		image_rect = self.image.get_rect()
-		size_reduction = 5
-		self.collision_rect = pygame.Rect(image_rect.left + size_reduction, \
-											image_rect.top + size_reduction, \
+		size_reduction = 10
+		self.collision_rect = pygame.Rect(image_rect.left - size_reduction, \
+											image_rect.top - size_reduction, \
 											image_rect.width - size_reduction, \
 											image_rect.height - size_reduction)
 		self.screen_w = screen_w
diff --git a/main.py b/main.py
index 38f3d35..79c8ad8 100644
--- a/main.py
+++ b/main.py
@@ -16,14 +16,16 @@ from cutter import Cutter
 pygame.init()
 
 global window_h, window_w, trees
-window_h = 640
-window_w = 480
+
 
 # Background
 bg_color = [255, 255, 255]
-screen = pygame.display.set_mode( (window_h, window_w) )
+screen = pygame.display.set_mode( (0,0) )
 pygame.display.set_caption("Ranger")
 
+window_h, window_w = screen.get_size ()
+
+
 # Tree
 plant_time = 100
 trees = []
@@ -38,8 +40,8 @@ ranger_speed = 4
 ranger = Ranger(window_h, window_w, ranger_speed)
 
 # Cutter
-cutter_time = 100
-tree_cutting_time = 100
+cutter_time = 50
+tree_cutting_time = 50
 cutter_speed = 4
 cutter = []
 
diff --git a/ranger.py b/ranger.py
index 21183d7..765a403 100644
--- a/ranger.py
+++ b/ranger.py
@@ -8,7 +8,7 @@ class Ranger:
 		self.speed = ranger_speed
 		self.image = pygame.image.load("images/ranger_hat.png")
 		image_rect = self.image.get_rect()
-		size_reduction = 5
+		size_reduction = 10
 		self.collision_rect = pygame.Rect(image_rect.left + size_reduction, \
 											image_rect.top + size_reduction, \
 											image_rect.width - size_reduction, \
@@ -69,6 +69,3 @@ class Ranger:
 		
 	def get_absolute_rect(self):
 		return self.collision_rect.move(self.position)
-	
-	def plant(self, trees):
-		trees.append(Tree(self.position))
diff --git a/tree.py b/tree.py
index aa9117d..34984c0 100644
--- a/tree.py
+++ b/tree.py
@@ -10,8 +10,8 @@ class Tree:
 		self.image = pygame.image.load(tree_images[randint(0, tree_images_number - 1)])
 		image_rect = self.image.get_rect()
 		size_reduction = 10
-		self.collision_rect = pygame.Rect(image_rect.left + size_reduction, \
-											image_rect.top + size_reduction, \
+		self.collision_rect = pygame.Rect(image_rect.left - size_reduction, \
+											image_rect.top - size_reduction, \
 											image_rect.width - size_reduction, \
 											image_rect.height - size_reduction)