Fixed double-crouching

levels/prototype_scene.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=24 format=3 uid="uid://cqrh2cc7m2i7f"]
+[gd_scene load_steps=21 format=3 uid="uid://cqrh2cc7m2i7f"]
 
 [ext_resource type="Environment" uid="uid://d0cfgtx2yxw13" path="res://environments/prototype_environment.tres" id="1_i6jab"]
-[ext_resource type="Script" uid="uid://ypgm3aplt78m" path="res://scripts/multiplayer/team_spawner.gd" id="4_pi0y7"]
 [ext_resource type="Material" uid="uid://bx3f5vx71ynh5" path="res://materials/Graymat.tres" id="4_y6i55"]
 [ext_resource type="Material" uid="uid://dynpcduei1wfn" path="res://materials/Bluemat.tres" id="4_yx0ab"]
 [ext_resource type="Material" uid="uid://mlha6r17v2en" path="res://materials/DarkBluemat.tres" id="5_bno23"]
@@ -15,22 +14,9 @@
 [ext_resource type="Script" uid="uid://dk1gjbuydemmb" path="res://scripts/multiplayer/plant_site/plant_site.gd" id="8_oujx2"]
 [ext_resource type="Script" uid="uid://b4cpux52fmx5o" path="res://scripts/multiplayer/plant_site/plant_deadzone.gd" id="9_1wlgq"]
 [ext_resource type="Material" uid="uid://c6xa4phihtya2" path="res://materials/Redmat.tres" id="9_ysk2e"]
+[ext_resource type="Script" path="res://scripts/multiplayer/spawn_system/team_spawner.gd" id="10_02ic3"]
 [ext_resource type="Script" uid="uid://3i00rp8urth7" path="res://scripts/object_container.gd" id="11_02ic3"]
 
-[sub_resource type="Animation" id="Animation_y6i55"]
-length = 0.001
-
-[sub_resource type="Animation" id="Animation_pi0y7"]
-resource_name = "main"
-length = 5.0
-loop_mode = 2
-
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_bno23"]
-_data = {
-&"RESET": SubResource("Animation_y6i55"),
-&"main": SubResource("Animation_pi0y7")
-}
-
 [sub_resource type="BoxShape3D" id="BoxShape3D_ysk2e"]
 size = Vector3(15.324341, 0.96273804, 21.381592)
 
@@ -233,30 +219,24 @@ operation = 2
 size = Vector3(20.339264, 4.566284, 3.4625244)
 material = ExtResource("7_8bje3")
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-libraries = {
-&"": SubResource("AnimationLibrary_bno23")
-}
-autoplay = "main"
-
 [node name="PlayersContainer" type="Node3D" parent="." node_paths=PackedStringArray("exlusion_list")]
 script = ExtResource("11_02ic3")
 exlusion_list = [NodePath("DefenceSpawn"), NodePath("AttackSpawn"), NodePath("SpectatorSpawn"), NodePath("MultiplayerSpawner")]
 
 [node name="DefenceSpawn" type="Marker3D" parent="PlayersContainer"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 37.170197, 0.5180037, -11.271502)
-script = ExtResource("4_pi0y7")
+script = ExtResource("10_02ic3")
 spawn_radius = 10.0
 
 [node name="AttackSpawn" type="Marker3D" parent="PlayersContainer"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.553003, 0.5180037, 20.371899)
-script = ExtResource("4_pi0y7")
+script = ExtResource("10_02ic3")
 team = 1
 spawn_radius = 5.0
 
 [node name="SpectatorSpawn" type="Marker3D" parent="PlayersContainer"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.1422176, 39.792877, -1.3889732)
-script = ExtResource("4_pi0y7")
+script = ExtResource("10_02ic3")
 team = 2
 spawn_radius = 10.0
 
@@ -269,7 +249,7 @@ script = ExtResource("11_02ic3")
 exlusion_list = [NodePath("MultiplayerSpawner"), NodePath("Bomb")]
 
 [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="DynamicObjectsContainer"]
-_spawnable_scenes = PackedStringArray("uid://dtbpyfdawb02b", "uid://cxdgk74ln5xpn", "uid://dgfqppi21c2u0")
+_spawnable_scenes = PackedStringArray("uid://cxdgk74ln5xpn", "uid://dgfqppi21c2u0")
 spawn_path = NodePath("..")
 script = ExtResource("6_oujx2")
 

