diff --git a/Resources/Textures/Tilemap_Canvas.tres b/Resources/Textures/Tilemap_Canvas.tres index cc052f71..7233c5a9 100644 --- a/Resources/Textures/Tilemap_Canvas.tres +++ b/Resources/Textures/Tilemap_Canvas.tres @@ -4,3 +4,4 @@ [resource] diffuse_texture = ExtResource("1_q2lyp") +specular_shininess = 0.0 diff --git a/Scenes/Maps/RebelBase.tscn b/Scenes/Maps/RebelBase.tscn index 75e498ea..d9bd6e3c 100644 --- a/Scenes/Maps/RebelBase.tscn +++ b/Scenes/Maps/RebelBase.tscn @@ -78,7 +78,7 @@ tile_set = ExtResource("5_vmlpc") metadata/_edit_lock_ = true [node name="Props" type="TileMapLayer" parent="Tilemaps"] -tile_map_data = PackedByteArray("AAAEACAAAAAGAAAAAAAFACAAAAAHAAAAAAAGACAAAAAGAAAAAAAHACAAAAAHAAAAAAAAACAAAAAGAAAAAAABACAAAAAHAAAAAAD+/yAAAAAGAAAAAAD//yAAAAAHAAAAAAD+/yMAAAAIAAAAAAD+/yQAAAAIAAEAAAAHACMAAAAIAAAAAAAHACQAAAAIAAEAAAAbABcAAAAIAAYAAAAbABgAAAAIAAYAAAAbABkAAAAIAAYAAAAbABoAAAAIAAYAAAAcABsAAAAHAAUAAAAdABsAAAAHAAUAAAAeABsAAAAHAAUAAAAfABsAAAAHAAUAAAAgABcAAAAGAAYAAAAgABgAAAAGAAYAAAAgABkAAAAGAAYAAAAgABoAAAAGAAYAAAAcABYAAAAHAAcAAAAdABYAAAAHAAcAAAAeABYAAAAHAAcAAAAfABYAAAAHAAcAAAAcABoAAAALAAQAAAAfABoAAAALAAQAAAAhAB0AAQAAAAAACwAhAB4AAQAAAAAACwAhAB8AAQAAAAAACwAaAB0AAQAAAAAACwAaAB4AAQAAAAAACwAaAB8AAQAAAAAACwAYAB0AAQAAAAAACwAYAB4AAQAAAAAACwAYAB8AAQAAAAAACwAjAB0AAQAAAAAACwAjAB4AAQAAAAAACwAjAB8AAQAAAAAACwAjACEAAQAAAAAAAgAkACEAAQAAAAAAAgAkABgAAQAAAAAAAgAkABkAAQAAAAAAAgAXABQAAQAAAAAAAgAXABUAAQAAAAAAAgAXACEAAQAAAAAADQAYACEAAQAAAAAADQAXACAAAQAAAAAADQAYACAAAQAAAAAAEAAZACEAAQAAAAAAEAAZACAAAQAAAAAAEAAkACAAAQAAAAAAEAAjACAAAQAAAAAAEAAiACAAAQAAAAAAEAAhACAAAQAAAAAAEAAhACEAAQAAAAAAEAAiACEAAQAAAAAAEAAfACEAAQAAAAAAEAAgACEAAQAAAAAAEAAgACAAAQAAAAAAEAAeACEAAQAAAAAADAAcACEAAQAAAAAADAAdACEAAQAAAAAADAAQABgAAQAAAAAAEAARABgAAQAAAAAAEAABABgAAQAAAAAAEAAHACEAAQAAAAAAEAAHACIAAQAAAAAAEAAJACAAAQAAAAAAEAAKACAAAQAAAAAAEAAJACEAAQAAAAAAEAAJACIAAQAAAAAAEAADABEAAAAIAAAAAAADABIAAAAIAAEAAAD6/xAAAAAGAAAAAAD7/xAAAAAHAAAAAAAEAB4AAAAJAAwAAAAEAB8AAAAJAA0AAAD//xcAAAAJAAwAAAD//xgAAAAJAA0AAAASABgAAAAJAAwAAAASABkAAAAJAA0AAAAPAB4AAAAJAAwAAAAPAB8AAAAJAA0AAAABAB4AAAAKAAwAAAABAB8AAAAKAA0AAAAAABcAAAAKAAwAAAAAABgAAAAKAA0AAAABABYAAAAKAAwAAAABABcAAAAKAA0AAAAMAB4AAAAKAAwAAAAMAB8AAAAKAA0AAAD8/xYAAAAKAAwAAAD8/xcAAAAKAA0AAAAIABYAAAAJAAwAAAAIABcAAAAJAA0AAAAFABYAAAAKAAwAAAAFABcAAAAKAA0AAAAEABYAAAAJAAwAAAAEABcAAAAJAA0AAAATABgAAAALAAQAAAAVABgAAAALAAQAAAAUABgAAAAKAAQAAAD8/w8AAQAAAAAAEAD8/xAAAQAAAAAAEAD5/w8AAQAAAAAAEAD4/w8AAQAAAAAAEAD5/xAAAQAAAAAAEAD9/w8AAQAAAAAAEAD4/xMAAQAAAAAAEAD4/xIAAQAAAAAAEAAJABgAAAAMAAoAAAAKABgAAAANAAoAAAD6/xgAAAAMAAoAAAD7/xgAAAANAAoAAAD6/xoAAQAAAAAAEAD6/xsAAQAAAAAAEAD7/xsAAQAAAAAAEAD8/xsAAQAAAAAAEAD7/xoAAQAAAAAAEAD4/xAAAQAAAAAAEAAQABwAAQAAAAAAEAARABwAAQAAAAAAEAAHABwAAQAAAAAAEAAIABwAAQAAAAAAEAAJABwAAQAAAAAAEAAKABwAAQAAAAAAEAA=") +tile_map_data = PackedByteArray("AAAEACAAAAAGAAAAAAAFACAAAAAHAAAAAAAGACAAAAAGAAAAAAAHACAAAAAHAAAAAAAAACAAAAAGAAAAAAABACAAAAAHAAAAAAD+/yAAAAAGAAAAAAD//yAAAAAHAAAAAAD+/yMAAAAIAAAAAAD+/yQAAAAIAAEAAAAHACMAAAAIAAAAAAAHACQAAAAIAAEAAAAbABcAAAAIAAYAAAAbABgAAAAIAAYAAAAbABkAAAAIAAYAAAAbABoAAAAIAAYAAAAcABsAAAAHAAUAAAAdABsAAAAHAAUAAAAeABsAAAAHAAUAAAAfABsAAAAHAAUAAAAgABcAAAAGAAYAAAAgABgAAAAGAAYAAAAgABkAAAAGAAYAAAAgABoAAAAGAAYAAAAcABYAAAAHAAcAAAAdABYAAAAHAAcAAAAeABYAAAAHAAcAAAAfABYAAAAHAAcAAAAcABoAAAALAAQAAAAfABoAAAALAAQAAAAhAB0AAQAAAAAACwAhAB4AAQAAAAAACwAhAB8AAQAAAAAACwAaAB0AAQAAAAAACwAaAB4AAQAAAAAACwAaAB8AAQAAAAAACwAYAB0AAQAAAAAACwAYAB4AAQAAAAAACwAYAB8AAQAAAAAACwAjAB0AAQAAAAAACwAjAB4AAQAAAAAACwAjAB8AAQAAAAAACwAjACEAAQAAAAAAAgAkACEAAQAAAAAAAgAkABgAAQAAAAAAAgAkABkAAQAAAAAAAgAXABQAAQAAAAAAAgAXABUAAQAAAAAAAgAXACEAAQAAAAAADQAYACEAAQAAAAAADQAXACAAAQAAAAAADQAYACAAAQAAAAAAEAAZACEAAQAAAAAAEAAZACAAAQAAAAAAEAAkACAAAQAAAAAAEAAjACAAAQAAAAAAEAAiACAAAQAAAAAAEAAhACAAAQAAAAAAEAAhACEAAQAAAAAAEAAiACEAAQAAAAAAEAAfACEAAQAAAAAAEAAgACEAAQAAAAAAEAAgACAAAQAAAAAAEAAeACEAAQAAAAAADAAcACEAAQAAAAAADAAdACEAAQAAAAAADAAQABgAAQAAAAAAEAARABgAAQAAAAAAEAABABgAAQAAAAAAEAAHACEAAQAAAAAAEAAHACIAAQAAAAAAEAAJACAAAQAAAAAAEAAKACAAAQAAAAAAEAAJACEAAQAAAAAAEAAJACIAAQAAAAAAEAADABEAAAAIAAAAAAADABIAAAAIAAEAAAD6/xAAAAAGAAAAAAD7/xAAAAAHAAAAAAAEAB4AAAAJAAwAAAAEAB8AAAAJAA0AAAD//xcAAAAJAAwAAAD//xgAAAAJAA0AAAASABgAAAAJAAwAAAASABkAAAAJAA0AAAAPAB4AAAAJAAwAAAAPAB8AAAAJAA0AAAABAB4AAAAKAAwAAAABAB8AAAAKAA0AAAAAABcAAAAKAAwAAAAAABgAAAAKAA0AAAABABYAAAAKAAwAAAABABcAAAAKAA0AAAAMAB4AAAAKAAwAAAAMAB8AAAAKAA0AAAD8/xYAAAAKAAwAAAD8/xcAAAAKAA0AAAAIABYAAAAJAAwAAAAIABcAAAAJAA0AAAAFABYAAAAKAAwAAAAFABcAAAAKAA0AAAAEABYAAAAJAAwAAAAEABcAAAAJAA0AAAATABgAAAALAAQAAAAVABgAAAALAAQAAAAUABgAAAAKAAQAAAD8/w8AAQAAAAAAEAD8/xAAAQAAAAAAEAD5/w8AAQAAAAAAEAD4/w8AAQAAAAAAEAD9/w8AAQAAAAAAEAD4/xMAAQAAAAAAEAD4/xIAAQAAAAAAEAAJABgAAAAMAAoAAAAKABgAAAANAAoAAAD6/xgAAAAMAAoAAAD7/xgAAAANAAoAAAD6/xoAAQAAAAAAEAD6/xsAAQAAAAAAEAD7/xsAAQAAAAAAEAD8/xsAAQAAAAAAEAD7/xoAAQAAAAAAEAD4/xAAAQAAAAAADAAQABwAAQAAAAAAEAARABwAAQAAAAAAEAAHABwAAQAAAAAAEAAIABwAAQAAAAAAEAAJABwAAQAAAAAAEAAKABwAAQAAAAAAEAA=") tile_set = ExtResource("5_vmlpc") metadata/_edit_lock_ = true diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 035a105a..073b78bf 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=141 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=140 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,7 +63,6 @@ [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"] @@ -641,7 +640,7 @@ Invisible = true metadata/_edit_group_ = true [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps/DebugTeleporter" instance=ExtResource("43_kf3qc")] -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_usuub")]) +Events = [SubResource("Resource_usuub")] [node name="BlueKeycard2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("35_rblsn")] position = Vector2(-1032, -317) @@ -820,7 +819,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 = Array[ExtResource("46_0bqta")]([SubResource("Resource_5er5x"), SubResource("Resource_b25hy")]) +Events = [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) @@ -863,7 +862,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 = Array[ExtResource("46_0bqta")]([SubResource("Resource_ji7au")]) +Events = [SubResource("Resource_ji7au")] [node name="Computer6" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1113, -139) @@ -873,7 +872,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 = Array[ExtResource("46_0bqta")]([SubResource("Resource_ji7au")]) +Events = [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) @@ -884,7 +883,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 = Array[ExtResource("46_0bqta")]([SubResource("Resource_ji7au")]) +Events = [SubResource("Resource_ji7au")] [node name="Computer5" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1344, -251) @@ -892,7 +891,7 @@ Targets = [NodePath("Computer5Script")] [node name="Computer5Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer5"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")]) +Events = [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) @@ -900,7 +899,7 @@ Target = NodePath("Script") [node name="Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer3"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_o2kpk")]) +Events = [SubResource("Resource_o2kpk")] [node name="Computer4" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-791, -505) @@ -908,7 +907,7 @@ Target = NodePath("Node2D") [node name="Node2D" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_s3g2w")]) +Events = [SubResource("Resource_s3g2w")] [node name="Label" type="Label" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] offset_left = -5.0 @@ -937,11 +936,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 = Array[ExtResource("46_0bqta")]([SubResource("Resource_068l7"), SubResource("Resource_l3nop")]) +Events = [SubResource("Resource_068l7"), SubResource("Resource_l3nop")] [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_wma5c")]) +Events = [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) @@ -1066,7 +1065,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 = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) +Requirements = [ExtResource("84_ma1ta")] [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) @@ -1206,7 +1205,7 @@ position = Vector2(-2072, -211) [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-2063, -232) -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_l476f"), SubResource("Resource_dskij")]) +Events = [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/Tilesets/factory.png.import b/Tilesets/factory.png.import index 95aa40eb..647d2c88 100644 --- a/Tilesets/factory.png.import +++ b/Tilesets/factory.png.import @@ -3,26 +3,25 @@ importer="texture" type="CompressedTexture2D" uid="uid://tphqodqyere1" -path.s3tc="res://.godot/imported/factory.png-cfcd1328a98fcb6fdb084c282bfedb79.s3tc.ctex" +path="res://.godot/imported/factory.png-cfcd1328a98fcb6fdb084c282bfedb79.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://Tilesets/factory.png" -dest_files=["res://.godot/imported/factory.png-cfcd1328a98fcb6fdb084c282bfedb79.s3tc.ctex"] +dest_files=["res://.godot/imported/factory.png-cfcd1328a98fcb6fdb084c282bfedb79.ctex"] [params] -compress/mode=2 +compress/mode=0 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/generate=false mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -32,4 +31,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=0 +detect_3d/compress_to=1