diff --git a/3D/BlueBox/BlueBox.aseprite b/3D/BlueBox/BlueBox.aseprite new file mode 100644 index 00000000..e2fa64b6 --- /dev/null +++ b/3D/BlueBox/BlueBox.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b45e451cc0c9216cbebabc255db8c97cbaf4ce46268c86beb52f72a80636cc5d +size 789 diff --git a/3D/BlueBox/BlueBox.blend b/3D/BlueBox/BlueBox.blend new file mode 100644 index 00000000..ed4547b5 Binary files /dev/null and b/3D/BlueBox/BlueBox.blend differ diff --git a/3D/BlueBox/BlueBox.blend.import b/3D/BlueBox/BlueBox.blend.import new file mode 100644 index 00000000..a8e87184 --- /dev/null +++ b/3D/BlueBox/BlueBox.blend.import @@ -0,0 +1,62 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://004q50v6wkrp" +path="res://.godot/imported/BlueBox.blend-f2b00453aced3d063bf3ebb23a3a9207.scn" + +[deps] + +source_file="res://3D/BlueBox/BlueBox.blend" +dest_files=["res://.godot/imported/BlueBox.blend-f2b00453aced3d063bf3ebb23a3a9207.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={ +"nodes": { +"PATH:Camera": { +"import/skip_import": true +}, +"PATH:Light": { +"import/skip_import": true +} +} +} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/3D/BlueBox/BlueBox_uv.png b/3D/BlueBox/BlueBox_uv.png new file mode 100644 index 00000000..c4abea8d --- /dev/null +++ b/3D/BlueBox/BlueBox_uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c3d7584df8d8eda80b40533d54373b117c8f00f4ae4c5d98befc88cbe25efd5 +size 480 diff --git a/3D/BlueBox/BlueBox_uv.png.import b/3D/BlueBox/BlueBox_uv.png.import new file mode 100644 index 00000000..11dda6cf --- /dev/null +++ b/3D/BlueBox/BlueBox_uv.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cmtgm77nfc2h3" +path.s3tc="res://.godot/imported/BlueBox_uv.png-62813d3c04897394c58222086c5774aa.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://3D/BlueBox/BlueBox_uv.png" +dest_files=["res://.godot/imported/BlueBox_uv.png-62813d3c04897394c58222086c5774aa.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/3D/BriefingRoom3D.tscn b/3D/BriefingRoom3D.tscn index 0c671bb0..cb266257 100644 --- a/3D/BriefingRoom3D.tscn +++ b/3D/BriefingRoom3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://cpgrmlc0c1ssj"] +[gd_scene load_steps=13 format=3 uid="uid://cpgrmlc0c1ssj"] [ext_resource type="Texture2D" uid="uid://be61lgrlwpnfc" path="res://Sprites/SingleTiles/Floor1.png" id="1_e50nb"] [ext_resource type="Texture2D" uid="uid://cbili227jlvys" path="res://Sprites/SingleTiles/Floor1_n.png" id="2_i1ujt"] @@ -8,6 +8,7 @@ [ext_resource type="Texture2D" uid="uid://lnfcp2p5lv86" path="res://Sprites/SingleTiles/Floor2_n.png" id="4_qeg8b"] [ext_resource type="Texture2D" uid="uid://dh6sndr5bwpx3" path="res://Sprites/SingleTiles/Wall1_n.png" id="4_re5kh"] [ext_resource type="PackedScene" uid="uid://b5qj2iaprortr" path="res://3D/Mainframe3D.tscn" id="8_7u58v"] +[ext_resource type="PackedScene" uid="uid://004q50v6wkrp" path="res://3D/BlueBox/BlueBox.blend" id="9_m2upl"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_twstw"] albedo_texture = ExtResource("1_e50nb") @@ -38,6 +39,7 @@ uv1_world_triplanar = true texture_filter = 0 [node name="BriefingRoom3d" type="Node3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00209835, -0.0137185, 0.00361562) [node name="GridMap" type="GridMap" parent="."] @@ -81,10 +83,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.45522, 2.60817, 0) transform = Transform3D(0.499658, 0, 0.0184963, 0, 0.5, 0, -0.0184963, 0, 0.499658, -1.05603, 1.36428, -1.02573) [node name="Box2" parent="." instance=ExtResource("4_i1ujt")] -transform = Transform3D(0.466514, 0, -0.179901, 0, 0.5, 0, 0.179901, 0, 0.466514, -1.05603, 1.86456, -1.02573) +transform = Transform3D(0.466514, 0, -0.179901, 0, 0.5, 0, 0.179901, 0, 0.466514, -1.05603, 1.86456, -0.88869) [node name="Box3" parent="." instance=ExtResource("4_i1ujt")] transform = Transform3D(0.426634, 0, 0.260736, 0, 0.5, 0, -0.260736, 0, 0.426634, 0.204804, 1.3723, -1.02573) [node name="Mainframe3d" parent="." instance=ExtResource("8_7u58v")] -transform = Transform3D(-1.81402e-08, 0, -0.415, 0, 0.415, 0, 0.415, 0, -1.81402e-08, 0.856712, 1.51847, -0.845607) +transform = Transform3D(-1.45122e-08, 0, -0.332, 0, 0.332, 0, 0.332, 0, -1.45122e-08, 0.856712, 1.44547, -0.845607) + +[node name="BlueBox" parent="." instance=ExtResource("9_m2upl")] +transform = Transform3D(0.252219, 0, -0.431724, 0, 0.5, 0, 0.431724, 0, 0.252219, -1.14299, 1.36002, -0.0777014) diff --git a/3D/Mainframe.blend b/3D/Mainframe.blend index 30af7240..33342999 100644 Binary files a/3D/Mainframe.blend and b/3D/Mainframe.blend differ diff --git a/3D/Mainframe.blend1 b/3D/Mainframe.blend1 index 4f28753d..30af7240 100644 Binary files a/3D/Mainframe.blend1 and b/3D/Mainframe.blend1 differ diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index b59f7808..49b188c4 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=81 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=82 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"] @@ -16,6 +16,7 @@ [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="9_mnq21"] [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://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="14_5j8ks"] [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="14_s23f3"] [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"] @@ -356,7 +357,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("14_5j8ks")]([SubResource("Resource_s23f3")]) [node name="ControlPad" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")] position = Vector2(205, 292) @@ -377,11 +378,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("14_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("14_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 a4f6ef38..3b80be5f 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=105 format=4 uid="uid://dqyfnby0t7gu1"] +[gd_scene load_steps=106 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"] @@ -64,6 +64,7 @@ [ext_resource type="Script" uid="uid://d0a0o50j82eo6" path="res://Scripts/Activables/ScriptableBase.cs" id="50_cr4hs"] [ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="50_w8nwr"] [ext_resource type="PackedScene" uid="uid://bb32f4p5e671j" path="res://Scenes/Actors/Fairy_Guard_FSM.tscn" id="51_awjkl"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="52_5glx6"] [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="Texture2D" uid="uid://cnayqn8jgb8jj" path="res://Models/carr/carr_rotating.png" id="56_5glx6"] @@ -160,7 +161,7 @@ TimeModifiers = Array[ExtResource("43_8n581")]([]) WaitForCompletion = true metadata/_custom_type_script = "uid://c0ndqalsc4jve" -[sub_resource type="Resource" id="Resource_bjd5y"] +[sub_resource type="Resource" id="Resource_8qe0x"] resource_local_to_scene = true script = ExtResource("39_83jc5") Patterns = Array[Object]([SubResource("Resource_kuo18")]) @@ -382,7 +383,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 @@ -553,7 +554,7 @@ InvertSignal = true [node name="FloorEmitter2" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")] position = Vector2(601, 147) -Script = SubResource("Resource_bjd5y") +Script = SubResource("Resource_8qe0x") InvertSignal = true [node name="Camera" parent="Tilemaps/Actors" instance=ExtResource("48_r562v")] @@ -565,7 +566,7 @@ Targets = [NodePath("Script")] [node name="Script" type="Node2D" parent="Tilemaps/Actors/ControlPad4"] script = ExtResource("50_cr4hs") -Events = [SubResource("Resource_8n581"), SubResource("Resource_iv5wi")] +Events = Array[ExtResource("52_5glx6")]([SubResource("Resource_8n581"), SubResource("Resource_iv5wi")]) [node name="FairyGuardFsm" parent="Tilemaps/Actors" instance=ExtResource("50_w8nwr")] position = Vector2(712, -136) @@ -624,7 +625,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("52_5glx6")]([SubResource("Resource_pgobb")]) [node name="AlarmBox" parent="Tilemaps" instance=ExtResource("52_5nxem")] position = Vector2(616, 88) diff --git a/Scenes/Maps/RebelBase.tscn b/Scenes/Maps/RebelBase.tscn index 36133930..75e498ea 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/test.tscn b/Scenes/test.tscn index 073b78bf..035a105a 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=140 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=141 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"] @@ -63,6 +63,7 @@ [ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="44_q5xi2"] [ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="45_5qg27"] [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="45_emjoj"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="46_0bqta"] [ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="46_i0omr"] [ext_resource type="PackedScene" uid="uid://cqrkisw6jg24w" path="res://Scenes/Props/MainFrame1.tscn" id="46_ny2s2"] [ext_resource type="PackedScene" uid="uid://cdti0hnbs3e63" path="res://Scenes/Actors/RoamingSusan.tscn" id="47_u1ve6"] @@ -640,7 +641,7 @@ Invisible = true metadata/_edit_group_ = true [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps/DebugTeleporter" instance=ExtResource("43_kf3qc")] -Events = [SubResource("Resource_usuub")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_usuub")]) [node name="BlueKeycard2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("35_rblsn")] position = Vector2(-1032, -317) @@ -819,7 +820,7 @@ position = Vector2(-1423, -188) [node name="LevelStartTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-781, -160) scale = Vector2(1.455, 1.455) -Events = [SubResource("Resource_5er5x"), SubResource("Resource_b25hy")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_5er5x"), SubResource("Resource_b25hy")]) [node name="AreaTrigger2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("28_6au4t")] position = Vector2(-435, -162) @@ -862,7 +863,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer2"] position = Vector2(120, 25) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_ji7au")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_ji7au")]) [node name="Computer6" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1113, -139) @@ -872,7 +873,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer6"] position = Vector2(0, 1) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_ji7au")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_ji7au")]) [node name="Computer7" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1175.36, 213.708) @@ -883,7 +884,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer7"] position = Vector2(0, 1) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_ji7au")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_ji7au")]) [node name="Computer5" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1344, -251) @@ -891,7 +892,7 @@ Targets = [NodePath("Computer5Script")] [node name="Computer5Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer5"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")]) [node name="Computer3" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-612.57, -358.528) @@ -899,7 +900,7 @@ Target = NodePath("Script") [node name="Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer3"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_o2kpk")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_o2kpk")]) [node name="Computer4" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-791, -505) @@ -907,7 +908,7 @@ Target = NodePath("Node2D") [node name="Node2D" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_s3g2w")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_s3g2w")]) [node name="Label" type="Label" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] offset_left = -5.0 @@ -936,11 +937,11 @@ position = Vector2(-792, -407) [node name="BossBattleEndScript" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps"] position = Vector2(-1628.53, -477.628) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_068l7"), SubResource("Resource_l3nop")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_068l7"), SubResource("Resource_l3nop")]) [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = [SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_wma5c")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_wma5c")]) [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) @@ -1065,7 +1066,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 = [ExtResource("84_ma1ta")] +Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) @@ -1205,7 +1206,7 @@ position = Vector2(-2072, -211) [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-2063, -232) -Events = [SubResource("Resource_l476f"), SubResource("Resource_dskij")] +Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_l476f"), SubResource("Resource_dskij")]) [node name="ShieldExtendPickup" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_0bqta")] position = Vector2(-1646, 38) diff --git a/Sprites/SingleTiles/BoxTexture_n.png.import b/Sprites/SingleTiles/BoxTexture_n.png.import index 9e0a752d..7dd2f942 100644 --- a/Sprites/SingleTiles/BoxTexture_n.png.import +++ b/Sprites/SingleTiles/BoxTexture_n.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://biqgn3mqml6pk" -path="res://.godot/imported/BoxTexture_n.png-17dccb2e00c6976789e3020569ef8349.ctex" +path.s3tc="res://.godot/imported/BoxTexture_n.png-17dccb2e00c6976789e3020569ef8349.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Sprites/SingleTiles/BoxTexture_n.png" -dest_files=["res://.godot/imported/BoxTexture_n.png-17dccb2e00c6976789e3020569ef8349.ctex"] +dest_files=["res://.godot/imported/BoxTexture_n.png-17dccb2e00c6976789e3020569ef8349.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://Sprites/SingleTiles/BoxTexture_n.png" process/fix_alpha_border=true process/premult_alpha=false process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/Sprites/SingleTiles/Floor2.png.import b/Sprites/SingleTiles/Floor2.png.import index 659c34bc..ae8162d2 100644 --- a/Sprites/SingleTiles/Floor2.png.import +++ b/Sprites/SingleTiles/Floor2.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://bucmiheu0osiq" -path="res://.godot/imported/Floor2.png-8bda937cbedc01a42de589ce368d5d9f.ctex" +path.s3tc="res://.godot/imported/Floor2.png-8bda937cbedc01a42de589ce368d5d9f.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Sprites/SingleTiles/Floor2.png" -dest_files=["res://.godot/imported/Floor2.png-8bda937cbedc01a42de589ce368d5d9f.ctex"] +dest_files=["res://.godot/imported/Floor2.png-8bda937cbedc01a42de589ce368d5d9f.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0