From d560f77811d4fc6f29bf477356a6d2e58dda0be1 Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Sat, 30 Nov 2024 12:46:08 +0100 Subject: next commit --- network/character_server.gd | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) (limited to 'network/character_server.gd') diff --git a/network/character_server.gd b/network/character_server.gd index f629283..4831b36 100644 --- a/network/character_server.gd +++ b/network/character_server.gd @@ -1,38 +1,16 @@ class_name CharacterServer +extends Server -signal received_packet(packet: Packet) signal logged_in(packet: CharacterServerLoginSuccessPacket) +signal logged_in_character_list(packet: CharacterServerLoginSuccessCharacterListPacket) signal requested_character_list(packet: RequestCharacterListSuccessPacket) signal selected_character(packet: CharacterSelectionSuccessPacket) -var host: String -var port: int = 6121 -var stream: PacketPeerStream = PacketPeerStream.new() -var peer: StreamPeerTCP = StreamPeerTCP.new() - @warning_ignore("shadowed_variable") func _init(host: String, port: int = 6121) -> void: - self.host = host - self.port = port - - stream.stream_peer = peer - peer.connect_to_host(host, port) - peer.poll() - - -## Emits [signal received_packet]. -func listen() -> void: - if peer.get_status() == StreamPeerTCP.Status.STATUS_CONNECTED: - var raw_packet: PackedByteArray = peer.get_partial_data(2)[1] - if raw_packet.size() > 0: - raw_packet += peer.get_data(peer.get_available_bytes())[1] - var header = raw_packet.decode_u16(0) - var packet_type = Constants.PacketDB[header] - var packet = packet_type.from_bytes(raw_packet) - - received_packet.emit(packet) + super._init(host, port) func login(account_id: int, login_id1: int, login_id2: int, gender: Constants.Gender): @@ -46,10 +24,16 @@ func login(account_id: int, login_id1: int, login_id2: int, gender: Constants.Ge peer.get_data(4) # in-between packet - var packet = await received_packet - if packet is CharacterServerLoginSuccessPacket: - print(inst_to_dict(packet)) - logged_in.emit(packet) + var login_success_packet = await received_packet + if login_success_packet is CharacterServerLoginSuccessPacket: + print(inst_to_dict(login_success_packet)) + logged_in.emit(login_success_packet) + + var character_list_packet = await received_packet + if character_list_packet is CharacterServerLoginSuccessCharacterListPacket: + print(inst_to_dict(character_list_packet)) + print(inst_to_dict(character_list_packet.character_information[0])) + logged_in_character_list.emit(character_list_packet) func request_character_list(): -- cgit v1.2.3