Moved character add/remove methods to the CharacterManager class.

Michael Fiano · Michael Fiano · commit d12ca7f5e177 · 2010-01-16T21:46:38.000-05:00
diff --git a/lib/characters.py b/lib/characters.py
@@ -1,5 +1,5 @@
 from constants import *
-from sprite import *
+from sprite import PlayerSprite
 
 class BaseCharacter(object):
     """The base class from which all other game characters derive."""
diff --git a/lib/manager.py b/lib/manager.py
@@ -3,6 +3,20 @@
 class CharacterManager(object):
 
     def __init__(self, screen):
+        self.screen = screen
         self.party = {
             'hero':     CharHero(screen),
             'test':     CharTest(screen) }
+
+    def party_add(self, char):
+        """Add a new party character to the player's party."""
+
+        if not self.party[char] in self.screen.party_sprites:
+            self.screen.party_sprites.add(self.party[char])
+            self.screen.add_all_sprites()
+
+    def party_remove(self, char):
+        """Remove a character from the player's party."""
+
+        if self.party[char] in self.screen.party_sprites:
+            self.party[char].kill()
diff --git a/lib/screens.py b/lib/screens.py
@@ -88,13 +88,13 @@ def create_sprites(self):
 
         self.party_sprites = pygame.sprite.Group([
             self.chars.party['hero'] ])
-        self.char_sprites = pygame.sprite.Group([
-            self.party_sprites ])
         self.gui_stats = StatsWindow(self.party_sprites)
 
     def add_all_sprites(self):
         """Add all sprite groups to the drawing order queue."""
 
+        self.char_sprites = pygame.sprite.Group([
+            self.party_sprites ])
         self.all_sprites = pygame.sprite.OrderedUpdates([
             self.map.layers['terrain'],
             self.char_sprites,
@@ -103,15 +103,6 @@ def add_all_sprites(self):
         for sprite in self.all_sprites:
             self.layers.add(sprite)
 
-    def add_to_party(self, chara):
-        """Called during gameplay to add a new party character to the game."""
-
-        if not self.chars.party[chara] in self.party_sprites:
-            self.party_sprites.add(self.chars.party['test'])
-            self.char_sprites = pygame.sprite.Group([
-                self.party_sprites ])
-            self.add_all_sprites()
-
     def draw(self):
         """Draws the sprites to the screen and updates the window."""
 
diff --git a/lib/states.py b/lib/states.py
@@ -87,9 +87,12 @@ def check_events(self):
                 elif event.key == K_d:
                     pygame.time.set_timer(DIALOG_EVENT, 100)
 
-                # An example of adding the test party character to the party.
+                # An example of adding and removing a test character to the
+                # party.
                 elif event.key == K_a:
-                    self.screen.add_to_party("test")
+                    self.screen.chars.party_add("test")
+                elif event.key == K_z:
+                    self.screen.chars.party_remove("test")
 
                 elif event.key in (
                     HERO_MOVE_DOWN,
