cgandeg/Archipelago-Game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor signal logic

Browse Source
This commit is contained in:
cgandeg
2026-03-15 13:06:21 -05:00
parent 1c95315496
commit 8bcf406576
21 changed files with 234 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Scenes/Characters/Player/player.tscn
View File

@@ -24,11 +24,12 @@ radius = 12.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_fu1fx"]
size = Vector2(6, 5)
[node name="Player" type="CharacterBody2D" unique_id=1502234578 node_paths=PackedStringArray("player_sprite", "state_machine") groups=["Player Group"]]
[node name="Player" type="CharacterBody2D" unique_id=1502234578 node_paths=PackedStringArray("player_sprite", "state_machine", "interact_scanner") groups=["Player Group"]]
y_sort_enabled = true
script = ExtResource("1_qqvsf")
player_sprite = NodePath("Player Sprite")
state_machine = NodePath("State Machine")
interact_scanner = NodePath("Marker2D/InteractScanner")
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=495465356]
position = Vector2(0, 4.5)
@@ -116,8 +117,6 @@ position = Vector2(0, 9.5)
shape = SubResource("RectangleShape2D_fu1fx")
debug_color = Color(0.79959095, 0.41617078, 0.18507844, 0.41960785)
[connection signal="CutsceneEnded" from="." to="State Machine/States/Cutscene State" method="OnCutsceneEnded"]
[connection signal="CutsceneStarted" from="." to="State Machine/States/Idle State" method="OnCutsceneStarted"]
[connection signal="SitOnFurnitureTriggered" from="." to="State Machine/States/Idle State" method="OnSitOnFurnitureTriggered"]
[connection signal="DirectionChanged" from="Components/FacingDirectionComponent" to="Player Sprite" method="UpdateSprite"]
[connection signal="DirectionChanged" from="Components/FacingDirectionComponent" to="Marker2D/InteractScanner" method="OnDirectionChanged"]
@@ -125,7 +124,6 @@ debug_color = Color(0.79959095, 0.41617078, 0.18507844, 0.41960785)
[connection signal="StartedWalking" from="State Machine/States/Walking State" to="Player Sprite" method="UpdateSprite"]
[connection signal="PlayerBeganDrawingBow" from="State Machine/States/Drawing Bow State" to="Player Sprite" method="UpdateSprite"]
[connection signal="PlayerBeganFiringArrow" from="State Machine/States/Firing Arrow State" to="Player Sprite" method="UpdateSprite"]
[connection signal="PlayerFiredArrow" from="State Machine/States/Firing Arrow State" to="." method="_on_using_item_a_state_arrow_fired"]
[connection signal="PlayAnimation" from="State Machine/States/Play Animation State" to="Player Sprite" method="PlaySpecifiedAnimation"]
[connection signal="AnimationFinished" from="Player Sprite" to="State Machine/States/Play Animation State" method="OnAnimationFinished"]
[connection signal="DrawingBowAnimationFinished" from="Player Sprite" to="State Machine/States/Drawing Bow State" method="OnDrawingBowAnimationFinished"]

3
Scenes/Maps/Connectors/bench_interaction_connector.tscn
View File

@@ -2,6 +2,5 @@
[ext_resource type="Script" uid="uid://c5yjcjk51l4bd" path="res://Scripts/Maps/Connectors/bench_interaction_connector.gd" id="1_34r4h"]
[node name="Bench Interaction Connector" type="Node" unique_id=541204437 node_paths=PackedStringArray("player")]
[node name="Bench Interaction Connector" type="Node" unique_id=541204437]
script = ExtResource("1_34r4h")
player = NodePath("")

BIN
Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

