# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1302346538 -7200
# Node ID f870e3122ac7dbb8adb54da9d9b9fe0c35b021ff
# Parent  a9d760134706a02ed914c1ecd4048c2eb59c34b3
Collect haiku scrolls.

diff -r a9d760134706 -r f870e3122ac7 data/game.json
--- a/data/game.json	Sat Apr 09 12:53:49 2011 +0200
+++ b/data/game.json	Sat Apr 09 12:55:38 2011 +0200
@@ -17,7 +17,7 @@
         "level": "temple",
         "doorway": "starting",
         "tofu": 0,
-        "scrolls": 0
+        "scrolls": []
     },
     "missions": {
         "monk_tea": false,
@@ -39,6 +39,7 @@
         "teacupfull": { "type": "TeaCupFull", "level": "_limbo", "pos": [0, 0] },
         "vase": { "type": "Vase", "level": "geisha_room", "pos": [1, 3], "broken": false },
         "salmon": { "type": "Salmon", "level": "fishmonger_house", "pos": [1, 3] },
+        "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [14, 16], "text": "a cherry blossom" },
         "aburage_001": { "type": "Aburage", "level": "temple", "pos": [12, 2] },
         "aburage_002": { "type": "Aburage", "level": "temple", "pos": [14, 2] }
     },
diff -r a9d760134706 -r f870e3122ac7 skaapsteker/levelscene.py
--- a/skaapsteker/levelscene.py	Sat Apr 09 12:53:49 2011 +0200
+++ b/skaapsteker/levelscene.py	Sat Apr 09 12:55:38 2011 +0200
@@ -214,7 +214,7 @@
         # Draw scroll count
 
         pos = self._clip_rect.right - 20, self._clip_rect.top + 225
-        count = Text("%s" % fox.scrolls, pos)
+        count = Text("%s" % len(fox.scrolls), pos)
         count.draw(self._level_surface)
         pos = self._clip_rect.right - 55, self._clip_rect.top + 220
         self._level_surface.blit(self._scroll, pos)
diff -r a9d760134706 -r f870e3122ac7 skaapsteker/sprites/items.py
--- a/skaapsteker/sprites/items.py	Sat Apr 09 12:53:49 2011 +0200
+++ b/skaapsteker/sprites/items.py	Sat Apr 09 12:55:38 2011 +0200
@@ -12,6 +12,19 @@
         self.remove()
 
 
+class HaikuScroll(Item):
+    image_file = 'haiku-scroll.png'
+
+    def player_action(self, player):
+        player.collect_scroll(self)
+        self.remove()
+
+
+    def setup(self, text, **opts):
+        super(HaikuScroll, self).setup(**opts)
+        self.text = text
+
+
 
 ##################################################
 # Monk tea mission
diff -r a9d760134706 -r f870e3122ac7 skaapsteker/sprites/player.py
--- a/skaapsteker/sprites/player.py	Sat Apr 09 12:53:49 2011 +0200
+++ b/skaapsteker/sprites/player.py	Sat Apr 09 12:55:38 2011 +0200
@@ -375,5 +375,11 @@
     def add_actionable(self, actionable):
         self._touching_actionables.append(actionable)
 
+
     def eat_aburage(self):
         self._me.tofu += 1
+
+
+    def collect_scroll(self, scroll):
+        self._me.scrolls.append(scroll.text)
+