Merge branch 'master' of ssh://play.qtechofficial.com:9940/funnymemellama/fml-avs

This commit is contained in:
zombie maniac 2024-12-23 13:49:29 -05:00
commit 29ba9dcbe3
Signed by: nbrooks211
GPG key ID: F43C85C0DF0C334E
3 changed files with 4 additions and 25 deletions

View file

@ -60,7 +60,7 @@ func _toggle_open():
close() close()
func _on_anim_finished(anim_name): func _on_anim_finished(_anim_name):
_open = !_open _open = !_open
@ -92,7 +92,7 @@ func activate(should_open: bool):
close() close()
func interact(other): func interact(_other):
if not interactable: if not interactable:
return return

View file

@ -7,7 +7,7 @@ func _ready() -> void:
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void: func _process(_delta: float) -> void:
var closest: Node3D var closest: Node3D
var least_dist = INF var least_dist = INF
for p: Node3D in get_tree().get_nodes_in_group('players'): for p: Node3D in get_tree().get_nodes_in_group('players'):

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=29 format=4 uid="uid://bbqug1s083mdi"] [gd_scene load_steps=28 format=4 uid="uid://bbqug1s083mdi"]
[ext_resource type="PackedScene" uid="uid://ci2uamlnv8swy" path="res://assets/maps/levelpool.blend" id="1_cpckw"] [ext_resource type="PackedScene" uid="uid://ci2uamlnv8swy" path="res://assets/maps/levelpool.blend" id="1_cpckw"]
[ext_resource type="PackedScene" uid="uid://cy86jyiy6skvk" path="res://scenes/player.tscn" id="2_eggmh"] [ext_resource type="PackedScene" uid="uid://cy86jyiy6skvk" path="res://scenes/player.tscn" id="2_eggmh"]
@ -79,9 +79,6 @@ _data = {
"open": SubResource("Animation_lexij") "open": SubResource("Animation_lexij")
} }
[sub_resource type="BoxShape3D" id="BoxShape3D_epqy0"]
size = Vector3(0.3, 0.5, 2.3)
[sub_resource type="BoxShape3D" id="BoxShape3D_dsbsn"] [sub_resource type="BoxShape3D" id="BoxShape3D_dsbsn"]
size = Vector3(2, 2, 2) size = Vector3(2, 2, 2)
@ -168,24 +165,6 @@ libraries = {
"": SubResource("AnimationLibrary_prvv0") "": SubResource("AnimationLibrary_prvv0")
} }
[node name="HoleRim" type="StaticBody3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="HoleRim"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.85, 0.25, -4.85)
shape = SubResource("BoxShape3D_epqy0")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="HoleRim"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.15, 0.25, -5.15)
shape = SubResource("BoxShape3D_epqy0")
[node name="CollisionShape3D3" type="CollisionShape3D" parent="HoleRim"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 5.15, 0.25, -3.85)
shape = SubResource("BoxShape3D_epqy0")
[node name="CollisionShape3D4" type="CollisionShape3D" parent="HoleRim"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 4.85, 0.25, -6.15)
shape = SubResource("BoxShape3D_epqy0")
[node name="WinBox" type="Area3D" parent="."] [node name="WinBox" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -1, -5) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -1, -5)
script = ExtResource("7_oxf41") script = ExtResource("7_oxf41")