Bug with jumping happening when trying to advance dialog but otherwise progress.
This commit is contained in:
parent
91186fa610
commit
25152de524
BIN
assets/portraits/WarriorGirl.png
Normal file
BIN
assets/portraits/WarriorGirl.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 721 B |
35
assets/portraits/WarriorGirl.png.import
Normal file
35
assets/portraits/WarriorGirl.png.import
Normal file
|
|
@ -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
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[gd_resource type="Resource" load_steps=3 format=2]
|
[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://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]
|
[resource]
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ func play_dialog_item(dialog_item :DialogItem, dialog_index :int = 0):
|
||||||
func stop_dialog():
|
func stop_dialog():
|
||||||
dialog_text = 'foo'
|
dialog_text = 'foo'
|
||||||
current_pane = UI_PANES.HUD
|
current_pane = UI_PANES.HUD
|
||||||
|
playing_dialog = false
|
||||||
emit_signal("ui_change")
|
emit_signal("ui_change")
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ func trigger_interaction():
|
||||||
UiManager.play_dialog_item(dialog)
|
UiManager.play_dialog_item(dialog)
|
||||||
|
|
||||||
func disable_dialog():
|
func disable_dialog():
|
||||||
UiManager.current_pane = UiManager.UI_PANES.HUD
|
pass
|
||||||
|
|
||||||
func _on_Interactable_Component_body_exited(body):
|
func _on_Interactable_Component_body_exited(body):
|
||||||
._on_Interactable_Component_body_exited(body)
|
._on_Interactable_Component_body_exited(body)
|
||||||
|
|
|
||||||
|
|
@ -129,14 +129,15 @@ func process_physics_input(delta):
|
||||||
# call the parent, Which would call the individuals
|
# call the parent, Which would call the individuals
|
||||||
.process_physics_input(delta)
|
.process_physics_input(delta)
|
||||||
# then process movement controls
|
# then process movement controls
|
||||||
get_movement_direction()
|
if UiManager.current_pane == UiManager.UI_PANES.HUD:
|
||||||
wants_jump()
|
get_movement_direction()
|
||||||
wants_crouch()
|
wants_jump()
|
||||||
wants_attack_primary()
|
wants_crouch()
|
||||||
wants_attack_secondary()
|
wants_attack_primary()
|
||||||
wants_dash()
|
wants_attack_secondary()
|
||||||
wants_roll()
|
wants_dash()
|
||||||
wants_climb()
|
wants_roll()
|
||||||
|
wants_climb()
|
||||||
|
|
||||||
func flip_sprite_to_movement_direction():
|
func flip_sprite_to_movement_direction():
|
||||||
if desired_movement_vector.x != 0.0:
|
if desired_movement_vector.x != 0.0:
|
||||||
|
|
|
||||||
|
|
@ -48,10 +48,12 @@ func _process(delta):
|
||||||
current_pane = UiManager.current_pane
|
current_pane = UiManager.current_pane
|
||||||
DialogContainer.visible = false
|
DialogContainer.visible = false
|
||||||
health_bar.visible = false
|
health_bar.visible = false
|
||||||
|
stamina_bar.visible = false
|
||||||
match current_pane:
|
match current_pane:
|
||||||
UiManager.UI_PANES.HUD:
|
UiManager.UI_PANES.HUD:
|
||||||
print("Enable HUD")
|
print("Enable HUD")
|
||||||
health_bar.visible = true
|
health_bar.visible = true
|
||||||
|
stamina_bar.visible = true
|
||||||
UiManager.UI_PANES.DIALOG:
|
UiManager.UI_PANES.DIALOG:
|
||||||
print("Enable Dialog")
|
print("Enable Dialog")
|
||||||
DialogContainerPortrait.texture = UiManager.dialog_portrait
|
DialogContainerPortrait.texture = UiManager.dialog_portrait
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user