Changed elevator to be child of path

This commit is contained in:
Marco 2025-03-11 16:17:29 +01:00
commit 9bbc631dd3
11 changed files with 117 additions and 116 deletions

View file

@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="CreditsCollection" load_steps=21 format=3 uid="uid://cojsc1rtf41i1"]
[gd_resource type="Resource" script_class="CreditsCollection" load_steps=20 format=3 uid="uid://cojsc1rtf41i1"]
[ext_resource type="Script" uid="uid://buq8eurx510ps" path="res://Scripts/Resources/CreditsCollection.cs" id="1_0bwsf"]
[ext_resource type="Script" uid="uid://bc4f4ggvk3ktf" path="res://Scripts/Resources/CreditsEntry.cs" id="1_aaqha"]
@ -105,13 +105,7 @@ Name = "Alexander Nikopoulos"
Contribution = "VFEZ"
metadata/_custom_type_script = "uid://bc4f4ggvk3ktf"
[sub_resource type="Resource" id="Resource_n6vk1"]
script = ExtResource("1_aaqha")
Name = "Garuda1982"
Contribution = "Sounds"
metadata/_custom_type_script = "uid://bc4f4ggvk3ktf"
[resource]
script = ExtResource("1_0bwsf")
Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), SubResource("Resource_n6vk1")])
Credits = Array[ExtResource("1_aaqha")]([SubResource("Resource_ep84i"), SubResource("Resource_ianh3"), SubResource("Resource_m7fsk"), SubResource("Resource_ans3w"), SubResource("Resource_1cmaw"), SubResource("Resource_vda0h"), SubResource("Resource_daaek"), SubResource("Resource_8vv0q"), SubResource("Resource_321dv"), SubResource("Resource_j7pkh"), SubResource("Resource_aaqha"), SubResource("Resource_gr2tg"), SubResource("Resource_b8hlh"), SubResource("Resource_gbaov"), SubResource("Resource_jkmrk"), SubResource("Resource_ivgyk"), null])
metadata/_custom_type_script = "uid://buq8eurx510ps"

View file

