From: adrianna Date: Fri, 9 Sep 2016 21:20:40 +0000 (+0200) Subject: made turnips bigger X-Git-Tag: tabakrolletjie-v1.0.0~143^2 X-Git-Url: https://git.ctpug.org.za/?p=tabakrolletjie.git;a=commitdiff_plain;h=e2e908448412e65859bfe0860ed5b7f8540f39cd made turnips bigger --- diff --git a/data/images/32/turnip1.png b/data/images/32/turnip1.png deleted file mode 100644 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 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 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 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 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 index 0000000..de66224 Binary files /dev/null and b/data/images/48/turnip3.png differ diff --git a/data/images/Makefile b/data/images/Makefile index 59c93f9..c9077ba 100644 --- a/data/images/Makefile +++ b/data/images/Makefile @@ -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) diff --git a/tabakrolletjie/turnip.py b/tabakrolletjie/turnip.py index f40478a..b67196a 100644 --- a/tabakrolletjie/turnip.py +++ b/tabakrolletjie/turnip.py @@ -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):