Changeset 21172

Timestamp:

10/12/08 16:23:41 (3 months ago)

Author:

nishio

Message:

/lang/python/saichugen remove iround&iturn(refactoring)

Location:

lang/python/saichugen/gae

Files:

• saichugen/main/logic.py (modified) (1 diff)
• saichugen/main/models.py (modified) (1 diff)
• saichugen/main/views.py (modified) (6 diffs)
• template/game.html (modified) (2 diffs)

lang/python/saichugen/gae/saichugen/main/logic.py

@@ -57 +57 @@
 def to_num(card):
     return card / 4 + 1
+

lang/python/saichugen/gae/saichugen/main/models.py

@@ -9 +9 @@
     is_single_game = db.BooleanProperty(default=True)
 
+    step = db.IntegerProperty(default=0) # 0..14
+    def next_step(self):
+        self.step += 1
+    def get_round(self):
+        return self.step / 3
+    def get_turn(self):
+        return self.step % 3
+
     def update(self, info):
         import cPickle

lang/python/saichugen/gae/saichugen/main/views.py

@@ -24 +24 @@
     #info = req.GET.get("info")
     info = dict(
-        iturn = 0,
-        iround = 0,
         game_score = [0, 0, 0],
         round_score = [0, 0, 0],
@@ -59 +57 @@
     plays = info["plays"]
     for i, xs in enumerate(plays):
-        cur_round = (i >= info["iround"] * 3)
+        cur_round = (i >= game.get_round() * 3)
         for p in range(3):
             if (info["winner_of_turn"][i] == p and
@@ -70 +68 @@
     
     real_log = [[], [], []]
-    for i in range(info["iround"]):
+    for i in range(game.get_round()):
         for p in range(3):
             real_log[p].append(log[p][i * 3:i * 3 + 3])
 
     for p in range(3):
-        real_log[p].append(log[p][info["iround"] * 3:])
+        real_log[p].append(log[p][game.get_round() * 3:])
 
     tvalue["real_log"] = real_log
@@ -108 +106 @@
         time_log.append(msg)
     tvalue["time_log"] = time_log
-    for key in "iround iturn game_score round_score".split():
+    for key in "game_score round_score".split():
         tvalue[key] = info[key]
 
@@ -144 +142 @@
         info["round_score"][winner] += logic.to_num(mid)
         addTimeLog(info, "System", "END_TURN_", 
-                   (info["iturn"], info["iturn"] + info["iround"] * 3))
-        info["iturn"] += 1
+                   (game.get_turn(), game.step))
+        game.next_step()
 
         # もしターンIDが3ならラウンド終了処理
-        if info["iturn"] == 3:
-            info["iturn"] = 0
+        if game.get_turn() == 0:
             rs = info["round_score"]
             mid = logic.get_mid(rs)
@@ -160 +157 @@
                     winner.append(False)
             info["winner_of_round"].append(winner)
-            addTimeLog(info, "System", "END_ROUND", info["iround"])
+            addTimeLog(info, "System", "END_ROUND", game.get_round())
             info["round_score"] = [0, 0, 0]
-            info["iround"] += 1 
-            if info["iround"] < 5:
-                addTimeLog(info, "System", "START_ROUND", info["iround"])
+            if game.get_round() < 5:
+                addTimeLog(info, "System", "START_ROUND", game.get_round())
         # もしラウンドIDが5ならゲーム終了処理
-        if info["iround"] == 5:
+        if game.step == 15:
             game.is_finished = True
-            addTimeLog(game, "System", "END_GAME")
+            addTimeLog(info, "System", "END_GAME")
 
         game.update(info)

lang/python/saichugen/gae/template/game.html

@@ -11 +11 @@
 {% endif %}
 <hr>
-Round {{ iround|add:1 }}, turn {{ iturn|add:1 }}.
+Round {{ game.get_round|add:1 }}, turn {{ game.get_turn|add:1 }}.
 Choose a card from your hand:
 <p>
@@ -23 +23 @@
 
 <hr>
+盤面状況：
 {% for logi in real_log %}
 <div style="width:150px; float: left;">