comparison gamelib/state.py @ 487:efb34a6cd2a1 engine_refactor

Make name param to an Item optional and use NAME if present.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 29 Aug 2010 13:07:49 +0200
parents a7ed199f69d5
children d8087848722d
comparison
equal deleted inserted replaced
486:14eb4b92c93b 487:efb34a6cd2a1
503 INVENTORY_IMAGE = None 503 INVENTORY_IMAGE = None
504 504
505 # name for interactions (i.e. def interact_with_<TOOL_NAME>) 505 # name for interactions (i.e. def interact_with_<TOOL_NAME>)
506 TOOL_NAME = None 506 TOOL_NAME = None
507 507
508 # name for interactions (i.e. def interact_with_<TOOL_NAME>)
509 NAME = None
510
508 # set to instance of CursorSprite 511 # set to instance of CursorSprite
509 CURSOR = None 512 CURSOR = None
510 513
511 def __init__(self, name): 514 def __init__(self, name=None):
512 self.name = name 515 self.name = self.NAME
516 if name is not None:
517 self.name = name
513 self.tool_name = name 518 self.tool_name = name
514 if self.TOOL_NAME is not None: 519 if self.TOOL_NAME is not None:
515 self.tool_name = self.TOOL_NAME 520 self.tool_name = self.TOOL_NAME
516 self.inventory_image = get_image('items', self.INVENTORY_IMAGE) 521 self.inventory_image = get_image('items', self.INVENTORY_IMAGE)
517 522
540 @classmethod 545 @classmethod
541 def _get_new_id(cls): 546 def _get_new_id(cls):
542 cls._counter += 1 547 cls._counter += 1
543 return cls._counter - 1 548 return cls._counter - 1
544 549
545 def __init__(self, name): 550 def __init__(self, name=None):
546 my_count = self._get_new_id() 551 my_count = self._get_new_id()
547 super(CloneableItem, self).__init__("%s.%s" % (name, my_count)) 552 super(CloneableItem, self).__init__("%s.%s" % (name, my_count))
548 self.tool_name = name 553 self.tool_name = name
549 if self.TOOL_NAME is not None: 554 if self.TOOL_NAME is not None:
550 self.tool_name = self.TOOL_NAME 555 self.tool_name = self.TOOL_NAME