Changeset 501:9a16483e49cb


Ignore:
Timestamp:
04/09/11 20:40:25 (12 years ago)
Author:
Neil Muller <drnlmuller@…>
Branch:
default
Phase:
public
Rebase:
61343439346161663037326230326631663631343262303735623032303331393339643039643664
Message:

Remove 1st set of blocking samuri

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • data/npcs/hattori.json

    r500 r501  
    4141    },
    4242    "gone" : {
    43         "on_entry" : "drop_item('tail_sprint')"
     43        "on_entry" : "drop_item('tail_sprint'); npcs.hattori.block = False"
    4444    }
    4545}
  • data/npcs/ichiro.json

    r305 r501  
    3636        "on_exit" : "switch_to('hattori')"
    3737    },
    38     "gone" : {
     38    "gone" : { "on_entry": "npcs.ichiro.block = False"
    3939    }
    4040}
  • skaapsteker/sprites/base.py

    r487 r501  
    280280        OpenDialog.post(self)
    281281
     282    def remove(self):
     283        self._me.level = '_limbo'
     284        self.kill()
     285
    282286
    283287class BlockingNPC(NPC):
  • skaapsteker/sprites/npcs.py

    r475 r501  
    2929                }
    3030
     31    def update(self):
     32        if not self._me.block:
     33            self.remove()
     34
     35
    3136
    3237
     
    3944                ('right', lambda x: transform.flip(x, True, False))),
    4045                }
     46
     47    def update(self):
     48        if not self._me.block:
     49            self.remove()
    4150
    4251
Note: See TracChangeset for help on using the changeset viewer.