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

Squashed commit of the following:

Browse Source 
commit f4e15f11cb99e3ecf97240a57ac407edccd8aabf
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sat Feb 8 03:23:33 2025 +0100

    Doable tutorial

commit a58fc407bbb248a11a3481607b186e16a58b44c7
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 14:56:29 2025 +0100

    items cocina

commit 764abca24270ad109306a6713c9029400544e487
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 13:40:01 2025 +0100

    Intro done

commit e16d1f69e3324f6cc3cb5fb1ba9d1444be92d47e
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 13:23:41 2025 +0100

    Skip dialog fix

commit 8350683785263c3fd037e6484143ef4c43c5ace9
Merge: b968ec4 21cb204
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Fri Feb 7 13:04:41 2025 +0100

    Merge branch 'gymkhana/escoria4' into gymkhana/escoria4-eneko-smoking-port

commit b968ec4d7c9e282cfd4bcdd048b3aa252981dedb
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Tue Feb 4 20:46:43 2025 +0100

    csv fix

commit 7ba00276b50f60e4b3e2b47303fdec12ac195767
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Tue Feb 4 00:08:48 2025 +0100

    translation keys

commit 127f0732bdfbb28e887609ec992e2fbd1b87bc87
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 2 09:41:29 2025 +0100

    pegatinas

commit 3ad3b05c3ec5d40172259acd430a7798f71da541
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Sun Feb 2 09:17:23 2025 +0100

    eneko dialogs

commit 97b5a69bc0385a5cecd17af48eaf2e45d5fd88f8
Merge: b641ae0 a03bed7
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Wed Jan 29 00:19:38 2025 +0100

    Merge branch 'gymkhana/escoria4' into gymkhana/escoria4-eneko-smoking-port

commit b641ae0da451647bf55888fea5421e4c9463c49c
Merge: 0d75ea8 aaa3953
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Mon Jan 27 17:21:38 2025 +0100

    Merge branch 'gymkhana/escoria4' into gymkhana/escoria4-eneko-smoking-port

commit 0d75ea8a44ff76b1ad6650f5acec2024a9a55685
Author: Oier Bravo Urtasun <oierbravo@gmail.com>
Date:   Mon Jan 27 17:18:41 2025 +0100

    wip
This commit is contained in:
Oier Bravo
2025-02-08 03:24:28 +01:00
parent 21cb204d9a
commit 6c772da846
31 changed files with 655 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd
View File

@@ -6,6 +6,10 @@ extends EditorPlugin
const MANAGER_CLASS="res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd"
const SETTINGS_ROOT="escoria/rtmi_dialog_simple"
const READING_SPEED_IN_WPM_DEFAULT_VALUE = 200
const TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE = 100
const TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE = 25
var left_click_actions: PackedStringArray = [
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP,
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH,

20
addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd
View File

@@ -38,7 +38,6 @@ func _ready() -> void:
func has_type(type: String) -> bool:
return true if type in ["floating"] else false
# Check whether a specific chooser type is supported by the
# dialog plugin
#
@@ -58,7 +57,6 @@ func has_chooser_type(type: String) -> bool:
func enable_preserve_dialog_box() -> void:
_should_preserve_dialog_box = true
# Instructs the dialog manager to no longer preserve the currently-preserved
# dialog box or to not preserve the next dialog box used by a `say` command
# (this is the default state).
@@ -105,7 +103,6 @@ func say(dialog_player: Node, global_id: String, text: String, type: String, key
state_machine._change_state("say")
func do_say(global_id: String, text: String) -> void:
# Only add_child here in order to prevent _type_player from running its _process method
# before we're ready, and only if it's necessary
@@ -122,10 +119,6 @@ func _init_type_player(type: String) -> void:
_type_player = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"\
).instantiate()
else:
_type_player = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn"\
).instantiate()
_dialog_tip = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn"\
).instantiate()
@@ -133,7 +126,6 @@ func _init_type_player(type: String) -> void:
_type_player.say_finished.connect(_on_say_finished)
_type_player.say_visible.connect(_on_say_visible)
func _initialize_say_states(global_id: String, text: String, type: String, key: String) -> void:
state_machine.states_map["say"].initialize(self, global_id, text, type, key)
state_machine.states_map["finish"].initialize(_dialog_player)
@@ -183,6 +175,7 @@ func do_choose(dialog_player: Node, dialog: ESCDialog, type: String = "simple"):
dialog_player.add_child(chooser)
chooser.set_dialog(dialog)
chooser.show_chooser()
var option = await chooser.option_chosen
dialog_player.remove_child(chooser)
# MODIFIED FOR RETURN TO MONKEY UI
@@ -191,6 +184,17 @@ func do_choose(dialog_player: Node, dialog: ESCDialog, type: String = "simple"):
# END MODIFIED FOR RETURN TO MONKEY UI
option_chosen.emit(option)
# Trigger running the dialogue faster
func speedup():
if is_instance_valid(_type_player):
_type_player.speedup()
# Trigger an instant finish of the current dialog
func finish():
if is_instance_valid(_type_player):
_type_player.finish()
# The say command has been interrupted, cancel the dialog display
func interrupt():

2
addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
View File

@@ -1,6 +1,6 @@
[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dvwfrnya2nhxu"]
[ext_resource type="FontFile" path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" id="1"]
[ext_resource type="FontFile" uid="uid://cne31d6e0513y" path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" id="1"]
[sub_resource type="StyleBoxFlat" id="1"]
content_margin_left = 5.0

12
addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres
View File

@@ -1,7 +1,11 @@
[gd_resource type="FontFile" load_steps=2 format=2]
[gd_resource type="FontFile" load_steps=2 format=3 uid="uid://cne31d6e0513y"]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" type="FontFile" id=1]
[ext_resource type="FontFile" uid="uid://dbuthr0652qv7" path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" id="1"]
[resource]
size = 21
font_data = ExtResource( 1 )
fallbacks = Array[Font]([ExtResource("1")])
cache/0/16/0/ascent = 0.0
cache/0/16/0/descent = 0.0
cache/0/16/0/underline_position = 0.0
cache/0/16/0/underline_thickness = 0.0
cache/0/16/0/scale = 1.0

11
addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres
View File

@@ -1,6 +1,11 @@
[gd_resource type="FontFile" load_steps=2 format=2]
[gd_resource type="FontFile" load_steps=2 format=3 uid="uid://d1ctari2iol5l"]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" type="FontFile" id=1]
[ext_resource type="FontFile" uid="uid://dbuthr0652qv7" path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" id="1"]
[resource]
font_data = ExtResource( 1 )
fallbacks = Array[Font]([ExtResource("1")])
cache/0/16/0/ascent = 0.0
cache/0/16/0/descent = 0.0
cache/0/16/0/underline_position = 0.0
cache/0/16/0/underline_thickness = 0.0
cache/0/16/0/scale = 1.0

2
addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd
View File

@@ -1,6 +1,6 @@
# A manager for ESC objects
extends Resource
class_name ESCObjectManager
class_name ESCObjectManagerRTMI
const CAMERA = "_camera"