From 3885af7ecc972bd1385696f4c21fb6d7493063d4 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Mon, 24 Mar 2025 19:27:37 +0100 Subject: [PATCH] Remapped map transitions --- Scenes/Items/Ammo1.tscn | 5 +++-- Scenes/Maps/Intro_Briefing.tscn | 1 - Scenes/Maps/Level2.tscn | 11 ++++++----- Scenes/Maps/PlayerFSMTest.tscn | 15 ++++++++------- Scenes/Maps/RebelBase.tscn | 5 +++-- Scenes/Maps/Roguelike.tscn | 5 +++-- Scenes/test.tscn | 2 +- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Scenes/Items/Ammo1.tscn b/Scenes/Items/Ammo1.tscn index d19ac5d6..7cd1801d 100644 --- a/Scenes/Items/Ammo1.tscn +++ b/Scenes/Items/Ammo1.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://cmr6fclttrpkb"] +[gd_scene load_steps=6 format=3 uid="uid://cmr6fclttrpkb"] [ext_resource type="Script" uid="uid://b3h7b30kerf60" path="res://Scripts/Interactables/ItemPickup.cs" id="1_it180"] [ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="2_j10i4"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_k1yis"] [ext_resource type="SpriteFrames" uid="uid://pmwatoyt2ase" path="res://Resources/Sprites/Ammo_Inventory_Sprite.tres" id="3_6n103"] [sub_resource type="CircleShape2D" id="CircleShape2D_6vv2s"] @@ -10,7 +11,7 @@ collision_layer = 4 collision_mask = 2 script = ExtResource("1_it180") -LootTable = [ExtResource("2_j10i4")] +LootTable = Array[ExtResource("2_k1yis")]([ExtResource("2_j10i4")]) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("CircleShape2D_6vv2s") diff --git a/Scenes/Maps/Intro_Briefing.tscn b/Scenes/Maps/Intro_Briefing.tscn index 1a50d57f..e711b12d 100644 --- a/Scenes/Maps/Intro_Briefing.tscn +++ b/Scenes/Maps/Intro_Briefing.tscn @@ -38,7 +38,6 @@ size = Vector2i(320, 160) render_target_update_mode = 4 [node name="BriefingRoom3d" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_qxk7q")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00209835, -0.0137185, 0.00361562) [node name="CRT" type="TextureRect" parent="."] top_level = true diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index c31dda21..3fbfaf2b 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=85 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=86 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"] @@ -18,6 +18,7 @@ [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"] [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"] @@ -48,7 +49,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_s1vkf") EggIndex = 0 -StartingEquipment = Array[ExtResource("3_hw1so")]([ExtResource("3_mqt4u")]) +StartingEquipment = [ExtResource("3_mqt4u")] [sub_resource type="LabelSettings" id="LabelSettings_5j8ks"] font = ExtResource("9_qo7ri") @@ -386,7 +387,7 @@ position = Vector2(196, 296) [node name="MotionSensor" parent="Tilemaps/Actors" instance=ExtResource("16_ehuec")] position = Vector2(254, 296) -Events = [SubResource("Resource_s23f3")] +Events = Array[ExtResource("15_5j8ks")]([SubResource("Resource_s23f3")]) [node name="ControlPad" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")] position = Vector2(205, 292) @@ -407,11 +408,11 @@ position = Vector2(504, 468) [node name="MovementSensorLonger" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")] position = Vector2(226, 486) -Events = [SubResource("Resource_qi6uc")] +Events = Array[ExtResource("15_5j8ks")]([SubResource("Resource_qi6uc")]) [node name="MovementSensorLonger2" parent="Tilemaps/Actors" instance=ExtResource("20_fdi4d")] position = Vector2(391, 455) -Events = [SubResource("Resource_mq37i")] +Events = Array[ExtResource("15_5j8ks")]([SubResource("Resource_mq37i")]) [node name="WallEmitter" parent="Tilemaps/Actors" instance=ExtResource("21_qi6uc")] position = Vector2(264, 482) diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 620b8c19..e997621f 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=107 format=4 uid="uid://dqyfnby0t7gu1"] +[gd_scene load_steps=108 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"] @@ -57,6 +57,7 @@ [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://c6467d6yx50qh" path="res://Scripts/Components/BulletSpawner.cs" id="43_b8ffn"] +[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="43_nadrw"] [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"] [ext_resource type="PackedScene" uid="uid://c27co22bjym3c" path="res://Scenes/Actors/Camera.tscn" id="48_r562v"] @@ -76,7 +77,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_u1i8n") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("5_u1i8n")]([]) [sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"] size = Vector2(30, 52.5) @@ -130,7 +131,7 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("43_nadrw")]([]) WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" @@ -158,11 +159,11 @@ DamageType = 0 OverrideControllable = false Controllable = false OverrideCreationModifier = false -TimeModifiers = [] +TimeModifiers = Array[ExtResource("43_nadrw")]([]) WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" -[sub_resource type="Resource" id="Resource_8qe0x"] +[sub_resource type="Resource" id="Resource_vto58"] resource_local_to_scene = true script = ExtResource("39_83jc5") Patterns = Array[Object]([SubResource("Resource_kuo18")]) @@ -384,7 +385,7 @@ scale = Vector2(0.66, 2.04) [node name="FairyFsm" parent="Tilemaps/AcidHitboxes" node_paths=PackedStringArray("DefeatScript") instance=ExtResource("12_64bae")] position = Vector2(776, -56) -ExtraLoot = [SubResource("Resource_w8nwr"), SubResource("Resource_awjkl")] +ExtraLoot = Array[ExtResource("13_b3y78")]([SubResource("Resource_w8nwr"), SubResource("Resource_awjkl")]) DefeatScript = NodePath("../../Actors/HorizontalForceField2") ActivationType = 2 @@ -555,7 +556,7 @@ InvertSignal = true [node name="FloorEmitter2" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")] position = Vector2(601, 147) -Script = SubResource("Resource_8qe0x") +Script = SubResource("Resource_vto58") InvertSignal = true [node name="Camera" parent="Tilemaps/Actors" instance=ExtResource("48_r562v")] diff --git a/Scenes/Maps/RebelBase.tscn b/Scenes/Maps/RebelBase.tscn index 40d07059..9d0ce962 100644 --- a/Scenes/Maps/RebelBase.tscn +++ b/Scenes/Maps/RebelBase.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=32 format=4 uid="uid://bx31ou6tw3kd1"] +[gd_scene load_steps=33 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"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_8anae"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_tgwif"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_vmlpc"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_sv42c"] @@ -30,7 +31,7 @@ [sub_resource type="Resource" id="Resource_53p3c"] script = ExtResource("4_tgwif") EggIndex = 0 -StartingEquipment = [null] +StartingEquipment = Array[ExtResource("3_8anae")]([null]) [sub_resource type="Resource" id="Resource_2ugqu"] script = ExtResource("11_esmuk") diff --git a/Scenes/Maps/Roguelike.tscn b/Scenes/Maps/Roguelike.tscn index 55b4e2be..177e2bd4 100644 --- a/Scenes/Maps/Roguelike.tscn +++ b/Scenes/Maps/Roguelike.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=16 format=4 uid="uid://bf1kqr3o6r6d4"] +[gd_scene load_steps=17 format=4 uid="uid://bf1kqr3o6r6d4"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_wbqvu"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_3fyis"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_3fyis"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="3_go1yg"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="4_pfafs"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="5_ktre5"] @@ -17,7 +18,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("3_go1yg") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("3_3fyis")]([]) [sub_resource type="CircleShape2D" id="CircleShape2D_5xgmc"] diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 29cf7318..c15eaf3e 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -580,7 +580,7 @@ position = Vector2(-1688, -232) [node name="LevelTeleporter" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("44_q5xi2")] position = Vector2(-2000, -867) -LevelPath = "res://Scenes/Maps/RebelBase.tscn" +LevelPath = "uid://dwwf0fjtbrn5g" SaveInventory = true IsEnabled = true