Skip to content

Commit 82c2a2c

Browse files
committed
[修改]Formatter
1 parent bc6773c commit 82c2a2c

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

backend/domain/game.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def __init__(self, game_id: str, players: List[dict], active: bool = True):
3030
self.action_message: str = ""
3131
self.dice_result: int = 0
3232
self.event_name: str = ""
33-
self.spell_cast_number: int = 0
34-
self.damage_info : Optional[int] = None
33+
self.spell_cast_number: int = 0
34+
self.damage_info: Optional[int] = None
3535

3636
def load_spells(self) -> Dict[str, Spell]:
3737
"""載入遊戲中可能存在的魔法石"""
@@ -127,10 +127,10 @@ def to_dict(self) -> dict:
127127
"players": [player.to_dict() for player in self.players],
128128
"active": self.active,
129129
"action_message": self.action_message,
130-
"dice_result":self.dice_result,
131-
"event_name":self.event_name,
132-
"spell_cast_number":self.spell_cast_number,
133-
"damage_info":self.damage_info,
130+
"dice_result": self.dice_result,
131+
"event_name": self.event_name,
132+
"spell_cast_number": self.spell_cast_number,
133+
"damage_info": self.damage_info,
134134
}
135135

136136
if self.current_player is not None:
@@ -178,7 +178,7 @@ def from_dict(cls, data: dict) -> "Game":
178178
game.turn = data["turn"]
179179
if "dice_result" in data:
180180
game.dice_result = data["dice_result"]
181-
181+
182182
if "event_name" in data:
183183
game.event_name = data["event_name"]
184184

backend/service/game_service.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def cast_spell(
134134
game.spell_cast_number = spell.get_value()
135135
game.dice_result = 0
136136
self.game_repository.update_game(game)
137-
137+
138138
game.action_message = player.player_id + " 手牌魔法石出完,局結束"
139139
game.event_name = "end_round_stone"
140140
game.spell_cast_number = 0
@@ -160,11 +160,13 @@ def cast_spell(
160160
game.spell_cast_number = spell.get_value()
161161
game.dice_result = 0
162162
self.game_repository.update_game(game)
163-
163+
164164
if spell.get_value() == 1:
165165
game.dice_result = spell_status
166166
game.event_name = "dice_rolled"
167-
game.action_message = f"除了 {player.player_id} ,其餘玩家扣除 {game.dice_result} 血量"
167+
game.action_message = (
168+
f"除了 {player.player_id} ,其餘玩家扣除 {game.dice_result} 血量"
169+
)
168170
game.damage_info = [-game.dice_result] * 5
169171
game.damage_info[game.current_player] = 0
170172
self.game_repository.update_game(game)
@@ -178,7 +180,7 @@ def cast_spell(
178180
game.event_name = "damage_HP"
179181
game.action_message = f"{player.player_id} 回復 1 血量 ,其餘玩家扣除 1 血量"
180182
game.damage_info = [-1] * 5
181-
game.damage_info[game.current_player] = 1
183+
game.damage_info[game.current_player] = 1
182184
self.game_repository.update_game(game)
183185
elif spell.get_value() == 5:
184186
game.event_name = "damage_HP"
@@ -188,12 +190,16 @@ def cast_spell(
188190
self.game_repository.update_game(game)
189191
elif spell.get_value() == 6:
190192
game.event_name = "damage_HP"
191-
game.action_message = f"{game.get_left_player(player).player_id} 扣除 1 血量"
193+
game.action_message = (
194+
f"{game.get_left_player(player).player_id} 扣除 1 血量"
195+
)
192196
game.damage_info[game.players.index(game.get_left_player(player))] = -1
193197
self.game_repository.update_game(game)
194198
elif spell.get_value() == 7:
195199
game.event_name = "damage_HP"
196-
game.action_message = f"{game.get_right_player(player).player_id} 扣除 1 血量"
200+
game.action_message = (
201+
f"{game.get_right_player(player).player_id} 扣除 1 血量"
202+
)
197203
game.damage_info[game.players.index(game.get_right_player(player))] = -1
198204
self.game_repository.update_game(game)
199205
elif spell.get_value() == 8:
@@ -205,7 +211,6 @@ def cast_spell(
205211
game.event_name = "spell_owl"
206212
game.action_message = f"{player.player_id} 得到一張秘密魔法石"
207213
self.game_repository.update_game(game)
208-
209214

210215
for p in game.players:
211216
if p.get_HP() == 0:
@@ -220,7 +225,7 @@ def cast_spell(
220225
self.end_round(game_id, game.players[game.current_player].player_id)
221226

222227
return True, 200
223-
228+
224229
def spell_stop(self, game_id: str, player_id: str) -> bool:
225230
"""玩家停止施法"""
226231
result = self.end_turn(game_id, player_id)
@@ -303,14 +308,14 @@ def end_round(self, game_id: str, player_id: str) -> None:
303308
if len(p.secret_spells) > 0:
304309
# 持有秘密魔法石,有幾個加幾分
305310
p.update_score(len(p.secret_spells))
306-
311+
307312
game.action_message = "結算分數中..."
308313
game.event_name = "counting_score"
309314
self.game_repository.update_game(game)
310315
self.start_new_round(game_id)
311316

312317
game = self.game_repository.get_game_by_id(game_id)
313-
if game.active:
318+
if game.active:
314319
game.action_message = "新局開始"
315320
game.event_name = "round_started"
316321
self.game_repository.update_game(game)
@@ -325,7 +330,6 @@ def start_new_round(self, game_id: str) -> None:
325330

326331
game.shuffle_player()
327332

328-
329333
for player in game.players:
330334
if player.score >= 8:
331335
# 已有玩家獲得8分

0 commit comments

Comments
 (0)