Added Engine.fortify (previously fortification would break Engine)

[pyrisk.git] / pyrisk / log.py

diff --git a/pyrisk/log.py b/pyrisk/log.py
index b6296163c9d02c9b6c5b3eecaea444c33589e525..1cb795543741a73c0eb7bf13faabef1e62fe4894 100644 (file)
--- a/pyrisk/log.py
+++ b/pyrisk/log.py
@@ -140,8 +140,8 @@ class Attack (MoveArmies):
         self.t_dice = t_dice
         self.s_dead = s_dead
         self.t_dead = t_dead
         self.t_dice = t_dice
         self.s_dead = s_dead
         self.t_dead = t_dead

-        self.message = 'attacked %s from %s with %d:%d.  Deaths %d:%d.  Remaining %d:%d' \
-            % (self.target, self.source, len(self.s_dice), len(self.t_dice),
+        self.message = '%s attacks %s with %d:%d.  Deaths %d:%d.  Remaining %d:%d' \
+            % (self.source, self.target, len(self.s_dice), len(self.t_dice),

                self.s_dead, self.t_dead,
                self.source.armies, self.target.armies)
 
                self.s_dead, self.t_dead,
                self.source.armies, self.target.armies)
 


@@ -149,13 +149,13 @@ class Conquer (Attack):
     def __init__(self, source, target, s_dice, t_dice, s_dead, t_dead):
         Attack.__init__(self, source, target, s_dice, t_dice, s_dead, t_dead,
                         armies=target.armies)
     def __init__(self, source, target, s_dice, t_dice, s_dead, t_dead):
         Attack.__init__(self, source, target, s_dice, t_dice, s_dead, t_dead,
                         armies=target.armies)

-        self.message = self.message.replace('attacked', 'conquered')
+        self.message = self.message.replace('attacks', 'conquers')

 
 class Fortify (MoveArmies):
 
 class Fortify (MoveArmies):

-    def __init__(self, *arg, **kwarg):
-        MoveArmies.__init__(self, *arg, **kwarg)
-        self.message = 'fortifies %s from %s with %d' \
-            % (self.target, self.source, self.armies)
+    def __init__(self, source, target, armies):
+        MoveArmies.__init__(self, source.player, source, target, armies)
+        self.message = '%s fortifies %s with %d' \
+            % (self.source, self.target, self.armies)

 
 class Logger (list):
     """Log messages generated by risk.base.Engine.
 
 class Logger (list):
     """Log messages generated by risk.base.Engine.