Skip to content

Commit

Permalink
chore: storing version and changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
StraToN committed Oct 6, 2023
1 parent 2b3eb45 commit f29f279
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [4.0.0-alpha.259](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.259) (2023-10-06)


### Features

* Created interation and dialog node types ([2b3eb45](https://github.com/godot-escoria/escoria-demo-game/commit/2b3eb4579d0d3960d35c32e729908a3f19e11183))



## [4.0.0-alpha.258](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.258) (2023-10-03)


Expand Down
12 changes: 6 additions & 6 deletions addons/escoria-core/game/core-scripts/esc_item.gd
Original file line number Diff line number Diff line change
Expand Up @@ -522,13 +522,13 @@ func get_animation_player() -> Node:
func get_interact_position() -> Vector2:
var pos_2d_count: int = 0
var pos_2d_position = null

var esclocation_count = 0
var esclocation_position = null

var interact_count = 0
var interact_position = null

for c in get_children():
if c is Position2D:
# Identify any Postion2D nodes
Expand All @@ -542,16 +542,16 @@ func get_interact_position() -> Vector2:
# This will catch all other Position2D related nodes
# including dialog locations and native Position2D nodes.
pos_2d_count += 1
pos_2d_position = c.global_position
pos_2d_position = c.global_position

if interact_position == null and \
esclocation_position == null and is_instance_valid(collision):
escoria.logger.warn(
self,
"No ESCLocation found to walk to for object " +
"%s. Middle of collision shape will be used." % global_id)
return collision.global_position

if interact_count > 0:
if interact_count > 1:
escoria.logger.warn(
Expand All @@ -566,7 +566,7 @@ func get_interact_position() -> Vector2:
"Multiple ESClocations found to walk to for object " +
"%s. Last one will be used." % global_id)
return esclocation_position


# React to the mouse entering the item by emitting the respective signal
func mouse_entered():
Expand Down
6 changes: 3 additions & 3 deletions addons/escoria-dialog-simple/types/floating.gd
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func _ready():

_current_line = ""



func _process(delta):
if _current_character.is_inside_tree() and \
Expand Down Expand Up @@ -136,14 +136,14 @@ func say(character: String, line: String) :
_current_character = escoria.object_manager.get_object(character).node

var dialog_location_count:int = 0

for c in escoria.object_manager.get_object(character).node.get_children():
if c is Position2D:
# Identify any Postion2D nodes
if c.is_class("ESCDialogLocation"):
dialog_location_count += 1
dialog_location_node = c

if dialog_location_count > 0:
if dialog_location_count > 1:
escoria.logger.warn(
Expand Down

0 comments on commit f29f279

Please sign in to comment.