Dustin/Attempt2
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

More multiplayer stuff.

Browse Source
This commit is contained in:
Dustin 2025-04-17 20:50:40 -07:00
parent ae3da7a468
commit 8a29cc5be3
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/singleton_autoloads/NetworkManager.gd
View File

@ -85,9 +85,13 @@ func unregister_player(id):
remote func pre_start_game(spawn_points): remote func pre_start_game(spawn_points):
# Change scene. # Change scene.
var world = load("res://src/levels/TestBox.tscn").instance() var world :Node = load("res://src/levels/TestBox.tscn").instance()
get_tree().get_root().get_node("/root/Main/ViewportContainer/Viewport").add_child(world) var ui :Node = load("res://src/ui/HUD.tscn").instance()
world.set_name("World")
get_tree().get_root().get_node("/root/Main/ViewportContainer/Viewport").add_child(world)
get_tree().get_root().get_node("/root/Main/ViewportContainer/Viewport").add_child(ui)
get_tree().get_root().get_node("/root/Main/ViewportContainer/Viewport/Lobby").hide() get_tree().get_root().get_node("/root/Main/ViewportContainer/Viewport/Lobby").hide()
var player_scene = load("res://src/actors/players/playerE/PlayerE.tscn") var player_scene = load("res://src/actors/players/playerE/PlayerE.tscn")
@ -109,7 +113,7 @@ remote func pre_start_game(spawn_points):
# # Otherwise set name from peer. # # Otherwise set name from peer.
# player.set_player_name(players[p_id]) # player.set_player_name(players[p_id])
world.get_node("/root/Main/ViewportContainer/Viewport/World").add_child(player) get_tree().get_root().get_node("/root/Main/ViewportContainer/Viewport").add_child(player)
#world.get_node("Players").add_child(player) #world.get_node("Players").add_child(player)
# # Set up score. # # Set up score.

62
src/actors/players/playerE/PlayerE.gd
View File

@ -28,6 +28,10 @@ const state_damage_amount :Dictionary = {
var player_info_index :int var player_info_index :int
var player_data :PlayerData var player_data :PlayerData
## Multiplayer Variables
puppet var puppet_pos = Vector2()
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
# PlayerInfo.player_health = health_component.health # PlayerInfo.player_health = health_component.health
@ -50,39 +54,47 @@ func _ready():
movement_component.state_stamina_cost = state_stamina_cost movement_component.state_stamina_cost = state_stamina_cost
puppet_pos = position
#var stamina_recovery :float = 0.0 #var stamina_recovery :float = 0.0
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
#PlayerInfo.player_position = global_position.round() if is_network_master():
player_data.player_position = global_position.round() #PlayerInfo.player_position = global_position.round()
# stamina_recovery += delta player_data.player_position = global_position.round()
# if stamina_recovery > 1.0: # stamina_recovery += delta
# stamina_component.recover(1) # if stamina_recovery > 1.0:
# stamina_recovery = 0.0 # stamina_component.recover(1)
# #print("recover ", stamina_component.stamina) # stamina_recovery = 0.0
# #print("recover ", stamina_component.stamina)
#PlayerInfo.player_stamina = stamina_component.stamina
player_data.player_stamina = stamina_component.stamina #PlayerInfo.player_stamina = stamina_component.stamina
player_data.player_stamina = stamina_component.stamina
##TODO: well I'm not sure I like this but making a whole state receiver is silly ##TODO: well I'm not sure I like this but making a whole state receiver is silly
if state_damage_amount.has(movement_state_machine.current_state.name): if state_damage_amount.has(movement_state_machine.current_state.name):
$Hitbox_Component.damage_amount = state_damage_amount[movement_state_machine.current_state.name] $Hitbox_Component.damage_amount = state_damage_amount[movement_state_machine.current_state.name]
else:
$Hitbox_Component.damage_amount = 10
match movement_state_machine.current_state.name:
"idle":
if Input.is_action_just_released("switch_primary_item_" + str(player_number)):
var _selected_item = player_inventory.switch_primary()
if _selected_item:
print("Switched Primary item to: ", _selected_item.name)
elif Input.is_action_just_released("switch_secondary_item_" + str(player_number)):
var _selected_item = player_inventory.switch_secondary()
if _selected_item:
print("Switched Secondary item to: ", _selected_item.name)
rset("puppet_pos", position)
else: else:
$Hitbox_Component.damage_amount = 10 position = puppet_pos
match movement_state_machine.current_state.name:
"idle":
if Input.is_action_just_released("switch_primary_item_" + str(player_number)):
var _selected_item = player_inventory.switch_primary()
if _selected_item:
print("Switched Primary item to: ", _selected_item.name)
elif Input.is_action_just_released("switch_secondary_item_" + str(player_number)):
var _selected_item = player_inventory.switch_secondary()
if _selected_item:
print("Switched Secondary item to: ", _selected_item.name)
func hit_Receiver(damage): func hit_Receiver(damage):
$Hurtbox_Component.set_hurtbox(false) $Hurtbox_Component.set_hurtbox(false)