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

Bufgixes for release

Browse source
This commit is contained in:
Marco 2025-04-10 12:00:08 +02:00
commit 8a0ae72bc9
34 changed files with 174 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Scenes/Maps/Level2.tscn
View file

@ -612,6 +612,17 @@ you can try a small preview
of the next level"
label_settings = ExtResource("44_q1ysg")
[node name="Label2" type="Label" parent="Tilemaps/Actors"]
z_index = 1
offset_left = 254.0
offset_top = 184.0
offset_right = 385.0
offset_bottom = 225.0
text = "Please note that this level
is not finished, it's mostly
a preview of new features."
label_settings = ExtResource("44_q1ysg")
[node name="CameraController" type="Camera2D" parent="."]
script = ExtResource("7_lxkiw")
pixel_snap = false

97
Scenes/Maps/Level3.tscn
View file

@ -55,7 +55,7 @@
[ext_resource type="PackedScene" uid="uid://dth038hcu6v1i" path="res://Scenes/Actors/Fairy_SpecialForce_FSM.tscn" id="47_wkglj"]
[ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="49_87jtn"]
[ext_resource type="PackedScene" uid="uid://dqr6myj0yaqvd" path="res://Scenes/Interactable/ScriptableMovementSensorLonger.tscn" id="50_tu8ih"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="51_rasxb"]
[ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="51_wkglj"]
[ext_resource type="Script" uid="uid://c8tx1gh0lxt0t" path="res://Scripts/Resources/Events/AlarmEnableEvent.cs" id="52_udf20"]
[ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="58_pjj1f"]
@ -186,7 +186,7 @@ position = Vector2(25, 566)
position = Vector2(601, 148)
[node name="NuclearGun" parent="Tilemaps/Actors" instance=ExtResource("14_vr1yp")]
position = Vector2(935, 824)
position = Vector2(809, 941)
[node name="Shelf" parent="Tilemaps/Actors" instance=ExtResource("15_vr1yp")]
position = Vector2(659, 81)
@ -308,10 +308,6 @@ Target = NodePath("..")
[node name="HiddenHorizontalDoor3" parent="Tilemaps/Actors" instance=ExtResource("17_7j1cb")]
position = Vector2(464, 511)
[node name="AlarmTrigger" type="Node2D" parent="Tilemaps/Actors/HiddenHorizontalDoor3" node_paths=PackedStringArray("Target")]
script = ExtResource("27_ao3d3")
Target = NodePath("..")
[node name="HorizontalForceField3" parent="Tilemaps/Actors" instance=ExtResource("24_llmpl")]
position = Vector2(736, 336)
@ -407,11 +403,13 @@ position = Vector2(41, 533)
[node name="ShieldExtendPickup" parent="Tilemaps/Actors" instance=ExtResource("43_rasxb")]
position = Vector2(-88, 426)
[node name="KeycardReaderGreen" parent="Tilemaps/Actors" instance=ExtResource("44_udf20")]
[node name="KeycardReaderGreen" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("44_udf20")]
position = Vector2(1058, 866)
Target = NodePath("../AcidBridge")
[node name="KeycardReaderGreen2" parent="Tilemaps/Actors" instance=ExtResource("44_udf20")]
[node name="KeycardReaderGreen2" parent="Tilemaps/Actors" node_paths=PackedStringArray("Target") instance=ExtResource("44_udf20")]
position = Vector2(1154, 861)
Target = NodePath("../AcidBridge")
[node name="VerticalDoor" parent="Tilemaps/Actors" instance=ExtResource("45_wy0ue")]
position = Vector2(700, 1096)
@ -428,14 +426,53 @@ position = Vector2(976, 892)
[node name="FairyGuardFsm7" parent="Tilemaps/Actors" instance=ExtResource("47_wkglj")]
position = Vector2(794, 844)
[node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("50_tu8ih")]
position = Vector2(400, 368)
Events = [SubResource("Resource_wy0ue")]
[node name="ThermatronFsm" parent="Tilemaps/Actors" instance=ExtResource("58_pjj1f")]
position = Vector2(617, 863)
[node name="FairyFsm11" parent="Tilemaps/Actors" instance=ExtResource("22_hh3t5")]
position = Vector2(541, 891)
[node name="FairyFsm12" parent="Tilemaps/Actors" instance=ExtResource("22_hh3t5")]
position = Vector2(618, 1012)
[node name="FairyFsm13" parent="Tilemaps/Actors" instance=ExtResource("22_hh3t5")]
position = Vector2(744, 938)
[node name="FairyGuardFsm8" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")]
position = Vector2(865, 935)
[node name="FairyGuardFsm9" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")]
position = Vector2(483, 1033)
[node name="FairyGuardFsm10" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")]
position = Vector2(535, 991)
[node name="FairyGuardFsm11" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")]
position = Vector2(480, 806)
[node name="FairyGuardFsm12" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")]
position = Vector2(818, 805)
[node name="FairyGuardFsm13" parent="Tilemaps/Actors" instance=ExtResource("21_qga4v")]
position = Vector2(1228, 937)
[node name="Label" type="Label" parent="Tilemaps/Actors"]
offset_left = 1409.0
offset_top = 930.0
offset_right = 1547.0
offset_bottom = 957.0
offset_left = 1413.0
offset_top = 928.0
offset_right = 1551.0
offset_bottom = 969.0
text = "This is the end of the demo,
there's nothing here for now"
there's nothing here for now.
Thanks for playing!"
label_settings = ExtResource("49_87jtn")
horizontal_alignment = 1
[node name="GreenKeyCard" parent="Tilemaps/Actors" instance=ExtResource("51_wkglj")]
position = Vector2(536, 827)
[node name="CameraController" type="Camera2D" parent="."]
process_mode = 1
@ -470,37 +507,3 @@ AlarmSound = ExtResource("34_bs5q6")
[node name="AudioStreamPlayer2D" parent="." instance=ExtResource("14_31m3n")]
process_mode = 3
autoplay = true
[node name="MovementSensorLonger" parent="." instance=ExtResource("50_tu8ih")]
position = Vector2(400, 368)
Events = Array[ExtResource("51_rasxb")]([SubResource("Resource_wy0ue")])
[node name="ThermatronFsm" parent="." instance=ExtResource("58_pjj1f")]
position = Vector2(617, 863)
[node name="FairyFsm" parent="." instance=ExtResource("22_hh3t5")]
position = Vector2(541, 891)
[node name="FairyFsm2" parent="." instance=ExtResource("22_hh3t5")]
position = Vector2(618, 1012)
[node name="FairyFsm3" parent="." instance=ExtResource("22_hh3t5")]
position = Vector2(744, 938)
[node name="FairyGuardFsm" parent="." instance=ExtResource("21_qga4v")]
position = Vector2(865, 935)
[node name="FairyGuardFsm2" parent="." instance=ExtResource("21_qga4v")]
position = Vector2(483, 1033)
[node name="FairyGuardFsm3" parent="." instance=ExtResource("21_qga4v")]
position = Vector2(535, 991)
[node name="FairyGuardFsm4" parent="." instance=ExtResource("21_qga4v")]
position = Vector2(480, 806)
[node name="FairyGuardFsm5" parent="." instance=ExtResource("21_qga4v")]
position = Vector2(818, 805)
[node name="FairyGuardFsm6" parent="." instance=ExtResource("21_qga4v")]
position = Vector2(1228, 937)

6
Scenes/Maps/RebelBase.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=33 format=4 uid="uid://bx31ou6tw3kd1"]
[gd_scene load_steps=32 format=4 uid="uid://bx31ou6tw3kd1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_6sq7s"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_cicvv"]
@ -19,7 +19,6 @@
[ext_resource type="Resource" uid="uid://mx860r8t37g1" path="res://Resources/Maps/Level2.tres" id="18_8anae"]
[ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="18_tbppe"]
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="19_nxss7"]
[ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="19_rf2ue"]
[ext_resource type="PackedScene" uid="uid://cyy5i38sf7fid" path="res://Scenes/Props/Locker.tscn" id="20_jrxvj"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="21_3u61o"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="22_jn5np"]
@ -179,9 +178,6 @@ LevelPath = "res://Scenes/Maps/Level2.tscn"
Map = ExtResource("18_8anae")
SaveInventory = true
[node name="GreenKeyCard" parent="Tilemaps/Actors" instance=ExtResource("19_rf2ue")]
position = Vector2(133, 298)
[node name="ControlPad" parent="Tilemaps" node_paths=PackedStringArray("Targets") instance=ExtResource("19_nxss7")]
position = Vector2(134, 371)
Targets = [NodePath("../Actors/HorizontalDoor")]

40
Scenes/Maps/Tutorial.tscn
View file

@ -1,9 +1,8 @@
[gd_scene load_steps=52 format=4 uid="uid://bpnahwxmjgb6t"]
[gd_scene load_steps=49 format=4 uid="uid://bpnahwxmjgb6t"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"]
[ext_resource type="Resource" uid="uid://b4u3cs6ietmow" path="res://Resources/Maps/Tutorial.tres" id="2_0xhda"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ajkcn"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_g48r8"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2m462"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_bnfdx"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="7_0md5g"]
@ -21,15 +20,14 @@
[ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="15_l8ewr"]
[ext_resource type="PackedScene" uid="uid://ca6befbx0nurt" path="res://Scenes/Interactable/ScriptableEnabledAlarmTrigger.tscn" id="15_qub1o"]
[ext_resource type="PackedScene" uid="uid://bc64lr3vlwchq" path="res://Scenes/Door_Vertical.tscn" id="16_wk6n2"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="16_xlcit"]
[ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="17_lq462"]
[ext_resource type="PackedScene" uid="uid://b0133vafvobxf" path="res://Scenes/Interactable/ScriptableDisabledAlarmTrigger.tscn" id="17_wxxk5"]
[ext_resource type="PackedScene" uid="uid://c8lgk4wnyi1e6" path="res://Scenes/Actors/HealthStation.tscn" id="20_d20if"]
[ext_resource type="PackedScene" uid="uid://fxvlaidieiv7" path="res://Scenes/Interactable/ScriptableAreaTrigger.tscn" id="21_t630o"]
[ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="22_nyb1x"]
[ext_resource type="Script" uid="uid://3yu2ae6fhwt" path="res://Scripts/Resources/Events/CameraTargetEvent.cs" id="23_kna5n"]
[ext_resource type="PackedScene" uid="uid://bb32f4p5e671j" path="res://Scenes/Actors/Fairy_Guard_FSM.tscn" id="24_covcf"]
[ext_resource type="Script" uid="uid://721y7j7wqa03" path="res://Scripts/Resources/Events/CameraTargetPlayerEvent.cs" id="24_jwvxm"]
[ext_resource type="PackedScene" uid="uid://bc054js8ep2b" path="res://Scenes/Actors/FairyGuard_New.tscn" id="24_m71ef"]
[ext_resource type="FontFile" uid="uid://cc3bdt3rt8a1o" path="res://fonts/Silver.ttf" id="25_covcf"]
[ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="25_mfnhx"]
[ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="26_r1dm5"]
@ -37,11 +35,6 @@
[ext_resource type="PackedScene" uid="uid://cnhgvn2salyxl" path="res://Scenes/Items/Icicle_Repeater.tscn" id="32_covcf"]
[ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="33_0xhda"]
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_g48r8")
EggIndex = 0
StartingEquipment = []
[sub_resource type="Resource" id="Resource_3vy3u"]
script = ExtResource("15_l8ewr")
ActivationType = 6
@ -123,7 +116,6 @@ SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition"),
255: NodePath("DebugEndStart")
})
MapStartData = SubResource("Resource_6wo78")
[node name="Parallax2D" type="Parallax2D" parent="."]
process_mode = 1
@ -191,10 +183,10 @@ position = Vector2(612, -56)
State = 1
[node name="OnAlarmEnabled" parent="Parallax2D/Tilemaps/Actors/VerticalDoor" instance=ExtResource("15_qub1o")]
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_3vy3u")])
Events = [SubResource("Resource_3vy3u")]
[node name="OnAlarmDisabled" parent="Parallax2D/Tilemaps/Actors/VerticalDoor" instance=ExtResource("17_wxxk5")]
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_wvpi7")])
Events = [SubResource("Resource_wvpi7")]
[node name="AlarmBox2" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("17_lq462")]
position = Vector2(440, -121)
@ -209,44 +201,39 @@ position = Vector2(72, 8)
[node name="Intro" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(128, 351)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_ierdo")])
Events = [SubResource("Resource_ierdo")]
[node name="Switch" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(234, 287)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_8yymf")])
Events = [SubResource("Resource_8yymf")]
[node name="Weapon" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(128, 176)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_dbad5"), SubResource("Resource_f3qhg"), SubResource("Resource_ulu4a")])
Events = [SubResource("Resource_dbad5"), SubResource("Resource_f3qhg"), SubResource("Resource_ulu4a")]
[node name="Barrels" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(231, 40)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_35vjh")])
Events = [SubResource("Resource_35vjh")]
[node name="Teleporter1" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(259, -41)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_p02qj")])
Events = [SubResource("Resource_p02qj")]
[node name="Teleporter2" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(345, -40)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_t62sp")])
Events = [SubResource("Resource_t62sp")]
[node name="Repeater" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(634, -40)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_m71ef")])
Events = [SubResource("Resource_m71ef")]
[node name="Cameras" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")]
position = Vector2(433, -41)
Events = Array[ExtResource("16_xlcit")]([SubResource("Resource_54a43"), SubResource("Resource_8phm4"), SubResource("Resource_7uxja")])
Events = [SubResource("Resource_54a43"), SubResource("Resource_8phm4"), SubResource("Resource_7uxja")]
[node name="VerticalDoor2" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("16_wk6n2")]
position = Vector2(916, -56)
[node name="FairyGuard" parent="Parallax2D/Tilemaps/Actors" node_paths=PackedStringArray("DefeatScript") instance=ExtResource("24_m71ef")]
position = Vector2(791, -75)
DefeatScript = NodePath("../VerticalDoor2")
ActivationType = 5
[node name="Interact" type="RichTextLabel" parent="Parallax2D/Tilemaps/Actors"]
offset_left = 160.0
offset_top = 224.0
@ -262,6 +249,9 @@ text = "[char=24A9] [char=24BB]
Interact"
vertical_alignment = 1
[node name="FairyGuardFsm" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("24_covcf")]
position = Vector2(782, -79)
[node name="Pick Up" type="RichTextLabel" parent="Parallax2D/Tilemaps/Actors"]
offset_left = 144.0
offset_top = 128.0