models/characters/worldmodels/molikman_ingame_tex_Molikman.png.import

@@ -0,0 +1,43 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://50bjd4m600y"
+path="res://.godot/imported/molikman_ingame_tex_Molikman.png-fa994ec91481577d99049156480274fc.ctex"
+metadata={
+"vram_texture": false
+}
+generator_parameters={
+"md5": "adf17223cdac27afac207ae40df37427"
+}
+
+[deps]
+
+source_file="res://models/characters/worldmodels/molikman_ingame_tex_Molikman.png"
+dest_files=["res://.godot/imported/molikman_ingame_tex_Molikman.png-fa994ec91481577d99049156480274fc.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

project.godot

@@ -166,3 +166,7 @@ menu_settings={
 3d_physics/layer_5="Players Attack Team"
 3d_physics/layer_6="Players Defence Team"
 3d_physics/layer_7="Interactible"
+
+[physics]
+
+3d/default_gravity=39.2

scripts/client_settings.gd

@@ -2,3 +2,6 @@ extends Node
 
 
 var SENSITIVITY: float = 0.02
+var TOGGLE_CROUCH: bool = false
+var TOGGLE_SCOPE: bool = false
+var TOGGLE_WALK: bool = false

scripts/multiplayer/player_input.gd

@@ -0,0 +1,182 @@
+extends MultiplayerSynchronizer
+
+class_name PlayerInput
+
+const SCOPE: int = 0b1
+const CROUCH: int = 0b10
+const WALK: int = 0b100
+
+#region SYNC
+@export var direction: Vector2
+@export var compressed_states: int
+#endregion
+
+signal jumped
+signal drop
+signal switch_weapon(to_slot: StringName)
+signal fire_begin
+signal fire_end
+signal alternate_state
+signal switch_firemode
+signal reload
+signal scope_begin
+signal scope_end
+signal crouch_begin
+signal crouch_end
+signal walk_begin
+signal walk_end
+signal interact_begin
+signal interact_end
+
+func _process(_delta: float) -> void:
+	if not is_multiplayer_authority(): return
+	direction = Input.get_vector("plr_strafe_r","plr_strafe_l", "plr_back","plr_forward")
+
+func _input(event: InputEvent) -> void:
+	if not is_multiplayer_authority(): return
+	if event.is_action_pressed("plr_ult"):
+		switch_on_server.rpc_id(1,"ultimate")
+	elif event.is_action_pressed("plr_bomb"):
+		switch_on_server.rpc_id(1,"bomb")
+	elif event.is_action_pressed("plr_primary"):
+		switch_on_server.rpc_id(1,"primary")
+	elif event.is_action_pressed("plr_active_first"):
+		switch_on_server.rpc_id(1,"ability_first")
+	elif event.is_action_pressed("plr_active_second"):
+		switch_on_server.rpc_id(1,"ability_second")
+	elif event.is_action_pressed("plr_active_third"):
+		switch_on_server.rpc_id(1,"ability_third")
+	elif event.is_action_pressed("plr_secondary"):
+		switch_on_server.rpc_id(1,"secondary")
+	elif event.is_action_pressed("plr_knife"):
+		switch_on_server.rpc_id(1,"knife")
+	
+	if event.is_action_pressed("plr_fire"):
+		fire_on_server.rpc_id(1,false)
+	if event.is_action_released("plr_fire"):
+		fire_on_server.rpc_id(1,true)
+	if event.is_action_pressed("plr_scope"):
+		alternate_state_on_server.rpc_id(1)
+	if event.is_action_pressed("plr_firemode"):
+		switch_firemode_on_server.rpc_id(1)
+		
+	if event.is_action_pressed("plr_drop"):
+		drop_on_server.rpc_id(1)
+	
+	var crouching: bool = compressed_states & CROUCH
+	var walking: bool = compressed_states & WALK
+	var scoping: bool = compressed_states & SCOPE
+	
+	if event.is_action_pressed("plr_crouch"):
+		if ClientSettings.TOGGLE_CROUCH:
+			crouch_on_server.rpc_id(1,crouching)
+			compressed_states ^= CROUCH
+		elif not crouching:
+			compressed_states |= CROUCH
+			crouch_on_server.rpc_id(1,false)
+	if event.is_action_released("plr_crouch") and not ClientSettings.TOGGLE_CROUCH and crouching:
+		compressed_states &= ~CROUCH
+		crouch_on_server.rpc_id(1,true)
+		
+	if event.is_action_pressed("plr_walk"):
+		if ClientSettings.TOGGLE_WALK:
+			walk_on_server.rpc_id(1,walking)
+			compressed_states ^= WALK
+		elif not walking:
+			compressed_states |= WALK
+			walk_on_server.rpc_id(1,false)
+	if event.is_action_released("plr_walk") and not ClientSettings.TOGGLE_WALK and walking:
+		compressed_states &= ~WALK
+		walk_on_server.rpc_id(1,true)
+	
+	if event.is_action_pressed("plr_scope"):
+		if ClientSettings.TOGGLE_SCOPE:
+			scope_on_server.rpc_id(1,scoping)
+			compressed_states ^= SCOPE
+		elif not scoping:
+			compressed_states |= SCOPE
+			scope_on_server.rpc_id(1,false)
+	if event.is_action_released("plr_scope") and not ClientSettings.TOGGLE_SCOPE and scoping:
+		compressed_states &= ~SCOPE
+		scope_on_server.rpc_id(1,true)
+	
+	if event.is_action_pressed("plr_reload"):
+		reload_on_server.rpc_id(1)
+	
+	if event.is_action_pressed("plr_interact"):
+		interact_on_server.rpc_id(1,false)
+	if event.is_action_released("plr_interact"):
+		interact_on_server.rpc_id(1,true)
+	
+	if event.is_action_pressed("plr_jump"):
+		jump_on_server.rpc_id(1)
+
+@rpc("authority","call_local","reliable")
+func switch_on_server(slot: StringName) -> void:
+	if not multiplayer.is_server(): return
+	switch_weapon.emit(slot)
+
+@rpc("authority","call_local","reliable")
+func drop_on_server() -> void:
+	if not multiplayer.is_server(): return
+	drop.emit()
+
+@rpc("authority","call_local","reliable")
+func fire_on_server(end: bool) -> void:
+	if not multiplayer.is_server(): return
+	if end:
+		fire_end.emit()
+	else:
+		fire_begin.emit()
+
+@rpc("authority","call_local","reliable")
+func alternate_state_on_server() -> void:
+	if not multiplayer.is_server(): return
+	alternate_state.emit()
+
+@rpc("authority","call_local","reliable")
+func switch_firemode_on_server() -> void:
+	if not multiplayer.is_server(): return
+	switch_firemode.emit()
+
+@rpc("authority","call_local","reliable")
+func crouch_on_server(end: bool) -> void:
+	if not multiplayer.is_server(): return
+	if end:
+		crouch_end.emit()
+	else:
+		crouch_begin.emit()
+
+@rpc("authority","call_local","reliable")
+func walk_on_server(end: bool) -> void:
+	if not multiplayer.is_server(): return
+	if end:
+		walk_end.emit()
+	else:
+		walk_begin.emit()
+
+@rpc("authority","call_local","reliable")
+func scope_on_server(end: bool) -> void:
+	if not multiplayer.is_server(): return
+	if end:
+		scope_end.emit()
+	else:
+		scope_begin.emit()
+
+@rpc("authority","call_local","reliable")
+func reload_on_server() -> void:
+	if not multiplayer.is_server(): return
+	reload.emit()
+
+@rpc("authority","call_local","reliable")
+func interact_on_server(end: bool) -> void:
+	if not multiplayer.is_server(): return
+	if end:
+		interact_end.emit()
+	else:
+		interact_begin.emit()
+
+@rpc("authority","call_local","reliable")
+func jump_on_server() -> void:
+	if not multiplayer.is_server(): return
+	jumped.emit()

scripts/multiplayer/player_input.gd.uid

@@ -0,0 +1 @@
+uid://dfvnx8f1v6m5g

scripts/multiplayer/session.gd

@@ -86,7 +86,7 @@ func _process(_delta: float) -> void:
 func update_clock(time: float):
 	reference_round_time = time
 
-@rpc("any_peer","call_remote","reliable")
+@rpc("authority","call_remote","reliable")
 func start_session() -> void:
 	if not is_server_request():
 		return
@@ -100,7 +100,7 @@ func start_session() -> void:
 	
 	start_round()
 
-@rpc("any_peer","call_remote","reliable")
+@rpc("authority","call_remote","reliable")
 func end_session() -> void:
 	if not is_server_request():
 		return
@@ -114,7 +114,7 @@ func end_session() -> void:
 
 	session_started = false
 
-@rpc("any_peer","call_remote","reliable")
+@rpc("authority","call_remote","reliable")
 func start_round() -> void:
 	if not is_server_request():
 		return
@@ -134,7 +134,7 @@ func start_round() -> void:
 	round_state = ROUND_STATES.BUY
 	round_state_changed.emit.call_deferred(round_state)
 
-@rpc("any_peer","call_remote","reliable")
+@rpc("authority","call_remote","reliable")
 func end_round(win_team: int) -> void:
 	if not is_server_request():
 		return
@@ -150,7 +150,7 @@ func end_round(win_team: int) -> void:
 	round_state = ROUND_STATES.AFTER_ROUND
 	round_state_changed.emit(round_state)
 
-@rpc("any_peer","call_remote","reliable")
+@rpc("authority","call_remote","reliable")
 func begin_main_stage() -> void:
 	if not is_server_request():
 		return
@@ -161,7 +161,7 @@ func begin_main_stage() -> void:
 	round_state = ROUND_STATES.ROUND
 	round_state_changed.emit(round_state)
 
-@rpc("any_peer","call_remote","reliable")
+@rpc("authority","call_remote","reliable")
 func begin_bomb_stage() -> void:
 	if not is_server_request():
 		return
@@ -179,7 +179,6 @@ func defuse_win() -> void:
 	bomb_timer.stop()
 	end_round(TEAMS.DEFENCE)
 
-@rpc("any_peer","call_local","reliable")
 func add_dead(team: int):
 	if multiplayer.is_server() == false:
 		return
@@ -204,12 +203,7 @@ func is_server_request() -> bool:
 ## ammo, remaining_ammo, slot - data for dropped weapon [br]
 ## for more, see dyn_objects_spawner.gd
 func spawn(data: Dictionary) -> void:
-	spawn_internal.rpc_id(1,data)
-
-@rpc("any_peer","call_local","reliable")
-func spawn_internal(data: Dictionary) -> void:
 	if multiplayer.is_server() == false:
-		printerr(str(multiplayer.get_remote_sender_id())+" tried to spawn internally on "+str(multiplayer.get_unique_id()))
 		return
 	
 	var object = dynamic_objects_spawner.spawn(data)
@@ -217,25 +211,14 @@ func spawn_internal(data: Dictionary) -> void:
 	if data.has("position"):
 		object.global_position = data.position
 
-func despawn(path: NodePath):
-	despawn_internal.rpc_id(1,path)
-
-@rpc("any_peer","call_local","reliable")
-func despawn_internal(path: NodePath) -> void:
+func despawn(path: NodePath) -> void:
 	if multiplayer.is_server() == false:
 		printerr(str(multiplayer.get_remote_sender_id())+" tried to despawn internally on "+str(multiplayer.get_unique_id()))
 		return
 	
 	get_node(path).queue_free()
 
-func shoot(damage: int,distance: float = 100) -> void:
-	if multiplayer.get_unique_id() == 1:
-		shoot_internal(1,damage,distance)
-	else:
-		shoot_internal.rpc_id(1,multiplayer.get_unique_id(),damage,distance)
-
-@rpc("any_peer","call_local","reliable")
-func shoot_internal(id:int , damage: int, distance: float) -> void:
+func shoot(id:int , damage: int, distance: float) -> void:
 	if multiplayer.is_server() == false:
 		return
 	
@@ -260,16 +243,12 @@ func shoot_internal(id:int , damage: int, distance: float) -> void:
 	if collision != {} and collision["collider"] is Player:
 		collision["collider"].take_damage.rpc_id(int(collision["collider"].name),damage)
 
-func interact() -> void:
-	if multiplayer.get_unique_id() == 1:
-		interact_internal(1)
-	else:
-		interact_internal.rpc_id(1,multiplayer.get_unique_id())
 
 @rpc("any_peer","call_local","reliable")
-func interact_internal(id:int) -> void:
+func interact() -> void:
 	if multiplayer.is_server() == false:
 		return
+	var id = multiplayer.get_remote_sender_id()
 	
 	var player: Player = player_nodes[id]
 	var player_camera: Camera3D = player.get_node("Camera3D")
@@ -285,16 +264,11 @@ func interact_internal(id:int) -> void:
 	if collision != {} and collision["collider"] is Interactible:
 		collision["collider"].interaction_start(id)
 
-func stop_interact():
-	if multiplayer.get_unique_id() == 1:
-		stop_interact_internal(1)
-	else:
-		stop_interact_internal.rpc_id(1,multiplayer.get_unique_id())
-
 @rpc("any_peer","call_local","reliable")
-func stop_interact_internal(id: int) -> void:
+func stop_interact() -> void:
 	if multiplayer.is_server() == false:
 		return
+	var id = multiplayer.get_remote_sender_id()
 	player_stopped_interacting.emit(id)
 
 func is_on_site() -> bool:

scripts/multiplayer/spawn_system/team_spawner.gd

@@ -15,6 +15,8 @@ func _exit_tree() -> void:
 	Session.round_started.disconnect(spawn)
 
 func spawn():
+	if not multiplayer.is_server():
+		return
 	match team:
 		Session.TEAMS.ATTACK:
 			for attacker in Lobby.attack_team:
@@ -36,18 +38,22 @@ func spawn_player(id: int) -> void:
 	elif team == Session.TEAMS.ATTACK:
 		Session.attackers_alive += 1 
 	
-	deferred_setup.bind(inst,team).call_deferred()
+	var distance = randf_range(0,spawn_radius)
+	var angle = randf_range(0,TAU)
+	var new_position = global_position + Vector3.RIGHT.rotated(Vector3.UP,angle) * distance
+	inst.player_id = id
+	get_parent().add_child(inst)
+	inst.global_position = new_position
+	inst.team = team
 
 func spawn_spectator(id: int) -> void:
 	var spectator: PackedScene = load("res://scenes/spectator.tscn")
 	var inst = spectator.instantiate()
 	
 	inst.name = str(id)
-	deferred_setup.bind(inst,Session.TEAMS.SPECTATE).call_deferred()
-
-func deferred_setup(what: Node3D, new_team: Session.TEAMS):
-	get_parent().add_child(what,true)
 	var distance = randf_range(0,spawn_radius)
 	var angle = randf_range(0,TAU)
 	var new_position = global_position + Vector3.RIGHT.rotated(Vector3.UP,angle) * distance
-	what.set_after_spawn.rpc_id(int(what.name),new_position,new_team)
+	get_parent().add_child(inst)
+	inst.global_position = new_position
+	inst.team = team

scripts/player/collision_team_updater.gd

@@ -7,17 +7,10 @@ extends Node
 const ATTACK_LAYER: int = 0b10000
 const DEFENCE_LAYER: int = 0b100000
 
-func on_spawned() -> void:
+func _ready() -> void:
+	if is_multiplayer_authority() == false: return
 	var mask = (ATTACK_LAYER if (player.team == Session.TEAMS.DEFENCE != inverse) else DEFENCE_LAYER)
 	if layer:
 		get_parent().collision_layer |= mask
 	else:
 		get_parent().collision_mask |= mask
-	global_update.rpc(layer,mask)
-
-@rpc
-func global_update(new_layer,mask) -> void:
-	if new_layer:
-		get_parent().collision_layer |= mask
-	else:
-		get_parent().collision_mask |= mask

scripts/player/dead_player_spectator.gd

@@ -4,9 +4,8 @@ extends Camera3D
 
 var active: bool
 
-func _ready() -> void:
-	if not is_multiplayer_authority():
-		return
+func _enter_tree() -> void:
+	set_multiplayer_authority(int(get_parent().get_parent().name))
 
 func set_active() -> void:
 	if not is_multiplayer_authority():

scripts/player/player.gd

@@ -4,10 +4,14 @@ class_name Player
 
 @export var team: Session.TEAMS
 @export var weapon_models: Dictionary[StringName,Node3D]
+@export var player_id: int = 1:
+	set(id):
+		player_id = id
+		$PlayerInput.set_multiplayer_authority(id)
+		$Camera3D.set_multiplayer_authority(id)
 
 var passived: bool = false
 
-signal spawned
 signal health_changed(to: int)
 signal died
 
@@ -26,51 +30,24 @@ const MAX_HP = 100
 	get:
 		return hp
 
-func _enter_tree() -> void:
-	set_multiplayer_authority(str(name).to_int())
-
 func _physics_process(_delta: float) -> void:
-	if not is_multiplayer_authority():
+	if not multiplayer.is_server():
 		return
 	
 	move_and_slide()
 
 func die() -> void:
-	if (not is_multiplayer_authority()):
+	if (not multiplayer.is_server()):
 		return
-	Session.add_dead.rpc(team)
+	Session.add_dead(team)
 	died.emit()
 	passived = true
 
-@rpc("any_peer","call_local","reliable")
 func passive() -> void:
 	passived = true
 
-@rpc("any_peer","call_local","reliable")
 func depassive() -> void:
 	passived = false
 
-@rpc("any_peer","call_local","reliable")
-func kill_request() -> void:
-	if multiplayer.get_remote_sender_id() != 1:
-		return
-	
-	die()
-
-@rpc("any_peer","call_local","reliable")
-func set_after_spawn(start_position: Vector3,new_team: int):
-	global_position = start_position
-	team = new_team as Session.TEAMS
-	spawned.emit()
-
-@rpc("any_peer","call_local","reliable")
 func take_damage(damage: int):
 	hp -= damage
-
-func _input(event: InputEvent) -> void:
-	if not is_multiplayer_authority():
-		return
-	if event.is_action_pressed("plr_interact"):
-		Session.interact()
-	if event.is_action_released("plr_interact"):
-		Session.stop_interact()

scripts/player/player_movement.gd

@@ -3,6 +3,9 @@ extends Node
 class_name PlayerMovement
 
 @export var player: Player
+@export var player_input: PlayerInput
+
+@export var jump_velocity: float
 var disabled: bool
 
 func disable() -> void:
@@ -15,7 +18,7 @@ func process_movement(max_speed: float,acceleration: float,deceleration: float,d
 		player.velocity.x = 0
 		player.velocity.z = 0
 		return
-	var input_dir := Input.get_vector("plr_strafe_r","plr_strafe_l", "plr_back","plr_forward")
+	var input_dir := player_input.direction
 	var direction := (player.transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized()
 	if direction:
 		player.velocity.x = clamp(player.velocity.x + direction.x * acceleration * delta,-max_speed*abs(direction.x),max_speed*abs(direction.x))
@@ -23,3 +26,6 @@ func process_movement(max_speed: float,acceleration: float,deceleration: float,d
 	else:
 		player.velocity.x = move_toward(player.velocity.x, 0, deceleration*delta)
 		player.velocity.z = move_toward(player.velocity.z, 0, deceleration*delta)
+
+func jump() -> void:
+	player.velocity.y = jump_velocity

scripts/player/states/crouching.gd

@@ -8,22 +8,22 @@ extends State
 @export var stand_up_area: Area3D
 @export var player: Player
 @export var player_movement: PlayerMovement
+@export var player_input: PlayerInput
 @export var animation_player: AnimationPlayer
 @export var crouch_time: float = 0.1
 @export var weapon_system: WeaponSystem
 
 func enter() -> void:
 	animation_player.play("crouch",-1,1/crouch_time)
+	player_input.crouch_end.connect(try_end_crouch)
 
 func exit() -> void:
 	animation_player.play("crouch",-1,-1/crouch_time,true)
+	player_input.crouch_end.disconnect(try_end_crouch)
 
 func physics_update(delta: float) -> void:
 	if not is_multiplayer_authority():
 		return
-	if Input.is_action_just_pressed("plr_jump") and player.is_on_floor() and toggle:
-		transition.emit("Stand")
-		return
 	
 	if not player.is_on_floor():
 		transition.emit("Fall")
@@ -31,7 +31,6 @@ func physics_update(delta: float) -> void:
 	
 	player_movement.process_movement(max_speed * weapon_system.get_speed_modifier(),acceleration,deceleration,delta)
 
-func state_input(event: InputEvent) -> void:
-	if (toggle == true and event.is_action_pressed("plr_crouch")) or (toggle == false and event.is_action_released("plr_crouch")):
-		if stand_up_area.has_overlapping_bodies() == false:
-			transition.emit("Stand")
+func try_end_crouch() -> void:
+	if player.is_on_floor() and stand_up_area.has_overlapping_bodies() == false:
+		transition.emit("Stand")

scripts/player/states/falling.gd

@@ -2,6 +2,7 @@ extends State
 
 @export var player: Player
 @export var player_movement: PlayerMovement
+@export var player_input: PlayerInput
 @export var max_speed: float = 5.0
 @export var acceleration: float
 @export var weapon_system: WeaponSystem
@@ -18,7 +19,12 @@ func physics_update(delta: float) -> void:
 	if not is_multiplayer_authority():
 		return
 	if player.is_on_floor():
-		transition.emit("Stand")
+		if player_input.compressed_states & PlayerInput.CROUCH:
+			transition.emit("Crouch")
+		elif player_input.compressed_states & PlayerInput.WALK:
+			transition.emit("Walk")
+		else:
+			transition.emit("Stand")
 		land_sound.multiplayer_play()
 	
 	player.velocity += player.get_gravity() * delta

scripts/player/states/standing.gd

@@ -3,9 +3,9 @@ extends State
 @export var max_speed: float = 5.0
 @export var acceleration: float = 2.0
 @export var deceleration: float = 200.0
-@export var JUMP_VELOCITY: float = 4.5
 @export var player: Player
 @export var player_movement: PlayerMovement
+@export var player_input: PlayerInput
 @export var weapon_system: WeaponSystem
 @export var audio: MultiplayerAudio3D
 @export var step_delay: float
@@ -14,18 +14,19 @@ extends State
 var step_time: float
 
 func enter() -> void:
-	pass
+	player_input.jumped.connect(on_jumped)
+	player_input.crouch_begin.connect(begin_crouch)
+	player_input.walk_begin.connect(begin_walk)
 
 func exit() -> void:
+	player_input.jumped.disconnect(on_jumped)
+	player_input.crouch_begin.disconnect(begin_crouch)
+	player_input.walk_begin.disconnect(begin_walk)
 	step_time = 0
 
 func physics_update(delta: float) -> void:
 	if not is_multiplayer_authority():
 		return
-	if Input.is_action_just_pressed("plr_jump") and player.is_on_floor():
-		player.velocity.y = JUMP_VELOCITY * sign(weapon_system.get_speed_modifier())
-		transition.emit("Fall")
-		return
 	
 	if not player.is_on_floor():
 		transition.emit("Fall")
@@ -38,9 +39,13 @@ func physics_update(delta: float) -> void:
 	
 	player_movement.process_movement(max_speed * weapon_system.get_speed_modifier(),acceleration,deceleration,delta)
 
-func state_input(event: InputEvent) -> void:
-	if event.is_action_pressed("plr_crouch"):
-		transition.emit("Crouch")
+func on_jumped() -> void:
+	if player.is_on_floor():
+		player_movement.jump()
+		transition.emit("Fall")
 
-	if event.is_action_pressed("plr_walk"):
-		transition.emit("Walk")
+func begin_walk() -> void:
+	transition.emit("Walk")
+
+func begin_crouch() -> void:
+	transition.emit("Crouch")

scripts/player/states/walk.gd

@@ -6,21 +6,22 @@ extends State
 @export var JUMP_VELOCITY: float = 4.5
 @export var player: Player
 @export var player_movement: PlayerMovement
+@export var player_input: PlayerInput
 @export var weapon_system: WeaponSystem
 
 func enter() -> void:
-	pass
+	player_input.crouch_begin.connect(begin_crouch)
+	player_input.walk_end.connect(end_walk)
+	player_input.jumped.connect(on_jumped)
 
 func exit() -> void:
-	pass
+	player_input.crouch_begin.disconnect(begin_crouch)
+	player_input.walk_end.disconnect(end_walk)
+	player_input.jumped.disconnect(on_jumped)
 
 func physics_update(delta: float) -> void:
 	if not is_multiplayer_authority():
 		return
-	if Input.is_action_just_pressed("plr_jump") and player.is_on_floor():
-		player.velocity.y = JUMP_VELOCITY
-		transition.emit("Fall")
-		return
 	
 	if not player.is_on_floor():
 		transition.emit("Fall")
@@ -28,9 +29,13 @@ func physics_update(delta: float) -> void:
 	
 	player_movement.process_movement(max_speed * weapon_system.get_speed_modifier(),acceleration,deceleration,delta)
 
-func state_input(event: InputEvent) -> void:
-	if event.is_action_released("plr_walk"):
-		transition.emit("Stand")
+func on_jumped() -> void:
+	if player.is_on_floor():
+		player_movement.jump()
+		transition.emit("Fall")
 
-	if event.is_action_pressed("plr_crouch"):
-		transition.emit("Crouch")
+func end_walk() -> void:
+	transition.emit("Stand")
+
+func begin_crouch() -> void:
+	transition.emit("Crouch")

scripts/player/team_color_switcher.gd

@@ -5,8 +5,5 @@ extends Node
 @export var blue_team_texture: Texture2D
 
 func _ready() -> void:
-	get_tree().create_timer(1).timeout.connect(on_player_spawned)
-
-func on_player_spawned() -> void:
 	if player.team == Session.TEAMS.DEFENCE:
 		material.albedo_texture = blue_team_texture

scripts/state_machine/machine.gd

@@ -13,6 +13,7 @@ func _ready() -> void:
 
 		else:
 			push_warning("Child of state machine is not state")
+	current_state.enter()
 
 func on_transition_required(to: StringName):
 	if is_multiplayer_authority() == false:
@@ -30,7 +31,7 @@ func change_state(to_state: State) -> void:
 	current_state = to_state
 	current_state.enter()
 
-@rpc
+@rpc("authority","call_local","reliable")
 func change_state_to_name(to_name: StringName):
 	if current_state != null:
 		current_state.exit()

scripts/weapon_system/gun/semi_auto_shoot_state.gd

@@ -39,7 +39,7 @@ func fire() -> void:
 	machine.animation_player.play(with_morphems("shoot"))
 	
 	if is_multiplayer_authority():
-		Session.shoot(damage,shoot_distance)
+		Session.shoot(int(machine.player.name),damage,shoot_distance)
 	
 	fire_timer.start()
 	machine.player_camera.recoil(horizontal_curve.sample(bullets_shot),vertical_curve.sample(bullets_shot))

scripts/weapon_system/knife/knife_attack.gd

@@ -14,7 +14,7 @@ func exit() -> void:
 
 func attack() -> void:
 	if is_multiplayer_authority():
-		Session.shoot(damage,1.5)
+		Session.shoot(int(machine.player.name),damage,1.5)
 
 func on_animation_finished(animation):
 	if animation == machine.animation_prefix + "attack":

scripts/weapon_system/knife/knife_attack_heavy.gd

@@ -12,7 +12,7 @@ func exit() -> void:
 
 func attack() -> void:
 	if is_multiplayer_authority():
-		Session.shoot(damage,1.5)
+		Session.shoot(int(machine.player.name),damage,1.5)
 
 func on_animation_finished(animation):
 	if animation == machine.animation_prefix + "heavy_attack":

scripts/weapon_system/weapon_system.gd

@@ -79,23 +79,12 @@ func switch(to: StringName, exit: bool = true):
 	ammo_updated.emit(current_state.ammo,current_state.remaining_ammo)
 	switched_to.emit(current_state)
 
-	update_remotes.rpc(to,exit)
-
 func return_to_previous(exit: bool = true):
 	if last_slot != "":
 		switch(last_slot, exit)
 	else:
 		switch("knife", exit)
 
-@rpc("authority","call_remote","reliable")
-func update_remotes(to: StringName,exit: bool):
-	if current_state != null and exit:
-		current_state.exit()
-	current_state = slots[to]
-	current_state.enter()
-	
-	switched_to.emit(current_state)
-
 func drop_current():
 	drop(current_state)
 
@@ -172,40 +161,3 @@ func _physics_process(delta: float) -> void:
 	if current_state == null or disabled:
 		return
 	current_state.physics_update(delta)
-
-func _input(event: InputEvent) -> void:
-	if is_multiplayer_authority() == false or disabled: return
-	
-	if current_state != null:
-		current_state.state_input(event)
-	
-	if event.is_action_pressed("plr_ult"):
-		switch("ultimate")
-	elif event.is_action_pressed("plr_bomb"):
-		switch("bomb")
-	elif event.is_action_pressed("plr_primary"):
-		switch("primary")
-	elif event.is_action_pressed("plr_active_first"):
-		switch("ability_first")
-	elif event.is_action_pressed("plr_active_second"):
-		switch("ability_second")
-	elif event.is_action_pressed("plr_active_third"):
-		switch("ability_third")
-	elif event.is_action_pressed("plr_secondary"):
-		switch("secondary")
-	elif event.is_action_pressed("plr_knife"):
-		switch("knife")
-	
-	if not Session.round_state == Session.ROUND_STATES.BUY and not player.passived:
-		if event.is_action_pressed("plr_fire"):
-			current_state.use_begin.rpc()
-		if event.is_action_released("plr_fire"):
-			current_state.use_end.rpc()
-		if event.is_action_pressed("plr_scope"):
-			current_state.alternate_state()
-		if event.is_action_pressed("plr_firemode"):
-			current_state.switch_mode()
-		
-	if event.is_action_pressed("plr_drop"):
-		drop_current()
-