From 86a031e3f5e9edecc77490d9910551c96c76ea3c Mon Sep 17 00:00:00 2001 From: Bryce Date: Tue, 17 Mar 2026 07:54:35 -0700 Subject: [PATCH] connections --- Ego.tscn | 61 ++++++++++++++----- .../transition_configurator.gd | 1 + .../transition_inspector_plugin.gd | 2 +- kq4-sierra-decompile | 2 +- project.godot | 4 ++ 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/Ego.tscn b/Ego.tscn index 5461db4..d267691 100644 --- a/Ego.tscn +++ b/Ego.tscn @@ -3,17 +3,14 @@ [ext_resource type="Script" uid="uid://brg2414xf5aep" path="res://AutoSpriteFrames.gd" id="1"] [ext_resource type="Texture2D" uid="uid://dn170b5k8r0i2" path="res://shadow.png" id="2"] [ext_resource type="FontFile" uid="uid://b1n7bvtur65ac" path="res://friendlyscribbles.ttf" id="4_1psks"] -[ext_resource type="Texture2D" uid="uid://dpul5cqwaheo3" path="res://ego/animations/minstrel-v3/idle-s-med/0000 .png" id="5_botsu"] [ext_resource type="Texture2D" uid="uid://ckmeitar23ocb" path="res://ego/masks/1.png" id="5_erh68"] [ext_resource type="Texture2D" uid="uid://bn8dqy1c05yis" path="res://ego/masks/2.png" id="6_g53vb"] -[ext_resource type="Texture2D" uid="uid://dktr5r4ir8gnl" path="res://ego/animations/minstrel-v3/idle-e-med/0000 .png" id="6_wqx8q"] [ext_resource type="Texture2D" uid="uid://b4inlny6ixmf0" path="res://ego/masks/3.png" id="7_jhjmn"] [ext_resource type="Texture2D" uid="uid://bnnap4pr1mr5h" path="res://ego/animations/rosella/img_00103_.png" id="9_pyi2f"] [ext_resource type="Texture2D" uid="uid://dck67hsxi3rnv" path="res://ego/animations/rosella/img_00069_.png" id="10_l4ay1"] [ext_resource type="Texture2D" uid="uid://bma63tibheds3" path="res://ego/animations/rosella/img_00001_.png" id="12_84jj5"] [ext_resource type="Texture2D" uid="uid://notpa4ibijco" path="res://ego/animations/rosella/img_00031_.png" id="13_ttpag"] [ext_resource type="Texture2D" uid="uid://bio44t1xei64v" path="res://ego/animations/rosella/img_00056_.png" id="14_2ts53"] -[ext_resource type="Texture2D" uid="uid://bmm0r2j8sin1a" path="res://ego/animations/minstrel-v3/idle-nw-med/0000 .png" id="26_qmiwt"] [ext_resource type="Texture2D" uid="uid://cg5sqbqaj1mmv" path="res://ego/animations/rosella/img_00076_.png" id="35_gphxb"] [ext_resource type="Texture2D" uid="uid://dwbrh1gl8ig4y" path="res://ego/animations/rosella/img_00077_.png" id="36_gpkly"] [ext_resource type="Texture2D" uid="uid://bgw06nmfunwda" path="res://ego/animations/rosella/img_00078_.png" id="37_0nogo"] @@ -24,7 +21,6 @@ [ext_resource type="Texture2D" uid="uid://d0de8nrdgr1wk" path="res://ego/animations/rosella/img_00083_.png" id="42_p3kcj"] [ext_resource type="Texture2D" uid="uid://crwhr71lshdva" path="res://ego/animations/rosella/img_00084_.png" id="43_lt2am"] [ext_resource type="Texture2D" uid="uid://d0l40is1juh67" path="res://ego/animations/rosella/img_00085_.png" id="44_a03gu"] -[ext_resource type="Texture2D" uid="uid://ycjgsv2wxjhw" path="res://ego/animations/minstrel-v3/idle-se-med/0000 .png" id="44_s7asw"] [ext_resource type="Texture2D" uid="uid://db848rfj88m05" path="res://ego/animations/rosella/img_00086_.png" id="45_8k8du"] [ext_resource type="Texture2D" uid="uid://mr8owblcx4hd" path="res://ego/animations/rosella/img_00087_.png" id="46_d4tyc"] [ext_resource type="Texture2D" uid="uid://dlug3lmdktatv" path="res://ego/animations/rosella/img_00088_.png" id="47_gjkxo"] @@ -34,7 +30,6 @@ [ext_resource type="Texture2D" uid="uid://bm8rmjef65tgj" path="res://ego/animations/rosella/img_00092_.png" id="51_w12ac"] [ext_resource type="Texture2D" uid="uid://cbx760fqragtk" path="res://ego/animations/rosella/img_00093_.png" id="52_ww1el"] [ext_resource type="Texture2D" uid="uid://puk2xmou5bse" path="res://ego/animations/rosella/img_00094_.png" id="53_5r8ch"] -[ext_resource type="Texture2D" uid="uid://bo8twk13dy0w5" path="res://ego/animations/minstrel-v3/idle-sw-med/0000 .png" id="54_md52e"] [ext_resource type="Texture2D" uid="uid://51ebjq5e220v" path="res://ego/animations/rosella/img_00095_.png" id="54_twso8"] [ext_resource type="Texture2D" uid="uid://b8xxc3utklfbg" path="res://ego/animations/rosella/img_00096_.png" id="55_qwddt"] [ext_resource type="Texture2D" uid="uid://dgm08dti21wf" path="res://ego/animations/rosella/img_00097_.png" id="56_665sf"] @@ -46,7 +41,6 @@ [ext_resource type="Texture2D" uid="uid://lbjiluk8ntk8" path="res://ego/animations/rosella/img_00104_.png" id="62_1oix2"] [ext_resource type="Texture2D" uid="uid://bd5q4c6e0xye4" path="res://ego/animations/rosella/img_00105_.png" id="63_hkmm4"] [ext_resource type="Texture2D" uid="uid://cf72vjyp24ppk" path="res://ego/animations/rosella/img_00061_.png" id="64_f3le7"] -[ext_resource type="Texture2D" uid="uid://dm1hjiggve4y1" path="res://ego/animations/minstrel-v3/idle-w-med/0000 .png" id="64_yus5f"] [ext_resource type="Texture2D" uid="uid://f284av04l3qc" path="res://ego/animations/rosella/img_00062_.png" id="65_c1022"] [ext_resource type="Texture2D" uid="uid://c43wvjoob67ga" path="res://ego/animations/rosella/img_00063_.png" id="66_1r88r"] [ext_resource type="Texture2D" uid="uid://deg2xa6euweai" path="res://ego/animations/rosella/img_00064_.png" id="67_fo0ow"] @@ -57,7 +51,6 @@ [ext_resource type="Texture2D" uid="uid://5viwlyfh5fj4" path="res://ego/animations/rosella/img_00070_.png" id="72_0kaxt"] [ext_resource type="Texture2D" uid="uid://btva2sp0ktooh" path="res://ego/animations/rosella/img_00071_.png" id="73_db5ja"] [ext_resource type="Texture2D" uid="uid://7fksrocnnefd" path="res://ego/animations/rosella/img_00072_.png" id="74_1jmh4"] -[ext_resource type="Texture2D" uid="uid://cytlpjrtwcj7t" path="res://ego/animations/minstrel-v3/idle-n-med/0000 .png" id="74_eny04"] [ext_resource type="Texture2D" uid="uid://cy4ynarwk2lwt" path="res://ego/animations/rosella/img_00073_.png" id="75_i71gw"] [ext_resource type="Texture2D" uid="uid://cxbsa3s17s4wy" path="res://ego/animations/rosella/img_00074_.png" id="76_t4gew"] [ext_resource type="Texture2D" uid="uid://d0jhqqpkylfpk" path="res://ego/animations/rosella/img_00075_.png" id="77_bn0fg"] @@ -146,11 +139,49 @@ shadow_color = Color(0, 0, 0, 0.517647) [sub_resource type="ShaderMaterial" id="ShaderMaterial_sle7q"] +[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_r545n"] +load_path = "res://.godot/imported/idle-med.png-0138e16d5f660e8411756bbd4065cd26.ctex" + +[sub_resource type="AtlasTexture" id="AtlasTexture_gms2r"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(120, 240, 108, 224) +margin = Rect2(42, 5, 52, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4nppn"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(1788, 952, 70, 235) +margin = Rect2(44, 1, 90, 5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_72g70"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(488, 732, 84, 221) +margin = Rect2(45, 3, 76, 19) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jgc4u"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(396, 716, 83, 228) +margin = Rect2(37, 2, 77, 12) + +[sub_resource type="AtlasTexture" id="AtlasTexture_k08d4"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(704, 4, 111, 239) +margin = Rect2(35, 1, 49, 1) + +[sub_resource type="AtlasTexture" id="AtlasTexture_kxwb1"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(516, 488, 81, 236) +margin = Rect2(29, 2, 79, 4) + +[sub_resource type="AtlasTexture" id="AtlasTexture_m5pot"] +atlas = SubResource("CompressedTexture2D_r545n") +region = Rect2(948, 944, 71, 234) +margin = Rect2(48, 2, 89, 6) + [sub_resource type="SpriteFrames" id="1"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("5_botsu") +"texture": SubResource("AtlasTexture_gms2r") }], "loop": true, "name": &"default", @@ -214,7 +245,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("6_wqx8q") +"texture": SubResource("AtlasTexture_4nppn") }], "loop": true, "name": &"talk_E", @@ -222,7 +253,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("74_eny04") +"texture": SubResource("AtlasTexture_72g70") }], "loop": true, "name": &"talk_N", @@ -238,7 +269,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("26_qmiwt") +"texture": SubResource("AtlasTexture_jgc4u") }], "loop": true, "name": &"talk_NW", @@ -246,7 +277,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("5_botsu") +"texture": SubResource("AtlasTexture_gms2r") }], "loop": true, "name": &"talk_S", @@ -254,7 +285,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("44_s7asw") +"texture": SubResource("AtlasTexture_k08d4") }], "loop": true, "name": &"talk_SE", @@ -262,7 +293,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("54_md52e") +"texture": SubResource("AtlasTexture_kxwb1") }], "loop": true, "name": &"talk_SW", @@ -270,7 +301,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("64_yus5f") +"texture": SubResource("AtlasTexture_m5pot") }], "loop": true, "name": &"talk_W", diff --git a/addons/transition_configurator/transition_configurator.gd b/addons/transition_configurator/transition_configurator.gd index 09c1ba0..5a3b0d6 100644 --- a/addons/transition_configurator/transition_configurator.gd +++ b/addons/transition_configurator/transition_configurator.gd @@ -7,6 +7,7 @@ var inspector_plugin: EditorInspectorPlugin func _enter_tree() -> void: inspector_plugin = INSPECTOR_PLUGIN.new() + print("HELLO") add_inspector_plugin(inspector_plugin) func _exit_tree() -> void: diff --git a/addons/transition_configurator/transition_inspector_plugin.gd b/addons/transition_configurator/transition_inspector_plugin.gd index d0e47e5..cf130d1 100644 --- a/addons/transition_configurator/transition_inspector_plugin.gd +++ b/addons/transition_configurator/transition_inspector_plugin.gd @@ -35,7 +35,7 @@ func _parse_begin(object: Object) -> void: func _on_configure_pressed(transition_piece: TransitionPiece) -> void: if config_dialog == null: config_dialog = CONFIG_DIALOG.new() - add_child(config_dialog) + EditorInterface.get_editor_main_screen().add_child(config_dialog) config_dialog.transition_piece = transition_piece config_dialog.populate_rooms() diff --git a/kq4-sierra-decompile b/kq4-sierra-decompile index 5aa99ef..3a0557d 160000 --- a/kq4-sierra-decompile +++ b/kq4-sierra-decompile @@ -1 +1 @@ -Subproject commit 5aa99efa916c6f4d2fd82e56534813dc8579b65c +Subproject commit 3a0557dc5c92862bbd8314a9ba44d151a027a6cd diff --git a/project.godot b/project.godot index 547041b..cbc1a93 100644 --- a/project.godot +++ b/project.godot @@ -32,6 +32,10 @@ window/size/initial_position_type=0 window/stretch/mode="viewport" mouse_cursor/custom_image="res://boot_icon.png" +[editor_plugins] + +enabled=PackedStringArray("res://addons/transition_configurator/plugin.cfg") + [gui] common/drop_mouse_on_gui_input_disabled=true