@ -1,15 +1,8 @@
[gd_scene load_steps=11 format=3 uid="uid://dnbtou2fklyvp"]
[gd_scene load_steps=7 format=3 uid="uid://dnbtou2fklyvp"]
[ext_resource type="Script" uid="uid://d0a0o50j82eo6" path="res://Scripts/Activables/ScriptableBase.cs" id="1_kao8y"]
[ext_resource type="Script" uid="uid://donxnd50p7dm8" path="res://Scripts/Resources/Events/AlarmDisableEvent.cs" id="2_8fwyu"]
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="3_eg1gw"]
[ext_resource type="Texture2D" uid="uid://bodoftbnvjh6i" path="res://Sprites/Actors/AlertSign.png" id="4_7ysp5"]
[ext_resource type="Script" uid="uid://daqdq17qiessy" path="res://Scripts/Components/AlarmSpriteSwitcher.cs" id="5_qohod"]
[sub_resource type="Resource" id="Resource_hppa0"]
script = ExtResource("2_8fwyu")
WaitForCompletion = true
[sub_resource type="AtlasTexture" id="AtlasTexture_adk1y"]
atlas = ExtResource("4_7ysp5")
region = Rect2(16, 0, 16, 8)
@ -44,12 +37,7 @@ animations = [{
"speed": 5.0
}]
[node name="AlarmBox" type="Node2D"]
script = ExtResource("1_kao8y")
Events = Array[Object]([SubResource("Resource_hppa0")])
[node name="ControlPad" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_eg1gw")]
Target = NodePath("..")
[node name="AlarmSign" type="Node2D"]
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_25o7d")

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=11 format=3 uid="uid://cxjumgf8bhr3l"]
[gd_scene load_steps=14 format=3 uid="uid://cxjumgf8bhr3l"]
[ext_resource type="Texture2D" uid="uid://cyq6f1n0nrgrs" path="res://Sprites/Elevator.png" id="1_0xq5m"]
[ext_resource type="Script" uid="uid://bd0m1l6pqjwf7" path="res://Scripts/Components/FSM/Elevator/ElevatorProxyProxy.cs" id="1_flxos"]
[ext_resource type="Script" uid="uid://b6jp6fhmwmobv" path="res://Scripts/Components/FSM/Elevator/ElevatorProxy.cs" id="1_xv5vg"]
[ext_resource type="Script" uid="uid://bpey64n21hyhu" path="res://Scripts/Activables/Elevator.cs" id="2_dmimb"]
[ext_resource type="Script" uid="uid://cuxk8rrhvpe2c" path="res://Scripts/Components/FSM/Elevator/Init.cs" id="3_xv5vg"]
@ -10,46 +11,66 @@
[ext_resource type="Script" uid="uid://72sfdklqrc6d" path="res://Scripts/Components/FSM/Elevator/Descending.cs" id="8_flmvm"]
[ext_resource type="AudioStream" uid="uid://b0b3rcpdvfwsk" path="res://SFX/elevator.ogg" id="9_flmvm"]
[sub_resource type="Curve2D" id="Curve2D_flxos"]
_data = {
"points": PackedVector2Array(0, 0, 0, 0, 0, -31, 0, 0, 0, 0, 0, 0)
}
point_count = 2
[sub_resource type="RectangleShape2D" id="RectangleShape2D_flxos"]
size = Vector2(32, 32)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_3lpp4"]
size = Vector2(20, 19)
[node name="Elevator" type="Area2D" node_paths=PackedStringArray("TopBody")]
[node name="Elevator" type="Path2D"]
curve = SubResource("Curve2D_flxos")
script = ExtResource("1_flxos")
[node name="StaticBody2D" type="StaticBody2D" parent="."]
collision_mask = 0
[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
shape = SubResource("RectangleShape2D_flxos")
[node name="Elevator" type="Area2D" parent="." node_paths=PackedStringArray("ElevatorPath", "TopBody")]
collision_layer = 0
collision_mask = 2
script = ExtResource("1_xv5vg")
TopBody = NodePath("")
ElevatorPath = NodePath("..")
TopBody = NodePath("../StaticBody2D/CollisionShape2D")
[node name="Sprite2D" type="Sprite2D" parent="."]
[node name="Sprite2D" type="Sprite2D" parent="Elevator"]
texture = ExtResource("1_0xq5m")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Elevator"]
position = Vector2(0, -0.5)
shape = SubResource("RectangleShape2D_3lpp4")
[node name="StateMachine" type="Node2D" parent="."]
[node name="StateMachine" type="Node2D" parent="Elevator"]
script = ExtResource("2_dmimb")
[node name="Init" type="Node2D" parent="StateMachine"]
[node name="Init" type="Node2D" parent="Elevator/StateMachine"]
script = ExtResource("3_xv5vg")
[node name="Bottom" type="Node2D" parent="StateMachine"]
[node name="Bottom" type="Node2D" parent="Elevator/StateMachine"]
script = ExtResource("5_57077")
[node name="Top" type="Node2D" parent="StateMachine"]
[node name="Top" type="Node2D" parent="Elevator/StateMachine"]
script = ExtResource("6_rd3yl")
[node name="Ascending" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("Sound")]
[node name="Ascending" type="Node2D" parent="Elevator/StateMachine" node_paths=PackedStringArray("Sound")]
script = ExtResource("7_r4wj7")
Sound = NodePath("../../AudioStreamPlayer2D")
[node name="Descending" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("Sound")]
[node name="Descending" type="Node2D" parent="Elevator/StateMachine" node_paths=PackedStringArray("Sound")]
script = ExtResource("8_flmvm")
Sound = NodePath("../../AudioStreamPlayer2D")
[node name="Disabled" type="Node2D" parent="StateMachine"]
[node name="Disabled" type="Node2D" parent="Elevator/StateMachine"]
[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Elevator"]
stream = ExtResource("9_flmvm")
[connection signal="area_entered" from="." to="." method="_on_area_entered"]
[connection signal="area_exited" from="." to="." method="_on_area_exited"]
[connection signal="area_entered" from="Elevator" to="Elevator" method="_on_area_entered"]
[connection signal="area_exited" from="Elevator" to="Elevator" method="_on_area_exited"]

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=14 format=3 uid="uid://d1h48wgasakk4"]
[gd_scene load_steps=15 format=3 uid="uid://d1h48wgasakk4"]
[ext_resource type="Script" uid="uid://d0a0o50j82eo6" path="res://Scripts/Activables/ScriptableBase.cs" id="1_2d4he"]
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="2_2xddf"]
[ext_resource type="Script" uid="uid://duhodrhcnoslh" path="res://Scripts/Interactables/Switch.cs" id="1_vly4n"]
[ext_resource type="Texture2D" uid="uid://bpc66amnvvkrn" path="res://Sprites/AlarmBox.png" id="2_slydm"]
[ext_resource type="Script" uid="uid://donxnd50p7dm8" path="res://Scripts/Resources/Events/AlarmDisableEvent.cs" id="2_umsjn"]
[ext_resource type="Script" uid="uid://daqdq17qiessy" path="res://Scripts/Components/AlarmSpriteSwitcher.cs" id="5_7g2v5"]
@ -10,6 +10,8 @@
script = ExtResource("2_umsjn")
WaitForCompletion = true
[sub_resource type="CircleShape2D" id="CircleShape2D_m2axc"]
[sub_resource type="AtlasTexture" id="AtlasTexture_enwfk"]
atlas = ExtResource("2_slydm")
region = Rect2(48, 0, 16, 16)
@ -65,12 +67,16 @@ animations = [{
"speed": 5.0
}]
[node name="AlarmBox" type="Node2D" groups=["Interactable"]]
script = ExtResource("1_2d4he")
Events = Array[Object]([SubResource("Resource_hppa0")])
[node name="AlarmBox" type="Area2D" node_paths=PackedStringArray("Targets") groups=["Interactable"]]
script = ExtResource("1_vly4n")
Targets = [NodePath("AlarmBox")]
[node name="ControlPad" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("2_2xddf")]
Target = NodePath("..")
[node name="AlarmBox" type="Node2D" parent="." groups=["Interactable"]]
script = ExtResource("1_2d4he")
Events = [SubResource("Resource_hppa0")]
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_m2axc")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_kbgi5")

