diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png similarity index 100% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png.import b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png.import similarity index 72% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png.import rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png.import index fd71bda74c..0f2541874f 100644 --- a/scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png.import +++ b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://crqn2002jp6ot" -path="res://.godot/imported/dust-cloud.png-6b347e363fc743de645720bcd78cda7b.ctex" +path="res://.godot/imported/dust-cloud.png-476d8aef82d2ca6a0d81f97333acf6d5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png" -dest_files=["res://.godot/imported/dust-cloud.png-6b347e363fc743de645720bcd78cda7b.ctex"] +source_file="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png" +dest_files=["res://.godot/imported/dust-cloud.png-476d8aef82d2ca6a0d81f97333acf6d5.ctex"] [params] diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/particles_canvasgroup_outline.gdshader b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/particles_canvasgroup_outline.gdshader similarity index 100% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/particles_canvasgroup_outline.gdshader rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/particles_canvasgroup_outline.gdshader diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/particles_canvasgroup_outline.gdshader.uid b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/particles_canvasgroup_outline.gdshader.uid similarity index 100% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/particles_canvasgroup_outline.gdshader.uid rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/particles_canvasgroup_outline.gdshader.uid diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd similarity index 97% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd index 6213a0997f..7848b8287d 100644 --- a/scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd +++ b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd @@ -5,13 +5,11 @@ class_name TileMapCover extends TileMapLayer ## A layer that covers props beneath it ## -## This is used as part of an experimental game mechanic where the Void (a starfield that acts like +## This is used as part of a game mechanic where the Void (a starfield that acts like ## an invisibility cloak) expands as the player runs ahead of it. When cells are covered using ## [method consume_cells], void tiles are placed in those cells and any props in those cells are ## hidden. Any props on tiles that are initially placed are also hidden at the start of the scene. ## [method uncover_all] can be used to remove all cells and reveal the props that were hidden. -## -## @experimental const _DURATION: float = 0.25 diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd.uid b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd.uid similarity index 100% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd.uid rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd.uid diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_particles.tscn b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_particles.tscn similarity index 92% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/void_particles.tscn rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_particles.tscn index 696ae2c3bf..1d1e128ea0 100644 --- a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_particles.tscn +++ b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_particles.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://s2ohp10ssq7l"] -[ext_resource type="Texture2D" uid="uid://crqn2002jp6ot" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/dust-cloud.png" id="1_hohl7"] +[ext_resource type="Texture2D" uid="uid://crqn2002jp6ot" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/dust-cloud.png" id="1_hohl7"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_31awk"] particles_animation = true diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.gd b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_spreading_enemy.gd similarity index 93% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.gd rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_spreading_enemy.gd index e846dd7894..a4b4b82946 100644 --- a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.gd +++ b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_spreading_enemy.gd @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: The Threadbare Authors # SPDX-License-Identifier: MPL-2.0 extends CharacterBody2D -## @experimental +## An enemy that patrols or chases the player, spreading Void as it moves ## The state of this enemy enum State { @@ -15,11 +15,6 @@ enum State { DEFEATED, } -const VOID_PARTICLES = preload( - "res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_particles.tscn" -) -const TERRAIN_SET: int = 0 -const VOID_TERRAIN: int = 9 const NEIGHBORS := [ TileSet.CELL_NEIGHBOR_BOTTOM_SIDE, TileSet.CELL_NEIGHBOR_LEFT_SIDE, @@ -34,6 +29,9 @@ const IDLE_EMIT_DISTANCE := sqrt(2 * (64.0 ** 2)) @export var idle_patrol_path: Path2D: set = _set_idle_patrol_path +## [GPUParticles2D] scene to spawn when tiles are consumed. +@export var void_particles: PackedScene + var node_to_follow: Node2D: set = _set_node_to_follow @@ -122,7 +120,7 @@ func _process(_delta: float) -> void: func _emit_particles() -> void: _distance_since_emit = 0 - var particles: GPUParticles2D = VOID_PARTICLES.instantiate() + var particles: GPUParticles2D = void_particles.instantiate() particles.emitting = true particles_canvas_group.add_child(particles) _live_particles += 1 diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.gd.uid b/scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_spreading_enemy.gd.uid similarity index 100% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.gd.uid rename to scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_spreading_enemy.gd.uid diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn b/scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn similarity index 92% rename from scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn rename to scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn index b1ceda9728..9eb236e9f0 100644 --- a/scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn +++ b/scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn @@ -1,12 +1,13 @@ [gd_scene format=3 uid="uid://cokul8w425pja"] -[ext_resource type="Script" uid="uid://dil8mgaf03bei" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.gd" id="1_304le"] +[ext_resource type="Script" uid="uid://dil8mgaf03bei" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_spreading_enemy.gd" id="1_304le"] [ext_resource type="Script" uid="uid://r1kriwyodjlt" path="res://scenes/game_logic/walk_behaviors/navigation_follow_walk_behavior.gd" id="2_31awk"] [ext_resource type="Script" uid="uid://id28maao3vdy" path="res://scenes/game_logic/walk_behaviors/path_walk_behavior.gd" id="2_304le"] +[ext_resource type="PackedScene" uid="uid://s2ohp10ssq7l" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/void_particles.tscn" id="2_r8oqq"] [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="3_45we0"] [ext_resource type="AudioStream" uid="uid://dgpeb1dtmfqud" path="res://assets/third_party/sounds/characters/enemies/guard/AlertSound.ogg" id="5_2dnul"] [ext_resource type="Texture2D" uid="uid://c75ofhy3swhj3" path="res://scenes/game_elements/characters/enemies/guard/components/exclamation_mark.png" id="6_pumxu"] -[ext_resource type="Shader" uid="uid://dvyec12fgsuta" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/particles_canvasgroup_outline.gdshader" id="7_o4sxw"] +[ext_resource type="Shader" uid="uid://dvyec12fgsuta" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/particles_canvasgroup_outline.gdshader" id="7_o4sxw"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_8g3pn"] size = Vector2(68, 20) @@ -110,6 +111,7 @@ collision_layer = 0 collision_mask = 0 motion_mode = 1 script = ExtResource("1_304le") +void_particles = ExtResource("2_r8oqq") [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1857084231] position = Vector2(5, 0) diff --git a/scenes/game_elements/characters/player/components/unify_abilities_test.tscn b/scenes/game_elements/characters/player/components/unify_abilities_test.tscn index 74f29f94d1..3201d85737 100644 --- a/scenes/game_elements/characters/player/components/unify_abilities_test.tscn +++ b/scenes/game_elements/characters/player/components/unify_abilities_test.tscn @@ -3,7 +3,7 @@ [ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="2_hx14g"] [ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="4_7v23v"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="4_rup4f"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="4_vodlh"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="4_vodlh"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="5_7gbyj"] [ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="6_8xu72"] [ext_resource type="TileSet" uid="uid://b778cuoftt88r" path="res://tiles/elevation_2.tres" id="6_g4p32"] diff --git a/scenes/quests/lore_quests/quest_000/5_void_runner/tutorial_void_runner.tscn b/scenes/quests/lore_quests/quest_000/5_void_runner/tutorial_void_runner.tscn index 917b57ba9e..8b0db82f57 100644 --- a/scenes/quests/lore_quests/quest_000/5_void_runner/tutorial_void_runner.tscn +++ b/scenes/quests/lore_quests/quest_000/5_void_runner/tutorial_void_runner.tscn @@ -8,12 +8,12 @@ [ext_resource type="TileSet" uid="uid://do0ffypatd77h" path="res://tiles/bridges.tres" id="5_a0m6m"] [ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="6_j205g"] [ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="7_avd7l"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="8_kxo05"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="8_kxo05"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="9_41blb"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="10_pxyem"] [ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="11_wdt4i"] [ext_resource type="Script" uid="uid://bgmwplmj3bfls" path="res://scenes/globals/game_state/inventory/inventory_item.gd" id="12_rogtb"] -[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn" id="13_app83"] +[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn" id="13_app83"] [ext_resource type="Script" uid="uid://bdhjixygupit1" path="res://scenes/game_elements/props/area_filler/area_filler.gd" id="14_2lxhj"] [ext_resource type="PackedScene" uid="uid://b2mj4jggli0ci" path="res://scenes/quests/lore_quests/quest_000/tutorial_npc/tutorial_npc.tscn" id="14_sdmwi"] [ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="15_m0rx6"] @@ -130,8 +130,8 @@ editor_draw_limits = true unique_name_in_owner = true position = Vector2(2943, -135) revealed = false -next_scene = "uid://dmoxtp65y3r2w" item = SubResource("Resource_6rywr") +next_scene = "uid://dmoxtp65y3r2w" [node name="VoidSpreadingEnemy" parent="OnTheGround" unique_id=1007896559 node_paths=PackedStringArray("void_layer", "idle_patrol_path") instance=ExtResource("13_app83")] position = Vector2(-195, 1774) diff --git a/scenes/quests/lore_quests/quest_002/1_void_runner/void_runner.tscn b/scenes/quests/lore_quests/quest_002/1_void_runner/void_runner.tscn index b92284ebfc..cae4c1efda 100644 --- a/scenes/quests/lore_quests/quest_002/1_void_runner/void_runner.tscn +++ b/scenes/quests/lore_quests/quest_002/1_void_runner/void_runner.tscn @@ -6,13 +6,13 @@ [ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="2_ljnmn"] [ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="3_7u86q"] [ext_resource type="Script" uid="uid://c2lx7gvkonxaa" path="res://scenes/game_elements/props/background_music/components/clip_switcher.gd" id="3_epkxq"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="3_g2rto"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="3_g2rto"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="4_85y51"] [ext_resource type="TileSet" uid="uid://bjx3gvah0ycl1" path="res://tiles/foam_2.tres" id="4_epkxq"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="5_46vkj"] [ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="6_5y4tu"] [ext_resource type="TileSet" uid="uid://b778cuoftt88r" path="res://tiles/elevation_2.tres" id="6_epkxq"] -[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn" id="6_wtoj6"] +[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn" id="6_wtoj6"] [ext_resource type="TileSet" uid="uid://do0ffypatd77h" path="res://tiles/bridges.tres" id="7_7xlw5"] [ext_resource type="Script" uid="uid://bdhjixygupit1" path="res://scenes/game_elements/props/area_filler/area_filler.gd" id="9_kgem8"] [ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="9_qgmg5"] @@ -1109,17 +1109,16 @@ polygon = PackedVector2Array(-221.5, 55.5, -226.5, 102.5, -174.5, 105.5, -158.5, [node name="CollectibleItem" parent="OnTheGround" unique_id=1898669578 instance=ExtResource("22_auh5r")] position = Vector2(474, 1058) revealed = false -next_scene = "uid://b8mfigsd8y5qs" item = SubResource("Resource_8l6e1") collected_dialogue = ExtResource("27_g2rto") +next_scene = "uid://b8mfigsd8y5qs" [node name="Temple" parent="OnTheGround" unique_id=539194064 instance=ExtResource("37_kgem8")] position = Vector2(3935, 1874) -[node name="Monk" parent="OnTheGround" unique_id=1480705042 node_paths=PackedStringArray("camera", "void_layer", "enemy", "collectible_thread") instance=ExtResource("23_swnl7")] +[node name="Monk" parent="OnTheGround" unique_id=1480705042 node_paths=PackedStringArray("camera", "enemy", "collectible_thread") instance=ExtResource("23_swnl7")] position = Vector2(3842, 1882) camera = NodePath("../Player/Camera2D") -void_layer = NodePath("../../TileMapLayers/Void") enemy = NodePath("../VoidSpreadingEnemy") collectible_thread = NodePath("../CollectibleItem") diff --git a/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_powerup.tscn b/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_powerup.tscn index ac2f2156f6..311c8c6ba2 100644 --- a/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_powerup.tscn +++ b/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_powerup.tscn @@ -7,7 +7,7 @@ [ext_resource type="PackedScene" uid="uid://dohb701lxbe5s" path="res://scenes/game_elements/props/hookable_needle/hookable_needle.tscn" id="4_7gbyj"] [ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="4_7v23v"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="4_rup4f"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="4_vodlh"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="4_vodlh"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="5_7gbyj"] [ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="6_8xu72"] [ext_resource type="PackedScene" uid="uid://evb46lm6ssu2" path="res://scenes/game_elements/props/hookable_pin/hookable_pin.tscn" id="6_vodlh"] @@ -17,7 +17,7 @@ [ext_resource type="TileSet" uid="uid://bdc7ucso7bx0s" path="res://tiles/shadows.tres" id="8_iu48k"] [ext_resource type="PackedScene" uid="uid://cfcgrfvtn04yp" path="res://scenes/ui_elements/hud/hud.tscn" id="11_7v23v"] [ext_resource type="Script" uid="uid://bd046eokvcnu2" path="res://addons/phantom_camera/scripts/phantom_camera_host/phantom_camera_host.gd" id="12_6tfyx"] -[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn" id="12_ptg16"] +[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn" id="12_ptg16"] [ext_resource type="Script" uid="uid://bhexx6mj1xv3q" path="res://addons/phantom_camera/scripts/phantom_camera/phantom_camera_2d.gd" id="13_ckhob"] [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="13_vodlh"] [ext_resource type="Script" uid="uid://8umksf8e80fw" path="res://addons/phantom_camera/scripts/resources/tween_resource.gd" id="14_0rece"] @@ -93,7 +93,7 @@ player_name = "Storyweaver" sprite_frames = ExtResource("5_7gbyj") [node name="Camera2D" type="Camera2D" parent="OnTheGround/Player" unique_id=1997394979] -physics_interpolation_mode = 1 +physics_interpolation_mode = 2 top_level = true position = Vector2(1280, 2008) limit_left = -1792 diff --git a/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_start.tscn b/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_start.tscn index d3e8ee88a6..85f0b7c546 100644 --- a/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_start.tscn +++ b/scenes/quests/lore_quests/quest_002/2_grappling_hook/grappling_hook_start.tscn @@ -6,7 +6,7 @@ [ext_resource type="AudioStream" uid="uid://bwgtbylflkup2" path="res://scenes/quests/lore_quests/quest_002/components/void_music.tres" id="2_wv4km"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="3_gbtro"] [ext_resource type="Script" uid="uid://x1mxt6bmei2o" path="res://scenes/ui_elements/cinematic/cinematic.gd" id="3_p44d7"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="3_upilw"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="3_upilw"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="4_10ahs"] [ext_resource type="Resource" uid="uid://1jkpxbyl7bqk" path="res://scenes/quests/lore_quests/quest_002/2_grappling_hook/intro_start.dialogue" id="4_aiq76"] [ext_resource type="Script" uid="uid://c2lx7gvkonxaa" path="res://scenes/game_elements/props/background_music/components/clip_switcher.gd" id="4_wv4km"] @@ -16,7 +16,7 @@ [ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="6_ngr1v"] [ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="7_upilw"] [ext_resource type="Script" uid="uid://bgmwplmj3bfls" path="res://scenes/globals/game_state/inventory/inventory_item.gd" id="8_jqq45"] -[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn" id="9_3g3x4"] +[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn" id="9_3g3x4"] [ext_resource type="PackedScene" uid="uid://covsdqqsd6rsy" path="res://scenes/game_elements/props/sign/sign.tscn" id="9_vdhd3"] [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="10_upilw"] [ext_resource type="PackedScene" uid="uid://cfcgrfvtn04yp" path="res://scenes/ui_elements/hud/hud.tscn" id="11_p44d7"] diff --git a/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling.tscn b/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling.tscn index 3b3d398109..e7a383bd49 100644 --- a/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling.tscn +++ b/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://2rbpl811wlv1" path="res://scenes/game_elements/props/background_music/background_music.tscn" id="1_grfk2"] [ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="1_kijyv"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="1_lmfic"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="1_wd35e"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="1_wd35e"] [ext_resource type="AudioStream" uid="uid://bwgtbylflkup2" path="res://scenes/quests/lore_quests/quest_002/components/void_music.tres" id="2_bcye7"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="2_kmyoj"] [ext_resource type="Script" uid="uid://c2lx7gvkonxaa" path="res://scenes/game_elements/props/background_music/components/clip_switcher.gd" id="3_4laor"] @@ -14,7 +14,7 @@ [ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="5_unlva"] [ext_resource type="TileSet" uid="uid://bjx3gvah0ycl1" path="res://tiles/foam_2.tres" id="6_bmrvw"] [ext_resource type="PackedScene" uid="uid://evb46lm6ssu2" path="res://scenes/game_elements/props/hookable_pin/hookable_pin.tscn" id="6_kmyoj"] -[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn" id="6_m0g5h"] +[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn" id="6_m0g5h"] [ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="7_unlva"] [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="8_c2723"] [ext_resource type="Script" uid="uid://bhexx6mj1xv3q" path="res://addons/phantom_camera/scripts/phantom_camera/phantom_camera_2d.gd" id="14_qbku0"] diff --git a/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling_round_2.tscn b/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling_round_2.tscn index 4d3ee5fabf..f7bc0f3fb7 100644 --- a/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling_round_2.tscn +++ b/scenes/quests/lore_quests/quest_002/3_void_grappling/void_grappling_round_2.tscn @@ -9,7 +9,7 @@ [ext_resource type="TileSet" uid="uid://do0ffypatd77h" path="res://tiles/bridges.tres" id="7_vbdam"] [ext_resource type="Material" uid="uid://64aeyjitacv3" path="res://scenes/game_elements/props/void/void_chromakey_material.tres" id="8_7xn87"] [ext_resource type="TileSet" uid="uid://ciq5guijvlyb0" path="res://tiles/void_chromakey.tres" id="9_jsqns"] -[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/tile_map_cover.gd" id="10_hx14t"] +[ext_resource type="Script" uid="uid://d1ly6uhh500xu" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/components/tile_map_cover.gd" id="10_hx14t"] [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="11_ikk66"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="12_80kqf"] [ext_resource type="PackedScene" uid="uid://dohb701lxbe5s" path="res://scenes/game_elements/props/hookable_needle/hookable_needle.tscn" id="13_6fnam"] @@ -22,7 +22,7 @@ [ext_resource type="PackedScene" uid="uid://dv4f232y8w8dv" path="res://scenes/game_elements/props/decoration/water_rock/water_rock.tscn" id="20_q1v2m"] [ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="21_gvlvr"] [ext_resource type="SpriteFrames" uid="uid://2ek86nvw6y28" path="res://scenes/game_elements/props/tree/components/tree_spriteframes_yellow.tres" id="22_siwq5"] -[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/quests/lore_quests/quest_002/1_void_runner/components/void_spreading_enemy.tscn" id="23_l07ag"] +[ext_resource type="PackedScene" uid="uid://cokul8w425pja" path="res://scenes/game_elements/characters/enemies/void_spreading_enemy/void_spreading_enemy.tscn" id="23_l07ag"] [ext_resource type="PackedScene" uid="uid://1vunygl4wpj6" path="res://scenes/game_elements/props/button_item/button_item.tscn" id="23_siwq5"] [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="24_6afks"] [ext_resource type="PackedScene" uid="uid://crqjcicx0vdu" path="res://scenes/game_elements/props/decoration/bush/bush.tscn" id="24_wrwcr"]