Merge branch 'master' of ctpug.org.za:tabakrolletjie

diff --git a/tabakrolletjie/constants.py b/tabakrolletjie/constants.py
index 9e1089281760df2c5782a480faddefae922fa371..6ddfd9fd01083bda88ae028072ba811a1df1c762 100644 (file)
--- a/tabakrolletjie/constants.py
+++ b/tabakrolletjie/constants.py
@@ -15,10 +15,10 @@ FPS_FRAMES = 50
 SCREEN_SIZE = (1024, 704)
 
 # Frame per second
-FPS = 60
+FPS = 30
 
 # Night length in ticks
-NIGHT_LENGTH = 3000
+NIGHT_LENGTH = 1500
 
 # Pymunk categories
 OBSTACLE_CATEGORY = 1 << 0

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 8294f4d426502fe149c5078fc9626c93c7995594..4fc9470ba90155cf109f20a7292496b148982039 100644 (file)
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -23,8 +23,8 @@ EAT_TURNIP_FILTER = pymunk.ShapeFilter(mask=TURNIP_CATEGORY)
 
 
 # Boyd parameters
-SPAWN_RATE = 10
-MAX_AGE = 60
+SPAWN_RATE = 5
+MAX_AGE = 30
 MAX_ELEMENTS = 400
 MAX_HEALTH = 100
 
@@ -33,7 +33,7 @@ DAY_HEALTH = 10
 
 HEAL_FACTOR = 1
 
-MOULD_STAGES = [15, 25]
+MOULD_STAGES = [7, 13]
 
 MOULD_RADIUS = 16
 

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index bae4df333482aac86024710984bda873fcbc5231..8ef12655ed5da1958a6187a474c8e9c69ea77cf7 100644 (file)
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -245,7 +245,7 @@ class BaseLight(object):
         return 5 * area * self.intensity / 6400  # 80x80 unit area
 
     def base_damage(self):
-        return 5 * self.intensity
+        return 10 * self.intensity
 
     def off(self):
         self.on = False

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index 115630ab65ef5e143e0266665b12d7e0af8570b9..803827665d534eb2627aef88dc47bb4d42a6d1a6 100644 (file)
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -17,7 +17,7 @@ from ..loader import loader
 from ..transforms import Overlay
 from ..turnip import Turnip
 from ..widgets import ImageButton
-from ..constants import NIGHT_LENGTH, DEBUG, FONTS, SCREEN_SIZE
+from ..constants import NIGHT_LENGTH, DEBUG, FONTS, SCREEN_SIZE, FPS
 
 
 class NightScene(BaseScene):
@@ -158,7 +158,7 @@ class NightScene(BaseScene):
             if self._total_ticks < NIGHT_LENGTH:
                 self._mould.tick(gamestate, self._space, self._lights)
                 self._lights.tick()
-                if self._total_ticks % 60 == 0:
+                if self._total_ticks % FPS == 0:
                     self._battery.current -= int(
                         self._lights.total_power_usage())
                     self.check_battery()