Skip to content

Commit

Permalink
fix: Fixes smaller things (#465)
Browse files Browse the repository at this point in the history
Co-authored-by: Dennis Ploeger <[email protected]>
  • Loading branch information
dploeger and dploeger authored Nov 26, 2021
1 parent 65b3a59 commit 8c9ee73
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ func update_terrain(on_event_finished_name = null) -> void:
return
if parent.get("dont_apply_terrain_scaling"):
return
if not parent.is_inside_tree():
return

var pos = parent.global_position
if pos.y <= VisualServer.CANVAS_ITEM_Z_MAX:
Expand Down
6 changes: 6 additions & 0 deletions addons/escoria-core/game/core-scripts/esc_item.gd
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,12 @@ func stop_talking():
)


# Replay the last idle animation
func update_idle():
get_animation_player().play(
animations.idles[_movable.last_dir].animation
)


# Return the camera position if a camera_position_node exists or the
# global position of the player
Expand Down
3 changes: 2 additions & 1 deletion addons/escoria-core/game/core-scripts/esc_player.gd
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ func _ready():
._ready()
else:
tooltip_name = ""
disconnect("input_event", self, "manage_input")
if is_connected("input_event", self, "manage_input"):
disconnect("input_event", self, "manage_input")
1 change: 1 addition & 0 deletions addons/escoria-core/game/core-scripts/esc_room.gd
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ func _ready():
player.animations = ResourceLoader.load(
animations[player.global_id]
)
player.update_idle()
escoria.object_manager.get_object("_camera").node.set_target(player)

for n in get_children():
Expand Down
4 changes: 4 additions & 0 deletions addons/escoria-ui-9verbs/verbs_menu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ func _ready():
but.toggle_mode = true

func _on_action_selected(action: String):
if escoria.inputs_manager.input_mode != escoria.inputs_manager.INPUT_ALL:
unselect_actions()
return

escoria.action_manager.set_current_action(action)

for but in get_children():
Expand Down

0 comments on commit 8c9ee73

Please sign in to comment.