Merge pull request #24 from yugu0202/develop

ログ出力システムの変更

Author: yugu0202

BoardManager.py

@@ -33,6 +33,9 @@ def set_map(self,file_date):
                 self.cool_position = list(map(int,file_line.split(":")[1].split(",")))
                 self.cool_position.reverse()
 
+    def get_map_str(self):
+        return "\n".join([",".join(map(str,line)) for line in self.map_data])
+
     def get_ready(self, character):
         if character == "hot":
             position = self.hot_position

Logger.py

@@ -1,19 +1,19 @@
-import shutil
-
 class Logger:
     def __init__(self,log_path:str,map_path:str):
         self.path = log_path
-        shutil.copyfile(map_path,self.path)
-        with open(self.path,mode="a") as f:
-            f.write("mapend")
+        with open(map_path, mode="r") as f:
+            data = "".join(list(map(lambda x: x[2:],f.readlines())))
+
+        with open(self.path, mode="w") as f:
+            f.write(data);
 
     def set_name(self,cool_name:str,hot_name:str):
         with open(self.path,mode="a") as f:
-            f.write(f"\n{cool_name},{hot_name}")
+            f.write(f"{cool_name},{hot_name}")
 
-    def action(self,character:str,command:str):
+    def action(self,map_data:str,cool_pos:str,hot_pos:str,cool_item:int,hot_item:int):
         with open(self.path,mode="a") as f:
-            f.write(f"\n{character},{command}")
+            f.write(f"\n{map_data}\n{cool_pos}\n{hot_pos}\n{cool_item},{hot_item}")
 
     def result(self,player:str,result:str,reason:str):
         winner = None

server.py

@@ -130,7 +130,7 @@ def setup(cool,hot):
 #キャラクター行動処理一回分
 def battle(character,logger,board_manager):
     character.send("@") #開始の合図
-    recieve = recieve_action(character,logger)
+    recieve = recieve_action(character)
     if recieve != "gr":
         board_manager.game_over = True
         board_manager.go_reason = "{character.tag} bad request"
@@ -140,15 +140,16 @@ def battle(character,logger,board_manager):
     character.send(result) #行動後のデータ
     if board_manager.game_over:
         return
-    recieve = recieve_action(character,logger) # walk look search put
+    recieve = recieve_action(character) # walk look search put
     data = board_manager.char_action(character.tag,recieve)
+    logger.action(board_manager.get_map_str(),",".join(map(str,reversed(board_manager.cool_position))),",".join(map(str,reversed(board_manager.hot_position))),board_manager.cool_item,board_manager.hot_item)
     result = "".join(map(str,data))
     character.send(result)
     if board_manager.game_over:
         return
     recieve = character.recieve() #ここは終了の合図 #が来る
 
-def recieve_action(character,logger):
+def recieve_action(character):
     recieve = character.recieve()
     if not recieve:
         print(f"{character.tag} is lose\nreason: lost connection", file=sys.stderr)
@@ -158,7 +159,6 @@ def recieve_action(character,logger):
         print(f"{character.tag} is lose\nreason: command {recieve} does not exists", file=sys.stderr)
         logger.result(character.tag,"lose",f"{character.tag} sent a command that does not exist. command: {recieve}")
         sys.exit(1)
-    logger.action(character.tag,recieve)
     return recieve
 
 if __name__ == "__main__":