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

Map Bugfixes

Browse source
This commit is contained in:
Marco 2025-05-09 10:00:33 +02:00
commit 01e61cb685
6 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Resources/Weapons/IcicleRepeater_t0.tres
View file

@ -10,7 +10,8 @@ script = ExtResource("4_ai75q")
Name = &"Icicle Repeater"
BulletData = ExtResource("1_2567x")
Priority = 10
RateOfFire = 0.2
AmmoPerShot = 1
RateOfFire = 0.05
BulletCapacity = 6
ReloadTime = 0.5
AutoReload = true

6
Scenes/MainMenu.tscn
View file

@ -21,9 +21,9 @@
[ext_resource type="Resource" uid="uid://byo74ews118nl" path="res://Resources/Music/No_Reason.tres" id="13_fh7cp"]
[ext_resource type="FontFile" uid="uid://cyk27h5aox1n7" path="res://fonts/sector_034.ttf" id="14_yxkem"]
[sub_resource type="AtlasTexture" id="AtlasTexture_hbsma"]
[sub_resource type="AtlasTexture" id="AtlasTexture_cy8ro"]
atlas = ExtResource("9_riqfo")
region = Rect2(192, 0, 32, 16)
region = Rect2(96, 0, 32, 16)
[sub_resource type="Theme" id="Theme_c7h4d"]
@ -71,7 +71,7 @@ offset_top = 40.995
offset_right = 186.42
offset_bottom = 56.995
rotation = 3.14159
texture = SubResource("AtlasTexture_hbsma")
texture = SubResource("AtlasTexture_cy8ro")
[node name="MarginContainer" type="MarginContainer" parent="."]
anchors_preset = 15

