Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-29 00:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from Zaseth/master

Browse Source 
Add try except for Mancala movement and finished Treasure hunt handlers
This commit is contained in:
r 2019-12-27 21:06:59 +00:00 committed by GitHub
commit b12af568bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
houdini/handlers/games/mancala.py
View File

@ -26,6 +26,7 @@ async def handle_join_game(p):
@handlers.handler(XTPacket('zm', ext='z')) @handlers.handler(XTPacket('zm', ext='z'))
@table_handler(MancalaLogic) @table_handler(MancalaLogic)
async def handle_send_move(p, move: int): async def handle_send_move(p, move: int):
try:
seat_id = p.table.get_seat_id(p) seat_id = p.table.get_seat_id(p)
is_player = seat_id < 2 is_player = seat_id < 2
game_ready = len(p.table.penguins) > 1 game_ready = len(p.table.penguins) > 1
@ -34,8 +35,10 @@ async def handle_send_move(p, move: int):
hollow, = map(int, move) hollow, = map(int, move)
current_player = p.table.penguins[p.table.logic.current_player - 1] current_player = p.table.penguins[p.table.logic.current_player - 1]
if current_player != p: return if current_player != p:
if not p.table.logic.is_valid_move(hollow): return return
if not p.table.logic.is_valid_move(hollow):
return
move_result = p.table.logic.place_stone(hollow) move_result = p.table.logic.place_stone(hollow)
await p.table.send_xt('zm', seat_id, hollow, move_result) await p.table.send_xt('zm', seat_id, hollow, move_result)
@ -53,3 +56,5 @@ async def handle_send_move(p, move: int):
return return
p.table.logic.current_player = 2 if p.table.logic.current_player == 1 else 1 p.table.logic.current_player = 2 if p.table.logic.current_player == 1 else 1
except (KeyError, ValueError):
p.logger.warn(f'Invalid mancala move made by {p}')

52
houdini/handlers/games/treasure.py
View File

@ -0,0 +1,52 @@
from houdini import handlers
from houdini.handlers import XTPacket
from houdini.handlers.games.table import table_handler
from houdini.data.room import TreasureHuntLogic
@handlers.handler(XTPacket('gz', ext='z'))
@table_handler(TreasureHuntLogic)
async def handle_get_game(p):
if len(p.table.penguins) == 2:
player_one = p.table.penguins[0]
await p.send_xt('gz', player_one.safe_name, str())
else:
await p.send_xt('gz', p.table.get_string())
@handlers.handler(XTPacket('jz', ext='z'))
@table_handler(TreasureHuntLogic)
async def handle_join_game(p):
game_full = len(p.table.penguins) > 2
if not game_full:
seat_id = p.table.get_seat_id(p)
await p.send_xt('jz', seat_id)
await p.table.send_xt('uz', seat_id, p.safe_name)
if len(p.table.penguins) == 2:
await p.table.send_xt('sz', p.table.get_string())
@handlers.handler(XTPacket('zm', ext='z'))
@table_handler(TreasureHuntLogic)
async def handle_send_move(p, movie: str, direction: str, spade: int):
try:
seat_id = p.table.get_seat_id(p)
is_player = seat_id < 2
game_ready = len(p.table.penguins) > 1
if is_player and game_ready:
current_player = p.table.penguins[p.table.logic.current_player - 1]
if current_player != p:
return
if not p.table.logic.is_valid_move(movie, direction, spade):
return
p.table.logic.make_move(movie, direction, spade)
await p.table.send_xt('zm', movie, direction, spade)
opponent = p.table.penguins[1 if p.table.logic.current_player == 1 else 0]
if p.table.logic.turns == 0:
winnings = p.table.logic.determine_winnings()
await p.add_coins(winnings)
await opponent.add_coins(winnings)
await p.table.reset()
return
p.table.logic.current_player = 2 if p.table.logic.current_player == 1 else 1
except (KeyError, ValueError):
p.logger.warn(f'Invalid treasure hunt move made by {p}')