oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Makes ESCDialog and ESCDialogOption instantiable without an ESC string

Browse Source 
and other dialog optimizations
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-11 22:55:35 +01:00
committed by GitHub
parent 907ba5f9d8
commit 1823845141
6 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/escoria-core/game/core-scripts/esc/esc_compiler.gd
View File

@@ -160,7 +160,8 @@ func _compile(lines: Array) -> Array:
group.statements = self._compile(group_lines)
returned.append(group)
elif dialog_regex.search(line):
var dialog = ESCDialog.new(line)
var dialog = ESCDialog.new()
dialog.load_string(line)
escoria.logger.trace("Line is a dialog")
var dialog_lines = []
while lines.size() > 0:
@@ -187,7 +188,8 @@ func _compile(lines: Array) -> Array:
lines.pop_front()
returned.append(dialog)
elif dialog_option_regex.search(line):
var dialog_option = ESCDialogOption.new(line)
var dialog_option = ESCDialogOption.new()
dialog_option.load_string(line)
escoria.logger.trace(
"Line is the dialog option %s" % \
dialog_option.option

7
addons/escoria-core/game/core-scripts/esc/types/esc_dialog.gd
View File

@@ -27,8 +27,11 @@ var timeout_option: int = 0
var options: Array
# Construct a dialog from a dialog string
func _init(dialog_string: String):
# Construct a dialog from an ESC dialog string
#
# #### Parameters
# - dialog_string: ESC dialog string
func load_string(dialog_string: String):
var dialog_regex = RegEx.new()
dialog_regex.compile(REGEX)

7
addons/escoria-core/game/core-scripts/esc/types/esc_dialog_option.gd
View File

@@ -16,8 +16,11 @@ var option: String setget ,get_option
var conditions: Array = []
# Create a dialog option from a string
func _init(option_string: String):
# Create a dialog option from an ESC string
#
# #### Parameter
# - option_string: ESC string for the dialog option
func load_string(option_string: String):
var option_regex = RegEx.new()
option_regex.compile(REGEX)

18
addons/escoria-core/game/core-scripts/esc_item.gd
View File

@@ -438,16 +438,22 @@ func turn_to(object: Node, wait: float = 0.0):
# Play the talking animation
func start_talking():
if get_animation_player().is_playing():
get_animation_player().stop()
get_animation_player().play(animations.speaks[_movable.last_dir].animation)
if get_animation_player():
if get_animation_player().is_playing():
get_animation_player().stop()
get_animation_player().play(
animations.speaks[_movable.last_dir].animation
)
# Stop playing the talking animation
func stop_talking():
if get_animation_player().is_playing():
get_animation_player().stop()
get_animation_player().play(animations.idles[_movable.last_dir].animation)
if get_animation_player():
if get_animation_player().is_playing():
get_animation_player().stop()
get_animation_player().play(
animations.idles[_movable.last_dir].animation
)
# Detect the child nodes and set respective references