More multiplayer stuff.
This commit is contained in:
parent
ae3da7a468
commit
8a29cc5be3
|
|
@ -85,8 +85,12 @@ func unregister_player(id):
|
|||
|
||||
remote func pre_start_game(spawn_points):
|
||||
# Change scene.
|
||||
var world = load("res://src/levels/TestBox.tscn").instance()
|
||||
var world :Node = load("res://src/levels/TestBox.tscn").instance()
|
||||
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()
|
||||
|
||||
|
|
@ -109,7 +113,7 @@ remote func pre_start_game(spawn_points):
|
|||
# # Otherwise set name from peer.
|
||||
# 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)
|
||||
|
||||
# # Set up score.
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ const state_damage_amount :Dictionary = {
|
|||
var player_info_index :int
|
||||
var player_data :PlayerData
|
||||
|
||||
## Multiplayer Variables
|
||||
puppet var puppet_pos = Vector2()
|
||||
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready():
|
||||
# PlayerInfo.player_health = health_component.health
|
||||
|
|
@ -50,12 +54,14 @@ func _ready():
|
|||
|
||||
movement_component.state_stamina_cost = state_stamina_cost
|
||||
|
||||
puppet_pos = position
|
||||
|
||||
|
||||
#var stamina_recovery :float = 0.0
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
if is_network_master():
|
||||
#PlayerInfo.player_position = global_position.round()
|
||||
player_data.player_position = global_position.round()
|
||||
# stamina_recovery += delta
|
||||
|
|
@ -84,6 +90,12 @@ func _process(delta):
|
|||
if _selected_item:
|
||||
print("Switched Secondary item to: ", _selected_item.name)
|
||||
|
||||
rset("puppet_pos", position)
|
||||
else:
|
||||
position = puppet_pos
|
||||
|
||||
|
||||
|
||||
func hit_Receiver(damage):
|
||||
$Hurtbox_Component.set_hurtbox(false)
|
||||
health_component.take_damage(damage)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user