13
Scenes/Maps/Level2.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=89 format=4 uid="uid://6a6tjohypmmb"]
[gd_scene load_steps=88 format=4 uid="uid://6a6tjohypmmb"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"]
@ -14,7 +14,6 @@
[ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="9_qo7ri"]
[ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="11_7an4p"]
[ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="14_s23f3"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="15_5j8ks"]
[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"]
[ext_resource type="PackedScene" uid="uid://c27co22bjym3c" path="res://Scenes/Actors/Camera.tscn" id="17_s23f3"]
@ -391,7 +390,7 @@ position = Vector2(196, 296)
[node name="MotionSensor" parent="Tilemaps/Actors" instance=ExtResource("16_ehuec")]
position = Vector2(254, 296)
Events = Array[ExtResource("15_5j8ks")]([SubResource("Resource_s23f3")])
Events = [SubResource("Resource_s23f3")]
[node name="ControlPad" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
position = Vector2(205, 292)
@ -412,11 +411,11 @@ position = Vector2(504, 468)
[node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")]
position = Vector2(226, 486)
Events = Array[ExtResource("15_5j8ks")]([SubResource("Resource_qi6uc")])
Events = [SubResource("Resource_qi6uc")]
[node name="MovementSensorLonger2" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")]
position = Vector2(391, 455)
Events = Array[ExtResource("15_5j8ks")]([SubResource("Resource_mq37i")])
Events = [SubResource("Resource_mq37i")]
[node name="WallEmitter" parent="Tilemaps/Actors" instance=ExtResource("21_qi6uc")]
position = Vector2(264, 482)
@ -635,6 +634,8 @@ script = ExtResource("8_wp8ds")
[node name="HUD" parent="." instance=ExtResource("9_mnq21")]
[node name="CameraController" parent="." instance=ExtResource("47_nq7r5")]
[node name="CameraTarget" type="Node2D" parent="."]
position = Vector2(311, 304)
script = ExtResource("44_5t0ab")
@ -645,5 +646,3 @@ position = Vector2(312, 303)
[node name="AlarmManager" type="Node2D" parent="."]
script = ExtResource("11_7an4p")
AlarmSound = ExtResource("31_nb1db")
[node name="CameraController" parent="." instance=ExtResource("47_nq7r5")]

5
Scenes/Maps/Level3.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=61 format=4 uid="uid://dnpmeebmjgv2t"]
[gd_scene load_steps=60 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"]
@ -50,7 +50,6 @@
[ext_resource type="PackedScene" uid="uid://bc64lr3vlwchq" path="res://Scenes/Door_Vertical.tscn" id="45_wy0ue"]
[ext_resource type="PackedScene" uid="uid://ddwcib46ttlrp" path="res://Scenes/Items/Ice_Shotgun_Pickup.tscn" id="46_y412u"]
[ext_resource type="PackedScene" uid="uid://dth038hcu6v1i" path="res://Scenes/Actors/Fairy_SpecialForce_FSM.tscn" id="47_wkglj"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="48_pjj1f"]
[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="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="51_wkglj"]
@ -428,7 +427,7 @@ position = Vector2(794, 844)
[node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("50_tu8ih")]
position = Vector2(400, 368)
Events = Array[ExtResource("48_pjj1f")]([SubResource("Resource_wy0ue")])
Events = [SubResource("Resource_wy0ue")]
[node name="ThermatronFsm" parent="Tilemaps/Actors" instance=ExtResource("58_pjj1f")]
position = Vector2(617, 863)

31
Scenes/test.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=168 format=4 uid="uid://bv451a8wgty4u"]
[gd_scene load_steps=167 format=4 uid="uid://bv451a8wgty4u"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ksslq"]
@ -49,7 +49,6 @@
[ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="34_17pjh"]
[ext_resource type="PackedScene" uid="uid://byjq8xpx4crfd" path="res://Scenes/Interactable/control_pad_blue_keycard.tscn" id="35_gdbcj"]
[ext_resource type="PackedScene" uid="uid://d0yes7huiyisw" path="res://Scenes/Items/Blue_Keycard.tscn" id="35_rblsn"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="36_7lma1"]
[ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="36_f8fh1"]
[ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="36_rd6f6"]
[ext_resource type="PackedScene" uid="uid://dsbk2l40er2da" path="res://Scenes/Props/Box_Blue.tscn" id="37_gtga7"]
@ -152,6 +151,7 @@ size = Vector2(23, 22)
[sub_resource type="Resource" id="Resource_xhinl"]
script = ExtResource("98_gvbi8")
BulletResource = ExtResource("95_f37sa")
EmitterOffset = Vector2(0, 0)
bulletCount = 1
rotationSpeed = 0.0
_rotationOffset = 0.0
@ -298,7 +298,7 @@ ActivationType = 0
Targets = Array[NodePath]([NodePath("../Rumia")])
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_7lma1"]
[sub_resource type="Resource" id="Resource_ldb17"]
resource_local_to_scene = true
script = ExtResource("49_0si7g")
Target = NodePath(".")
@ -315,6 +315,7 @@ metadata/_custom_type_script = "uid://bngko08ho85p6"
[sub_resource type="Resource" id="Resource_mgwgx"]
script = ExtResource("98_gvbi8")
BulletResource = ExtResource("95_f37sa")
EmitterOffset = Vector2(0, 0)
bulletCount = 1
rotationSpeed = 0.0
_rotationOffset = 90.0
@ -688,7 +689,7 @@ position = Vector2(-1832, -99)
[node name="Chest2" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("25_4b2ed")]
position = Vector2(-679, -408)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("76_dskij"), ExtResource("77_wma5c"), ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("76_dskij")])
LootTable = [ExtResource("76_dskij"), ExtResource("77_wma5c"), ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("94_gd7x4"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("6_khabp"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("77_wma5c"), ExtResource("76_dskij")]
[node name="Valve" parent="Parallax2D/Factory Tilemaps/Debug Room" node_paths=PackedStringArray("Target") instance=ExtResource("48_8usll")]
position = Vector2(-666, -545)
@ -994,7 +995,7 @@ position = Vector2(-1488, -544)
[node name="Chest" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-920, -424)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("27_y1lom"), ExtResource("28_u0dff"), ExtResource("29_wb5l5"), ExtResource("30_0d2o6"), ExtResource("5_nqier")])
LootTable = [ExtResource("27_y1lom"), ExtResource("28_u0dff"), ExtResource("29_wb5l5"), ExtResource("30_0d2o6"), ExtResource("5_nqier")]
[node name="RedKeycard_Switch_2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("17_e3v0b")]
position = Vector2(-1095, 132)
@ -1244,7 +1245,7 @@ Events = Array[ExtResource("61_ldb17")]([SubResource("Resource_068l7"), SubResou
[node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")]
position = Vector2(-1487, -396)
Events = Array[ExtResource("61_ldb17")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_7lma1")])
Events = Array[ExtResource("61_ldb17")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_ldb17")])
[node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")]
position = Vector2(-1657, -788)
@ -1373,7 +1374,7 @@ position = Vector2(-2000, -736)
[node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")]
position = Vector2(-2027, -735)
Targets = [NodePath("../HorizontalForceField")]
Requirements = Array[ExtResource("36_7lma1")]([ExtResource("84_ma1ta")])
Requirements = [ExtResource("84_ma1ta")]
[node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
position = Vector2(-872, -220)
@ -1433,35 +1434,35 @@ position = Vector2(-1624, -813)
[node name="Chest3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-376, 54)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]
[node name="Chest5" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-1048, -139)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")]
[node name="Chest6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-2104, -362)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g"), ExtResource("4_swym2")]
[node name="Chest4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-823, 67)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]
[node name="Chest7" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-1417, 326)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]
[node name="Chest10" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-1515, 408)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]
[node name="Chest8" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-1544, 552)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]
[node name="Chest9" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("25_4b2ed")]
position = Vector2(-1384, 231)
LootTable = Array[ExtResource("36_7lma1")]([ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")])
LootTable = [ExtResource("6_khabp"), ExtResource("94_gd7x4"), ExtResource("95_srv0g")]
[node name="Ammo13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
position = Vector2(-392, 52)

2
Scripts/Actors/Boss.cs
View file

@ -157,7 +157,7 @@ public partial class Boss : Enemy, IActivable, IScriptHost
{
_bossHud.Visible = true;
}
GameManager.Instance.CameraTargetObject(_cameraMarker);
//GameManager.Instance.CameraTargetObject(_cameraMarker);
StartPhase(CurrentPhase);
return true;