diff --git a/level/scenes/Player_Lilguy.tscn b/level/scenes/Player_Lilguy.tscn index 3bc6cda..ea87a1b 100644 --- a/level/scenes/Player_Lilguy.tscn +++ b/level/scenes/Player_Lilguy.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=6 format=3 uid="uid://db06e8q8f8bdq"] +[gd_scene load_steps=7 format=3 uid="uid://db06e8q8f8bdq"] -[ext_resource type="PackedScene" uid="uid://byw3ig2bs1wgu" path="res://assets/characters/player/LilguyRigged.glb" id="1_e6qwr"] +[ext_resource type="Script" uid="uid://c2si8gkbnde0c" path="res://level/scripts/player.gd" id="1_player"] +[ext_resource type="PackedScene" uid="uid://byw3ig2bs1wgu" path="res://assets/characters/player/LilguyRigged.glb" id="2_lilguy"] [ext_resource type="Script" uid="uid://cf7jky1bcs560" path="res://level/scripts/lilguy_body.gd" id="3_body"] -[ext_resource type="Script" uid="uid://bj7yrijm7bppq" path="res://level/scripts/spring_arm_offset.gd" id="9_dlyie"] +[ext_resource type="Script" uid="uid://bj7yrijm7bppq" path="res://level/scripts/spring_arm_offset.gd" id="4_spring"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_yxyay"] radius = 0.35796 @@ -12,26 +13,35 @@ height = 1.73092 properties/0/path = NodePath(".:position") properties/0/spawn = true properties/0/replication_mode = 1 -properties/1/path = NodePath("AnimationPlayer:current_animation") +properties/1/path = NodePath("LilguyRigged/AnimationPlayer:current_animation") properties/1/spawn = true properties/1/replication_mode = 1 properties/2/path = NodePath("PlayerNick/Nickname:text") properties/2/spawn = true properties/2/replication_mode = 1 -properties/3/path = NodePath("Armature:rotation") +properties/3/path = NodePath("LilguyRigged/Armature:rotation") properties/3/spawn = true properties/3/replication_mode = 1 -[node name="LilguyRigged" instance=ExtResource("1_e6qwr")] +[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("_body", "_spring_arm_offset", "_weapon_attachment", "_weapon_container", "_offhand_attachment", "_offhand_container")] +script = ExtResource("1_player") collision_mask = 3 +_body = NodePath("LilguyRigged/Armature") +_spring_arm_offset = NodePath("SpringArmOffset") +_weapon_attachment = NodePath("LilguyRigged/Armature/Skeleton3D/WeaponPoint") +_weapon_container = NodePath("LilguyRigged/Armature/Skeleton3D/WeaponPoint/WeaponContainer") +_offhand_attachment = NodePath("LilguyRigged/Armature/Skeleton3D/OffhandPoint") +_offhand_container = NodePath("LilguyRigged/Armature/Skeleton3D/OffhandPoint/OffhandContainer") -[node name="Armature" parent="." index="0" node_paths=PackedStringArray("_character", "animation_player")] +[node name="LilguyRigged" parent="." instance=ExtResource("2_lilguy")] + +[node name="Armature" parent="LilguyRigged" index="0" node_paths=PackedStringArray("_character", "animation_player")] transform = Transform3D(0.003, 0, 0, 0, -1.3113416e-10, -0.003, 0, 0.003, -1.3113416e-10, 0, 0, 0) script = ExtResource("3_body") -_character = NodePath("..") +_character = NodePath("../..") animation_player = NodePath("../AnimationPlayer") -[node name="Skeleton3D" parent="Armature" index="0"] +[node name="Skeleton3D" parent="LilguyRigged/Armature" index="0"] bones/0/position = Vector3(-0.32852697, 2.914154, -546.76843) bones/0/rotation = Quaternion(-0.6608288, 0.28933647, -0.19178489, 0.6654384) bones/1/position = Vector3(0.054167695, 63.219894, -3.33786e-06) @@ -78,45 +88,45 @@ bones/23/position = Vector3(1.3624241e-05, 15.034077, 9.790485e-06) bones/23/rotation = Quaternion(0.11885707, 0.009521758, -0.0077993367, 0.9928351) bones/24/position = Vector3(-2.4847686e-06, 11.913359, -6.198885e-06) -[node name="WeaponPoint" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="1"] +[node name="WeaponPoint" type="BoneAttachment3D" parent="LilguyRigged/Armature/Skeleton3D" index="1"] transform = Transform3D(-0.43292555, -0.61284775, 0.6610542, 0.7782953, 0.11585887, 0.61711675, -0.45478758, 0.78166103, 0.42681834, -352.38528, -73.5694, -531.96124) bone_name = "mixamorig_RightHand" bone_idx = 14 -[node name="WeaponContainer" type="Node3D" parent="Armature/Skeleton3D/WeaponPoint" index="0"] +[node name="WeaponContainer" type="Node3D" parent="LilguyRigged/Armature/Skeleton3D/WeaponPoint" index="0"] transform = Transform3D(36.6912, 297.2667, 16.921356, 46.72698, 11.0892515, -296.13126, -294.05847, 38.85366, -44.94499, 24.08223, -7.4241333, 7.098694) -[node name="OffhandPoint" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="2"] +[node name="OffhandPoint" type="BoneAttachment3D" parent="LilguyRigged/Armature/Skeleton3D" index="2"] transform = Transform3D(0.6212382, -0.004605584, -0.7836083, -0.620316, 0.60813713, -0.49535576, 0.47882265, 0.7938187, 0.37494114, 135.65903, 334.35764, -511.2708) bone_name = "mixamorig_LeftHand" bone_idx = 10 -[node name="OffhandContainer" type="Node3D" parent="Armature/Skeleton3D/OffhandPoint" index="0"] +[node name="OffhandContainer" type="Node3D" parent="LilguyRigged/Armature/Skeleton3D/OffhandPoint" index="0"] transform = Transform3D(-17.74905, -295.46814, -48.82108, 21.019196, -50.01525, 295.05362, -298.73593, 14.035805, 23.660797, 0.005859375, 0.39337158, 0.06616211) -[node name="CollisionShape3D" type="CollisionShape3D" parent="." index="2"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.066, 0.828, 0.01) shape = SubResource("CapsuleShape3D_yxyay") -[node name="SpringArmOffset" type="Node3D" parent="." index="3" node_paths=PackedStringArray("_spring_arm")] +[node name="SpringArmOffset" type="Node3D" parent="." node_paths=PackedStringArray("_spring_arm")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) -script = ExtResource("9_dlyie") +script = ExtResource("4_spring") _spring_arm = NodePath("SpringArm3D") -[node name="SpringArm3D" type="SpringArm3D" parent="SpringArmOffset" index="0"] +[node name="SpringArm3D" type="SpringArm3D" parent="SpringArmOffset"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) spring_length = 5.0 -[node name="Camera3D" type="Camera3D" parent="SpringArmOffset/SpringArm3D" index="0"] +[node name="Camera3D" type="Camera3D" parent="SpringArmOffset/SpringArm3D"] current = true -[node name="PlayerNick" type="Node3D" parent="." index="4"] +[node name="PlayerNick" type="Node3D" parent="."] -[node name="Nickname" type="Label3D" parent="PlayerNick" index="0"] +[node name="Nickname" type="Label3D" parent="PlayerNick"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.97037, 0) billboard = 1 outline_modulate = Color(0, 0, 0, 0.301961) text = "player name test" -[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="." index="5"] +[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."] replication_config = SubResource("SceneReplicationConfig_xbohm") diff --git a/level/scenes/level.tscn b/level/scenes/level.tscn index 7b27e50..be288e1 100644 --- a/level/scenes/level.tscn +++ b/level/scenes/level.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=19 format=3 uid="uid://dugaivbj1o66n"] [ext_resource type="Script" uid="uid://d0dgljwwl463n" path="res://level/scripts/level.gd" id="1_e1sh7"] -[ext_resource type="PackedScene" uid="uid://ck82j7gvkb0i4" path="res://level/scenes/player.tscn" id="1_uvcbi"] +[ext_resource type="PackedScene" uid="uid://db06e8q8f8bdq" path="res://level/scenes/Player_Lilguy.tscn" id="1_uvcbi"] [ext_resource type="FontFile" uid="uid://diapabmalpcrj" path="res://assets/fonts/Kurland.ttf" id="3_icc4p"] [ext_resource type="PackedScene" uid="uid://b48oxbcgxu3d8" path="res://assets/Objects/Colosseum_10.fbx" id="4_u750a"] [ext_resource type="PackedScene" uid="uid://hd6pq287rgye" path="res://level/scenes/weapons/world_weapon_testsword.tscn" id="5_cwx4m"] diff --git a/level/scripts/network.gd b/level/scripts/network.gd index 2115042..8337b5a 100644 --- a/level/scripts/network.gd +++ b/level/scripts/network.gd @@ -13,10 +13,6 @@ var player_info = { signal player_connected(peer_id, player_info) signal server_disconnected -func _process(_delta): - if Input.is_action_just_pressed("quit"): - get_tree().quit(0) - func _ready() -> void: multiplayer.server_disconnected.connect(_on_connection_failed) multiplayer.connection_failed.connect(_on_server_disconnected)