Replaced most cameras in levels with a scene

2026-06-09 04:55:54 +00:00 · 2025-05-07 11:58:08 +02:00 · 2025-05-07 11:58:08 +02:00 · 9548688850
commit 9548688850
parent 869a3b4c06
17 changed files with 107 additions and 105 deletions
--- a/Resources/BossPhases/Rumia_NS2.tres
+++ b/Resources/BossPhases/Rumia_NS2.tres
@ -26,6 +26,7 @@ BulletScene = ExtResource("1_as8n2")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -73,6 +74,7 @@ BulletScene = ExtResource("1_as8n2")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
@ -113,6 +115,7 @@ BulletScene = ExtResource("4_tek7n")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -153,6 +156,7 @@ BulletScene = ExtResource("4_tek7n")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -193,6 +197,7 @@ BulletScene = ExtResource("5_n4xqo")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -233,6 +238,7 @@ BulletScene = ExtResource("5_n4xqo")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
@ -295,6 +301,7 @@ BulletScene = ExtResource("7_gsnyb")
 BulletSpeed = 80.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 0
@ -343,6 +350,7 @@ BulletScene = ExtResource("7_gsnyb")
 BulletSpeed = 80.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
@ -391,6 +399,7 @@ BulletScene = ExtResource("7_gsnyb")
 BulletSpeed = 80.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -439,6 +448,7 @@ BulletScene = ExtResource("7_gsnyb")
 BulletSpeed = 80.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
--- a/Resources/BossPhases/Rumia_SP1.tres
+++ b/Resources/BossPhases/Rumia_SP1.tres
@ -41,6 +41,7 @@ BulletScene = ExtResource("1_o4um1")
 BulletSpeed = 100.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -90,6 +91,7 @@ BulletScene = ExtResource("4_ruawj")
 BulletSpeed = 100.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
--- a/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres
+++ b/Resources/Bullets/Boss/Rumia/Rumia_Red_Chase_Bullet.tres
@ -22,6 +22,7 @@ BulletScene = ExtResource("1_y6dig")
 BulletSpeed = 70.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = true
 Owner = 2
--- a/Resources/Bullets/EmitterTestBullet.tres
+++ b/Resources/Bullets/EmitterTestBullet.tres
@ -9,6 +9,7 @@ BulletScene = ExtResource("1_ji2e1")
 BulletSpeed = 20.0
 Direction = Vector2(1, 0)
 BulletDamage = 8.0
+Knockback = 1.0
 LifeTime = 8.0
 DestroyOnCollision = true
 Owner = 0
--- a/Resources/Maps/SimpleScene.tres
+++ b/Resources/Maps/SimpleScene.tres
@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="MapResource" load_steps=3 format=3 uid="uid://c4qpuy35j23i7"]
+
+[ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="1_vabsy"]
+[ext_resource type="Resource" uid="uid://cn8tu4jct04rp" path="res://Resources/StartData/Pistol_Start.tres" id="1_wh6gt"]
+
+[resource]
+script = ExtResource("1_vabsy")
+LevelId = 0
+MapName = &"Simple Scene"
+MapDescription = &"A simple scene to get started up"
+ScenePath = &"uid://prgabjxh44lf"
+WeaponsAllowed = true
+StartData = ExtResource("1_wh6gt")
+metadata/_custom_type_script = "uid://quy4d4tgvqfy"
--- a/Resources/Patterns/rumia_ns_2.tres
+++ b/Resources/Patterns/rumia_ns_2.tres
@ -13,6 +13,7 @@ BulletScene = ExtResource("1_4xpdn")
 BulletSpeed = 40.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -53,6 +54,7 @@ BulletScene = ExtResource("3_gr7a3")
 BulletSpeed = 50.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
@ -93,6 +95,7 @@ BulletScene = ExtResource("1_4xpdn")
 BulletSpeed = 50.0
 Direction = Vector2(1, 0)
 BulletDamage = 20.0
+Knockback = 1.0
 LifeTime = 20.0
 DestroyOnCollision = false
 Owner = 2