View file

@ -16,6 +16,7 @@
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_mnq21"]
[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="10_4nd4a"]
[ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="11_7an4p"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="13_ehuec"]
[ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="14_s23f3"]
[ext_resource type="PackedScene" uid="uid://oi8svqsspcsj" path="res://Scenes/Interactable/ScriptableMovementSensor.tscn" id="16_ehuec"]
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="16_s23f3"]
@ -54,19 +55,13 @@ Targets = Array[NodePath]([NodePath("../WallEmitter"), NodePath("../WallEmitter2
WaitForCompletion = true
metadata/_custom_type_script = "uid://bwox5lmgiijcs"
[sub_resource type="Curve2D" id="Curve2D_hw1so"]
_data = {
"points": PackedVector2Array(0, 0, 0, 0, 0, -31, 0, 0, 0, 0, 0, 0)
}
point_count = 2
[node name="GameScene" type="Node2D"]
script = ExtResource("1_t2k72")
PlayerTemplate = ExtResource("2_2jsgm")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition")
})
StartingEquipment = [ExtResource("3_mqt4u")]
StartingEquipment = Array[ExtResource("3_6w05j")]([ExtResource("3_mqt4u")])
MapStartData = SubResource("Resource_6wo78")
[node name="Tilemaps" type="Node2D" parent="."]
@ -115,7 +110,7 @@ position = Vector2(196, 296)
[node name="MotionSensor" parent="Tilemaps/Actors" instance=ExtResource("16_ehuec")]
position = Vector2(254, 296)
Events = [SubResource("Resource_s23f3")]
Events = Array[ExtResource("13_ehuec")]([SubResource("Resource_s23f3")])
[node name="ControlPad" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
position = Vector2(205, 292)
@ -136,7 +131,7 @@ position = Vector2(504, 468)
[node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")]
position = Vector2(226, 486)
Events = [SubResource("Resource_qi6uc")]
Events = Array[ExtResource("13_ehuec")]([SubResource("Resource_qi6uc")])
[node name="WallEmitter" parent="Tilemaps/Actors" instance=ExtResource("21_qi6uc")]
position = Vector2(264, 482)
@ -148,13 +143,8 @@ position = Vector2(312, 482)
BulletResource = ExtResource("22_uaqq6")
EmitCoolDown = 0.5
[node name="Path2D" type="Path2D" parent="Tilemaps/Actors"]
[node name="Elevator" parent="Tilemaps/Actors" instance=ExtResource("23_577wb")]
position = Vector2(-64, 576)
curve = SubResource("Curve2D_hw1so")
metadata/_edit_group_ = true
[node name="Elevator" parent="Tilemaps/Actors/Path2D" node_paths=PackedStringArray("ElevatorPath") instance=ExtResource("23_577wb")]
ElevatorPath = NodePath("..")
[node name="AlarmBox" parent="Tilemaps/Actors" instance=ExtResource("23_uaqq6")]
position = Vector2(-9, 516)
@ -185,11 +175,13 @@ Direction = 0
[node name="SpiderBomb" parent="Tilemaps/Actors" instance=ExtResource("27_577wb")]
position = Vector2(132, 361)
[node name="ControlPad3" parent="Tilemaps/Actors" instance=ExtResource("16_s23f3")]
[node name="ControlPad3" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
position = Vector2(-88, 517)
Targets = [NodePath("../Elevator")]
[node name="ControlPad4" parent="Tilemaps/Actors" instance=ExtResource("16_s23f3")]
[node name="ControlPad4" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
position = Vector2(-89, 548)
Targets = [NodePath("../Elevator")]
[node name="CameraController" type="Camera2D" parent="."]
script = ExtResource("7_lxkiw")

View file

@ -1,8 +1,7 @@
[gd_scene load_steps=20 format=4 uid="uid://dnpmeebmjgv2t"]
[gd_scene load_steps=19 format=4 uid="uid://dnpmeebmjgv2t"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_0pe42"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_bn5f4"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_skof0"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_w0rax"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_6nsxd"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_tvyok"]
@ -21,7 +20,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_w0rax")
EggIndex = 0
StartingEquipment = Array[ExtResource("3_skof0")]([])
StartingEquipment = []
[sub_resource type="RectangleShape2D" id="RectangleShape2D_tvyok"]
size = Vector2(52, 64)
@ -55,7 +54,7 @@ tile_set = ExtResource("5_6nsxd")
metadata/_edit_lock_ = true
[node name="Props" type="TileMapLayer" parent="Tilemaps"]
tile_map_data = PackedByteArray("AAADABMAAQAAAAAAAQAEABMAAQAAAAAAAQANABMAAQAAAAAAAQANABQAAQAAAAAAAQAQABQAAQAAAAAAAQAQABIAAAAIAAgAAAAPABIAAAAEAAoAAAAOABIAAAAEAAoAAAANABIAAAAEAAoAAAAMABIAAAAEAAoAAAALABIAAAAEAAoAAAAJABIAAAAGAAoAAAARABYAAAAJAAwAAAARABcAAAAJAA0AAAAVABYAAAAJAAIAAAAVABcAAAAJAAMAAAAWABYAAAAKAAIAAAAWABcAAAAKAAMAAAAXABYAAAAKAAAAAAAXABcAAAAKAAEAAAAYABYAAAAJAAIAAAAYABcAAAAJAAMAAAAPABEAAQAAAAAAAgAQABEAAQAAAAAAAgAGABIAAAAIAAgAAAAFABIAAAAEAAoAAAAEABIAAAAEAAoAAAADABIAAAAGAAoAAAAKABIAAAAEAAoAAAAPABUAAAAEAAoAAAAOABUAAAAEAAoAAAANABUAAAAEAAoAAAAMABUAAAAEAAoAAAALABUAAAAEAAoAAAAKABUAAAAEAAoAAAAJABUAAAAGAAoAAAAQABUAAAAIAAgAAAAFABUAAAAIAAgAAAAEABUAAAAEAAoAAAADABUAAAAGAAoAAAAFABgAAQAAAAAADQAFABkAAQAAAAAADQAZABYAAAAKAAIAAAAZABcAAAAKAAMAAAAUABYAAAAKAAwAAAAUABcAAAAKAA0AAAAaABYAAAAJAAwAAAAaABcAAAAJAA0AAAApABYAAAAGAAYAAAApABcAAAAGAAYAAAApABgAAAAGAAYAAAApABkAAAAGAAYAAAApABoAAAAGAAYAAAApABsAAAAGAAYAAAApABwAAAAGAAYAAAAiAB0AAAAHAAUAAAAjAB0AAAAHAAUAAAAkAB0AAAAHAAUAAAAlAB0AAAAHAAUAAAAmAB0AAAAHAAUAAAAnAB0AAAAHAAUAAAAoAB0AAAAHAAUAAAAsABQAAAAKAAwAAAAsABUAAAAKAA0AAAAvABcAAAAKAAgAAAAvABgAAAAKAAkAAAAwABcAAAAKAAgAAAAwABgAAAAKAAkAAAAxABcAAAAKAAgAAAAxABgAAAAKAAkAAAAyABcAAAAKAAgAAAAyABgAAAAKAAkAAAAzABcAAAAKAAgAAAAzABgAAAAKAAkAAAA0ABcAAAAKAAgAAAA0ABgAAAAKAAkAAAAhAB0AAAAHAAUAAAAIAC0AAAAHAAUAAAAJAC0AAAAHAAUAAAAKAC0AAAAHAAUAAAANAC0AAAAHAAUAAAAOAC0AAAAHAAUAAAAPAC0AAAAHAAUAAAAQAC0AAAAHAAUAAAARAC0AAAAHAAUAAAAHAC0AAAAGAAUAAAAHAC4AAAAGAAYAAAAHAC8AAAAGAAYAAAADACEAAAAIAAYAAAADACIAAAAIAAYAAAADACMAAAAIAAYAAAADACQAAAAIAAYAAAABACcAAAAHAAcAAAACACcAAAAHAAcAAAADACcAAAAIAAcAAAADACUAAAAIAAYAAAADACYAAAAIAAYAAAAeADUAAAAIAAgAAAAdADUAAAAGAAoAAAAiADUAAAAIAAgAAAAhADUAAAAGAAoAAAAmADgAAAAIAAgAAAAlADgAAAAGAAoAAAAqADgAAAAIAAgAAAApADgAAAAGAAoAAAA=")
tile_map_data = PackedByteArray("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")
tile_set = ExtResource("5_6nsxd")
metadata/_edit_lock_ = true
@ -65,6 +64,9 @@ metadata/_edit_lock_ = true
[node name="AlarmBox" parent="Tilemaps/Actors" instance=ExtResource("7_bn5f4")]
position = Vector2(228, 234)
[node name="AlarmBox3" parent="Tilemaps/Actors" instance=ExtResource("7_bn5f4")]
position = Vector2(433, 358)
[node name="Teleporter" parent="Tilemaps/Actors" instance=ExtResource("8_skof0")]
position = Vector2(66, 274)

View file

@ -1,8 +1,7 @@
[gd_scene load_steps=14 format=4 uid="uid://8ppagfume46d"]
[gd_scene load_steps=13 format=4 uid="uid://8ppagfume46d"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_hx5ph"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_r7f28"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_p30fy"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_4wg3n"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_e10oj"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_4t7ma"]
@ -16,7 +15,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_4wg3n")
EggIndex = 0
StartingEquipment = Array[ExtResource("3_p30fy")]([])
StartingEquipment = []
[node name="GameScene" type="Node2D"]
process_mode = 3

View file

@ -42,13 +42,14 @@
[ext_resource type="PackedScene" uid="uid://cnhgvn2salyxl" path="res://Scenes/Items/Icicle_Repeater.tscn" id="32_luw81"]
[ext_resource type="PackedScene" uid="uid://bjb1xv0ny1qim" path="res://Scenes/Props/Chair.tscn" id="33_7ft0s"]
[ext_resource type="Script" uid="uid://bgertv72tq1dt" path="res://Scripts/Components/FSM/NewPlayerStateMachine.cs" id="34_2vu2h"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="35_16ubp"]
[ext_resource type="Script" uid="uid://btwuahxvreivs" path="res://Scripts/Components/FSM/Player/NewInit.cs" id="35_mpb62"]
[ext_resource type="Script" uid="uid://dl50bcl8dx3k8" path="res://Scripts/Components/FSM/TestModule.cs" id="36_4rfvg"]
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_u1i8n")
EggIndex = 0
StartingEquipment = Array[ExtResource("5_u1i8n")]([])
StartingEquipment = []
[sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"]
size = Vector2(30, 52.5)
@ -62,15 +63,12 @@ colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1)
[sub_resource type="GradientTexture1D" id="GradientTexture1D_4gtx8"]
gradient = SubResource("Gradient_2vu2h")
[sub_resource type="Curve2D" id="Curve2D_pgobb"]
[sub_resource type="Curve2D" id="Curve2D_16ubp"]
_data = {
"points": PackedVector2Array(0, 0, 0, 0, 0, -80, 0, 0, 0, 0, 0, 0)
}
point_count = 2
[sub_resource type="RectangleShape2D" id="RectangleShape2D_7ft0s"]
size = Vector2(32, 32)
[sub_resource type="Resource" id="Resource_pgobb"]
script = ExtResource("29_3ll5g")
RelativeTargetPosition = Vector2(0, -96)
@ -90,7 +88,7 @@ PlayerTemplate = ExtResource("8_c3v4x")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition")
})
StartingEquipment = [ExtResource("3_6314l"), ExtResource("4_yyg8m")]
StartingEquipment = Array[ExtResource("5_u1i8n")]([ExtResource("3_6314l"), ExtResource("4_yyg8m")])
MapStartData = SubResource("Resource_6wo78")
[node name="Tilemaps" type="Node2D" parent="."]
@ -201,7 +199,7 @@ position = Vector2(59, 386)
[node name="Chest" parent="Tilemaps/Actors" instance=ExtResource("18_v2gcl")]
position = Vector2(56, 320)
LootTable = Array[ExtResource("5_u1i8n")]([ExtResource("19_1ajuh"), ExtResource("20_rff8l"), ExtResource("21_cub4j"), ExtResource("22_4gtx8"), ExtResource("3_6314l"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh")])
LootTable = [ExtResource("19_1ajuh"), ExtResource("20_rff8l"), ExtResource("21_cub4j"), ExtResource("22_4gtx8"), ExtResource("3_6314l"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh"), ExtResource("23_1ajuh")]
[node name="Turret360" parent="Tilemaps/Actors" instance=ExtResource("24_rff8l")]
position = Vector2(374, 503)
@ -230,26 +228,15 @@ position = Vector2(342, 193)
[node name="ElevatorControlPadBottom" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("20_0knpf")]
position = Vector2(228, 144)
Targets = [NodePath("../ElevatorPath/Elevator")]
Targets = [NodePath("../Elevator")]
[node name="ElevatorControlPadBottom2" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("20_0knpf")]
position = Vector2(232, 53)
Targets = [NodePath("../ElevatorPath/Elevator")]
Targets = [NodePath("../Elevator")]
[node name="ElevatorPath" type="Path2D" parent="Tilemaps/Actors"]
[node name="Elevator" parent="Tilemaps/Actors" instance=ExtResource("28_3ll5g")]
position = Vector2(255, 144)
curve = SubResource("Curve2D_pgobb")
metadata/_edit_group_ = true
[node name="Elevator" parent="Tilemaps/Actors/ElevatorPath" node_paths=PackedStringArray("ElevatorPath", "TopBody") instance=ExtResource("28_3ll5g")]
ElevatorPath = NodePath("..")
TopBody = NodePath("../StaticBody2D/CollisionShape2D")
[node name="StaticBody2D" type="StaticBody2D" parent="Tilemaps/Actors/ElevatorPath"]
collision_mask = 0
[node name="CollisionShape2D" type="CollisionShape2D" parent="Tilemaps/Actors/ElevatorPath/StaticBody2D"]
shape = SubResource("RectangleShape2D_7ft0s")
curve = SubResource("Curve2D_16ubp")
[node name="YinYangGun" parent="Tilemaps/Actors" instance=ExtResource("30_bea3m")]
position = Vector2(364, 195)
@ -268,7 +255,7 @@ position = Vector2(260, 194)
[node name="ScriptableAreaTrigger" parent="Tilemaps" instance=ExtResource("28_fuxq3")]
position = Vector2(230, 250)
Events = [SubResource("Resource_pgobb")]
Events = Array[ExtResource("35_16ubp")]([SubResource("Resource_pgobb")])
[node name="CameraController" type="Camera2D" parent="."]
process_mode = 1

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,21 @@
using Cirno.Scripts.Enums;
using Godot;
namespace Cirno.Scripts.Components.FSM.Elevator;
public partial class ElevatorProxyProxy : Path2D, IActivable
{
[Export] public ElevatorState StartingState { get; protected set; } = ElevatorState.Bottom;
private ElevatorProxy _elevatorProxy;
public override void _Ready()
{
_elevatorProxy = this.GetNode<ElevatorProxy>("Elevator");
}
public bool Activate(ActivationType activationType = ActivationType.Toggle)
{
return _elevatorProxy.Activate(activationType);
}
}

View file

@ -0,0 +1 @@
uid://bd0m1l6pqjwf7