From 9e8c739353510ac0809707772857886de259fbb7 Mon Sep 17 00:00:00 2001
From: Elis Axelsson <elis.axelsson@gmail.com>
Date: Fri, 28 Jul 2017 15:11:30 +0200
Subject: [PATCH] Change sizes and speeds to be based on gridSize

---
 classes/enemies/ogre.py   | 14 ++++++++++----
 classes/towers/bubbler.py |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/classes/enemies/ogre.py b/classes/enemies/ogre.py
index 459ec92..47281bf 100644
--- a/classes/enemies/ogre.py
+++ b/classes/enemies/ogre.py
@@ -1,12 +1,18 @@
 import pygame
+from classes.settings import Settings
 from classes.enemies.enemy import Enemy
 
 
 class Ogre(Enemy):
     def __init__(self, gridPos):
+        settings = Settings()
+
+        # One quarter grid size
+        one_quarter = round(settings.gridSize / 4)
+
         # Make a surface
         surface = pygame.Surface(
-            (30, 30),
+            (one_quarter * 3, one_quarter * 3),
             pygame.SRCALPHA
         )
 
@@ -14,8 +20,8 @@ class Ogre(Enemy):
         pygame.draw.circle(
             surface,
             (0, 255, 0),
-            (15, 15),
-            15,
+            (round(one_quarter * 1.5), round(one_quarter * 1.5)),
+            round(one_quarter * 1.5),
             0
         )
 
@@ -24,5 +30,5 @@ class Ogre(Enemy):
             gridPos=gridPos,
             surface=surface,
             health=200,
-            speed=20,
+            speed=settings.gridSize * 2.5,
         )
diff --git a/classes/towers/bubbler.py b/classes/towers/bubbler.py
index 157f68e..e92f60b 100644
--- a/classes/towers/bubbler.py
+++ b/classes/towers/bubbler.py
@@ -26,8 +26,8 @@ class Bubbler(Tower):
         super(self.__class__, self).__init__(
             fireRate=250,
             damage=10,
-            range=300,
-            speed=100,
+            range=settings.gridSize * 8,
+            speed=settings.gridSize * 2.5,
             surface=surface,
             gridPos=gridPos,
             projectile=Bubble,