Jonathan
/
Undertaker-Simulator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Jonathan:0d2830d2f20277ab17f35a197576dbdaf9b74c99
Branches Tags
Jonathan:main
Jonathan:rose_physics
Jonathan:kenney_char_dead_end
Jonathan:visuals
..
compare: Jonathan:96e53b9bbe5a37b7181ab971a4a0b55f119a52c3
Branches Tags
Jonathan:main
Jonathan:rose_physics
Jonathan:kenney_char_dead_end
Jonathan:visuals

No commits in common. '0d2830d2f20277ab17f35a197576dbdaf9b74c99' and '96e53b9bbe5a37b7181ab971a4a0b55f119a52c3' have entirely different histories.
0d2830d2f2 ... 96e53b9bbe

3 changed files with 5 additions and 192 deletions
Show Stats

184
scenes/room.tscn
Unescape View File

@ -1,4 +1,4 @@
[gd_scene load_steps=106 format=4 uid="uid://157h04x0krfu"]
[gd_scene load_steps=97 format=4 uid="uid://157h04x0krfu"]
[ext_resource type="PackedScene" uid="uid://bjufextny1icg" path="res://models/UndertakerAssets.glb" id="1_7dqbv"]
[ext_resource type="ArrayMesh" uid="uid://c5hhygnuya8m4" path="res://models/ceiling.res" id="1_jn645"]
@ -48,7 +48,6 @@
[ext_resource type="ArrayMesh" uid="uid://ydc6tdd1gu42" path="res://models/telephone_station.res" id="46_geot1"]
[ext_resource type="ArrayMesh" uid="uid://w8oivhqk4kv3" path="res://models/telephone.res" id="47_1s4n5"]
[ext_resource type="PackedScene" uid="uid://dcvhqqp75xtws" path="res://prefabs/rose.tscn" id="48_1s4n5"]
[ext_resource type="Script" uid="uid://4301hu7hhhoq" path="res://scenes/telephone_station.gd" id="48_lxjld"]
[ext_resource type="Script" uid="uid://bgrc6ktuxyrm6" path="res://scenes/pickupable.gd" id="49_bahpm"]
[ext_resource type="PackedScene" uid="uid://cddhjs1rtgotq" path="res://models/RubberDuck.glb" id="50_11at7"]
[ext_resource type="PackedScene" uid="uid://c4cpduyayg7m" path="res://models/Hammer.glb" id="51_gmm1g"]
@ -324,68 +323,6 @@ _data = {
&"RESET": SubResource("Animation_mc3m6")
}
[sub_resource type="Animation" id="Animation_gyv14"]
resource_name = "coffin_rumble"
length = 10.0
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("CoffinUpper:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.1930314, 0.22500344, 0.26103258, 0.8765567, 0.90852875, 0.9445579, 1.9791579, 2.0111299, 2.047159, 2.484012, 2.5159838, 2.552013, 3.6512344, 3.6832063, 3.7192354, 4.166797, 4.198769, 4.2347984, 4.5150948, 4.5470667, 4.5830956, 6.1537967, 6.1857686, 6.221798, 7.1523805, 7.1843524, 7.2203817, 7.7001305, 7.7321024, 7.7681313, 9.566797, 9.59877, 9.634799),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
"update": 0,
"values": [Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.014046758, 0.5784328, 0), Vector3(-0.018958597, 0.6043641, -3.9257357e-09), Vector3(-0.014046758, 0.5784328, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("CoffinUpper:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.19290128, 0.22639443, 0.26666668, 0.8764266, 0.90991974, 0.950192, 1.9790277, 2.0125208, 2.052793, 2.4838817, 2.5173748, 2.5576472, 3.6511042, 3.6845973, 3.7248697, 4.166667, 4.20016, 4.2404327, 4.5149646, 4.5484576, 4.58873, 6.1536665, 6.1871595, 6.2274323, 7.1522503, 7.1857433, 7.226016, 7.7000003, 7.7334933, 7.7737656, 9.566668, 9.600161, 9.640433),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
"update": 0,
"values": [Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927), Vector3(0, 3.1415927, 3.1415927), Vector3(-8.742278e-08, 3.1415927, 3.132866), Vector3(0, 3.1415927, 3.1415927)]
}
[sub_resource type="Animation" id="Animation_ehhah"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("CoffinUpper:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(-0.014046758, 0.5784328, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("CoffinUpper:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(3.1415925, 0, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_yrunl"]
_data = {
&"RESET": SubResource("Animation_ehhah"),
&"coffin_rumble": SubResource("Animation_gyv14")
}
[sub_resource type="Animation" id="Animation_yggoe"]
resource_name = "CoffinSlideFire"
length = 2.0
@ -568,96 +505,6 @@ size = Vector3(0.6904297, 0.0803833, 0.5888672)
[sub_resource type="BoxShape3D" id="BoxShape3D_11at7"]
size = Vector3(0.6904297, 0.0803833, 1.6538086)
[sub_resource type="Animation" id="Animation_014nw"]
resource_name = "phone_pickzup"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Telephone:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.4),
"transitions": PackedFloat32Array(0.3922923, 1),
"update": 0,
"values": [Vector3(-0.15991092, 0.012449861, 0.42038155), Vector3(-0.5200389, 0.012449861, 0.6262381)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Telephone:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.4),
"transitions": PackedFloat32Array(0.3922923, 1),
"update": 0,
"values": [Vector3(1.5707964, 0, 0), Vector3(1.5707964, -1.6794605, 0)]
}
[sub_resource type="Animation" id="Animation_ki8oc"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Telephone:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(-0.15991092, 0.012449861, 0.42038155)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Telephone:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(1.5707964, 0, 0)]
}
[sub_resource type="Animation" id="Animation_wy7hx"]
resource_name = "Hangup"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Telephone:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.40234256),
"transitions": PackedFloat32Array(0.34151018, 1.0000005),
"update": 0,
"values": [Vector3(-0.5200389, 0.012449861, 0.6262381), Vector3(-0.15991092, 0.012449861, 0.42038155)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Telephone:rotation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.40234256),
"transitions": PackedFloat32Array(0.34151018, 1.0000005),
"update": 0,
"values": [Vector3(1.5707964, -1.6794605, 0), Vector3(1.5707964, 0, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ki8oc"]
_data = {
&"Hangup": SubResource("Animation_wy7hx"),
&"RESET": SubResource("Animation_ki8oc"),
&"phone_pickzup": SubResource("Animation_014nw")
}
[sub_resource type="SphereShape3D" id="SphereShape3D_pyvr3"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_u215o"]
resource_name = "Material.003"
cull_mode = 2
@ -1551,7 +1398,6 @@ script = ExtResource("20_ns543")
[node name="CoffinOpenable" type="Node3D" parent="CoffinSwitcher"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.24035808, 0.8164685, 2.485278)
visible = false
script = ExtResource("20_mc3m6")
[node name="ArmsAnimationPivot" type="Node3D" parent="CoffinSwitcher/CoffinOpenable"]
@ -1620,6 +1466,7 @@ shape = SubResource("BoxShape3D_bahpm")
[node name="CoffinSlideOut" type="Node3D" parent="CoffinSwitcher"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.24035808, 0.8164685, 2.485278)
visible = false
script = ExtResource("24_a5qmg")
[node name="Liftarms2" type="MeshInstance3D" parent="CoffinSwitcher/CoffinSlideOut"]
@ -1641,16 +1488,10 @@ mesh = ExtResource("19_yggoe")
skeleton = NodePath("../../../..")
[node name="CoffinUpper" type="MeshInstance3D" parent="CoffinSwitcher/CoffinSlideOut/AnimParent"]
transform = Transform3D(1, 0, 0, 0, -1, -1.509958e-07, 0, 1.509958e-07, -1, -0.014046758, 0.5784328, 0)
transform = Transform3D(1, 0, 0, 0, -1, -8.742278e-08, 0, 8.742278e-08, -1, -0.014046758, 0.5784328, 0)
mesh = ExtResource("20_2ulci")
skeleton = NodePath("../../../..")
[node name="AnimationPlayer" type="AnimationPlayer" parent="CoffinSwitcher/CoffinSlideOut/AnimParent"]
libraries = {
&"": SubResource("AnimationLibrary_yrunl")
}
autoplay = "coffin_rumble"
[node name="CoffinSlideFire" type="Node3D" parent="CoffinSwitcher"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.24035808, 0.8164685, 2.485278)
visible = false
@ -1951,23 +1792,12 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.1620214, 1.4303728, -3.3571877)
mesh = ExtResource("46_geot1")
skeleton = NodePath("")
script = ExtResource("48_lxjld")
[node name="Telephone" type="MeshInstance3D" parent="Telephone_Station"]
transform = Transform3D(6.326305, 0, 0, 0, -2.7653158e-07, -6.326305, 0, 6.326305, -2.7653158e-07, -0.15991092, 0.012449861, 0.42038155)
[node name="Telephone" type="MeshInstance3D" parent="."]
transform = Transform3D(6.326305, 0, 0, 0, 0, -6.326305, 0, 6.326305, 0, 0.0021104813, 1.4428227, -2.9368062)
mesh = ExtResource("47_1s4n5")
skeleton = NodePath("")
[node name="AnimationPlayer" type="AnimationPlayer" parent="Telephone_Station"]
libraries = {
&"": SubResource("AnimationLibrary_ki8oc")
}
[node name="Interactable" parent="Telephone_Station" instance=ExtResource("3_w68ji")]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Telephone_Station/Interactable"]
shape = SubResource("SphereShape3D_pyvr3")
[node name="Roses" type="Node3D" parent="."]
[node name="Rose" parent="Roses" instance=ExtResource("48_1s4n5")]
@ -2234,13 +2064,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.3286197, 2.5819588)
light_color = Color(3.5223498, 2.2263649, 0, 1)
light_energy = 0.0
[node name="Hammer" parent="." instance=ExtResource("51_gmm1g")]
transform = Transform3D(0.5660891, -1.9103099, 0.1739514, 0, 0.18136814, 1.9917594, -1.9182135, -0.56375664, 0.051335264, -0.75209147, 1.0442615, -2.8823638)
[connection signal="changed" from="Lever" to="CoffinSwitcher/CoffinOpenable" method="_on_lever_changed"]
[connection signal="on_hit" from="Button/Interactable" to="CoffinSwitcher/CoffinSlideFire" method="_on_interactable_on_hit"]
[connection signal="on_hit" from="Button2/Interactable" to="CoffinSwitcher/CoffinSlideFire" method="_on_interactable_on_hit"]
[connection signal="on_hit" from="Telephone_Station/Interactable" to="Telephone_Station" method="_on_interactable_on_hit"]
[editable path="UndertakerAssets"]
[editable path="Character"]

12
scenes/telephone_station.gd
Unescape View File

@ -1,12 +0,0 @@
extends MeshInstance3D
@onready var animation_player: AnimationPlayer = $AnimationPlayer
var isPickedUp:bool = false
func _on_interactable_on_hit() -> void:
isPickedUp = !isPickedUp
print("hit")
if isPickedUp:
animation_player.play("phone_pickzup")
else:
animation_player.play("Hangup")

1
scenes/telephone_station.gd.uid
Unescape View File

@ -1 +0,0 @@
uid://4301hu7hhhoq
Write Preview
Loading…
Cancel
Save