From 25152de5242b5518e7b8e7f42c55be27113d2377 Mon Sep 17 00:00:00 2001 From: Dustin Date: Tue, 17 Jun 2025 17:18:24 -0700 Subject: [PATCH] Bug with jumping happening when trying to advance dialog but otherwise progress. --- assets/portraits/WarriorGirl.png | Bin 0 -> 721 bytes assets/portraits/WarriorGirl.png.import | 35 ++++++++++++++++++ assets/text/dialog/WarriorGirl_Intro.tres | 2 +- lib/singleton_autoloads/UIManager.gd | 1 + src/Interactables/interactable_npc_dialog.gd | 2 +- .../playerE/PlayerE-Movement_StateReceiver.gd | 17 +++++---- src/ui/HUD.gd | 2 + 7 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 assets/portraits/WarriorGirl.png create mode 100644 assets/portraits/WarriorGirl.png.import diff --git a/assets/portraits/WarriorGirl.png b/assets/portraits/WarriorGirl.png new file mode 100644 index 0000000000000000000000000000000000000000..6197f61bc796bab457634e77a019b25cdda9acdc GIT binary patch literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>VCwdCaSW-L z^LCc6M@XQ^@#iO_Ei%p>dEqcg!ui>vgZ*jKJrZ`z%UXJ2(E_ukV>-8Py5uh^Q`XR9 zx#$$b+PJI0P-RQuOZJE>ERR+lwYcEoDA0WQSAEr;*K;e24pi6e{$E@E&iZ}9xt-7B z)I@|>90gbohRNJ*NpGIJEc@CkKM*RM)Q&b|?P?)=+2^QiqN?=1P;YSD0;A@2(3 zQ~w2)emAYxG{||ll)k@w%~153djnYR-|6|mZ+{XicKi+!Y(_<>*5jejE@-d zn0HwE$`>sA{jX@-@r-}Y@1-;5+Z|k?zrl{_2;&{Lg2&ei@8x%>f46pUzbv_#bx$Y5 z+KC(j>=Ex7_S-33sI9NtKJ!KV0`JVP?;nTTUT_xt`scCmpCu_qE9d0bvUD)-;C--c zp0%TD$^7&0avJ=4*GsJ}uY6<3m-Fn(=iN~S4?JQoujywfWZ2Gl$HFeX(cyQ)^Y?MA zJ7Zqtah+%S(zju?KHqo7Wd5p$)p>q(O+R7&VS3N3F?Fltg=Np{e^twxJl}rr&Ed~0 zCw2!Y!%Uk~Detf_ot10v_vIIA|7X@on4JCjV=Bj!nwKxsZMMTa_wC#E!w0VaHF^;e zKf9=L<|oq&+w=OH)~(&cw)QnMo9rIrKR*^WeA^=KczMo#0dDQ$f9G!NFIWq6@XTuS zga=1c`UB-1&R^g7jwK^Xcv)8Wf>P6i(c#xycvf=SIrvVHau8rIkUr2Gt?{pQj{bx> z_vY=Ed%>MP*WJRQD29El=4J2p1@X&PE#R+P@!u!~8fM2%K6}1^ZBKlZK~%%L-&PrX x=3VFRP4rd|U`gYi|8VD5K?S}CW(~9JZx{CN-E+%mAux?Hc)I$ztaD0e0su~>RNw#r literal 0 HcmV?d00001 diff --git a/assets/portraits/WarriorGirl.png.import b/assets/portraits/WarriorGirl.png.import new file mode 100644 index 0000000..d63f6fe --- /dev/null +++ b/assets/portraits/WarriorGirl.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/WarriorGirl.png-9f501edf6f27b5a11aae7948e00cc6e3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/portraits/WarriorGirl.png" +dest_files=[ "res://.import/WarriorGirl.png-9f501edf6f27b5a11aae7948e00cc6e3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/text/dialog/WarriorGirl_Intro.tres b/assets/text/dialog/WarriorGirl_Intro.tres index 0ba90fd..8e8560c 100644 --- a/assets/text/dialog/WarriorGirl_Intro.tres +++ b/assets/text/dialog/WarriorGirl_Intro.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" load_steps=3 format=2] [ext_resource path="res://src/classes/dialog_item.gd" type="Script" id=1] -[ext_resource path="res://assets_tmp/MManPortrait.png" type="Texture" id=2] +[ext_resource path="res://assets/portraits/WarriorGirl.png" type="Texture" id=2] [resource] script = ExtResource( 1 ) diff --git a/lib/singleton_autoloads/UIManager.gd b/lib/singleton_autoloads/UIManager.gd index 0f283be..1821ca4 100644 --- a/lib/singleton_autoloads/UIManager.gd +++ b/lib/singleton_autoloads/UIManager.gd @@ -41,6 +41,7 @@ func play_dialog_item(dialog_item :DialogItem, dialog_index :int = 0): func stop_dialog(): dialog_text = 'foo' current_pane = UI_PANES.HUD + playing_dialog = false emit_signal("ui_change") # Called every frame. 'delta' is the elapsed time since the previous frame. diff --git a/src/Interactables/interactable_npc_dialog.gd b/src/Interactables/interactable_npc_dialog.gd index 38298f9..edfaa9f 100644 --- a/src/Interactables/interactable_npc_dialog.gd +++ b/src/Interactables/interactable_npc_dialog.gd @@ -28,7 +28,7 @@ func trigger_interaction(): UiManager.play_dialog_item(dialog) func disable_dialog(): - UiManager.current_pane = UiManager.UI_PANES.HUD + pass func _on_Interactable_Component_body_exited(body): ._on_Interactable_Component_body_exited(body) diff --git a/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd b/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd index 339ad55..5e2291d 100644 --- a/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd +++ b/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd @@ -129,14 +129,15 @@ func process_physics_input(delta): # call the parent, Which would call the individuals .process_physics_input(delta) # then process movement controls - get_movement_direction() - wants_jump() - wants_crouch() - wants_attack_primary() - wants_attack_secondary() - wants_dash() - wants_roll() - wants_climb() + if UiManager.current_pane == UiManager.UI_PANES.HUD: + get_movement_direction() + wants_jump() + wants_crouch() + wants_attack_primary() + wants_attack_secondary() + wants_dash() + wants_roll() + wants_climb() func flip_sprite_to_movement_direction(): if desired_movement_vector.x != 0.0: diff --git a/src/ui/HUD.gd b/src/ui/HUD.gd index a1d9e62..e78ba78 100644 --- a/src/ui/HUD.gd +++ b/src/ui/HUD.gd @@ -48,10 +48,12 @@ func _process(delta): current_pane = UiManager.current_pane DialogContainer.visible = false health_bar.visible = false + stamina_bar.visible = false match current_pane: UiManager.UI_PANES.HUD: print("Enable HUD") health_bar.visible = true + stamina_bar.visible = true UiManager.UI_PANES.DIALOG: print("Enable Dialog") DialogContainerPortrait.texture = UiManager.dialog_portrait