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

One step closer to multiplayer

Browse Source
This commit is contained in:
Dustin 2025-04-17 22:23:16 -07:00
parent 8a29cc5be3
commit 0248be637d
2 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/classes/actor.gd
View File

@ -19,6 +19,13 @@ onready var movement_component: Movement_StateReceiver = $Movement_StateReceiver
#onready var movement_state_machine: StateMachineAnimatedActor = $movement_state_machine
onready var movement_state_machine: StateMachine = $Movement_StateMachine
onready var animated_sprite : AnimatedSprite = $AnimatedSprite_StateReceiver
## Multiplayer Variables
puppet var puppet_pos = Vector2()
puppet var puppet_anim_sprite_frame :int
puppet var puppet_anim_sprite_name :String
puppet var puppet_transform: Transform2D
##TODO:
# Can't seem to implement the ready and process node functions
@ -27,13 +34,26 @@ onready var movement_state_machine: StateMachine = $Movement_StateMachine
# interfaces for the state machines.
func _ready() -> void:
pass
puppet_anim_sprite_name = animated_sprite.animation
puppet_anim_sprite_frame = animated_sprite.frame
puppet_transform = transform
# if not is_network_master():
# animated_sprite.set_process(false)
# animated_sprite.set_physics_process(false)
#movement_state_machine.init_animated_actor(self)
#movement_component.attack_function = funcref(self, "attack")
# movement_component.player_number = player_number
func _process(delta):
if is_network_master():
rset("puppet_anim_sprite_name", animated_sprite.animation)
rset("puppet_anim_sprite_frame", animated_sprite.frame)
else:
animated_sprite.animation = puppet_anim_sprite_name
animated_sprite.frame = puppet_anim_sprite_frame
func _unhandled_input(event: InputEvent) -> void:
if is_network_master():
if actor_type == "Player":
movement_component.process_input(event)
#movement_state_machine.process_input(event)
@ -41,9 +61,15 @@ func _unhandled_input(event: InputEvent) -> void:
func _physics_process(delta: float) -> void:
# Input based or polling input is not done in _unhandled_input
# gives us the ability to turn off polling this way
if is_network_master():
if actor_type == "Player":
movement_component.process_physics_input(delta)
movement_component.process_physics(delta)
rset("puppet_pos", position)
rset("puppet_transform", transform)
else:
position = puppet_pos
transform = puppet_transform
#movement_state_machine.process_physics(delta)
#
#func _process(delta: float) -> void:

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

@ -28,9 +28,6 @@ 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():
@ -61,14 +58,13 @@ func _ready():
# 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
# if stamina_recovery > 1.0:
# stamina_component.recover(1)
# stamina_recovery = 0.0
# #print("recover ", stamina_component.stamina)
# stamina_recovery += delta
# if stamina_recovery > 1.0:
# stamina_component.recover(1)
# stamina_recovery = 0.0
# #print("recover ", stamina_component.stamina)
#PlayerInfo.player_stamina = stamina_component.stamina
player_data.player_stamina = stamina_component.stamina
@ -90,10 +86,6 @@ 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):