--- a/Scenes/Maps/Level2.tscn
+++ b/Scenes/Maps/Level2.tscn
@ -6,14 +6,12 @@
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_06rc0"]
 [ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="6_e12id"]
 [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_up0ka"]
-[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="7_lxkiw"]
 [ext_resource type="Texture2D" uid="uid://cvgxompqq0f0o" path="res://Sprites/Props/Science_Apparatus_1.png" id="7_oydv1"]
 [ext_resource type="PackedScene" uid="uid://cjsnhyl0nqbau" path="res://Scenes/Props/ICCTv.tscn" id="8_6w05j"]
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="8_wp8ds"]
 [ext_resource type="Texture2D" uid="uid://clep85beuyg2w" path="res://Sprites/Props/Vials.png" id="9_j5c74"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_mnq21"]
 [ext_resource type="FontFile" uid="uid://coek1e2q257pq" path="res://fonts/at01.ttf" id="9_qo7ri"]
-[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://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"]
@ -46,7 +44,9 @@
 [ext_resource type="PackedScene" uid="uid://cqi87wcxymbhx" path="res://Scenes/Props/Shelf.tscn" id="40_sb7g3"]
 [ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="42_nq7r5"]
 [ext_resource type="Resource" uid="uid://b0xtpdb4by8mm" path="res://Resources/Maps/Level3.tres" id="43_joghw"]
+[ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="44_5t0ab"]
 [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="44_q1ysg"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="47_nq7r5"]

 [sub_resource type="LabelSettings" id="LabelSettings_5j8ks"]
 font = ExtResource("9_qo7ri")
@ -623,11 +623,6 @@ 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
-enable_smoothing = false
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@ -642,7 +637,7 @@ script = ExtResource("8_wp8ds")

 [node name="CameraTarget" type="Node2D" parent="."]
 position = Vector2(311, 304)
-script = ExtResource("10_4nd4a")
+script = ExtResource("44_5t0ab")

 [node name="PlayerStartPosition" type="Marker2D" parent="."]
 position = Vector2(312, 303)
@ -650,3 +645,5 @@ 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")]
--- a/Scenes/Maps/Level3.tscn
+++ b/Scenes/Maps/Level3.tscn
@ -1,21 +1,18 @@
-[gd_scene load_steps=62 format=4 uid="uid://dnpmeebmjgv2t"]
+[gd_scene load_steps=61 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="Resource" uid="uid://b0xtpdb4by8mm" path="res://Resources/Maps/Level3.tres" id="2_pjj1f"]
-[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_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"]
 [ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="7_bn5f4"]
 [ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="8_skof0"]
-[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="9_nrpyf"]
 [ext_resource type="PackedScene" uid="uid://d1h48wgasakk4" path="res://Scenes/Interactable/alarm_box.tscn" id="9_w0rax"]
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="10_00msh"]
 [ext_resource type="Script" uid="uid://crpkvxepkcrir" path="res://Scripts/Components/Actors/ForceFieldCollisionDisabler.cs" id="10_w0rax"]
 [ext_resource type="PackedScene" uid="uid://d0j1bmgbefyp2" path="res://Scenes/Actors/Lightbridge.tscn" id="11_6nsxd"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="11_7j1cb"]
 [ext_resource type="PackedScene" uid="uid://djf0y08ix66fn" path="res://Scenes/Interactable/Chest.tscn" id="12_6nsxd"]
-[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="12_ow2h2"]
 [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="13_jhwgn"]
 [ext_resource type="PackedScene" uid="uid://dyvrwksve4ulg" path="res://Scenes/Items/Yin_Yang_Gun_Pickup.tscn" id="13_tn8mb"]
 [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="14_31m3n"]
@ -58,6 +55,8 @@
 [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"]
 [ext_resource type="Script" uid="uid://c8tx1gh0lxt0t" path="res://Scripts/Resources/Events/AlarmEnableEvent.cs" id="52_udf20"]
+[ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="54_wkglj"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="58_87jtn"]
 [ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="58_pjj1f"]

 [sub_resource type="RectangleShape2D" id="RectangleShape2D_tvyok"]
@ -146,19 +145,19 @@ State = 1

 [node name="Chest" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")]
 position = Vector2(72, 408)
-LootTable = Array[ExtResource("3_w0rax")]([ExtResource("14_l8btv"), ExtResource("15_mi8uj")])
+LootTable = [ExtResource("14_l8btv"), ExtResource("15_mi8uj")]

 [node name="Chest2" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")]
 position = Vector2(249, 312)
-LootTable = Array[ExtResource("3_w0rax")]([ExtResource("14_l8btv")])
+LootTable = [ExtResource("14_l8btv")]

 [node name="Chest9" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")]
 position = Vector2(-119, 390)
-LootTable = Array[ExtResource("3_w0rax")]([ExtResource("14_l8btv")])
+LootTable = [ExtResource("14_l8btv")]

 [node name="Chest10" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")]
 position = Vector2(-102, 488)
-LootTable = Array[ExtResource("3_w0rax")]([ExtResource("14_l8btv")])
+LootTable = [ExtResource("14_l8btv")]

 [node name="Chest3" parent="Tilemaps/Actors" instance=ExtResource("12_6nsxd")]
 position = Vector2(360, 136)
@ -475,12 +474,6 @@ 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
-script = ExtResource("9_nrpyf")
-pixel_snap = false
-enable_smoothing = false
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@ -493,9 +486,11 @@ script = ExtResource("10_00msh")

 [node name="HUD" parent="." instance=ExtResource("11_7j1cb")]

+[node name="CameraController" parent="." instance=ExtResource("58_87jtn")]
+
 [node name="CameraTarget" type="Node2D" parent="."]
 position = Vector2(115, 328)
-script = ExtResource("12_ow2h2")
+script = ExtResource("54_wkglj")

 [node name="PlayerStartPosition" type="Marker2D" parent="."]
 position = Vector2(66, 272)
--- a/Scenes/Maps/Level4.tscn
+++ b/Scenes/Maps/Level4.tscn
--- a/Scenes/Maps/PlayerFSMTest.tscn
+++ b/Scenes/Maps/PlayerFSMTest.tscn
@ -1,22 +1,19 @@
-[gd_scene load_steps=111 format=4 uid="uid://dqyfnby0t7gu1"]
+[gd_scene load_steps=110 format=4 uid="uid://dqyfnby0t7gu1"]

 [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"]
 [ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"]
 [ext_resource type="Script" uid="uid://quy4d4tgvqfy" path="res://Scripts/Resources/MapResource.cs" id="4_nadrw"]
 [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_u1i8n"]
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_6314l"]
-[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="5_u1i8n"]
 [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_yyg8m"]
 [ext_resource type="Script" uid="uid://dk0572j6bj7p3" path="res://Scripts/Misc/NavigationMap.cs" id="7_nadrw"]
 [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="8_c3v4x"]
 [ext_resource type="Material" uid="uid://cdaeormgf78de" path="res://Resources/Materials/Static_Scanlines.tres" id="8_cub4j"]
-[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="9_dj0ui"]
 [ext_resource type="Script" uid="uid://crpkvxepkcrir" path="res://Scripts/Components/Actors/ForceFieldCollisionDisabler.cs" id="9_wt88c"]
 [ext_resource type="PackedScene" uid="uid://cmr6fclttrpkb" path="res://Scenes/Items/Ammo1.tscn" id="10_6314l"]
 [ext_resource type="PackedScene" uid="uid://d0j1bmgbefyp2" path="res://Scenes/Actors/Lightbridge.tscn" id="10_k6t8d"]
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="10_qmakk"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="11_hmqao"]
-[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="12_8to53"]
 [ext_resource type="PackedScene" uid="uid://clieeuln36a7a" path="res://Scenes/Actors/Fairy_FSM.tscn" id="12_64bae"]
 [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="13_8fnge"]
 [ext_resource type="Script" uid="uid://cq65aed620ijo" path="res://Scripts/Resources/Loot/LootDrop.cs" id="13_b3y78"]
@ -57,7 +54,6 @@
 [ext_resource type="Script" uid="uid://bngko08ho85p6" path="res://Scripts/Resources/BulletScript.cs" id="39_83jc5"]
 [ext_resource type="Resource" uid="uid://dqnvesdj0dk3v" path="res://Resources/Bullets/simple_enemy_bullet.tres" id="39_b0wyy"]
 [ext_resource type="Script" uid="uid://c0ndqalsc4jve" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="40_o56je"]
-[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="42_5glx6"]
 [ext_resource type="Script" uid="uid://c6467d6yx50qh" path="res://Scripts/Components/BulletSpawner.cs" id="43_b8ffn"]
 [ext_resource type="PackedScene" uid="uid://b7gkxlll3b1eg" path="res://Scenes/Activable/FloorEmitter.tscn" id="44_b8ffn"]
 [ext_resource type="Resource" uid="uid://cmra7n6so1x4u" path="res://Resources/BulletScripts/Basic_Enemy_Emitter_Spiral_Bullets.tres" id="45_4mkc6"]
@ -67,18 +63,21 @@
 [ext_resource type="PackedScene" uid="uid://bb32f4p5e671j" path="res://Scenes/Actors/Fairy_Guard_FSM.tscn" id="51_awjkl"]
 [ext_resource type="PackedScene" uid="uid://d1h48wgasakk4" path="res://Scenes/Interactable/alarm_box.tscn" id="52_5nxem"]
 [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="52_q2wmj"]
+[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="55_8qe0x"]
 [ext_resource type="Texture2D" uid="uid://cnayqn8jgb8jj" path="res://Models/carr/carr_rotating.png" id="56_5glx6"]
 [ext_resource type="PackedScene" uid="uid://iooa4gqy2uu2" path="res://Scenes/Items/Nuclear_Gun_Pickup.tscn" id="56_iv5wi"]
 [ext_resource type="PackedScene" uid="uid://ey71mxa5ocpn" path="res://Scenes/Items/Shield_Extend_Pickup.tscn" id="60_bjd5y"]
 [ext_resource type="PackedScene" uid="uid://d3hds3dbosfcm" path="res://Scenes/Items/PhysicsDropWrapper.tscn" id="62_5glx6"]
 [ext_resource type="PackedScene" uid="uid://d360rx247qywn" path="res://3D/3DTest.tscn" id="68_8n581"]
+[ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="69_nadrw"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="72_vto58"]
 [ext_resource type="PackedScene" uid="uid://dth038hcu6v1i" path="res://Scenes/Actors/Fairy_SpecialForce_FSM.tscn" id="73_nadrw"]

 [sub_resource type="Resource" id="Resource_vto58"]
 script = ExtResource("4_u1i8n")
 EggIndex = 0
 StartingEquipment = [ExtResource("3_6314l")]
-RemoveEquipment = Array[ExtResource("5_u1i8n")]([])
+RemoveEquipment = []
 metadata/_custom_type_script = "uid://mja0rk7n2kln"

 [sub_resource type="Resource" id="Resource_1tvdd"]
@ -142,6 +141,7 @@ burstInterval = 0.5
 ShotsPerBurst = 100
 BurstRate = 0.0
 _targetPlayer = false
+_predictPlayer = false
 OverrideOwner = false
 Owner = 0
 OverrideDamageType = false
@ -149,7 +149,7 @@ DamageType = 0
 OverrideControllable = false
 Controllable = false
 OverrideCreationModifier = false
-TimeModifiers = Array[ExtResource("42_5glx6")]([])
+TimeModifiers = []
 WaitForCompletion = true
 metadata/_custom_type_script = "uid://c0ndqalsc4jve"

@ -170,6 +170,7 @@ burstInterval = 0.5
 ShotsPerBurst = 100
 BurstRate = 0.0
 _targetPlayer = false
+_predictPlayer = false
 OverrideOwner = false
 Owner = 0
 OverrideDamageType = false
@ -177,11 +178,11 @@ DamageType = 0
 OverrideControllable = false
 Controllable = false
 OverrideCreationModifier = false
-TimeModifiers = Array[ExtResource("42_5glx6")]([])
+TimeModifiers = []
 WaitForCompletion = true
 metadata/_custom_type_script = "uid://c0ndqalsc4jve"

-[sub_resource type="Resource" id="Resource_nadrw"]
+[sub_resource type="Resource" id="Resource_8qe0x"]
 resource_local_to_scene = true
 script = ExtResource("39_83jc5")
 Patterns = Array[Object]([SubResource("Resource_kuo18")])
@ -495,7 +496,7 @@ position = Vector2(59, 386)

 [node name="Chest" parent="Tilemaps/NavigationRegion2D/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/NavigationRegion2D/Actors" instance=ExtResource("24_rff8l")]
 position = Vector2(374, 503)
@ -586,7 +587,7 @@ InvertSignal = true

 [node name="FloorEmitter2" parent="Tilemaps/NavigationRegion2D/Actors" instance=ExtResource("44_b8ffn")]
 position = Vector2(601, 147)
-Script = SubResource("Resource_nadrw")
+Script = SubResource("Resource_8qe0x")
 InvertSignal = true

 [node name="Camera" parent="Tilemaps/NavigationRegion2D/Actors" instance=ExtResource("48_r562v")]
@ -619,7 +620,7 @@ Targets = [NodePath("Script")]

 [node name="Script" type="Node2D" parent="Tilemaps/NavigationRegion2D/Actors/ControlPad4"]
 script = ExtResource("50_cr4hs")
-Events = [SubResource("Resource_8n581"), SubResource("Resource_iv5wi")]
+Events = Array[ExtResource("55_8qe0x")]([SubResource("Resource_8n581"), SubResource("Resource_iv5wi")])

 [node name="FairyGuardFsm" parent="Tilemaps/NavigationRegion2D/Actors" instance=ExtResource("50_w8nwr")]
 position = Vector2(712, -136)
@ -690,7 +691,7 @@ transform = Transform3D(0.826924, -0.385938, 0.408961, 0, 0.727282, 0.686339, -0

 [node name="ScriptableAreaTrigger" parent="Tilemaps" instance=ExtResource("28_fuxq3")]
 position = Vector2(230, 250)
-Events = [SubResource("Resource_pgobb")]
+Events = Array[ExtResource("55_8qe0x")]([SubResource("Resource_pgobb")])

 [node name="AlarmBox" parent="Tilemaps" instance=ExtResource("52_5nxem")]
 position = Vector2(616, 88)
@ -703,12 +704,6 @@ position = Vector2(616, 18)
 collision_layer = 4
 ItemToDrop = ExtResource("23_1ajuh")

-[node name="CameraController" type="Camera2D" parent="."]
-process_mode = 1
-script = ExtResource("9_dj0ui")
-pixel_snap = false
-enable_smoothing = false
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@ -721,9 +716,11 @@ script = ExtResource("10_qmakk")

 [node name="HUD" parent="." instance=ExtResource("11_hmqao")]

+[node name="CameraController" parent="." instance=ExtResource("72_vto58")]
+
 [node name="CameraTarget" type="Node2D" parent="."]
 position = Vector2(124, 338)
-script = ExtResource("12_8to53")
+script = ExtResource("69_nadrw")

 [node name="PlayerStartPosition" type="Marker2D" parent="."]
 position = Vector2(635, 70)
--- a/Scenes/Maps/RebelBase.tscn
+++ b/Scenes/Maps/RebelBase.tscn
@ -20,13 +20,13 @@
 [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://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"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="23_4quap"]
-[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="24_us5cw"]
+[ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="24_8anae"]
 [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="25_nrq5u"]
 [ext_resource type="PackedScene" uid="uid://cl7s06sk106uo" path="res://Scenes/Props/VendingMachine.tscn" id="26_6sq7s"]
 [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="26_yowd0"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="27_rf2ue"]

 [sub_resource type="Resource" id="Resource_2ugqu"]
 script = ExtResource("11_esmuk")
@ -196,12 +196,6 @@ position = Vector2(202, 376)
 [node name="Locker3" parent="Tilemaps/Props2" instance=ExtResource("20_jrxvj")]
 position = Vector2(180, 376)

-[node name="CameraController" type="Camera2D" parent="."]
-process_mode = 1
-script = ExtResource("21_3u61o")
-pixel_snap = false
-enable_smoothing = false
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@ -214,9 +208,12 @@ script = ExtResource("22_jn5np")

 [node name="HUD" parent="." instance=ExtResource("23_4quap")]

+[node name="CameraController" parent="." instance=ExtResource("27_rf2ue")]
+MaxAimOffsetDistance = 64.0
+
 [node name="CameraTarget" type="Node2D" parent="."]
 position = Vector2(115, 328)
-script = ExtResource("24_us5cw")
+script = ExtResource("24_8anae")

 [node name="PlayerStartPosition" type="Marker2D" parent="."]
 position = Vector2(111, 305)
--- a/Scenes/Maps/Roguelike.tscn
+++ b/Scenes/Maps/Roguelike.tscn
@ -4,7 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_3fyis"]
 [ext_resource type="Resource" uid="uid://6ek4lmtuij4t" path="res://Resources/Maps/Roguelite.tres" id="2_k5t51"]
 [ext_resource type="Script" uid="uid://bt2qjgnf1wc2r" path="res://Scripts/Controllers/RogueliteRoomManager.cs" id="4_jtlua"]
-[ext_resource type="Script" uid="uid://dd535g2nxqpg1" path="res://Scripts/Misc/CameraController.cs" id="6_gwtv6"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="6_gwtv6"]
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="9_vhvs2"]
 [ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="9_wbqvu"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="10_6gk3e"]
@ -28,13 +28,7 @@ y_sort_enabled = true
 script = ExtResource("4_jtlua")
 MapThemes = Array[Object]([ExtResource("25_7gtqx")])

-[node name="CameraController" type="Camera2D" parent="."]
-process_mode = 1
-script = ExtResource("6_gwtv6")
-PixelSnap = false
-EnableSmoothing = false
-AimLerpSpeed = 0.8
-DebugCamera2ActionName = &"debug_camera_1"
+[node name="CameraController" parent="." instance=ExtResource("6_gwtv6")]

 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
--- a/Scenes/Maps/SimpleScene.tscn
+++ b/Scenes/Maps/SimpleScene.tscn
@ -1,43 +1,38 @@
-[gd_scene load_steps=13 format=4 uid="uid://prgabjxh44lf"]
+[gd_scene load_steps=12 format=4 uid="uid://prgabjxh44lf"]

 [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_4uv21"]
+[ext_resource type="Resource" uid="uid://c4qpuy35j23i7" path="res://Resources/Maps/SimpleScene.tres" id="2_c2687"]
 [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_xfbh8"]
-[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_bc0u7"]
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="4_em3f4"]
 [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="5_75e1c"]
-[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="11_uct4d"]
+[ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="7_75lrj"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="10_c2687"]
 [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="12_3bxj4"]
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="12_hibtc"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="13_66bei"]
-[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="14_2aa7w"]
 [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="15_d7e3u"]

-[sub_resource type="Resource" id="Resource_6wo78"]
-script = ExtResource("4_bc0u7")
-EggIndex = 0
-StartingEquipment = []
-
 [node name="GameScene" type="Node2D"]
 process_mode = 3
 script = ExtResource("1_4uv21")
+MapResource = ExtResource("2_c2687")
 PlayerTemplate = ExtResource("2_xfbh8")
 SpawnMarkers = Dictionary[int, NodePath]({
 0: NodePath("PlayerStartPosition")
 })
-MapStartData = SubResource("Resource_6wo78")

 [node name="Tilemaps" type="Node2D" parent="."]
 process_mode = 1

 [node name="Floor" type="TileMapLayer" parent="Tilemaps" node_paths=PackedStringArray("_solidLayers") groups=["Solid"]]
-tile_map_data = PackedByteArray("AAAEABAAAAAEAAIAAAAEABEAAAAEAAIAAAAEABIAAAAEAAIAAAAEABMAAAAEAAIAAAAEABQAAAAEAAIAAAAEABUAAAAEAAIAAAAEABYAAAAEAAIAAAAFABAAAAAEAAIAAAAFABEAAAAEAAIAAAAFABIAAAAEAAIAAAAFABMAAAAEAAIAAAAFABQAAAAEAAIAAAAFABUAAAAEAAIAAAAFABYAAAAEAAIAAAAGABAAAAAEAAIAAAAGABEAAAAEAAIAAAAGABIAAAAEAAIAAAAGABMAAAAEAAIAAAAGABQAAAAEAAIAAAAGABUAAAAEAAIAAAAGABYAAAAEAAIAAAAHABAAAAAEAAIAAAAHABEAAAAEAAIAAAAHABIAAAAEAAIAAAAHABMAAAAEAAIAAAAHABQAAAAEAAIAAAAHABUAAAAEAAIAAAAHABYAAAAEAAIAAAAIABAAAAAEAAIAAAAIABEAAAAEAAIAAAAIABIAAAAEAAIAAAAIABMAAAAEAAIAAAAIABQAAAAEAAIAAAAIABUAAAAEAAIAAAAIABYAAAAEAAIAAAAJABAAAAAEAAIAAAAJABEAAAAEAAIAAAAJABIAAAAEAAIAAAAJABMAAAAEAAIAAAAJABQAAAAEAAIAAAAJABUAAAAEAAIAAAAJABYAAAAEAAIAAAAKABAAAAAEAAIAAAAKABEAAAAEAAIAAAAKABIAAAAEAAIAAAAKABMAAAAEAAIAAAAKABQAAAAEAAIAAAAKABUAAAAEAAIAAAAKABYAAAAEAAIAAAADABAAAAAEAAIAAAADABEAAAAEAAIAAAADABIAAAAEAAIAAAADABMAAAAEAAIAAAADABQAAAAEAAIAAAADABUAAAAEAAIAAAADABYAAAAEAAIAAAADABcAAAAEAAIAAAADABgAAAAEAAIAAAAEABcAAAAEAAIAAAAEABgAAAAEAAIAAAAFABcAAAAEAAIAAAAFABgAAAAEAAIAAAAGABcAAAAEAAIAAAAGABgAAAAEAAIAAAAHABcAAAAEAAIAAAAHABgAAAAEAAIAAAAIABcAAAAEAAIAAAAIABgAAAAEAAIAAAAJABcAAAAEAAIAAAAJABgAAAAEAAIAAAAKABcAAAAEAAIAAAAKABgAAAAEAAIAAAALABAAAAAEAAIAAAALABEAAAAEAAIAAAALABIAAAAEAAIAAAALABMAAAAEAAIAAAALABQAAAAEAAIAAAALABUAAAAEAAIAAAALABYAAAAEAAIAAAALABcAAAAEAAIAAAALABgAAAAEAAIAAAA=")
+tile_map_data = PackedByteArray("AAAEABAABgABAAMAAAAEABEABgABAAMAAAAEABIABgABAAMAAAAEABMABgABAAMAAAAEABQABgABAAMAAAAEABUABgABAAMAAAAEABYABgABAAMAAAAFABAABgABAAMAAAAFABEABgABAAMAAAAFABIABgABAAMAAAAFABMABgABAAMAAAAFABQABgABAAMAAAAFABUABgABAAMAAAAFABYABgABAAMAAAAGABAABgABAAMAAAAGABEABgABAAMAAAAGABIABgABAAMAAAAGABMABgABAAMAAAAGABQABgABAAMAAAAGABUABgABAAMAAAAGABYABgABAAMAAAAHABAABgABAAMAAAAHABEABgABAAMAAAAHABIABgABAAMAAAAHABMABgABAAMAAAAHABQABgABAAMAAAAHABUABgABAAMAAAAHABYABgABAAMAAAAIABAABgABAAMAAAAIABEABgABAAMAAAAIABIABgABAAMAAAAIABMABgABAAMAAAAIABQABgABAAMAAAAIABUABgABAAMAAAAIABYABgABAAMAAAAJABAABgABAAMAAAAJABEABgABAAMAAAAJABIABgABAAMAAAAJABMABgABAAMAAAAJABQABgABAAMAAAAJABUABgABAAMAAAAJABYABgABAAMAAAAKABAABgABAAMAAAAKABEABgABAAMAAAAKABIABgABAAMAAAAKABMABgABAAMAAAAKABQABgABAAMAAAAKABUABgABAAMAAAAKABYABgABAAMAAAADABAABgABAAMAAAADABEABgABAAMAAAADABIABgABAAMAAAADABMABgABAAMAAAADABQABgABAAMAAAADABUABgABAAMAAAADABYABgABAAMAAAADABcABgABAAMAAAADABgABgABAAMAAAAEABcABgABAAMAAAAEABgABgABAAMAAAAFABcABgABAAMAAAAFABgABgABAAMAAAAGABcABgABAAMAAAAGABgABgABAAMAAAAHABcABgABAAMAAAAHABgABgABAAMAAAAIABcABgABAAMAAAAIABgABgABAAMAAAAJABcABgABAAMAAAAJABgABgABAAMAAAAKABcABgABAAMAAAAKABgABgABAAMAAAALABAABgABAAMAAAALABEABgABAAMAAAALABIABgABAAMAAAALABMABgABAAMAAAALABQABgABAAMAAAALABUABgABAAMAAAALABYABgABAAMAAAALABcABgABAAMAAAALABgABgABAAMAAAA=")
 tile_set = ExtResource("4_em3f4")
 script = ExtResource("5_75e1c")
 _solidLayers = [NodePath("../Solid"), NodePath("../Props")]
 metadata/_edit_lock_ = true

 [node name="Solid" type="TileMapLayer" parent="Tilemaps" groups=["Solid"]]
-tile_map_data = PackedByteArray("AAACAA0AAAAAAAsAAAADAA0AAAABAAQAAAAEAA0AAAABAAQAAAAFAA0AAAABAAQAAAAGAA0AAAABAAQAAAAHAA0AAAABAAQAAAAIAA0AAAABAAQAAAAJAA0AAAABAAQAAAAKAA0AAAABAAQAAAALAA0AAAABAAQAAAAMAA0AAAABAAsAAAAMAA4AAAAAAAQAAAAMAA8AAAAAAAQAAAAMABAAAAAAAAQAAAAMABEAAAAAAAQAAAAMABMAAAAAAAQAAAAMABIAAAAAAAQAAAAMABQAAAAAAAQAAAAMABUAAAAAAAQAAAAMABYAAAAAAAQAAAAMABcAAAAAAAQAAAAMABgAAAAAAAQAAAAMABkAAAABAAwAAAALABkAAAABAAQAAAAKABkAAAABAAQAAAAJABkAAAABAAQAAAAIABkAAAABAAQAAAAHABkAAAABAAQAAAAGABkAAAABAAQAAAAFABkAAAABAAQAAAAEABkAAAABAAQAAAADABkAAAABAAQAAAACABkAAAAAAAwAAAACABgAAAAAAAQAAAACABYAAAAAAAQAAAACABcAAAAAAAQAAAACABUAAAAAAAQAAAACABQAAAAAAAQAAAACABIAAAAAAAQAAAACABMAAAAAAAQAAAACABEAAAAAAAQAAAACABAAAAAAAAQAAAACAA8AAAAAAAQAAAACAA4AAAAAAAQAAAADAA4AAAAKAAgAAAADAA8AAAAKAAkAAAAEAA4AAAAKAAgAAAAEAA8AAAAKAAkAAAAFAA4AAAAKAAgAAAAFAA8AAAAKAAkAAAAGAA4AAAAKAAgAAAAGAA8AAAAKAAkAAAAHAA4AAAAKAAgAAAAHAA8AAAAKAAkAAAAIAA4AAAAKAAgAAAAIAA8AAAAKAAkAAAAJAA4AAAAKAAgAAAAJAA8AAAAKAAkAAAAKAA4AAAAKAAgAAAAKAA8AAAAKAAkAAAALAA4AAAAKAAgAAAALAA8AAAAKAAkAAAA=")
+tile_map_data = PackedByteArray("AAACAA0AAAAAAAsAAAADAA0AAAABAAQAAAAEAA0AAAABAAQAAAAFAA0AAAABAAQAAAAGAA0AAAABAAQAAAAHAA0AAAABAAQAAAAIAA0AAAABAAQAAAAJAA0AAAABAAQAAAAKAA0AAAABAAQAAAALAA0AAAABAAQAAAAMAA0AAAABAAsAAAAMAA4AAAAAAAQAAAAMAA8AAAAAAAQAAAAMABAAAAAAAAQAAAAMABEAAAAAAAQAAAAMABMAAAAAAAQAAAAMABIAAAAAAAQAAAAMABQAAAAAAAQAAAAMABUAAAAAAAQAAAAMABYAAAAAAAQAAAAMABcAAAAAAAQAAAAMABgAAAAAAAQAAAAMABkAAAABAAwAAAALABkAAAABAAQAAAAKABkAAAABAAQAAAAJABkAAAABAAQAAAAIABkAAAABAAQAAAAHABkAAAABAAQAAAAGABkAAAABAAQAAAAFABkAAAABAAQAAAAEABkAAAABAAQAAAADABkAAAABAAQAAAACABkAAAAAAAwAAAACABgAAAAAAAQAAAACABYAAAAAAAQAAAACABcAAAAAAAQAAAACABUAAAAAAAQAAAACABQAAAAAAAQAAAACABIAAAAAAAQAAAACABMAAAAAAAQAAAACABEAAAAAAAQAAAACABAAAAAAAAQAAAACAA8AAAAAAAQAAAACAA4AAAAAAAQAAAADAA4AAAAPAAgAAAADAA8AAAAPAAkAAAAEAA4AAAAPAAgAAAAEAA8AAAAPAAkAAAAFAA4AAAAPAAgAAAAFAA8AAAAPAAkAAAAGAA4AAAAPAAgAAAAGAA8AAAAPAAkAAAAHAA4AAAAPAAgAAAAHAA8AAAAPAAkAAAAIAA4AAAAPAAgAAAAIAA8AAAAPAAkAAAAJAA4AAAAPAAgAAAAJAA8AAAAPAAkAAAAKAA4AAAAPAAgAAAAKAA8AAAAPAAkAAAALAA4AAAAPAAgAAAALAA8AAAAPAAkAAAA=")
 tile_set = ExtResource("4_em3f4")
 metadata/_edit_lock_ = true

@ -48,12 +43,6 @@ metadata/_edit_lock_ = true
 [node name="Actors" type="Node2D" parent="Tilemaps"]
 metadata/_edit_lock_ = true

-[node name="CameraController" type="Camera2D" parent="."]
-process_mode = 1
-script = ExtResource("11_uct4d")
-pixel_snap = false
-enable_smoothing = false
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@ -66,9 +55,11 @@ script = ExtResource("12_hibtc")

 [node name="HUD" parent="." instance=ExtResource("13_66bei")]

+[node name="CameraController" parent="." instance=ExtResource("10_c2687")]
+
 [node name="CameraTarget" type="Node2D" parent="."]
 position = Vector2(115, 328)
-script = ExtResource("14_2aa7w")
+script = ExtResource("7_75lrj")

 [node name="PlayerStartPosition" type="Marker2D" parent="."]
 position = Vector2(111, 305)
--- a/Scenes/Maps/Tutorial.tscn
+++ b/Scenes/Maps/Tutorial.tscn
@ -5,14 +5,12 @@
 [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ajkcn"]
 [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"]
 [ext_resource type="PackedScene" uid="uid://b0gpbkxdfbnjh" path="res://Scenes/Actors/ForceField_Horizontal.tscn" id="7_jsqwh"]
 [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="8_qon0r"]
 [ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="8_tkja4"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_5i7tl"]
 [ext_resource type="PackedScene" uid="uid://q7hau0tl3vsr" path="res://Scenes/Items/IcicleGun.tscn" id="9_x0ht6"]
 [ext_resource type="PackedScene" uid="uid://dux8pv1y8wkt0" path="res://Scenes/Props/Capacitor.tscn" id="10_2drkr"]
-[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="10_kpjh7"]
 [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="11_htvvb"]
 [ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="11_pkaga"]
 [ext_resource type="PackedScene" uid="uid://c27co22bjym3c" path="res://Scenes/Actors/Camera.tscn" id="12_chhxg"]
@ -35,6 +33,8 @@
 [ext_resource type="Resource" uid="uid://xtg062tcon1j" path="res://Resources/Maps/Level1.tres" id="28_xlcit"]
 [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"]
+[ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="33_xlcit"]
+[ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="35_hw4jy"]

 [sub_resource type="NavigationPolygon" id="NavigationPolygon_0xhda"]
 vertices = PackedVector2Array(1312.97, -563.313, 1242, -158.773, 1242, -394, 954, 250, 1170.29, 250, 1116.57, 556.156, 954, 522, -184.391, 582.789, -154, 522, -225.617, -477.563, -154, -202, 1162, -394, 1162, -410, 774, -410, 774, -394, -138, -394, -138, -202, 137, -24, 153, -24, 153, -8, 134, 6, 122, 6, 168, -8, 168, 6, 134, 90, 198, 90, 198, 182, 134, 182, 134, 266, 198, 266, 198, 390, 186, 374, 186, 390, 170, 374, 170, 358, 134, 358, 134, 422, 122, 422, 122, 358, 122, 266, 86, 358, 86, 374, 70, 374, 58, 266, 70, 390, 58, 390, 122, 182, 122, 90, 58, 182, 58, 90, 58, 6, 58, -44, 137, -44, 294, 6, 250, 6, 250, -86, 294, -86, 374, 6, 330, 6, 330, -86, 374, -86, 1030, 6, 970, 6, 970, -86, 1030, -86, 1226, -67.5703, 1226, -118, 1234.85, -118, 856, 4, 902, 6, 634, 6, 808, 4, 712, 4, 664, 4, 634, -86, 664, -26, 902, -86, 856, -26, 664, -60, 680, -60, 680, -44, 712, -44, 712, -86, 808, -86, 808, -44, 840, -44, 840, -60, 856, -60, 856, -86, 840, -26, 840, -42, 808, -42, 712, -42, 680, -42, 680, -26, 664, -86, 536, 4, 598, 6, 426, 6, 472, 4, 536, -26, 472, -26, 488, -44, 520, -44, 568, -44, 568, -74, 598, -86, 426, -86, 520, -74, 440, -44, 488, -74, 440, -74)
@ -387,11 +387,6 @@ tile_map_data = PackedByteArray("AAD3////AgAEAAUAAAD3/wAAAgADAAUAAAD3/wEAAgADAAY
 tile_set = ExtResource("5_2m462")
 metadata/_edit_lock_ = true

-[node name="CameraController" type="Camera2D" parent="."]
-process_mode = 1
-script = ExtResource("7_0md5g")
-pixel_snap = false
-
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@ -405,9 +400,11 @@ script = ExtResource("8_qon0r")

 [node name="HUD" parent="." instance=ExtResource("9_5i7tl")]

+[node name="CameraController" parent="." instance=ExtResource("35_hw4jy")]
+
 [node name="CameraTarget" type="Node2D" parent="."]
 position = Vector2(115, 328)
-script = ExtResource("10_kpjh7")
+script = ExtResource("33_xlcit")

 [node name="PlayerStartPosition" type="Marker2D" parent="."]
 position = Vector2(128, 384)
--- a/Scenes/camera_controller.tscn
+++ b/Scenes/camera_controller.tscn
@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=3 uid="uid://bmif3jo03yuol"]
+
+[ext_resource type="Script" uid="uid://dd535g2nxqpg1" path="res://Scripts/Misc/CameraController.cs" id="1_wovnw"]
+
+[node name="CameraController" type="Camera2D"]
+process_mode = 1
+script = ExtResource("1_wovnw")
+PixelSnap = false
+EnableSmoothing = false
+MaxAimOffsetDistance = 80.0
+DebugCamera2ActionName = &"debug_camera_1"
--- a/Scenes/test.tscn
+++ b/Scenes/test.tscn
--- a/Scripts/Misc/CameraController.cs
+++ b/Scripts/Misc/CameraController.cs
@ -14,7 +14,7 @@ public partial class CameraController : Camera2D
    [Export] public float SmoothTime { get; set; } = 0.2f;
    
    [Export] public float MaxAimOffsetDistance { get; set; } = 64f;
-    [Export] public float AimLerpSpeed { get; set; } = 10f; // How fast the offset adapts
+    [Export] public float AimLerpSpeed { get; set; } = 0.8f; // How fast the offset adapts
    [Export] public float AimDeadzone { get; set; } = 0.2f;
    
    [ExportGroup("Name Strings")]