diff --git a/Scenes/Actors/RebelBase/rumia_rebel_1.tscn b/Scenes/Actors/RebelBase/rumia_rebel_1.tscn new file mode 100644 index 00000000..672c7810 --- /dev/null +++ b/Scenes/Actors/RebelBase/rumia_rebel_1.tscn @@ -0,0 +1,30 @@ +[gd_scene load_steps=7 format=3 uid="uid://cychwkelxf0h3"] + +[ext_resource type="Script" uid="uid://cjy38nsh83ug1" path="res://Scripts/Activables/NPC.cs" id="1_j1l2o"] +[ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="2_17fwl"] +[ext_resource type="Texture2D" uid="uid://bbdrws471xslc" path="res://Sprites/Actors/Rumia-world.png" id="3_su4y0"] + +[sub_resource type="Resource" id="Resource_2ugqu"] +script = ExtResource("2_17fwl") +TimelineName = &"rumia_rebel_base_1" +WaitForCompletion = true +metadata/_custom_type_script = "uid://ddv26x2qilprb" + +[sub_resource type="AtlasTexture" id="AtlasTexture_cr26l"] +atlas = ExtResource("3_su4y0") +region = Rect2(0, 0, 8, 16) + +[sub_resource type="CircleShape2D" id="CircleShape2D_cr26l"] + +[node name="Rumia" type="Area2D" groups=["Interactable"]] +collision_layer = 68 +collision_mask = 0 +script = ExtResource("1_j1l2o") +Events = Array[Object]([SubResource("Resource_2ugqu")]) +metadata/_edit_group_ = true + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = SubResource("AtlasTexture_cr26l") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_cr26l") diff --git a/Scenes/Actors/Tutorial/tutorial_bubble.tscn b/Scenes/Actors/Tutorial/tutorial_bubble.tscn new file mode 100644 index 00000000..30595e37 --- /dev/null +++ b/Scenes/Actors/Tutorial/tutorial_bubble.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=6 format=3 uid="uid://darhrx8hscsbe"] + +[ext_resource type="Script" uid="uid://cjy38nsh83ug1" path="res://Scripts/Activables/NPC.cs" id="1_plp6f"] +[ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="2_fubt0"] +[ext_resource type="Texture2D" uid="uid://hibdc7gpqchj" path="res://Sprites/Actors/TutorialPoint.png" id="3_2cto7"] + +[sub_resource type="Resource" id="Resource_2ugqu"] +script = ExtResource("2_fubt0") +TimelineName = &"" +WaitForCompletion = true +metadata/_custom_type_script = "uid://ddv26x2qilprb" + +[sub_resource type="CircleShape2D" id="CircleShape2D_cr26l"] + +[node name="Tutorial" type="Area2D" groups=["Interactable"]] +collision_layer = 68 +collision_mask = 0 +script = ExtResource("1_plp6f") +Events = Array[Object]([SubResource("Resource_2ugqu")]) +metadata/_edit_group_ = true + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("3_2cto7") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_cr26l") diff --git a/Scenes/Maps/RebelBase.tscn b/Scenes/Maps/RebelBase.tscn index ebb6f764..ec3db9ea 100644 --- a/Scenes/Maps/RebelBase.tscn +++ b/Scenes/Maps/RebelBase.tscn @@ -5,7 +5,6 @@ [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="2_m7mag"] [ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="2_pu05b"] [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="3_5wmap"] -[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_cr26l"] [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="4_js5qv"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_ls56o"] [ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="4_tlevr"] @@ -14,6 +13,7 @@ [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_2ugqu"] [ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="6_m31cm"] [ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="7_u7oae"] +[ext_resource type="PackedScene" uid="uid://cychwkelxf0h3" path="res://Scenes/Actors/RebelBase/rumia_rebel_1.tscn" id="8_cjue1"] [ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="9_700kw"] [ext_resource type="Script" uid="uid://cjy38nsh83ug1" path="res://Scripts/Activables/NPC.cs" id="9_cr26l"] [ext_resource type="Texture2D" uid="uid://bbdrws471xslc" path="res://Sprites/Actors/Rumia-world.png" id="10_6rpbc"] @@ -28,7 +28,7 @@ [sub_resource type="Resource" id="Resource_53p3c"] script = ExtResource("4_ls56o") EggIndex = 0 -StartingEquipment = Array[ExtResource("3_cr26l")]([null]) +StartingEquipment = [null] [sub_resource type="Resource" id="Resource_2ugqu"] script = ExtResource("7_u7oae") @@ -89,19 +89,8 @@ State = 1 position = Vector2(47, 496) State = 1 -[node name="Rumia" type="Area2D" parent="Tilemaps/Actors" groups=["Interactable"]] +[node name="Rumia" parent="Tilemaps/Actors" instance=ExtResource("8_cjue1")] position = Vector2(216, 386) -collision_layer = 68 -collision_mask = 0 -script = ExtResource("9_cr26l") -Events = Array[Object]([SubResource("Resource_2ugqu")]) -metadata/_edit_group_ = true - -[node name="Sprite2D" type="Sprite2D" parent="Tilemaps/Actors/Rumia"] -texture = SubResource("AtlasTexture_cr26l") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Tilemaps/Actors/Rumia"] -shape = SubResource("CircleShape2D_cr26l") [node name="Chair2" parent="Tilemaps/Actors" instance=ExtResource("14_2ugqu")] position = Vector2(-80, 250) diff --git a/Scenes/Maps/Tutorial.tscn b/Scenes/Maps/Tutorial.tscn index 3c0f824e..22d69fce 100644 --- a/Scenes/Maps/Tutorial.tscn +++ b/Scenes/Maps/Tutorial.tscn @@ -2,7 +2,6 @@ [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ajkcn"] -[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_covcf"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_g48r8"] [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"] @@ -18,6 +17,7 @@ [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"] [ext_resource type="PackedScene" uid="uid://d1h48wgasakk4" path="res://Scenes/Interactable/alarm_box.tscn" id="13_cawq2"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="13_covcf"] [ext_resource type="Script" uid="uid://donxnd50p7dm8" path="res://Scripts/Resources/Events/AlarmDisableEvent.cs" id="14_wc2f3"] [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="15_l8ewr"] [ext_resource type="PackedScene" uid="uid://ca6befbx0nurt" path="res://Scenes/Interactable/ScriptableEnabledAlarmTrigger.tscn" id="15_qub1o"] @@ -38,7 +38,7 @@ [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_g48r8") EggIndex = 0 -StartingEquipment = Array[ExtResource("3_covcf")]([]) +StartingEquipment = [] [sub_resource type="Resource" id="Resource_hppa0"] script = ExtResource("14_wc2f3") @@ -145,7 +145,7 @@ metadata/_edit_lock_ = true [node name="Props" type="TileMapLayer" parent="Parallax2D/Tilemaps"] y_sort_enabled = true -tile_map_data = PackedByteArray("AAAGAA4AAAAKAAwAAAAGAA8AAAAKAA0AAAAJAA4AAAAJAAwAAAAJAA8AAAAJAA0AAAAGAAMAAAAKAAwAAAAGAAQAAAAKAA0AAAAJAAMAAAAJAAwAAAAJAAQAAAAJAA0AAAANAPv/AAAJAAwAAAAOAPv/AAAKAAwAAAAOAPz/AAAKAA0AAAANAPz/AAAJAA0AAAADAPr/AQAAAAAAAQAEAPr/AQAAAAAAAQAFAPr/AQAAAAAAAQAGAPr/AQAAAAAAAQAKAPr/AQAAAAAAAQALAPr/AQAAAAAAAQAMAPr/AQAAAAAAAQAHAPr/AQAAAAAAAgAIAPr/AQAAAAAAAgAJAPr/AQAAAAAAAgADAPv/AQAAAAAAAgAEAPv/AQAAAAAAAgAFAPv/AQAAAAAAAgAGAPv/AQAAAAAAAgAGAPz/AQAAAAAAAgAHAPz/AQAAAAAAAgAIAPz/AQAAAAAAAgAJAPz/AQAAAAAAAgAKAPz/AQAAAAAAAgADAPz/AQAAAAAAAgAEAPz/AQAAAAAAAgAFAPz/AQAAAAAAAgAHAPv/AQAAAAAAAQAIAPv/AQAAAAAAAgAJAPv/AQAAAAAAAQAKAPv/AQAAAAAAAgAcAPz/AQAAAAAACQAdAPz/AQAAAAAACQAhAPz/AQAAAAAACQAiAPz/AQAAAAAACQAeAP//AQAAAAAACQAfAP//AQAAAAAACQAgAP//AQAAAAAACQAYAPv/AAAJAAwAAAAYAPz/AAAJAA0AAAAZAPv/AAAKAAwAAAAZAPz/AAAKAA0AAAAmAPv/AAAKAA4AAAAmAPz/AAAKAA8AAAA5APv/AAAJAAwAAAA5APz/AAAJAA0AAAA7APv/AAAKAAwAAAA7APz/AAAKAA0AAAArAPv/AQAAAAAACQArAPz/AQAAAAAACQAqAPv/AQAAAAAACQArAP7/AQAAAAAACQArAP//AQAAAAAACQAqAP//AQAAAAAACQAzAPv/AQAAAAAACQAzAPz/AQAAAAAACQA0APv/AQAAAAAACQAzAP7/AQAAAAAACQAzAP//AQAAAAAACQA0AP//AQAAAAAACQAMAPz/AQAAAAAADAAMAP3/AQAAAAAADAAMAP7/AQAAAAAADAALAPz/AQAAAAAADAALAPv/AQAAAAAADAAMAPv/AQAAAAAADAAMAP//AQAAAAAADAALAP3/AQAAAAAADAALAP7/AQAAAAAADAALAP//AQAAAAAADAALAAAAAQAAAAAADAAMAAAAAQAAAAAADAAKAP3/AQAAAAAAAQAKAP7/AQAAAAAAAQAJAP3/AQAAAAAAAQA=") +tile_map_data = PackedByteArray("AAAGAA4AAAAKAAwAAAAGAA8AAAAKAA0AAAAJAA4AAAAJAAwAAAAJAA8AAAAJAA0AAAAGAAMAAAAKAAwAAAAGAAQAAAAKAA0AAAAJAAMAAAAJAAwAAAAJAAQAAAAJAA0AAAANAPv/AAAJAAwAAAAOAPv/AAAKAAwAAAAOAPz/AAAKAA0AAAANAPz/AAAJAA0AAAADAPr/AQAAAAAAAQAEAPr/AQAAAAAAAQAFAPr/AQAAAAAAAQAGAPr/AQAAAAAAAQAKAPr/AQAAAAAAAQALAPr/AQAAAAAAAQAMAPr/AQAAAAAAAQAHAPr/AQAAAAAAAgAIAPr/AQAAAAAAAgAJAPr/AQAAAAAAAgADAPv/AQAAAAAAAgAEAPv/AQAAAAAAAgAFAPv/AQAAAAAAAgAGAPv/AQAAAAAAAgAGAPz/AQAAAAAAAgAHAPz/AQAAAAAAAgAIAPz/AQAAAAAAAgAJAPz/AQAAAAAAAgAKAPz/AQAAAAAAAgADAPz/AQAAAAAAAgAEAPz/AQAAAAAAAgAFAPz/AQAAAAAAAgAHAPv/AQAAAAAAAQAIAPv/AQAAAAAAAgAJAPv/AQAAAAAAAQAKAPv/AQAAAAAAAgAcAPz/AQAAAAAACQAdAPz/AQAAAAAACQAhAPz/AQAAAAAACQAiAPz/AQAAAAAACQAeAP//AQAAAAAACQAfAP//AQAAAAAACQAgAP//AQAAAAAACQAYAPv/AAAJAAwAAAAYAPz/AAAJAA0AAAAZAPv/AAAKAAwAAAAZAPz/AAAKAA0AAAAmAPv/AAAKAA4AAAAmAPz/AAAKAA8AAAA5APv/AAAJAAwAAAA5APz/AAAJAA0AAAA7APv/AAAKAAwAAAA7APz/AAAKAA0AAAArAPv/AQAAAAAACQArAPz/AQAAAAAACQAqAPv/AQAAAAAACQArAP7/AQAAAAAACQArAP//AQAAAAAACQAqAP//AQAAAAAACQAzAPv/AQAAAAAACQAzAPz/AQAAAAAACQA0APv/AQAAAAAACQAzAP7/AQAAAAAACQAzAP//AQAAAAAACQA0AP//AQAAAAAACQAMAPz/AQAAAAAADAAMAP3/AQAAAAAADAAMAP7/AQAAAAAADAALAPz/AQAAAAAADAALAPv/AQAAAAAADAAMAPv/AQAAAAAADAAMAP//AQAAAAAADAALAP3/AQAAAAAADAALAP7/AQAAAAAAAQALAP//AQAAAAAADAALAAAAAQAAAAAADAAMAAAAAQAAAAAADAAKAP3/AQAAAAAAAQAKAP7/AQAAAAAAAQAJAP3/AQAAAAAAAQA=") tile_set = ExtResource("5_2m462") metadata/_edit_lock_ = true @@ -186,17 +186,17 @@ position = Vector2(511, -115) [node name="AlarmBox" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("13_cawq2")] position = Vector2(440, -107) -Events = Array[Object]([SubResource("Resource_hppa0")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_hppa0")]) [node name="VerticalDoor" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("16_wk6n2")] position = Vector2(612, -56) State = 1 [node name="OnAlarmEnabled" parent="Parallax2D/Tilemaps/Actors/VerticalDoor" instance=ExtResource("15_qub1o")] -Events = Array[Object]([SubResource("Resource_3vy3u")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_3vy3u")]) [node name="OnAlarmDisabled" parent="Parallax2D/Tilemaps/Actors/VerticalDoor" instance=ExtResource("17_wxxk5")] -Events = Array[Object]([SubResource("Resource_wvpi7")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_wvpi7")]) [node name="AlarmBox2" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("17_lq462")] position = Vector2(440, -121) @@ -211,35 +211,35 @@ position = Vector2(72, 8) [node name="Intro" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(128, 351) -Events = Array[Object]([SubResource("Resource_ierdo")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_ierdo")]) [node name="Switch" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(154, 256) -Events = Array[Object]([SubResource("Resource_8yymf")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_8yymf")]) [node name="Weapon" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(128, 176) -Events = Array[Object]([SubResource("Resource_dbad5"), SubResource("Resource_f3qhg"), SubResource("Resource_ulu4a")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_dbad5"), SubResource("Resource_f3qhg"), SubResource("Resource_ulu4a")]) [node name="Barrels" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(127, 10) -Events = Array[Object]([SubResource("Resource_35vjh")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_35vjh")]) [node name="Teleporter1" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(259, -41) -Events = Array[Object]([SubResource("Resource_p02qj")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_p02qj")]) [node name="Teleporter2" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(345, -40) -Events = Array[Object]([SubResource("Resource_t62sp")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_t62sp")]) [node name="Repeater" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(634, -40) -Events = Array[Object]([SubResource("Resource_m71ef")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_m71ef")]) [node name="ScriptableAreaTrigger" parent="Parallax2D/Tilemaps/Actors/TutorialDialogueTriggers" instance=ExtResource("21_t630o")] position = Vector2(433, -41) -Events = Array[Object]([SubResource("Resource_54a43"), SubResource("Resource_8phm4"), SubResource("Resource_7uxja")]) +Events = Array[ExtResource("13_covcf")]([SubResource("Resource_54a43"), SubResource("Resource_8phm4"), SubResource("Resource_7uxja")]) [node name="VerticalDoor2" parent="Parallax2D/Tilemaps/Actors" instance=ExtResource("16_wk6n2")] position = Vector2(916, -56) diff --git a/Scripts/Components/IIRotateable.cs.uid b/Scripts/Components/IIRotateable.cs.uid new file mode 100644 index 00000000..ec227382 --- /dev/null +++ b/Scripts/Components/IIRotateable.cs.uid @@ -0,0 +1 @@ +uid://dc4orc3cthj6n diff --git a/Scripts/Enums/Direction.cs.uid b/Scripts/Enums/Direction.cs.uid new file mode 100644 index 00000000..856e999a --- /dev/null +++ b/Scripts/Enums/Direction.cs.uid @@ -0,0 +1 @@ +uid://bxx741mcybi8c diff --git a/Sprites/Actors/TutorialPoint.aseprite b/Sprites/Actors/TutorialPoint.aseprite new file mode 100644 index 00000000..b9221238 --- /dev/null +++ b/Sprites/Actors/TutorialPoint.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3eddf1ec6b7154244f7ab9826a0d5aace16692e673de7b561be8a4ff3b3ac57 +size 1171 diff --git a/Sprites/Actors/TutorialPoint.png b/Sprites/Actors/TutorialPoint.png new file mode 100644 index 00000000..faea0550 --- /dev/null +++ b/Sprites/Actors/TutorialPoint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:767fa41e4b7737e0a1ca53f5798f83c8c191eae8441944dbdce050a71d195628 +size 148 diff --git a/Sprites/Actors/TutorialPoint.png.import b/Sprites/Actors/TutorialPoint.png.import new file mode 100644 index 00000000..7c9974de --- /dev/null +++ b/Sprites/Actors/TutorialPoint.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://hibdc7gpqchj" +path="res://.godot/imported/TutorialPoint.png-491ceb4687b84ce0bc0ac82fd468584b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/TutorialPoint.png" +dest_files=["res://.godot/imported/TutorialPoint.png-491ceb4687b84ce0bc0ac82fd468584b.ctex"] + +[params] + +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=false +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=1