40
Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png.import Normal file
View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bqvnkdyhfa1yq"
path="res://.godot/imported/Home_01_Overlay_01.png-5522c04136136f6c0c2aaf9e86a5116f.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png"
dest_files=["res://.godot/imported/Home_01_Overlay_01.png-5522c04136136f6c0c2aaf9e86a5116f.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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

22
Scenes/Maps/Forest Dungeon Entrance/Interiors/home_01.tscn
View File

@@ -10,6 +10,7 @@
[ext_resource type="PackedScene" uid="uid://b7u4hlvuqiefn" path="res://Scenes/Objects/Chests/Item Chests/item_chest_02 (Metal).tscn" id="4_a58cd"]
[ext_resource type="PackedScene" uid="uid://b60nr4wfvijpf" path="res://Scenes/Objects/Dialogue/dialogue_trigger.tscn" id="5_msu6a"]
[ext_resource type="Texture2D" uid="uid://bm5ewxv51potl" path="res://Assets/Spritesheets/NPCs/Miner_Mike.png" id="6_x3y8m"]
[ext_resource type="Texture2D" uid="uid://bqvnkdyhfa1yq" path="res://Scenes/Maps/Forest Dungeon Entrance/Interiors/Home_01_Overlay_01.png" id="11_6xfm6"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_7kg22"]
size = Vector2(32, 8)
@@ -73,15 +74,18 @@ size = Vector2(11, 14)
[node name="Home 01" type="Node2D" unique_id=1401818514]
y_sort_enabled = true
[node name="Collision Loading Zone Connector" type="Node" parent="." unique_id=483597596]
[node name="Connectors" type="Node" parent="." unique_id=517749045]
[node name="Collision Loading Zone Connector" type="Node" parent="Connectors" unique_id=483597596]
script = ExtResource("1_18bbf")
[node name="Spawn Marker Connector" type="Node" parent="." unique_id=296643918 node_paths=PackedStringArray("player", "markers")]
[node name="Spawn Marker Connector" type="Node" parent="Connectors" unique_id=296643918 node_paths=PackedStringArray("player", "markers")]
script = ExtResource("2_16uj4")
player = NodePath("../Player")
markers = NodePath("../Spawn Markers")
player = NodePath("../../Player")
markers = NodePath("../../Spawn Markers")
[node name="Chest Interaction Connector" parent="." unique_id=625804018 instance=ExtResource("3_ec540")]
[node name="Chest Interaction Connector" parent="Connectors" unique_id=625804018 node_paths=PackedStringArray("player") instance=ExtResource("3_ec540")]
player = NodePath("../../Player")
[node name="Tilemap" type="Node2D" parent="." unique_id=894627186]
y_sort_enabled = true
@@ -92,7 +96,7 @@ tile_set = ExtResource("1_rf04x")
[node name="Decor" type="TileMapLayer" parent="Tilemap" unique_id=941487815]
y_sort_enabled = true
tile_map_data = PackedByteArray("AAADAAQABAAAAAAAAAAEAAUABQAAAAAAAAACAAgAAgAAAAIAAAACAAkAAgAAAAMAAAADAAgAAgACAAIAAAADAAkAAgACAAMAAAAEAAgACQADAAAAAAAMAAUACwAAAAgAAAAIAAMACgAGAAAAAAA=")
tile_map_data = PackedByteArray("AAADAAQABAAAAAAAAAAEAAUABQAAAAAAAAACAAgAAgAAAAIAAAACAAkAAgAAAAMAAAADAAgAAgACAAIAAAADAAkAAgACAAMAAAAEAAgACQADAAAAAAAMAAUACwAAAAgAAAAIAAMACgAGAAAAAAAJAAQAAwAAAAAAAAAKAAQACQABAAAAAAA=")
tile_set = ExtResource("1_rf04x")
[node name="Decor 2" type="TileMapLayer" parent="Tilemap" unique_id=1988290805]
@@ -155,3 +159,9 @@ zoom = Vector2(3, 3)
[node name="Player" parent="." unique_id=1502234578 instance=ExtResource("2_lky26")]
position = Vector2(108, 139)
[node name="Overlay" type="Sprite2D" parent="." unique_id=455840170]
position = Vector2(124, 217)
scale = Vector2(0.25, 0.25)
texture = ExtResource("11_6xfm6")
offset = Vector2(16, -436)

11
Scenes/Maps/Forest Dungeon Entrance/path_to_dungeon_01.tscn
View File

@@ -65,15 +65,18 @@ y_sort_enabled = true
[node name="Connectors" type="Node" parent="." unique_id=1365901208]
[node name="Chest Interaction Connector" parent="Connectors" unique_id=625804018 instance=ExtResource("1_jtncl")]
[node name="Chest Interaction Connector" parent="Connectors" unique_id=625804018 node_paths=PackedStringArray("player") instance=ExtResource("1_jtncl")]
player = NodePath("../../Player")
[node name="Arrow Spawner" parent="Connectors" unique_id=627092886 node_paths=PackedStringArray("arrow_parent") instance=ExtResource("2_jtncl")]
[node name="Arrow Spawner" parent="Connectors" unique_id=627092886 node_paths=PackedStringArray("player", "arrow_parent") instance=ExtResource("2_jtncl")]
player = NodePath("../../Player")
arrow_parent = NodePath("../../Objects/Projectiles")
[node name="Bench Interaction Connector" parent="Connectors" unique_id=541204437 node_paths=PackedStringArray("player") instance=ExtResource("3_x6da4")]
player = NodePath("../../Player")
[node name="Interactive Loading Zone Connector" parent="Connectors" unique_id=833475826 instance=ExtResource("4_4lnhp")]
[node name="Interactive Loading Zone Connector" parent="Connectors" unique_id=833475826 node_paths=PackedStringArray("player") instance=ExtResource("4_4lnhp")]
player = NodePath("../../Player")
[node name="Spawn Marker Connector" parent="Connectors" unique_id=807187299 node_paths=PackedStringArray("player", "markers") instance=ExtResource("5_lphfo")]
player = NodePath("../../Player")
@@ -337,7 +340,7 @@ destination_marker_name = "Entrance"
position = Vector2(278, 474)
[node name="Player" parent="." unique_id=1502234578 instance=ExtResource("4_4igim")]
position = Vector2(656, 488)
position = Vector2(89, 450)
[node name="Camera2D" type="Camera2D" parent="Player" unique_id=1115720225]
position = Vector2(0, 1)

8
Scenes/Maps/base_map.tscn Normal file
View File

@@ -0,0 +1,8 @@
[gd_scene format=3 uid="uid://cb7es4u3xy5hw"]
[ext_resource type="Script" uid="uid://da5dg36wink7x" path="res://Scripts/Maps/base_map.gd" id="1_71ugn"]
[node name="BaseMap" type="Node2D" unique_id=94057185]
script = ExtResource("1_71ugn")
[node name="Connectors" type="Node" parent="." unique_id=226687733]

3
Scenes/main.tscn
View File

@@ -13,8 +13,9 @@ script = ExtResource("1_jjgbg")
[node name="Map Transitioner" type="Node" parent="." unique_id=1528505665]
script = ExtResource("3_kry3j")
[node name="Dialogue Trigger Connector" type="Node" parent="." unique_id=1187622540]
[node name="Dialogue Trigger Connector" type="Node" parent="." unique_id=1187622540 node_paths=PackedStringArray("dialogue_box")]
script = ExtResource("4_6bp64")
dialogue_box = NodePath("../Gui/Dialogue Box")
[node name="World" type="Node2D" parent="." unique_id=578440549]
script = ExtResource("2_bo1nx")