Changeset 85 for pycodebattler

Timestamp:

01/06/11 20:58:00 (14 years ago)

Author:

atzm

Message:

support to make warrior by parameters

Location:

pycodebattler/trunk/pycodebattler

Files:

• battle.py (modified) (1 diff)
• scouter.py (modified) (1 diff)
• warrior.py (modified) (1 diff)

pycodebattler/trunk/pycodebattler/battle.py

@@ -133 +133 @@
     ]]
     players = [
-        pycodebattler.warrior.Warrior(
+        pycodebattler.warrior.Warrior.make(
             pycodebattler.util.path2name(f),
             open(f),

pycodebattler/trunk/pycodebattler/scouter.py

@@ -20 +20 @@
 def _main_entry():
     if len(sys.argv) == 1:
-        p = [pycodebattler.warrior.Warrior('stdin', sys.stdin)]
+        p = [pycodebattler.warrior.Warrior.make('stdin', sys.stdin)]
     else:
-        p = [pycodebattler.warrior.Warrior(
+        p = [pycodebattler.warrior.Warrior.make(
              pycodebattler.util.path2name(f), open(f))
              for f in sys.argv[1:]]

pycodebattler/trunk/pycodebattler/warrior.py

@@ -64 +64 @@
 
 class Warrior:
-    def __init__(self, name, fp, skill_list=[], luck_range=5000):
-        scorer = pycodebattler.score.Scorer(fp.readlines())
-
-        self._luck_range = luck_range
+    def __init__(self, name, hitpoint, skillpoint, strength, concentration,
+                 defense, agility, luck, skill_list=[], luck_range=5000):
         self._name = name
         self._skill_list = {}
-        self._max_hitpoint = self._hitpoint = scorer.style_score()
-        self._max_skillpoint = self._skillpoint = scorer.name_score()
-        self._strength = scorer.complex_score()
-        self._concentration = scorer.colon_score()
-        self._defense = scorer.lines_score()
-        self._agility = scorer.const_score()
-        self._luck = luck_range // (self.hitpoint() +
-                                    self.skillpoint() +
-                                    self.strength() +
-                                    self.concentration() +
-                                    self.defense() +
-                                    self.agility())
+        self._max_hitpoint = self._hitpoint = hitpoint
+        self._max_skillpoint = self._skillpoint = skillpoint
+        self._strength = strength
+        self._concentration = concentration
+        self._defense = defense
+        self._agility = agility
+        self._luck = luck
+        self._luck_range = luck_range
 
         for sk in skill_list:
             self._skill_list[sk.name()] = sk
+
+    @classmethod
+    def make(klass, name, fp, skill_list=[], luck_range=5000):
+        scorer = pycodebattler.score.Scorer(fp.readlines())
+
+        hitpoint = scorer.style_score()
+        skillpoint = scorer.name_score()
+        strength = scorer.complex_score()
+        concentration = scorer.colon_score()
+        defense = scorer.lines_score()
+        agility = scorer.const_score()
+        luck = luck_range // (hitpoint + skillpoint + strength +
+                              concentration + defense + agility) or 1
+
+        return klass(name, hitpoint, skillpoint, strength, concentration,
+                     defense, agility, luck, skill_list, luck_range)
 
     def __str__(self):