fixed missing serverWorld issue and added status to login response

This commit is contained in:
steev 2024-01-15 10:43:56 +01:00
parent 1a9f49f5e9
commit 69881973a4
12 changed files with 33 additions and 4 deletions

View File

@ -52,7 +52,7 @@ class GameManager:
self.logger.info("game manager is starting the game")
for userAddr in self.__users.keys():
try:
user = self.__serverWorld.getPlayers[userAddr]["player"]
user = self.__players[userAddr]["player"]
user.addMana(1000)
user.adjustHP(1000)
user.shuffleDeck()

View File

@ -92,6 +92,7 @@ class NetworkManager:
self.__gameManager.getLogger().info(f"confirming login for user")
self.send({
"event": "loginresponse",
"status": "success",
"id": user[client_address]["player"].getID(),
}, client_address)

View File

@ -0,0 +1,29 @@
10:37:09,378 root INFO starting up server
10:37:09,379 root INFO starting up game manager
10:37:09,379 root INFO preparing to start server
10:37:09,379 root INFO starting up network manager
10:37:09,379 root INFO starting up network manager
10:37:09,379 root INFO starting up tcp server
10:37:09,380 root INFO starting up thread for client socket accepting
10:40:46,771 root INFO Connected with ('127.0.0.1', 51297)
10:40:46,771 root INFO starting client handler thread for client at address ('127.0.0.1', 51297)
10:40:46,773 root INFO decoded message {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}
10:40:46,773 root INFO user in message None
10:40:46,774 root INFO user logging in
10:40:46,774 root INFO task passed off to gameManager
10:40:46,774 root INFO creating user with id: <bound method Player.getID of <Classes.Game.Player.Player object at 0x000001A9DC7D2F00>>
10:40:46,774 root INFO new length of user dictionary: 1
10:40:46,774 root INFO connected users 1
10:40:46,775 root INFO confirming login for user
10:40:46,775 root INFO incommingevent {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}
10:40:46,775 root INFO Received message from ('127.0.0.1', 51297): {"event": "login", "username": "player", "deck": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}
10:41:00,103 root INFO Connected with ('127.0.0.1', 51299)
10:41:00,103 root INFO starting client handler thread for client at address ('127.0.0.1', 51299)
10:41:00,104 root INFO decoded message {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]}
10:41:00,104 root INFO user in message None
10:41:00,104 root INFO user logging in
10:41:00,104 root INFO task passed off to gameManager
10:41:00,104 root INFO creating user with id: <bound method Player.getID of <Classes.Game.Player.Player object at 0x000001A9DC7D32C0>>
10:41:00,104 root INFO new length of user dictionary: 2
10:41:00,105 root INFO 2 players have join game starts
10:41:28,589 root INFO Connection with ('127.0.0.1', 51297) closed.

View File

@ -1,12 +1,11 @@
import json
import pygame
from Classes.System.Network.TCPClient import TCPClient
from Classes.Game.World import World
from Classes.Game.Player import Player
# event the client sends to let the server know it logged in
def Login(tcpClient:TCPClient):
def Login(tcpClient):
payload = {
"event":"login",
"username": "player",