Changeset 573:ebca2f14517f


Ignore:
Timestamp:
04/10/11 00:55:00 (12 years ago)
Author:
Adrianna Pińska <adrianna.pinska@…>
Branch:
default
Phase:
public
Rebase:
33393064656135643631633237656330363633633062303961363332376636623766663964353031
Message:

made agreement depend on both rice and document; made table square

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • data/game.json

    r550 r573  
    3939        "cannon": { "type": "Cannon", "level": "road", "pos": [57, 8], "broken": false, "block": true },
    4040        "rice": { "type": "Rice", "level": "tea_house", "pos": [3, 8], "broken": false },
    41         "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9] },
     41        "documents": { "type": "Documents", "level": "tea_house", "pos": [7, 9], "broken": false },
    4242        "vase": { "type": "Vase", "level": "geisha_room", "pos": [22, 4], "broken": false },
    4343        "salmon": { "type": "Salmon", "level": "_limbo", "pos": [1, 3] },
  • data/levels/tea_house.json

    r519 r573  
    1717        "X..?.........?..........X",
    1818        "X=-->..?....<>.....?....X",
    19         "X?....?pq?.......?pXXq.?X",
     19        "X?....?XX?.......?pXXq.?X",
    2020        "XXXXXXXXXXXXXXXXXXXXXXXXX"
    2121    ],
  • skaapsteker/sprites/items.py

    r567 r573  
    282282    breaking_sound = 'sounds/tearing-rice bag.ogg', 0.2
    283283
    284 
    285 class Documents(Item):
    286     image_file = 'props/documents.png'
    287 
    288     msg = "Let's see if they notice if I add a zero"
    289 
    290     def player_action(self, player):
    291         if not self.world.missions.kanedas_agreement_disrupted:
     284    liftable = False
     285
     286    def smash(self):
     287        super(Rice, self).smash()
     288        if self.world.items.documents.broken:
    292289            self.world.missions.kanedas_agreement_disrupted = True
     290
     291
     292class Documents(BreakableItem):
     293    whole_image_file = 'props/documents.png'
     294    broken_image_file = 'props/documents.png'
     295
     296    msg = "Let's see if they notice if I add a zero."
     297
     298    def player_action(self, player):
     299        if not self._me.broken:
    293300            notify(self.msg)
     301        super(Documents, self).smash()
     302        if self.world.items.rice.broken:
     303            self.world.missions.kanedas_agreement_disrupted = True
    294304
    295305
Note: See TracChangeset for help on using the changeset viewer.