maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 10:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed elevator to be child of path

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

26
Scenes/Maps/Level2.tscn
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")

10
Scenes/Maps/Level3.tscn
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)

5
Scenes/Maps/Level4.tscn
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

33
Scenes/Maps/PlayerFSMTest.tscn
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