Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
MaddoScientisto 2025-03-18 21:05:12 +01:00
commit 77b89a8fbc
25 changed files with 799 additions and 56 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=132 format=4 uid="uid://bv451a8wgty4u"]
[gd_scene load_steps=134 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"]
@ -103,9 +103,11 @@
[ext_resource type="Resource" uid="uid://cmra7n6so1x4u" path="res://Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres" id="95_7m6n7"]
[ext_resource type="Resource" uid="uid://dodwpect0ldjf" path="res://Resources/Items/Heart_Pickup.tres" id="95_srv0g"]
[ext_resource type="PackedScene" uid="uid://nupd3pg74vua" path="res://Scenes/Activable/ScriptableInvisibleEmitter.tscn" id="96_ygp23"]
[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="97_gvbi8"]
[ext_resource type="Resource" uid="uid://dtkti2rjlcp3u" path="res://Resources/Bullets/Fire_Emitter_Bullet.tres" id="97_xwjvv"]
[ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="98_gvbi8"]
[ext_resource type="Script" uid="uid://bngko08ho85p6" path="res://Scripts/Resources/BulletScript.cs" id="99_j6vrf"]
[ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="99_xwjvv"]
[sub_resource type="Resource" id="Resource_6sau4"]
script = ExtResource("7_l32kg")
@ -214,7 +216,7 @@ ActivationType = 0
Targets = Array[NodePath]([NodePath("../Rumia")])
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_ygp23"]
[sub_resource type="Resource" id="Resource_j6vrf"]
resource_local_to_scene = true
script = ExtResource("49_0si7g")
Target = NodePath(".")
@ -241,6 +243,14 @@ burstInterval = 0.5
ShotsPerBurst = 100
BurstRate = 0.0
_targetPlayer = false
OverrideOwner = false
Owner = 0
OverrideDamageType = false
DamageType = 0
OverrideControllable = false
Controllable = false
OverrideCreationModifier = false
TimeModifiers = Array[ExtResource("97_gvbi8")]([])
WaitForCompletion = true
metadata/_custom_type_script = "uid://c0ndqalsc4jve"
@ -575,7 +585,7 @@ IsEnabled = true
Target = NodePath("../DebugTeleporter")
[node name="DebugTeleporter" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("30_8fdby")]
position = Vector2(-1078, -97)
position = Vector2(-434, 101)
Invisible = true
metadata/_edit_group_ = true
@ -865,7 +875,7 @@ Events = Array[ExtResource("44_mah4x")]([SubResource("Resource_068l7"), SubResou
[node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")]
position = Vector2(-1487, -396)
Events = Array[ExtResource("44_mah4x")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_ygp23")])
Events = Array[ExtResource("44_mah4x")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_j6vrf")])
[node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")]
position = Vector2(-1657, -788)
@ -1175,7 +1185,6 @@ InvertSignal = true
position = Vector2(-722, 56)
rotation = -1.5708
Script = SubResource("Resource_f37sa")
InvertSignal = true
[node name="InvisibleBulletEmitter2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("96_ygp23")]
position = Vector2(-1492, -168)
@ -1183,6 +1192,12 @@ rotation = -1.5708
Script = SubResource("Resource_f37sa")
EmitOnStart = true
[node name="HeartExtendPickup" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("99_xwjvv")]
position = Vector2(-386, 84)
[node name="HeartExtendPickup2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("99_xwjvv")]
position = Vector2(-712, -393)
[node name="PlayerParent" type="Node2D" parent="Parallax2D/Factory Tilemaps"]
[node name="BeamShadows" type="TileMapLayer" parent="Parallax2D/Factory Tilemaps"]