WIP: let player use magic

Author: fmarco

core/core.py

@@ -48,8 +48,7 @@ def handle_user_input(self):
 
     def check_damages(self):
         if self.hero.is_dead:
-            print 'You lose'
-            self.stop()
+            self.stop(message='You lose !')
 
     def draw(self):
         self.hero.show_stats()
@@ -85,3 +84,4 @@ def stop(self, message=None):
         self.running = False
         if message:
             print message
+            _ = raw_input('Press any key...')

core/entities/__init__.py

@@ -43,6 +43,12 @@ def right(self):
     def left(self):
         self.update_level(**{'action': ['left', self.movement]})
 
+    def fight_with(self, enemy):
+        raise NotImplementedError
+    
+    def perform_physical_attack(self, enemy):
+        raise NotImplementedError
+
 
 class Enemy(Entity):
 
@@ -59,6 +65,12 @@ def __init__(self, *args, **kwargs):
     def move(self):
         raise NotImplementedError
 
+    def fight_with(self, enemy):
+        self.perform_physical_attack(enemy)
+    
+    def perform_physical_attack(self, enemy):
+        enemy.hp = enemy.hp - self.attack
+
 
 class Blob(Enemy):
     symbol = 'O'
@@ -105,6 +117,10 @@ class Hero(Entity):
     hp = 10
     max_hp = 10
     attack = 5
+    battle_operations = {
+        0: 'attack',
+        1: 'magic'
+    }
 
     def __init__(self, *args, **kwargs):
         initial_attrs = kwargs.pop('hero_attrs', {})
@@ -136,3 +152,24 @@ def use_item(self):
             item.use(self)
         except ValueError:
             pass
+
+    def fight_with(self, enemy):
+        attacking = True
+        while attacking:
+            print '0) attack'
+            print '1) magic'
+            choose = raw_input('Choose an action')
+            try:
+                ch = int(choose)
+                choice = self.battle_operations.get(ch)
+                if choice:
+                    if choice == 'attack':
+                        self.perform_physical_attack(enemy)
+                    elif choice == 'magic':
+                        continue
+                    attacking = False
+            except ValueError:
+                pass
+    
+    def perform_physical_attack(self, enemy):
+        enemy.hp = enemy.hp - self.attack

core/levels/__init__.py

@@ -142,15 +142,13 @@ def update(self, *args, **kwargs):
 
     def fight(self, attacker, defender):
         while True:
-            defender.hp = defender.hp - attacker.attack
+            attacker.fight_with(defender)
             if defender.is_dead:
                 if isinstance(defender, Enemy):
-                    x = self.coordinates[defender]['x']
-                    y = self.coordinates[defender]['y']
-                    self.level_map[x][y] = None
-                    del self.coordinates[defender]
-                    self.enemies.remove(defender)
+                    self.remove_entity(defender)
                     self.draw()
+                    print 'You win !'
+                    _ = raw_input('Press any key...')
                 raise BattleFinishedException
             attacker, defender = defender, attacker
 
@@ -162,6 +160,13 @@ def add_entity_at_coordinates(self, entity, x, y):
         }
         self.level_map[x][y] = entity
 
+    def remove_entity(self, entity):
+        x = self.coordinates[entity]['x']
+        y = self.coordinates[entity]['y']
+        self.level_map[x][y] = None
+        del self.coordinates[entity]
+        self.enemies.remove(entity)
+
     def move_enemies(self):
         for enemy in self.enemies:
             enemy.move()

test_level.json

@@ -1,17 +1,17 @@
 {
     "map":
     [
-        ["#", "#", "#", "#", "#", "#", "#", "#"],
-        ["#", ".", "M",".", ".", ".",  ".", "#"],
-        ["#", ".", ".",".", ".", ".",  "Z", "#"],
-        ["#", ".", ".",".", ".", ".",  ".", "#"],
-        ["#", ".", ".",".", ".", "M",  ".", "#"],
-        ["#", "O", ".",".", "#", ".",  ".", "#"],
-        ["#", ".", ".",".", "#", ".",  ".", "#"],
-        ["#", ".", "#", ".", "#", "#", ".", "#"],
-        ["#", ".", ".",".", "#", ".",  "O", "#"],
-        ["#", ".", ".",".", "#", ".",  ".", "#"],
-        ["#", "#", "#", "#", "#", "#", "#", "#"]
+        ["#", "#", "#", "#", "#", "#", "#", "#", "#"],
+        ["#", ".", "M",".", ".", ".",  ".", ".", "#"],
+        ["#", ".", ".",".", ".", ".",  "Z", ".", "#"],
+        ["#", ".", ".",".", ".", ".",  ".", ".", "#"],
+        ["#", ".", ".",".", ".", "M",  ".", ".", "#"],
+        ["#", "O", ".",".", "#", ".",  ".", ".", "#"],
+        ["#", ".", ".",".", "#", ".",  ".", ".", "#"],
+        ["#", ".", "#", ".", "#", "#", ".", ".", "#"],
+        ["#", ".", ".",".", "#", ".",  "O", ".", "#"],
+        ["#", ".", ".",".", "#", ".",  ".", ".", "#"],
+        ["#", "#", "#", "#", "#", "#", "#", "#", "#"]
     ],
     "name": "level_1"
 }