diff --git a/Blender/ANIM_bull.blend1 b/Blender/ANIM_bull.blend1 new file mode 100644 index 0000000..d65d40b Binary files /dev/null and b/Blender/ANIM_bull.blend1 differ diff --git a/Blender/ANIM_matador.blend1 b/Blender/ANIM_matador.blend1 new file mode 100644 index 0000000..844dc26 Binary files /dev/null and b/Blender/ANIM_matador.blend1 differ diff --git a/Blender/matador_v03.blend1 b/Blender/matador_v03.blend1 new file mode 100644 index 0000000..411050d Binary files /dev/null and b/Blender/matador_v03.blend1 differ diff --git a/Blender/sword.blend1 b/Blender/sword.blend1 new file mode 100644 index 0000000..9f596b8 Binary files /dev/null and b/Blender/sword.blend1 differ diff --git a/actors/player/player.tscn b/actors/player/player.tscn index 9cbccfd..a03eadc 100644 --- a/actors/player/player.tscn +++ b/actors/player/player.tscn @@ -23,7 +23,7 @@ script = ExtResource("2_camera_iso") [node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23) -[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 1942410469) index="0" unique_id=550138996] +[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 1057197468) index="0" unique_id=840295370] bones/0/position = Vector3(0, 0, 0.009963839) bones/0/rotation = Quaternion(0.7071068, 0, 0, 0.7071067) bones/0/scale = Vector3(1, 1, 1) diff --git a/actors/player/player_follow_light.gd b/actors/player/player_follow_light.gd new file mode 100644 index 0000000..0805b67 --- /dev/null +++ b/actors/player/player_follow_light.gd @@ -0,0 +1,14 @@ +extends Node3D + +var player: Node3D = null + +func _process(delta: float) -> void: + # If we don't have the player yet, try to find them in the group + if not is_instance_valid(player): + var players = get_tree().get_nodes_in_group("player") + if players.size() > 0: + player = players[0] as Node3D + + # If the player exists, follow their position + if is_instance_valid(player): + global_position = player.global_position diff --git a/actors/player/player_follow_light.gd.uid b/actors/player/player_follow_light.gd.uid new file mode 100644 index 0000000..a8fb86a --- /dev/null +++ b/actors/player/player_follow_light.gd.uid @@ -0,0 +1 @@ +uid://cmapsaj010q40 diff --git a/actors/player/player_follow_light.tscn b/actors/player/player_follow_light.tscn new file mode 100644 index 0000000..5ca3933 --- /dev/null +++ b/actors/player/player_follow_light.tscn @@ -0,0 +1,14 @@ +[gd_scene format=3 uid="uid://4v25hb0qu5l0"] + +[ext_resource type="Script" uid="uid://cmapsaj010q40" path="res://actors/player/player_follow_light.gd" id="1_w7wrt"] + +[node name="PlayerFollowLight" type="Node3D" unique_id=1889971494] +script = ExtResource("1_w7wrt") + +[node name="SpotLight3D" type="SpotLight3D" parent="." unique_id=1523840927] +transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 2.6136062, 1.0431258e-07) +light_color = Color(0.9999998, 0.8702623, 0.60548127, 1) +light_energy = 8.0 +shadow_enabled = true +distance_fade_length = 30.45 +spot_angle = 72.62192 diff --git a/levels/lobby_level.tscn b/levels/lobby_level.tscn index a963d01..c495b53 100644 --- a/levels/lobby_level.tscn +++ b/levels/lobby_level.tscn @@ -2,6 +2,7 @@ [ext_resource type="PackedScene" uid="uid://bbfvwolhomilp" path="res://props/torch.tscn" id="1_w7uyf"] [ext_resource type="PackedScene" uid="uid://bd56iuttyiypv" path="res://props/barrel_simple.tscn" id="2_3o0md"] +[ext_resource type="PackedScene" uid="uid://4v25hb0qu5l0" path="res://actors/player/player_follow_light.tscn" id="2_8bh2m"] [ext_resource type="PackedScene" uid="uid://dctmlh4hnuux1" path="res://art/levels/lobby.glb" id="2_w7uyf"] [ext_resource type="Script" uid="uid://cwbf7jfkr8j10" path="res://levels/lobby_underground.gd" id="4_73452"] [ext_resource type="Script" uid="uid://dn77mjyxllgl6" path="res://levels/to_the_bear_level.gd" id="5_6j2sa"] @@ -45,8 +46,8 @@ size = Vector3(4.1274414, 8.299622, 6.9958496) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="Lights" unique_id=955995990] transform = Transform3D(-0.502238, -0.82287306, 0.26577574, 0.36594617, 0.07621761, 0.9275096, -0.78347975, 0.5630903, 0.26284787, 0, 0, 0) -light_color = Color(0.78431374, 0.8117647, 1, 1) -light_energy = 0.228 +light_color = Color(0.5266291, 0.5549962, 0.9999985, 1) +light_energy = 0.466 shadow_enabled = true [node name="SpotLight3D" type="SpotLight3D" parent="Lights" unique_id=1783040386] @@ -99,6 +100,9 @@ transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -0.3 [node name="Torch8" parent="Lights/Torches" unique_id=987701581 instance=ExtResource("1_w7uyf")] transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -0.349617, 1.9073486e-06, -0.31505227) +[node name="PlayerFollowLight" parent="Lights" unique_id=1889971494 instance=ExtResource("2_8bh2m")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.1712027, 0) + [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=939963056] environment = SubResource("Environment_lobby") @@ -240,7 +244,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.1928787, 0.11255789, 2.8063 transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0, 0, 0) script = ExtResource("4_73452") -[node name="Plane" parent="Lobby_underground" index="1" unique_id=1962555538] +[node name="Plane" parent="Lobby_underground" index="1" unique_id=2038841618] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.2352347, 0) [node name="AnimationPlayer" type="AnimationPlayer" parent="Lobby_underground" unique_id=2070502042] diff --git a/props/torch.tscn b/props/torch.tscn index aed0901..c94f74e 100644 --- a/props/torch.tscn +++ b/props/torch.tscn @@ -167,6 +167,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.011785, -2.371254, 16.2322 [node name="OmniLight3D" type="OmniLight3D" parent="MeshInstance3D/TorchLight" unique_id=1094582672] transform = Transform3D(0.9999986, -0.001596809, 0.00045388562, 0.0014380338, 0.96984345, 0.24372463, -0.00082937966, -0.24372365, 0.9698444, 9.096397, 6.2542057, -15.77264) light_color = Color(0.92773837, 0.6304423, 0, 1) +light_energy = 2.0 shadow_enabled = true omni_range = 13.657384