From 5073cfea70d624da3f2140461d6954592ec5f7ac Mon Sep 17 00:00:00 2001
From: MaddoScientisto <maddo.science@gmail.com>
Date: Fri, 28 Feb 2025 22:50:03 +0100
Subject: [PATCH] Project upgrade to RC3

---
 Cirno.csproj                                           |  2 +-
 Cirno.csproj.old.5                                     |  3 ++-
 Resources/BossPhases/Rumia_Lasers.tres                 |  2 ++
 Resources/BossPhases/Rumia_NS2.tres                    | 10 ++++++++++
 Resources/BossPhases/Rumia_SP1.tres                    |  2 ++
 Resources/Bullets/Boss/Rumia/LaserBulletTest.tres      |  1 +
 .../Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres     |  1 +
 Resources/Debug/DebugLevels.tres                       |  8 ++++----
 Resources/Patterns/rumia_ns_2.tres                     |  3 +++
 Scenes/test.tscn                                       |  2 +-
 Tilesets/factory.aseprite                              |  4 ++--
 Tilesets/factory.png                                   |  4 ++--
 Tilesets/factory_tileset.tres                          |  3 +++
 13 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Cirno.csproj b/Cirno.csproj
index 70e4b94f..99d1c42c 100644
--- a/Cirno.csproj
+++ b/Cirno.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0-rc.2">
+<Project Sdk="Godot.NET.Sdk/4.4.0-rc.3">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
diff --git a/Cirno.csproj.old.5 b/Cirno.csproj.old.5
index 07241326..70e4b94f 100644
--- a/Cirno.csproj.old.5
+++ b/Cirno.csproj.old.5
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.0-rc.1">
+<Project Sdk="Godot.NET.Sdk/4.4.0-rc.2">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="Export.ps1" />
+    <Content Include="omnisharp.json" />
     <Content Include="Publish.ps1" />
     <Content Include="Scripts\Resources\Events\tsconfig.json" />
   </ItemGroup>
diff --git a/Resources/BossPhases/Rumia_Lasers.tres b/Resources/BossPhases/Rumia_Lasers.tres
index c1da39cf..70ae36a8 100644
--- a/Resources/BossPhases/Rumia_Lasers.tres
+++ b/Resources/BossPhases/Rumia_Lasers.tres
@@ -67,6 +67,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_54787")])
 
 [sub_resource type="Resource" id="Resource_7tuk4"]
@@ -106,6 +107,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_1yaaf")])
 
 [sub_resource type="Resource" id="Resource_reykq"]
diff --git a/Resources/BossPhases/Rumia_NS2.tres b/Resources/BossPhases/Rumia_NS2.tres
index 953461a1..b9ea58c4 100644
--- a/Resources/BossPhases/Rumia_NS2.tres
+++ b/Resources/BossPhases/Rumia_NS2.tres
@@ -30,6 +30,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_cj86d")])
 
 [sub_resource type="Resource" id="Resource_puvpt"]
@@ -69,6 +70,7 @@ LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")])
 
 [sub_resource type="Resource" id="Resource_44j24"]
@@ -101,6 +103,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_cj86d")])
 
 [sub_resource type="Resource" id="Resource_wkxow"]
@@ -133,6 +136,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")])
 
 [sub_resource type="Resource" id="Resource_gcqck"]
@@ -165,6 +169,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_cj86d")])
 
 [sub_resource type="Resource" id="Resource_bxbto"]
@@ -197,6 +202,7 @@ LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_pbgtt")])
 
 [sub_resource type="Resource" id="Resource_q48s1"]
@@ -251,6 +257,7 @@ LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 0
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
 
 [sub_resource type="Resource" id="Resource_80ngy"]
@@ -300,6 +307,7 @@ LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
 
 [sub_resource type="Resource" id="Resource_ncfnl"]
@@ -341,6 +349,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
 
 [sub_resource type="Resource" id="Resource_vkthc"]
@@ -382,6 +391,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_ln27r"), SubResource("Resource_nal31")])
 
 [sub_resource type="Resource" id="Resource_n2gn4"]
diff --git a/Resources/BossPhases/Rumia_SP1.tres b/Resources/BossPhases/Rumia_SP1.tres
index 22d6a19f..16657b9d 100644
--- a/Resources/BossPhases/Rumia_SP1.tres
+++ b/Resources/BossPhases/Rumia_SP1.tres
@@ -35,6 +35,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 Modifier = SubResource("Resource_80ngy")
 TimeModifiers = null
 
@@ -77,6 +78,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 Modifier = SubResource("Resource_e6jj0")
 TimeModifiers = null
 
diff --git a/Resources/Bullets/Boss/Rumia/LaserBulletTest.tres b/Resources/Bullets/Boss/Rumia/LaserBulletTest.tres
index 2eeb6ca2..17617033 100644
--- a/Resources/Bullets/Boss/Rumia/LaserBulletTest.tres
+++ b/Resources/Bullets/Boss/Rumia/LaserBulletTest.tres
@@ -29,4 +29,5 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = Array[Object]([SubResource("Resource_3a5dw"), SubResource("Resource_rtncg")])
diff --git a/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres b/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres
index 95412447..06d3f127 100644
--- a/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres
+++ b/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres
@@ -26,5 +26,6 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 Modifier = SubResource("Resource_jeq72")
 TimeModifiers = Array[Object]([SubResource("Resource_edsop")])
diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres
index cb774236..82a327c1 100644
--- a/Resources/Debug/DebugLevels.tres
+++ b/Resources/Debug/DebugLevels.tres
@@ -19,7 +19,7 @@ _name = "Intro"
 [sub_resource type="Resource" id="Resource_cfhv5"]
 script = ExtResource("1_ov731")
 EggIndex = 0
-StartingEquipment = []
+StartingEquipment = Array[ExtResource("2_bkci5")]([])
 
 [sub_resource type="Resource" id="Resource_0k62o"]
 script = ExtResource("2_tnajf")
@@ -31,7 +31,7 @@ StartData = SubResource("Resource_cfhv5")
 [sub_resource type="Resource" id="Resource_tpb7s"]
 script = ExtResource("1_ov731")
 EggIndex = 0
-StartingEquipment = []
+StartingEquipment = Array[ExtResource("2_bkci5")]([])
 
 [sub_resource type="Resource" id="Resource_edoov"]
 script = ExtResource("2_tnajf")
@@ -43,7 +43,7 @@ StartData = SubResource("Resource_tpb7s")
 [sub_resource type="Resource" id="Resource_1sw5g"]
 script = ExtResource("1_ov731")
 EggIndex = 255
-StartingEquipment = []
+StartingEquipment = Array[ExtResource("2_bkci5")]([])
 
 [sub_resource type="Resource" id="Resource_47bot"]
 script = ExtResource("2_tnajf")
@@ -73,7 +73,7 @@ _name = "Rebel Base"
 [sub_resource type="Resource" id="Resource_maxpt"]
 script = ExtResource("1_ov731")
 EggIndex = 0
-StartingEquipment = []
+StartingEquipment = Array[ExtResource("2_bkci5")]([])
 
 [sub_resource type="Resource" id="Resource_pein5"]
 script = ExtResource("2_tnajf")
diff --git a/Resources/Patterns/rumia_ns_2.tres b/Resources/Patterns/rumia_ns_2.tres
index 76a9e372..2e2a3e29 100644
--- a/Resources/Patterns/rumia_ns_2.tres
+++ b/Resources/Patterns/rumia_ns_2.tres
@@ -16,6 +16,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = null
 
 [sub_resource type="Resource" id="Resource_ne4q3"]
@@ -48,6 +49,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = null
 
 [sub_resource type="Resource" id="Resource_kohuh"]
@@ -80,6 +82,7 @@ LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
 DamageType = 0
+Controllable = false
 TimeModifiers = null
 
 [sub_resource type="Resource" id="Resource_depjj"]
diff --git a/Scenes/test.tscn b/Scenes/test.tscn
index 989f3b99..1b453fed 100644
--- a/Scenes/test.tscn
+++ b/Scenes/test.tscn
@@ -475,7 +475,7 @@ SpawnMarkers = Dictionary[int, NodePath]({
 2: NodePath("Factory Tilemaps/LevelProps/BossDebugTeleporterDestination"),
 255: NodePath("Factory Tilemaps/Debug Room/DebugRoomStartPosition")
 })
-StartingEquipment = [ExtResource("4_swym2"), ExtResource("5_nqier")]
+StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("4_swym2"), ExtResource("5_nqier")])
 MapStartData = SubResource("Resource_6sau4")
 metadata/_edit_lock_ = true
 
diff --git a/Tilesets/factory.aseprite b/Tilesets/factory.aseprite
index a65c0a7e..fcaab218 100644
--- a/Tilesets/factory.aseprite
+++ b/Tilesets/factory.aseprite
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7566cc70d2151a32b8bf0e0c469e09035af61064b6e24bfeb381e0fe77425dd9
-size 7672
+oid sha256:7e5fe4bf9aade3112d1dd80d4e0695409dee2d258731a3a1c382ab8a6176b4db
+size 7702
diff --git a/Tilesets/factory.png b/Tilesets/factory.png
index b8da1f7d..92015857 100644
--- a/Tilesets/factory.png
+++ b/Tilesets/factory.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69f16ad4c7d039ccd749afefc7c1ce6e74d2303928f1e866e8bfb93f159c45d1
-size 10358
+oid sha256:5ccf5d6184494657401caec19595bb7620a56d9fcbbf921aacab1d068e9dc5a0
+size 10414
diff --git a/Tilesets/factory_tileset.tres b/Tilesets/factory_tileset.tres
index addc1deb..6adbb6cf 100644
--- a/Tilesets/factory_tileset.tres
+++ b/Tilesets/factory_tileset.tres
@@ -949,6 +949,9 @@ texture = ExtResource("1_70kxh")
 11:1/0 = 0
 11:2/0 = 0
 11:3/0 = 0
+12:2/0 = 0
+12:2/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+12:3/0 = 0
 
 [sub_resource type="TileSetScenesCollectionSource" id="TileSetScenesCollectionSource_qg3vu"]
 resource_name = "Props"