# HG changeset patch # User Adrianna PiƄska # Date 1315946377 -7200 # Node ID 9c47bf162ea19528d175ea0516258d817463991b # Parent 8502e422cefc8e0d133da2cf07a9e2d2eba46f13 snake has plastic surgery diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-body-r.png Binary file data/tiles/common/snake/snake-body-r.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-body.png Binary file data/tiles/common/snake/snake-body.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-corner-tl.png Binary file data/tiles/common/snake/snake-corner-tl.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-head-eye-r.png Binary file data/tiles/common/snake/snake-head-eye-r.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-head-mouth-open-r.png Binary file data/tiles/common/snake/snake-head-mouth-open-r.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-head-r.png Binary file data/tiles/common/snake/snake-head-r.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-head-tongue-r.png Binary file data/tiles/common/snake/snake-head-tongue-r.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-head.png Binary file data/tiles/common/snake/snake-head.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-tail-r.png Binary file data/tiles/common/snake/snake-tail-r.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 data/tiles/common/snake/snake-tail.png Binary file data/tiles/common/snake/snake-tail.png has changed diff -r 8502e422cefc -r 9c47bf162ea1 mamba/snake.py --- a/mamba/snake.py Tue Sep 13 21:32:38 2011 +0200 +++ b/mamba/snake.py Tue Sep 13 22:39:37 2011 +0200 @@ -78,7 +78,7 @@ def __init__(self, image_name, tile_pos): super(Segment, self).__init__() - self._base_image = "/".join(["snake", image_name]) + self.set_base_image(image_name) self._colour_overlay = self.GREEN self._orientation = Snake.UP @@ -86,6 +86,9 @@ self.update_image() self.set_tile_pos(tile_pos) + def set_base_image(self, image_name): + self._base_image = "/".join(["snake", image_name]) + def make_images(self): self._images = {} for orientation, muts in [ @@ -112,29 +115,41 @@ class Head(Segment): + CLOSED = "snake-head" + OPEN = "snake-head-mouth-open-r" + EYE = mutators.Overlay("tiles/common/snake/snake-head-eye-r.png") + TONGUE = mutators.Overlay("tiles/common/snake/snake-head-tongue-r.png") + def __init__(self, tile_pos): - self._eye = mutators.Overlay("tiles/common/snake/snake-head-eye-r.png") - self._tongue = mutators.Overlay( - "tiles/common/snake/snake-head-tongue-r.png") - self._detail_mutators = (self._eye,) - super(Head, self).__init__("snake-head-mouth-open-r", tile_pos) + self._detail_mutators = (self.EYE,) + super(Head, self).__init__(self.CLOSED, tile_pos) + + def mouth_open(self): + self.set_base_image(self.OPEN) + self.make_images() + self.update_image() + + def mouth_closed(self): + self.set_base_image(self.CLOSED) + self.make_images() + self.update_image() def tongue_out(self): - self._detail_mutators = (self._eye, self._tongue) + self._detail_mutators = (self.EYE, self.TONGUE) self.make_images() self.update_image() def tongue_in(self): - self._detail_mutators = (self._eye,) + self._detail_mutators = (self.EYE,) self.make_images() self.update_image() class Body(Segment): def __init__(self, tile_pos): - super(Body, self).__init__("snake-body-r", tile_pos) + super(Body, self).__init__("snake-body", tile_pos) class Tail(Segment): def __init__(self, tile_pos): - super(Tail, self).__init__("snake-tail-r", tile_pos) + super(Tail, self).__init__("snake-tail", tile_pos) diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-body-r.svg --- a/source/svg/tiles/common/snake/snake-body-r.svg Tue Sep 13 21:32:38 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-corner-tl.svg --- a/source/svg/tiles/common/snake/snake-corner-tl.svg Tue Sep 13 21:32:38 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-head-eye-r.svg --- a/source/svg/tiles/common/snake/snake-head-eye-r.svg Tue Sep 13 21:32:38 2011 +0200 +++ b/source/svg/tiles/common/snake/snake-head-eye-r.svg Tue Sep 13 22:39:37 2011 +0200 @@ -14,7 +14,7 @@ id="svg2" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="snake-head-r.svg"> + sodipodi:docname="snake-head-tongue-r.svg"> - - - - + position="0,190" + id="guide3074" /> @@ -93,7 +77,7 @@ transform="translate(0,-852.36218)"> + transform="matrix(0.79999996,0,0,0.79999996,-7.5128653,191.63886)"> - - + position="100,0" + id="guide4744" /> - - - - + position="0,190" + id="guide3074" /> @@ -104,11 +80,16 @@ id="layer1" transform="translate(0,-852.36218)"> + sodipodi:type="arc" + style="fill:#ffffff;fill-opacity:1;stroke:none" + id="path4181" + sodipodi:cx="111.66381" + sodipodi:cy="113.89365" + sodipodi:rx="66.037735" + sodipodi:ry="62.778732" + d="m 177.70155,113.89365 c 0,34.67173 -29.56611,62.77873 -66.03774,62.77873 -36.471633,0 -66.037734,-28.107 -66.037734,-62.77873 0,-34.67174 29.566101,-62.778736 66.037734,-62.778736 0.0285,0 0.0571,1.8e-5 0.0856,5.3e-5 l -0.0856,62.778683 z" + transform="matrix(0.96368557,0.96368557,-1.0137129,1.0137129,107.84665,729.29792)" + sodipodi:start="0" + sodipodi:end="4.7136853" /> diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-head-r.svg --- a/source/svg/tiles/common/snake/snake-head-r.svg Tue Sep 13 21:32:38 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-head-tongue-r.svg --- a/source/svg/tiles/common/snake/snake-head-tongue-r.svg Tue Sep 13 21:32:38 2011 +0200 +++ b/source/svg/tiles/common/snake/snake-head-tongue-r.svg Tue Sep 13 22:39:37 2011 +0200 @@ -14,7 +14,7 @@ id="svg2" version="1.1" inkscape:version="0.48.1 r9760" - sodipodi:docname="snake-head-tongue-r.svg"> + sodipodi:docname="snake-head-mouth-open-r.svg"> - - - - - - - + position="0,190" + id="guide3074" /> @@ -94,7 +66,7 @@ image/svg+xml - + @@ -106,7 +78,7 @@ diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-head.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/source/svg/tiles/common/snake/snake-head.svg Tue Sep 13 22:39:37 2011 +0200 @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-tail-r.svg --- a/source/svg/tiles/common/snake/snake-tail-r.svg Tue Sep 13 21:32:38 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff -r 8502e422cefc -r 9c47bf162ea1 source/svg/tiles/common/snake/snake-tail.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/source/svg/tiles/common/snake/snake-tail.svg Tue Sep 13 22:39:37 2011 +0200 @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + +