From: Neil <neil@dip.sun.ac.za>
Date: Sat, 10 Sep 2016 18:03:36 +0000 (+0200)
Subject: Merge branch 'master' of ctpug:tabakrolletjie
X-Git-Tag: tabakrolletjie-v1.0.0~58^2~1
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=2c4e75ff72faa75a3a7386dbbc6d14ba5c18024f;p=tabakrolletjie.git

Merge branch 'master' of ctpug:tabakrolletjie
---

2c4e75ff72faa75a3a7386dbbc6d14ba5c18024f
diff --cc tabakrolletjie/lights.py
index 723da6a,bae4df3..8ef1265
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@@ -237,8 -245,11 +245,11 @@@ 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
+ 
      def toggle(self):
          self.colour_pos += 1
          if self.colour_pos >= len(self.colour_cycle):