made turnips bigger
authoradrianna <adrianna.pinska@gmail.com>
Fri, 9 Sep 2016 21:20:40 +0000 (23:20 +0200)
committeradrianna <adrianna.pinska@gmail.com>
Fri, 9 Sep 2016 21:21:06 +0000 (23:21 +0200)
data/images/32/turnip1.png [deleted file]
data/images/32/turnip2.png [deleted file]
data/images/32/turnip3.png [deleted file]
data/images/48/turnip1.png [new file with mode: 0644]
data/images/48/turnip2.png [new file with mode: 0644]
data/images/48/turnip3.png [new file with mode: 0644]
data/images/Makefile
tabakrolletjie/turnip.py

diff --git a/data/images/32/turnip1.png b/data/images/32/turnip1.png
deleted file mode 100644 (file)
index 6df8e84..0000000
Binary files a/data/images/32/turnip1.png and /dev/null differ
diff --git a/data/images/32/turnip2.png b/data/images/32/turnip2.png
deleted file mode 100644 (file)
index 4a88a8a..0000000
Binary files a/data/images/32/turnip2.png and /dev/null differ
diff --git a/data/images/32/turnip3.png b/data/images/32/turnip3.png
deleted file mode 100644 (file)
index 1153012..0000000
Binary files a/data/images/32/turnip3.png and /dev/null differ
diff --git a/data/images/48/turnip1.png b/data/images/48/turnip1.png
new file mode 100644 (file)
index 0000000..6cff42f
Binary files /dev/null and b/data/images/48/turnip1.png differ
diff --git a/data/images/48/turnip2.png b/data/images/48/turnip2.png
new file mode 100644 (file)
index 0000000..0e31e29
Binary files /dev/null and b/data/images/48/turnip2.png differ
diff --git a/data/images/48/turnip3.png b/data/images/48/turnip3.png
new file mode 100644 (file)
index 0000000..de66224
Binary files /dev/null and b/data/images/48/turnip3.png differ
index 59c93f9379a7b76c52ba1db25ace0bd470cfd312..c9077baec232f9a0d825160d897a03fc092591ff 100644 (file)
@@ -1,13 +1,13 @@
 VPATH=../../sources/vector
 
-TURNIP=seed turnip1 turnip2 turnip3
+TURNIP=turnip1 turnip2 turnip3
 MOULD_BODY=mouldA mouldB mouldC
 MOULD=eyeballA eyeballB eyeballC
 LIGHT=spotlight lamp laser
 
 IMG16=$(MOULD_BODY)
-IMG32=$(TURNIP) $(MOULD_BODY) $(MOULD) $(LIGHT)
-IMG48=$(LIGHT)
+IMG32=$(MOULD_BODY) $(MOULD) $(LIGHT) seed
+IMG48=$(LIGHT) $(TURNIP)
 IMG64=$(MOULD_BODY)
 
 CURSORS=seed $(LIGHT)
index f40478a1e79834ec64ff5433590c6820fa42664f..b67196a525da4d00d19c024aee3880399194a49c 100644 (file)
@@ -28,7 +28,7 @@ class Turnip(object):
         self._update_image()
         self.eaten = False  # Flag for boyd
         self._body = pymunk.Body(0, 0, pymunk.Body.STATIC)
-        self._shape = pymunk.Circle(self._body, 16)
+        self._shape = pymunk.Circle(self._body, 24)
         self._shape.filter = TURNIP_FILTER
         self._body.position = pymunk.pygame_util.from_pygame(
             self._pos, pygame.display.get_surface())
@@ -39,7 +39,7 @@ class Turnip(object):
         space.add(self._body, self._shape)
 
     def _update_image(self):
-        self._image = loader.load_image('32', 'turnip%d.png' % (self._age + 1))
+        self._image = loader.load_image('48', 'turnip%d.png' % (self._age + 1))
         self._image = pygame.transform.rotate(self._image, self._rotation)
 
     def render(self, surface):