From: adrianna <adrianna.pinska@gmail.com>
Date: Fri, 9 Sep 2016 21:10:22 +0000 (+0200)
Subject: made light fixtures smaller
X-Git-Tag: tabakrolletjie-v1.0.0~143^2~3
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=8cce42a8cf2e7a4af99a199f4e24f3ac6c94f654;p=tabakrolletjie.git

made light fixtures smaller
---

diff --git a/data/images/48/lamp.png b/data/images/48/lamp.png
new file mode 100644
index 0000000..b985f44
Binary files /dev/null and b/data/images/48/lamp.png differ
diff --git a/data/images/48/laser.png b/data/images/48/laser.png
new file mode 100644
index 0000000..c23df50
Binary files /dev/null and b/data/images/48/laser.png differ
diff --git a/data/images/48/spotlight.png b/data/images/48/spotlight.png
new file mode 100644
index 0000000..b7231c8
Binary files /dev/null and b/data/images/48/spotlight.png differ
diff --git a/data/images/64/lamp.png b/data/images/64/lamp.png
deleted file mode 100644
index ae2443c..0000000
Binary files a/data/images/64/lamp.png and /dev/null differ
diff --git a/data/images/64/laser.png b/data/images/64/laser.png
deleted file mode 100644
index 2ba3633..0000000
Binary files a/data/images/64/laser.png and /dev/null differ
diff --git a/data/images/64/spotlight.png b/data/images/64/spotlight.png
deleted file mode 100644
index 5d54037..0000000
Binary files a/data/images/64/spotlight.png and /dev/null differ
diff --git a/data/images/Makefile b/data/images/Makefile
index af81aa2..59c93f9 100644
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@ -7,25 +7,31 @@ LIGHT=spotlight lamp laser
 
 IMG16=$(MOULD_BODY)
 IMG32=$(TURNIP) $(MOULD_BODY) $(MOULD) $(LIGHT)
-IMG64=$(MOULD_BODY) $(LIGHT)
+IMG48=$(LIGHT)
+IMG64=$(MOULD_BODY)
 
 CURSORS=seed $(LIGHT)
 
 PNG16=$(patsubst %, 16/%.png, $(IMG16))
 PNG32=$(patsubst %, 32/%.png, $(IMG32))
+PNG48=$(patsubst %, 48/%.png, $(IMG48))
 PNG64=$(patsubst %, 64/%.png, $(IMG64))
 PNG_CURSORS=$(patsubst %, cursors/%.png, $(CURSORS))
 
-all: $(PNG16) $(PNG32) $(PNG64) $(PNG_CURSORS)
+all: $(PNG16) $(PNG32) $(PNG48) $(PNG64) $(PNG_CURSORS)
 
 16/%.png: %.svg
 	@mkdir -p `dirname $@`
 	@inkscape -z -e $@ -w 16 -h 16 $<
-	
+
 32/%.png: %.svg
 	@mkdir -p `dirname $@`
 	@inkscape -z -e $@ -w 32 -h 32 $<
-	
+
+48/%.png: %.svg
+	@mkdir -p `dirname $@`
+	@inkscape -z -e $@ -w 48 -h 48 $<
+
 64/%.png: %.svg
 	@mkdir -p `dirname $@`
 	@inkscape -z -e $@ -w 64 -h 64 $<
diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index 5334d64..e546b29 100644
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -206,13 +206,13 @@ class BaseLight(object):
         if self._image is None:
             fitting_colour = self.COLOURS[self.colour]
             self._image = loader.load_image(
-                "64", self.FITTING_IMG,
+                "48", self.FITTING_IMG,
                 transform=Multiply(colour=fitting_colour))
         return self._image
 
     def render_fitting(self, surface):
         rx, ry = pymunk.pygame_util.to_pygame(self.position, surface)
-        surface.blit(self.get_image(), (rx - 32, ry - 32), None, 0)
+        surface.blit(self.get_image(), (rx - 24, ry - 24), None, 0)
 
     def tick(self):
         pass