diff --git a/assets/Objects/TestSword.glb b/assets/Objects/TestSword.glb new file mode 100644 index 0000000..c91623b Binary files /dev/null and b/assets/Objects/TestSword.glb differ diff --git a/assets/Objects/TestSword.glb.import b/assets/Objects/TestSword.glb.import new file mode 100644 index 0000000..6780ce6 --- /dev/null +++ b/assets/Objects/TestSword.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://culurukxpqswh" +path="res://.godot/imported/TestSword.glb-654084f6adc83be4d960efd745434e40.scn" + +[deps] + +source_file="res://assets/Objects/TestSword.glb" +dest_files=["res://.godot/imported/TestSword.glb-654084f6adc83be4d960efd745434e40.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/assets/characters/player/LilguyRigged.glb b/assets/characters/player/LilguyRigged.glb new file mode 100644 index 0000000..83c868f Binary files /dev/null and b/assets/characters/player/LilguyRigged.glb differ diff --git a/assets/characters/player/LilguyRigged.glb.import b/assets/characters/player/LilguyRigged.glb.import new file mode 100644 index 0000000..73ad396 --- /dev/null +++ b/assets/characters/player/LilguyRigged.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://byw3ig2bs1wgu" +path="res://.godot/imported/LilguyRigged.glb-9dcd728c67b8641eab7596898bc8bcff.scn" + +[deps] + +source_file="res://assets/characters/player/LilguyRigged.glb" +dest_files=["res://.godot/imported/LilguyRigged.glb-9dcd728c67b8641eab7596898bc8bcff.scn"] + +[params] + +nodes/root_type="Character" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/level/resources/weapon_testsword.tres b/level/resources/weapon_testsword.tres new file mode 100644 index 0000000..4a311bd --- /dev/null +++ b/level/resources/weapon_testsword.tres @@ -0,0 +1,13 @@ +[gd_resource type="Resource" script_class="WeaponData" load_steps=2 format=3 uid="uid://pqoldmf2q3t6"] + +[ext_resource type="Script" uid="uid://d2homvlmrg6xs" path="res://level/scripts/weapon_data.gd" id="1"] + +[resource] +script = ExtResource("1") +weapon_name = "Iron Sword" +description = "A simple iron sword. Good for close combat." +damage = 20.0 +attack_range = 3.5 +attack_cooldown = 0.6 +knockback_force = 12.0 +weight = 2.0 diff --git a/level/scenes/Player_Lilguy.tscn b/level/scenes/Player_Lilguy.tscn new file mode 100644 index 0000000..b53c440 --- /dev/null +++ b/level/scenes/Player_Lilguy.tscn @@ -0,0 +1,101 @@ +[gd_scene load_steps=5 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://bj7yrijm7bppq" path="res://level/scripts/spring_arm_offset.gd" id="9_dlyie"] + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_yxyay"] +radius = 0.35796 +height = 1.73092 + +[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_xbohm"] +properties/0/path = NodePath(".:position") +properties/0/spawn = true +properties/0/replication_mode = 1 +properties/1/path = NodePath("3DGodotRobot/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("3DGodotRobot:rotation") +properties/3/spawn = true +properties/3/replication_mode = 1 + +[node name="LilguyRigged" instance=ExtResource("1_e6qwr")] + +[node name="Armature" parent="." index="0"] +transform = Transform3D(0.003, 0, 0, 0, -1.3113416e-10, -0.003, 0, 0.003, -1.3113416e-10, 0, 0, 0) + +[node name="Skeleton3D" parent="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) +bones/1/rotation = Quaternion(0.015321622, 0.025352472, 0.09471857, 0.99506325) +bones/2/position = Vector3(-1.8112361e-05, 73.7566, -1.621247e-05) +bones/2/rotation = Quaternion(0.03465983, 0.05047194, 0.051301006, 0.99680465) +bones/3/position = Vector3(-3.0510128e-05, 84.29319, 9.059899e-06) +bones/3/rotation = Quaternion(0.029244617, 0.05379084, -0.051849358, 0.9967763) +bones/4/position = Vector3(3.8038404e-05, 94.83001, 1.9073414e-06) +bones/4/rotation = Quaternion(0.0006216668, 0.08164933, 0.020402616, 0.99645215) +bones/5/position = Vector3(-0.25257444, 72.84532, -7.644296e-06) +bones/5/rotation = Quaternion(0.03735582, 0.19943666, -0.04159315, 0.97831464) +bones/6/position = Vector3(-0.606337, 174.89494, 7.152558e-06) +bones/7/position = Vector3(-0.19949026, 76.75483, 52.286175) +bones/7/rotation = Quaternion(0.8036073, -0.09628728, 0.10672547, 0.57754105) +bones/8/position = Vector3(4.5403274e-05, 110.91907, 9.404198e-05) +bones/8/rotation = Quaternion(0.25522038, -0.08967137, 0.029357873, 0.962268) +bones/9/position = Vector3(2.3064584e-05, 173.66367, 5.063071e-05) +bones/9/rotation = Quaternion(0.0878422, -0.16096674, 0.2433837, 0.9524378) +bones/10/position = Vector3(-2.2947788e-05, 166.48767, -1.2734416e-05) +bones/11/position = Vector3(0.23053212, 76.75536, -52.28617) +bones/11/rotation = Quaternion(0.14271575, -0.5852634, 0.78228706, 0.15851216) +bones/12/position = Vector3(1.532285e-05, 110.91911, 4.0430357e-05) +bones/12/rotation = Quaternion(0.3219699, 0.13412467, 0.27112576, 0.8971269) +bones/13/position = Vector3(1.5523525e-05, 173.6661, 0.00010698747) +bones/13/rotation = Quaternion(0.090376474, 0.101556264, -0.39819276, 0.907172) +bones/14/position = Vector3(-2.0682812e-05, 166.48976, 3.939679e-05) +bones/15/position = Vector3(0.6496186, -35.1185, 49.84838) +bones/15/rotation = Quaternion(0.38543195, 0.163806, 0.8217493, 0.3864424) +bones/16/position = Vector3(8.771768e-06, 312.91962, 7.4840264e-06) +bones/16/rotation = Quaternion(-0.05300442, 0.17209676, 0.3905684, 0.90278995) +bones/17/position = Vector3(-1.8137518e-05, 301.05597, -2.1670077e-05) +bones/17/rotation = Quaternion(0.24982397, 0.64725155, -0.6711768, 0.2611037) +bones/18/position = Vector3(-3.026353e-05, 14.185886, -1.4917823e-06) +bones/18/rotation = Quaternion(0.11539763, 0.017187236, -0.010002268, 0.9931203) +bones/19/position = Vector3(-4.351055e-06, 11.391233, -2.5032205e-06) +bones/20/position = Vector3(0.014209064, -35.118507, -49.848385) +bones/20/rotation = Quaternion(-0.07370265, -0.18747172, 0.9412239, 0.2711456) +bones/21/position = Vector3(2.8756085e-05, 312.91974, 5.14377e-06) +bones/21/rotation = Quaternion(-0.037353612, -0.04220169, 0.46135134, 0.8854257) +bones/22/position = Vector3(2.2092872e-05, 301.0575, 1.8114511e-05) +bones/22/rotation = Quaternion(0.7933202, 0.12858748, -0.36227232, 0.47208825) +bones/23/position = Vector3(1.3624241e-05, 15.034077, 9.790485e-06) +bones/23/rotation = Quaternion(0.11885707, 0.00952176, -0.0077993367, 0.9928351) +bones/24/position = Vector3(-2.4847686e-06, 11.913359, -6.198885e-06) + +[node name="CollisionShape3D" type="CollisionShape3D" parent="." index="2"] +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")] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) +script = ExtResource("9_dlyie") +_spring_arm = NodePath("SpringArm3D") + +[node name="SpringArm3D" type="SpringArm3D" parent="SpringArmOffset" index="0"] +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"] +current = true + +[node name="PlayerNick" type="Node3D" parent="." index="4"] + +[node name="Nickname" type="Label3D" parent="PlayerNick" index="0"] +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"] +replication_config = SubResource("SceneReplicationConfig_xbohm") diff --git a/level/scenes/level.tscn b/level/scenes/level.tscn index 46a0ca0..aaf5b3d 100644 --- a/level/scenes/level.tscn +++ b/level/scenes/level.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=19 format=3 uid="uid://dugaivbj1o66n"] +[gd_scene load_steps=20 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://cffjduipbb3s5" path="res://level/scenes/player.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" path="res://level/scenes/weapons/world_weapon_shield.tscn" id="5_xerh7"] +[ext_resource type="PackedScene" uid="uid://hd6pq287rgye" path="res://level/scenes/weapons/world_weapon_testsword.tscn" id="6_xerh7"] [sub_resource type="PlaneMesh" id="PlaneMesh_r5xs5"] size = Vector2(90, 90) @@ -350,6 +351,9 @@ transform = Transform3D(15, 0, 0, 0, 15, 0, 0, 0, 15, 1.301034, -1.2294581, 2.06 [node name="WorldWeaponShield" parent="." instance=ExtResource("5_xerh7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.6566563, 0.024999619, 8.476057) +[node name="WorldWeaponSword" parent="." instance=ExtResource("6_xerh7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.1038065, 0.024999619, 4.551466) + [connection signal="pressed" from="Menu/MainContainer/MainMenu/Buttons/Host" to="." method="_on_host_pressed"] [connection signal="pressed" from="Menu/MainContainer/MainMenu/Buttons/Join" to="." method="_on_join_pressed"] [connection signal="pressed" from="Menu/MainContainer/MainMenu/Option4/Quit" to="." method="_on_quit_pressed"] diff --git a/level/scenes/weapons/TestSwordMesh.tscn b/level/scenes/weapons/TestSwordMesh.tscn new file mode 100644 index 0000000..d6906cb --- /dev/null +++ b/level/scenes/weapons/TestSwordMesh.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://rkvkbxlweo60"] + +[ext_resource type="PackedScene" uid="uid://culurukxpqswh" path="res://assets/Objects/TestSword.glb" id="1_4fdvi"] + +[node name="TestSwordMesh" type="Node3D"] + +[node name="TestSword" parent="." instance=ExtResource("1_4fdvi")] +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0.104662895, 0) diff --git a/level/scenes/weapons/shield_mesh.tscn b/level/scenes/weapons/shield_mesh.tscn index 30dc85e..66cba5e 100644 --- a/level/scenes/weapons/shield_mesh.tscn +++ b/level/scenes/weapons/shield_mesh.tscn @@ -1,9 +1,14 @@ -[gd_scene load_steps=2 format=3 uid="uid://rbvk4mg40ceg"] +[gd_scene load_steps=3 format=3 uid="uid://rbvk4mg40ceg"] [ext_resource type="ArrayMesh" uid="uid://rsoymmi6yqhp" path="res://assets/Objects/shield.obj" id="1"] +[ext_resource type="ArrayMesh" uid="uid://dmottq5u3my52" path="res://assets/characters/Lobster/10029_Lobster_v1_iterations-2.obj" id="2_gfu4n"] [node name="ShieldMesh" type="Node3D"] [node name="MeshInstance3D" type="MeshInstance3D" parent="."] transform = Transform3D(-0.79798645, 0, -0.056724526, 0, 0.8, 0, 0.056724526, 0, -0.79798645, 0.75818217, -1.2635326, 1.7408726) mesh = ExtResource("1") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="MeshInstance3D"] +transform = Transform3D(0.005003864, 0.023845885, -0.14800794, -0.00021703207, -0.14808898, -0.023866294, -0.14991644, 0.0010103066, -0.0049056155, 0.5944414, 1.6416295, 2.3408623) +mesh = ExtResource("2_gfu4n") diff --git a/level/scenes/weapons/world_weapon_testsword.tscn b/level/scenes/weapons/world_weapon_testsword.tscn new file mode 100644 index 0000000..22247dc --- /dev/null +++ b/level/scenes/weapons/world_weapon_testsword.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=4 format=3 uid="uid://hd6pq287rgye"] + +[ext_resource type="Script" uid="uid://ccnnd0y4jqiot" path="res://level/scripts/world_weapon.gd" id="1"] +[ext_resource type="Resource" uid="uid://pqoldmf2q3t6" path="res://level/resources/weapon_testsword.tres" id="2_vcb1s"] + +[sub_resource type="BoxShape3D" id="1"] +size = Vector3(0.3, 0.3, 1.2) + +[node name="WorldWeaponSword" type="RigidBody3D"] +collision_layer = 4 +collision_mask = 2 +mass = 2.0 +script = ExtResource("1") +weapon_data = ExtResource("2_vcb1s") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("1")