# HG changeset patch
# User Adrianna Pińska <adrianna.pinska@gmail.com>
# Date 1302396900 -7200
# Node ID ebca2f14517f8ad11099b538576bac927bc81930
# Parent  f6a0fbf918fd3bebf01781bc211ebcf21f5a5ddc
made agreement depend on both rice and document; made table square

diff -r f6a0fbf918fd -r ebca2f14517f data/game.json
--- a/data/game.json	Sun Apr 10 02:36:06 2011 +0200
+++ b/data/game.json	Sun Apr 10 02:55:00 2011 +0200
@@ -38,7 +38,7 @@
         "oil": { "type": "Oil", "level": "road", "pos": [17, 8] },
         "cannon": { "type": "Cannon", "level": "road", "pos": [57, 8], "broken": false, "block": true },
         "rice": { "type": "Rice", "level": "tea_house", "pos": [3, 8], "broken": false },
-        "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9] },
+        "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9], "broken": false },
         "vase": { "type": "Vase", "level": "geisha_room", "pos": [22, 4], "broken": false },
         "salmon": { "type": "Salmon", "level": "_limbo", "pos": [1, 3] },
         "no_mask": { "type": "NoMask", "level": "theatre", "pos": [10, 10], "broken": false },
diff -r f6a0fbf918fd -r ebca2f14517f data/levels/tea_house.json
--- a/data/levels/tea_house.json	Sun Apr 10 02:36:06 2011 +0200
+++ b/data/levels/tea_house.json	Sun Apr 10 02:55:00 2011 +0200
@@ -16,7 +16,7 @@
         "X=>............<>.......X",
         "X..?.........?..........X",
         "X=-->..?....<>.....?....X",
-        "X?....?pq?.......?pXXq.?X",
+        "X?....?XX?.......?pXXq.?X",
         "XXXXXXXXXXXXXXXXXXXXXXXXX"
     ],
     "enemies": [
diff -r f6a0fbf918fd -r ebca2f14517f skaapsteker/sprites/items.py
--- a/skaapsteker/sprites/items.py	Sun Apr 10 02:36:06 2011 +0200
+++ b/skaapsteker/sprites/items.py	Sun Apr 10 02:55:00 2011 +0200
@@ -281,16 +281,26 @@
     broken_image_file = 'props/rice-broken.png'
     breaking_sound = 'sounds/tearing-rice bag.ogg', 0.2
 
+    liftable = False
 
-class Documents(Item):
-    image_file = 'props/documents.png'
+    def smash(self):
+        super(Rice, self).smash()
+        if self.world.items.documents.broken:
+            self.world.missions.kanedas_agreement_disrupted = True
+
 
-    msg = "Let's see if they notice if I add a zero"
+class Documents(BreakableItem):
+    whole_image_file = 'props/documents.png'
+    broken_image_file = 'props/documents.png'
+
+    msg = "Let's see if they notice if I add a zero."
 
     def player_action(self, player):
-        if not self.world.missions.kanedas_agreement_disrupted:
+        if not self._me.broken:
+            notify(self.msg)
+        super(Documents, self).smash()
+        if self.world.items.rice.broken:
             self.world.missions.kanedas_agreement_disrupted = True
-            notify(self.msg)
 
 
 ##################################################