WIP

This reverts commit d3eff4e006.

.cursorignore

@@ -0,0 +1,3 @@
+*.import
+*.uid
+*.translation

.editorconfig

@@ -0,0 +1,3 @@
+[*.esc]
+indent_style = tab
+indent_size = 2

.gdlintrc

@@ -0,0 +1,47 @@
+class-definitions-order:
+- tools
+- classnames
+- extends
+- docstrings
+- signals
+- enums
+- consts
+- staticvars
+- exports
+- pubvars
+- prvvars
+- onreadypubvars
+- onreadyprvvars
+- others
+class-load-variable-name: (([A-Z][a-z0-9]*)+|_?[a-z][a-z0-9]*(_[a-z0-9]+)*)
+class-name: ([A-Z][a-z0-9]*)+
+class-variable-name: _?[a-z][a-z0-9]*(_[a-z0-9]+)*
+comparison-with-itself: null
+constant-name: _?[A-Z][A-Z0-9]*(_[A-Z0-9]+)*
+disable: []
+duplicated-load: null
+enum-element-name: '[A-Z][A-Z0-9]*(_[A-Z0-9]+)*'
+enum-name: ([A-Z][a-z0-9]*)+
+excluded_directories: !!set
+  .git: null
+expression-not-assigned: null
+function-argument-name: _?[a-z][a-z0-9]*(_[a-z0-9]+)*
+function-arguments-number: 10
+function-name: (_on_([A-Z][a-z0-9]*)+(_[a-z0-9]+)*|_?[a-z][a-z0-9]*(_[a-z0-9]+)*)
+function-preload-variable-name: ([A-Z][a-z0-9]*)+
+function-variable-name: '[a-z][a-z0-9]*(_[a-z0-9]+)*'
+load-constant-name: (([A-Z][a-z0-9]*)+|_?[A-Z][A-Z0-9]*(_[A-Z0-9]+)*)
+loop-variable-name: _?[a-z][a-z0-9]*(_[a-z0-9]+)*
+max-file-lines: 1000
+max-line-length: 300
+max-public-methods: 20
+max-returns: 6
+mixed-tabs-and-spaces: null
+no-elif-return: null
+no-else-return: null
+signal-name: '[a-z][a-z0-9]*(_[a-z0-9]+)*'
+sub-class-name: _?([A-Z][a-z0-9]*)+
+tab-characters: 1
+trailing-whitespace: null
+unnecessary-pass: null
+unused-argument: null

.gitea/CODEOWNERS

@@ -1,2 +0,0 @@
-# Escoria developers own the code
-* @StraToN @BHSDuncan @balloonpopper

.gitea/workflows/prueba.yml.example

@@ -1,19 +0,0 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [release]
-
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
-      - run: echo "🍏 This job's status is ${{ job.status }}."

.gitea/workflows/push-release.yml

@@ -0,0 +1,39 @@
+name: Gymkhana exports
+run-name: ${{ gitea.actor }} is building Gymkhanikas 🚀
+on:
+  push:
+    branches:
+      - 'release/*'
+      - '!main'
+env:
+  GODOT_VERSION: 4.5
+  EXPORT_NAME: LasGymkhanikasDeUli
+  PROJECT_PATH: .
+  APPWRITE_API_KEY: "${{ secrets.APPWRITE_API_KEY }}"
+  
+jobs:
+  all-exports:
+    name: All exports
+    runs-on: ubuntu-latest
+    container:
+      image: oierbravo/godot-ci-with-node:4.5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: Setup
+        run: |
+          git clone https://github.com/godot-escoria/escoria-demo-game $PROJECT_PATH/../escoria-demo-game
+      - name: All builds
+        run: |
+          ./apply_patches.sh
+          ./build.sh
+      - name: Upload Artifact
+        uses: akkuman/gitea-release-action@v1
+        with:
+          files: |
+            build/**/*.appimage
+            build/**/*.tar.gz
+            build/**/*.zip
+            build/**/*.exe

.gitea/workflows/release.yml.disabled

@@ -1,64 +0,0 @@
-name: Gymkhana release
-run-name: ${{ gitea.actor }} is releasing out Gymkhanikas de Uli 🚀
-on:
-  push:
-    branches: [ main ]
-
-env:
-  GODOT_VERSION: 3.6
-  EXPORT_NAME: gymkhana
-jobs:
-  export-linux:
-    name: Linux Export
-    runs-on: act-latest
-    container:
-      image: barichello/godot-ci:3.6
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          lfs: true
-      - name: Setup
-        run: |
-          echo $PATH
-          mkdir -v -p ~/.local/share/godot/templates
-      - name: Linux Build
-        run: |
-          mkdir -v -p build/linux
-          git clone https://github.com/godot-escoria/escoria-demo-game.git
-          cd addons
-          ln -sf ../escoria-demo-game/addons/escoria-core escoria-core
-          cd ..
-          godot -v --export "Linux/X11" build/linux/Gymkhana.x86_64   --no-window
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: linux
-          path: build/linux
-  export-web:
-    name: Web Export
-    runs-on: act-latest
-    container:
-      image: barichello/godot-ci:3.6
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          lfs: true
-      - name: Setup
-        run: |
-          echo $PATH
-          mkdir -v -p ~/.local/share/godot/templates
-      - name: HTML5 Build
-        run: |
-          mkdir -v -p build/web
-          git clone https://github.com/godot-escoria/escoria-demo-game.git
-          cd addons
-          ln -sf ../escoria-demo-game/addons/escoria-core escoria-core
-          cd ..
-          godot -v --export "HTML5" build/web/index.html --no-window
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: web
-          path: build/web

.gitignore

@@ -12,4 +12,12 @@ bin
 addons/escoria-core/default_bus_layout.tres
 
 .idea/
-.vscode/settings.json
+
+# Optional Addons per environment. 
+addons/godot-plugin-refresher/
+addons/script-ide/
+build/
+.env
+
+# API credentials
+secret/

.tmp

@@ -1,9 +0,0 @@
-:look
-say player "It's a bottle."
-stop
-
-:pickup
-inventory_add r9_bottle true
-set_active r9_bottle_left false
-set_active r9_bottle_middle false
-set_active r9_bottle_right false

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "editor.tabSize": 4,
+  "editor.insertSpaces": false,
+  "editor.detectIndentation": false
+}

AUTHORS.md

@@ -1,9 +0,0 @@
-## Development
-- Oier
-- Eneko
-
-## Collaborations
-- Pico
-- Miette
-- Niko
-- Urtzi

COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

LICENSE

@@ -1,7 +1,39 @@
-Copyright (c) 2012-2020 Juan Linietsky, Ariel Manzur.
+SOURCE CODE OF THIS GAME IS LICENSED UNDER GPL VERSION 3 (or later):
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+************************************************************************************
+
+ALL THE MULTIMEDIA ASSETS (TEXT, IMAGES, AUDIO AND VIDEO) ARE LICENSED UNDER CREATIVE COMMONS ATTRIBUTION-NONCOMMERCIAL-SHAREALIKE 4.0 (except the Leve Palestina song and Morpheus' voice in Spanish version of Matrix):
+
+Las Gymkhanikas de Uli  © 2025 by Uliwood Studios is licensed under CC BY-NC-SA 4.0. To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
+
+************************************************************************************
+
+THIS GAME USES ESCORIA FRAMEWORK AND IS BASED ON ESCORIA DEMO GAME. BOTH HAVE THE FOLLOWING LICENSE:
+
+MIT License
+
+Copyright (c) 2021 Escoria framework
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -3,18 +3,37 @@
 Point-and-click adventure game developed using Escoria framework and Godot engine.
 
 ## Building from source
+### Assumed folder structure
+```
+any-folder
+├── gymkhana -> This project.
+└── escoria-demo-game -> Folder for escoria core.
 
+```
+### Steps
 1) Clone `gymkhana` repo
-2) Clone `escoria-demo-game` repo (develop branch)
-3) Create `gymkhana/addons/escoria-core` symlink pointing to `escoria-demo-game/addons/escoria-core`
-
+2) Clone `escoria-demo-game` repo (main branch)
+3) Apply patches from the root folder. Run: `./apply_patches.sh`
 
 ## Video export.
 - 1280 x 720 | 25fps
 - Export to MP4
 - Convert to ogv `ffmpeg -i input.mp4 -c:v libtheora -q:v 6 -c:a libvorbis -q:a 4 output.ogv`
 
+## Audio exports
+- Speech: Quality: 5, 11.000khz, mono
+- Music: Quality: 9, 44.100khz, stereo
+
 ## Export
 - Web: `godot -v --export "HTML5" ../gymkhana-export-html/index.html`
 - Linux: `godot -v --export "Linux/X11" ../LasGymkhanikasDeUli-1.0-RC1.appimage`
-- ~~Windows: godot -v --export "Windows Desktop x64" ../LasGymkhanikasDeUli-1.0-RC1.exe~~
+- ~~Windows: godot -v --export "Windows Desktop x64" ../LasGymkhanikasDeUli-1.0-RC1.exe~~
+
+
+## Sound attributions:
+- button_clicking.ogg | Button Clicking 1 by Sheyvan -- https://freesound.org/s/475188/ -- License: Creative Commons 0
+- menu_button.ogg | Videogame Menu BUTTON CLICK by Christopherderp -- https://freesound.org/s/342200/ -- License: Creative Commons 0
+- birds_ambient_loop.ogg | https://freesound.org/people/Garuda1982/sounds/691629/ -- License: Creative Commons 0
+
+## Icon attributions:
+- Translate button: Noun Project. Public domain

action_defaults.esc

@@ -1,2 +1,2 @@
 :use | TK
-say current_player "I can't use this!"
+	say($player, "I can't use this!", "action_default_say")

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/ChooserButton.gd.uid

@@ -0,0 +1 @@
+uid://dpynhyggey3bb

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/chooser_button.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=3 format=3 uid="uid://v5lk1jcyag2q"]
+
+[ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="1_k44u5"]
+[ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_e65rn"]
+
+[node name="Button" type="Button"]
+theme = ExtResource("1_k44u5")
+script = ExtResource("2_e65rn")
+with_sound = false

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd

@@ -2,9 +2,11 @@
 # Supports timeout and avatar display
 extends ESCDialogOptionsChooser
 
+const chooser_button = preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/chooser_button.tscn")
 
-export(Color, RGB) var color_normal = Color(1.0,1.0,1.0,1.0)
-export(Color, RGB) var color_hover = Color(165.0,42.0,42.0, 1.0)
+
+@export var color_normal = Color(1.0,1.0,1.0,1.0) # (Color, RGB)
+@export var color_hover = Color(165.0,42.0,42.0, 1.0) # (Color, RGB)
 
 
 var _no_more_options: bool = false
@@ -13,14 +15,14 @@ var _no_more_options: bool = false
 # Hide the chooser at the start just to be safe
 func _ready() -> void:
 	hide_chooser()
-	pause_mode = PAUSE_MODE_STOP
-	escoria.connect("paused", self, "_on_paused")
-	escoria.connect("resumed", self, "_on_resumed")
+	process_mode = PROCESS_MODE_PAUSABLE
+	escoria.connect("paused", Callable(self, "_on_paused"))
+	escoria.connect("resumed", Callable(self, "_on_resumed"))
 
 
 # Process the timeout display
 func _process(delta: float) -> void:
-	if $MarginContainer.visible and self.dialog and self.dialog.timeout > 0:
+	if %MarginContainer.visible and self.dialog and self.dialog.timeout > 0:
 		$TimerProgress.value = (
 			self.dialog.timeout - $Timer.time_left
 		) / self.dialog.timeout * 100
@@ -28,23 +30,17 @@ func _process(delta: float) -> void:
 
 # Show the chooser
 func show_chooser():
-	var _vbox = $MarginContainer/ScrollContainer/VBoxContainer
+	var _vbox = %VBoxContainer
 	for option_node in _vbox.get_children():
 		_vbox.remove_child(option_node)
 
-	_remove_avatar()
-
 	for option in self.dialog.options:
 		if option.is_valid():
-			var _option_node = Button.new()
+			var _option_node = chooser_button.instantiate()
 			_option_node.text = (option as ESCDialogOption).option
-			_option_node.flat = true
-			_option_node.add_color_override("font_color", color_normal)
-			_option_node.add_color_override("font_color_hover", color_hover)
 			_vbox.add_child(_option_node)
-			_option_node.connect("pressed", self, "_on_answer_selected", [
-				option
-			])
+			
+			_option_node.pressed.connect(_on_answer_selected.bind(option))
 
 	# If we've no options left, signify as much and start the timer with a
 	# very short interval so the appropriate signal can be fired. Note that
@@ -54,21 +50,21 @@ func show_chooser():
 		_no_more_options = true
 		$Timer.start(0.05)
 		return
-
-	if self.dialog.avatar != "-":
-		$AvatarContainer.add_child(
-			ResourceLoader.load(self.dialog.avatar).instance()
-		)
-
-	$MarginContainer.show()
+	
+	%MarginContainer.show()
+	# Position in the middle of the screen.
+	# Must be called after show
+	%MarginContainer.position.x = get_viewport_rect().size.x / 2 - _vbox.size.x /2
+	%MarginContainer.position.y = get_viewport_rect().size.y / 2 - _vbox.size.y /2
 
 	if self.dialog.timeout > 0:
+		
 		$Timer.start(self.dialog.timeout)
 
 
 # Hide the chooser
 func hide_chooser():
-	$MarginContainer.hide()
+	%MarginContainer.hide()
 
 
 # An option was choosen, emit the option
@@ -76,9 +72,8 @@ func hide_chooser():
 # #### Parameters
 # - option: Option that was chosen
 func _option_chosen(option: ESCDialogOption):
-	_remove_avatar()
 	$TimerProgress.value = 0
-	emit_signal("option_chosen", option)
+	option_chosen.emit(option)
 
 
 # An option was chosen directly from the list
@@ -95,12 +90,6 @@ func _on_Timer_timeout() -> void:
 	_no_more_options = false
 	_option_chosen(option_chosen)
 
-
-# Remove the avatar
-func _remove_avatar():
-	if $AvatarContainer.get_child_count() > 0:
-		$AvatarContainer.remove_child($AvatarContainer.get_child(0))
-
 # Handler managing pause notification from Escoria
 func _on_paused():
 	hide_chooser()

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd.uid

@@ -0,0 +1 @@
+uid://cvhue8e0ory00

addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn

@@ -1,61 +1,62 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=5 format=3 uid="uid://nbnsf3pmh4jg"]
 
-[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" type="Script" id=1]
-[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2]
+[ext_resource type="Script" uid="uid://cvhue8e0ory00" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" id="1"]
+[ext_resource type="Theme" uid="uid://dvwfrnya2nhxu" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme/dialog.tres" id="2"]
 
-[sub_resource type="Gradient" id=1]
-colors = PoolColorArray( 1, 0, 0, 1, 1, 0, 0, 1 )
+[sub_resource type="Gradient" id="1"]
+colors = PackedColorArray(1, 0, 0, 1, 1, 0, 0, 1)
 
-[sub_resource type="GradientTexture" id=2]
-gradient = SubResource( 1 )
+[sub_resource type="GradientTexture2D" id="2"]
+gradient = SubResource("1")
 
 [node name="text_dialog_choice" type="Control"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_top = 560.0
-margin_right = 7.0
-theme = ExtResource( 2 )
-script = ExtResource( 1 )
+layout_mode = 3
+anchors_preset = 0
+size_flags_horizontal = 4
+size_flags_vertical = 4
+theme = ExtResource("2")
+script = ExtResource("1")
+color_hover = Color(0.0704665, 0.552225, 0, 1)
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
-margin_left = 20.0
-margin_top = 10.0
-margin_right = 1280.0
-margin_bottom = 185.0
+unique_name_in_owner = true
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -20.0
+offset_top = -20.0
+offset_right = 20.0
+offset_bottom = 20.0
+grow_horizontal = 2
+grow_vertical = 2
 mouse_filter = 2
-custom_constants/margin_top = 20
-custom_constants/margin_left = 20
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
 
 [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
-margin_left = 20.0
-margin_top = 20.0
-margin_right = 1260.0
-margin_bottom = 175.0
-scroll_horizontal_enabled = false
-__meta__ = {
-"_edit_use_anchors_": false
-}
+clip_contents = false
+layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"]
-margin_right = 1240.0
-margin_bottom = 155.0
+unique_name_in_owner = true
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-custom_constants/separation = 10
-__meta__ = {
-"_edit_use_anchors_": false
-}
+theme_override_constants/separation = 10
 
 [node name="Timer" type="Timer" parent="."]
 one_shot = true
 
-[node name="TimerProgress" type="TextureProgress" parent="."]
+[node name="TimerProgress" type="TextureProgressBar" parent="."]
+custom_minimum_size = Vector2(0, 20)
+layout_mode = 0
 anchor_right = 1.0
-rect_min_size = Vector2( 0, 20 )
-texture_progress = SubResource( 2 )
 nine_patch_stretch = true
-
-[node name="AvatarContainer" type="Node2D" parent="."]
-position = Vector2( 94, 68 )
+texture_progress = SubResource("2")
 
 [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd

@@ -9,7 +9,7 @@ class_name SayLastDialogOptionCommand
 
 # Return the descriptor of the arguments of this command
 func configure() -> ESCCommandArgumentDescriptor:
-  return ESCCommandArgumentDescriptor.new()
+	return ESCCommandArgumentDescriptor.new()
 
 # Run the command
 func run(_command_params: Array) -> int:
@@ -34,17 +34,15 @@ func run(_command_params: Array) -> int:
 		return ESCExecution.RC_CANCEL
 
 	var last_chosen_option = escoria.globals_manager.get_global("ESC_DIALOG_CHOSEN_OPTION")
-	# Surround text with quotes. Required by escoria.dialog_player.say()
-	var text = "\"%s\"" % last_chosen_option
-
 	var speaking_character_global_id = escoria.main.current_scene.player.global_id
 
 	escoria.dialog_player.say(
 		speaking_character_global_id,
 		"",
-		text
+		last_chosen_option.get_translated_option(),
+		last_chosen_option.get_translation_id()
 	)
-	yield(escoria.dialog_player, "say_finished")
+	await escoria.dialog_player.say_finished
 	escoria.current_state = escoria.GAME_STATE.DEFAULT
 
 	return ESCExecution.RC_OK

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_last_dialog_option.gd.uid

@@ -0,0 +1 @@
+uid://dlsaxwtoarkon

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd

@@ -54,7 +54,7 @@ func configure() -> ESCCommandArgumentDescriptor:
 
 # Validate whether the given arguments match the command descriptor
 func validate(arguments: Array):
-	if not .validate(arguments):
+	if not super.validate(arguments):
 		return false
 
 	if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \
@@ -74,7 +74,7 @@ func run(command_params: Array) -> int:
 	escoria.current_state = escoria.GAME_STATE.DIALOG
 	var param_global_id = command_params[0]
 	var param_list_id = command_params[1]
-	var param_lenght = command_params[2]
+	var param_length = command_params[2]
 	
 	if !escoria.dialog_player:
 		escoria.logger.error(
@@ -94,7 +94,7 @@ func run(command_params: Array) -> int:
 		escoria.current_state = escoria.GAME_STATE.DEFAULT
 		return ESCExecution.RC_CANCEL
 
-	var text = param_list_id + "_" + String(rng.randi_range(0,param_lenght -1)) + ':" "'
+	var key = param_list_id + "_" + String.num_int64(rng.randi_range(0,param_length -1))
 
 	var speaking_character_global_id = escoria.main.current_scene.player.global_id \
 		if param_global_id.to_upper() == CURRENT_PLAYER_KEYWORD \
@@ -102,10 +102,11 @@ func run(command_params: Array) -> int:
 
 	escoria.dialog_player.say(
 		speaking_character_global_id,
-		"",
-		text
+		"", # default type
+		key,
+		key
 	)
-	yield(escoria.dialog_player, "say_finished")
+	await escoria.dialog_player.say_finished
 	escoria.current_state = escoria.GAME_STATE.DEFAULT
 
 	var current_count_global_key = "%s_count" % [param_list_id]
@@ -123,4 +124,4 @@ func interrupt():
 	escoria.logger.debug(
 		self,
 		"[%s] interrupt() function not implemented." % get_command_name()
-	)
+	)

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_random.gd.uid

@@ -0,0 +1 @@
+uid://duufh3f25hav8

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd

@@ -52,7 +52,7 @@ func configure() -> ESCCommandArgumentDescriptor:
 
 # Validate whether the given arguments match the command descriptor
 func validate(arguments: Array):
-	if not .validate(arguments):
+	if not super.validate(arguments):
 		return false
 
 	if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \
@@ -95,9 +95,10 @@ func run(command_params: Array) -> int:
 
 	var current_index_global_key = "%s_current_iteration" % [param_list_id]
 	var current_index = escoria.globals_manager.get_global(current_index_global_key)
+	
 	if(current_index == null):
 		current_index = 0
-	var text = '%s_%s:" "' % [param_list_id,current_index]
+	var key = "%s_%s" % [param_list_id,current_index]
 	
 
 	var speaking_character_global_id = escoria.main.current_scene.player.global_id \
@@ -107,9 +108,10 @@ func run(command_params: Array) -> int:
 	escoria.dialog_player.say(
 		speaking_character_global_id,
 		"",
-		text
+		key,
+		key,
 	)
-	yield(escoria.dialog_player, "say_finished")
+	await escoria.dialog_player.say_finished
 	escoria.current_state = escoria.GAME_STATE.DEFAULT
 
 	current_index += 1
@@ -137,4 +139,4 @@ func interrupt():
 	escoria.logger.debug(
 		self,
 		"[%s] interrupt() function not implemented." % get_command_name()
-	)
+	)

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_sequence.gd.uid

@@ -0,0 +1 @@
+uid://tvxyry5g7kou

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_to_camera.gd

@@ -0,0 +1,139 @@
+# `say_to_camera player text [type]`
+#
+# Displays the specified string as dialog spoken by the player. This command
+# blocks further event execution until the dialog has finished being 'said'
+# (either as displayed text or as audible speech from a file).
+#
+# Global variables can be substituted into the text by wrapping the global
+# name in braces.
+# e.g. say player "I have {coin_count} coins remaining".
+#
+# **Parameters**
+#
+# - *player*: Global ID of the `ESCPlayer` or `ESCItem` object that is active.
+#	You can specify `current_player` in order to refer to the currently active
+#	player, e.g. in cases where multiple players are playable such as in games
+#	like Maniac Mansion or Day of the Tentacle.
+# - *text*: Text to display.
+# - *key*: Translation key (default: nil)
+# - *type*: Dialog type to use. One of `floating` or `avatar`.
+#   (default: the value set in the setting "Escoria/UI/Default Dialog Type")
+#
+# The text supports translation keys by prepending the key followed by
+# a colon (`:`) to the text.
+# For more details see: https://docs.escoria-framework.org/en/devel/getting_started/dialogs.html#translations
+#
+# Playing an audio file while the text is being
+# displayed is also supported by this mechanism.
+# For more details see: https://docs.escoria-framework.org/en/devel/getting_started/dialogs.html#recorded_speech
+#
+# Example: `say(player, "Picture's looking good.", "ROOM1_PICTURE")`
+#
+# @ESC
+extends ESCBaseCommand
+class_name SayToCameraCommand
+
+
+const CURRENT_PLAYER_KEYWORD = "CURRENT_PLAYER"
+
+const DEFAULT_CAMERA_DIRECTION = 4
+
+var globals_regex : RegEx		# Regex to match global variables in strings
+
+
+
+# Constructor
+func _init() -> void:
+	globals_regex = RegEx.new()
+	# Use look-ahead/behind to capture the term (i.e. global) in braces
+	globals_regex.compile("(?<=\\{)(.*)(?=\\})")
+
+
+# Return the descriptor of the arguments of this command
+func configure() -> ESCCommandArgumentDescriptor:
+	return ESCCommandArgumentDescriptor.new(
+		2,
+		[TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING],
+		[
+			null,
+			null,
+			"",
+			""
+		],
+		[
+			true,
+			false,
+			false,
+			true
+		]
+	)
+
+
+# Validate whether the given arguments match the command descriptor
+func validate(arguments: Array):
+	if not super.validate(arguments):
+		return false
+
+	if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \
+		and not escoria.object_manager.has(arguments[0]):
+		raise_invalid_object_error(self, arguments[0])
+		return false
+
+	return true
+
+
+# Run the command
+func run(command_params: Array) -> int:
+	var dict: Dictionary
+
+	escoria.current_state = escoria.GAME_STATE.DIALOG
+
+	if !escoria.dialog_player:
+		raise_error(
+			self,
+			"No dialog player was registered and the 'say' command was encountered."
+		)
+		escoria.current_state = escoria.GAME_STATE.DEFAULT
+		return ESCExecution.RC_ERROR
+
+	if not escoria.main.current_scene.player:
+		escoria.logger.warn(
+			self,
+			"[%s]: No player item in the current scene was registered and the say command was encountered."
+					% get_command_name()
+		)
+		escoria.current_state = escoria.GAME_STATE.DEFAULT
+		return ESCExecution.RC_CANCEL
+
+	# Replace the names of any globals in "{ }" with their value
+	command_params[1] = escoria.globals_manager.replace_globals(command_params[1])
+
+	
+
+	var speaking_character_global_id = escoria.main.current_scene.player.global_id \
+		if command_params[0].to_upper() == CURRENT_PLAYER_KEYWORD \
+		else command_params[0]
+	var node = escoria.object_manager.get_object(command_params[0]).node
+
+
+	escoria.object_manager.get_object(command_params[0]).node\
+			.set_direction(DEFAULT_CAMERA_DIRECTION)
+
+	escoria.dialog_player.say(
+		speaking_character_global_id,
+		command_params[3],
+		command_params[1],
+		command_params[2]
+	)
+	await escoria.dialog_player.say_finished
+	escoria.current_state = escoria.GAME_STATE.DEFAULT
+	
+	return ESCExecution.RC_OK
+
+
+# Function called when the command is interrupted.
+func interrupt():
+	escoria.logger.debug(
+		self,
+		"[%s] interrupt() function not implemented." % get_command_name()
+	)

addons/escoria-ui-return-monkey-island-dialog-simple/commands/say_to_camera.gd.uid

@@ -0,0 +1 @@
+uid://d0sdlkjqr8f67

addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd

@@ -1,4 +0,0 @@
-extends Label
-
-func _process(_delta):
-	self.visible = escoria.inputs_manager.input_mode != escoria.inputs_manager.INPUT_NONE

addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn

@@ -1,13 +1,13 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3 uid="uid://dyi4lxm20wgne"]
 
-[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" type="DynamicFont" id=1]
-[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" type="Script" id=2]
+[ext_resource type="Theme" uid="uid://dvpaon5mw2w8l" path="res://addons/escoria-ui-return-monkey-island/theme.tres" id="1_3renm"]
 
 [node name="Label" type="Label"]
-margin_left = 1057.0
-margin_top = 533.0
-margin_right = 1259.0
-margin_bottom = 551.0
-custom_fonts/font = ExtResource( 1 )
-text = "Haz click para acelerar el texto"
-script = ExtResource( 2 )
+offset_left = 1073.0
+offset_top = 508.0
+offset_right = 1248.0
+offset_bottom = 531.0
+grow_horizontal = 0
+mouse_filter = 1
+theme = ExtResource("1_3renm")
+text = "click_to_skip_dialog"

addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd

@@ -1,31 +0,0 @@
-"""
-Base interface for all states: it doesn't do anything in itself
-but forces us to pass the right arguments to the methods below
-and makes sure every State object had all of these methods.
-"""
-extends Node
-
-
-signal finished(next_state_name)
-
-
-# Initialize the state. E.g. change the animation
-func enter():
-	return
-
-
-# Clean up the state. Reinitialize values like a timer
-func exit():
-	return
-
-
-func handle_input(_event):
-	return
-
-
-func update(_delta):
-	return
-
-
-func _on_animation_finished(_anim_name):
-	return

addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd

@@ -1,92 +0,0 @@
-"""
-Base interface for a generic state machine
-It handles initializing, setting the machine active or not
-delegating _physics_process, _input calls to the State nodes,
-and changing the current/active state.
-"""
-extends Node
-
-
-signal state_changed(current_state)
-
-
-"""
-You must set a starting node from the inspector or on
-the node that inherits from this state machine interface
-If you don't the game will crash (on purpose, so you won't
-forget to initialize the state machine)
-"""
-export(NodePath) var START_STATE
-var states_map = {}
-
-var states_stack = []  # can also be used as a pushdown automaton
-var current_state = null
-var current_state_name = ""
-var _active = false setget set_active
-
-
-func initialize(start_state):
-	for child in get_children():
-		child.connect("finished", self, "_change_state")
-
-	set_active(true)
-	states_stack.push_front(start_state)
-	current_state = states_stack[0]
-	current_state.enter()
-
-
-func set_active(value):
-	_active = value
-	set_physics_process(value)
-	set_process_input(value)
-	if not _active:
-		states_stack = []
-		current_state = null
-
-
-func _input(event):
-	current_state.handle_input(event)
-
-
-func _physics_process(delta):
-	current_state.update(delta)
-
-
-func _on_animation_finished(anim_name):
-	if not _active:
-		return
-	current_state._on_animation_finished(anim_name)
-
-
-func _change_state(state_name):
-	if not _active:
-		return
-
-	escoria.logger.trace(
-		self,
-		"Dialog State Machine: Changing state from '%s' to '%s'." % [current_state_name, state_name]
-	)
-
-	current_state.exit()
-
-	if state_name == "previous":
-		states_stack.pop_front()
-	else:
-		states_stack[0] = states_map[state_name]
-
-	current_state = states_stack[0]
-
-	emit_signal("state_changed", current_state)
-
-	#if state_name != "previous":
-	current_state.enter()
-
-	current_state_name = state_name
-
-
-func get_current_state_name():
-	for key in states_map.keys():
-		if states_map[key] == current_state:
-			return key
-
-	return null

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

@@ -1,5 +1,5 @@
+@tool
 # A simple dialog manager for Escoria
-tool
 extends EditorPlugin
 
 
@@ -10,23 +10,23 @@ 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: PoolStringArray = [
+var left_click_actions: PackedStringArray = [
 	RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP,
 	RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH,
 	RTMISimpleDialogSettings.LEFT_CLICK_ACTION_NOTHING
 ]
 
-var stop_talking_animation_on_options: PoolStringArray = [
+var stop_talking_animation_on_options: PackedStringArray = [
 	RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_TEXT,
 	RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO
 ]
 
 # Override function to return the plugin name.
-func get_plugin_name():
+func _get_plugin_name():
 	return "escoria-rtmi-dialog-simple"
 
 # Unregister ourselves
-func disable_plugin():
+func _disable_plugin():
 	print("Disabling plugin Escoria Dialog Simple")
 	ESCProjectSettingsManager.remove_setting(
 		ESCProjectSettingsManager.DEFAULT_DIALOG_TYPE
@@ -44,6 +44,11 @@ func disable_plugin():
 		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST
 	)
 
+	ESCProjectSettingsManager.remove_setting(
+		RTMISimpleDialogSettings.SLOW_TEXT_MODE
+	)
+
+
 	ESCProjectSettingsManager.remove_setting(
 		RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY
 	)
@@ -64,8 +69,8 @@ func disable_plugin():
 
 
 # Add ourselves to the list of dialog managers
-func enable_plugin():
-	print("Enabling plugin Escoria Dialog Simple")
+func _enable_plugin():
+	print("Enabling plugin RTMI Dialog Simple")
 
 	if EscoriaPlugin.register_dialog_manager(self, MANAGER_CLASS):
 		ESCProjectSettingsManager.register_setting(
@@ -87,23 +92,23 @@ func enable_plugin():
 
 		ESCProjectSettingsManager.register_setting(
 			RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS,
-			TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE,
+			RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE,
 			{
-				"type": TYPE_REAL
+				"type": TYPE_FLOAT
 			}
 		)
 
 		ESCProjectSettingsManager.register_setting(
 			RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST,
-			TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE,
+			RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE,
 			{
-				"type": TYPE_REAL
+				"type": TYPE_FLOAT
 			}
 		)
-
+		
 		ESCProjectSettingsManager.register_setting(
-			RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY,
-			false,
+			RTMISimpleDialogSettings.SLOW_TEXT_MODE,
+			RTMISimpleDialogSettings.SLOW_TEXT_MODE_DEFAULT_VALUE,
 			{
 				"type": TYPE_BOOL
 			}
@@ -111,13 +116,21 @@ func enable_plugin():
 
 		ESCProjectSettingsManager.register_setting(
 			RTMISimpleDialogSettings.READING_SPEED_IN_WPM,
-			READING_SPEED_IN_WPM_DEFAULT_VALUE,
+			RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE,
 			{
 				"type": TYPE_INT
 			}
 		)
 
-		var left_click_actions_string: String = left_click_actions.join(",")
+		ESCProjectSettingsManager.register_setting(
+			RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY,
+			RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY_DEFAULT_VALUE,
+			{
+				"type": TYPE_INT
+			}
+		)
+
+		var left_click_actions_string: String = ",".join(left_click_actions)
 
 		ESCProjectSettingsManager.register_setting(
 			RTMISimpleDialogSettings.LEFT_CLICK_ACTION,
@@ -129,7 +142,7 @@ func enable_plugin():
 			}
 		)
 
-		var stop_talking_animation_on_options_string: String = stop_talking_animation_on_options.join(",")
+		var stop_talking_animation_on_options_string: String = ",".join(stop_talking_animation_on_options)
 
 		ESCProjectSettingsManager.register_setting(
 			RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON,
@@ -143,6 +156,6 @@ func enable_plugin():
 
 	else:
 		get_editor_interface().set_plugin_enabled(
-			get_plugin_name(),
+			_get_plugin_name(),
 			false
 		)

addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd.uid

@@ -0,0 +1 @@
+uid://bw7paepd6ster

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

@@ -2,9 +2,13 @@
 extends ESCDialogManager
 class_name ESCReturnToMonekyIslandDialogs
 
-
 # State machine that governs how the dialog manager behaves
-var state_machine = preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd").new()
+var state_machine = (
+	preload(
+		"res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd"
+	)
+	. new()
+)
 
 # The currently running player
 var _type_player: Node = null
@@ -16,6 +20,9 @@ var _dialog_player: Node = null
 # Reference to the dialog hint ("click to speed up")
 var _dialog_tip: Node = null
 
+# Config holder for click to continue feature.
+var _click_to_continue: bool
+
 # Basic state tracking
 var _is_saying: bool = false
 
@@ -24,10 +31,15 @@ var _is_saying: bool = false
 var _should_preserve_dialog_box: bool = false
 
 
+func _init() -> void:
+	_click_to_continue = escoria.settings_manager.get_custom_setting(
+		RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY_KEY, false
+	)
+
+
 func _ready() -> void:
 	add_child(state_machine)
-	escoria.connect("paused", self, "_on_paused")
-
+	escoria.connect("paused", Callable(self, "_on_paused"))
 
 
 # Check whether a specific type is supported by the
@@ -37,7 +49,7 @@ func _ready() -> void:
 # - type: required type
 # *Returns* Whether the type is supported or not
 func has_type(type: String) -> bool:
-	return true if type in ["floating"] else false
+	return true if type == "floating" else false
 
 
 # Check whether a specific chooser type is supported by the
@@ -49,6 +61,7 @@ func has_type(type: String) -> bool:
 func has_chooser_type(type: String) -> bool:
 	return true if type == "simple" else false
 
+
 # Instructs the dialog manager to preserve the next dialog box used by a `say`
 # command until a call to `disable_preserve_dialog_box` is made.
 #
@@ -72,7 +85,7 @@ func disable_preserve_dialog_box() -> void:
 	if is_instance_valid(_dialog_player) and _dialog_player.get_children().has(_type_player):
 		_dialog_player.remove_child(_type_player)
 		_preserved_type_player_type = ""
-		_dialog_player.remove_child(_dialog_tip)
+
 
 # Output a text said by the item specified by the global id. Emit
 # `say_finished` after finishing displaying the text.
@@ -83,17 +96,18 @@ func disable_preserve_dialog_box() -> void:
 # - text: Text to say, optional prefixed by a translation key separated
 #   by a ":"
 # - type: Type of dialog box to use
-func say(dialog_player: Node, global_id: String, text: String, type: String):
+# - *key*: Translation key
+func say(dialog_player: Node, global_id: String, text: String, type: String, key: String):
 	_dialog_player = dialog_player
 
-	_initialize_say_states(global_id, text, type)
+	_initialize_say_states(global_id, text, type, key)
 
 	if _should_preserve_dialog_box:
 		# If the dialog box type doesn't match what's currently being reused (if anything),
 		# we want to remove the old one (if it exists) and then initialize and add the new dialog
 		# box type to the dialog player
 		if type != _preserved_type_player_type:
-			if _dialog_player.get_children().has(_type_player):
+			if is_instance_valid(_type_player) and _dialog_player.get_children().has(_type_player):
 				_dialog_player.remove_child(_type_player)
 
 			_init_type_player(type)
@@ -105,37 +119,39 @@ func say(dialog_player: Node, global_id: String, text: String, type: String):
 	state_machine._change_state("say")
 
 
-func do_say(global_id: String, text: String) -> void:
+func do_say(global_id: String, text: String, has_audio: bool = false) -> 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
 	if not _dialog_player.get_children().has(_type_player):
 		_dialog_player.add_child(_type_player)
-	add_dialog_tip()
-	
-
-	_type_player.say(global_id, text)
 
+	if not _click_to_continue:
+		add_dialog_tip()
 
+	_type_player.say(global_id, text, has_audio)
+	escoria.game_scene.clear_highlights()
+	gymkhana.cursor_manager.clear_cursor()
 
 
 func _init_type_player(type: String) -> void:
 	if type == "floating":
-		_type_player = preload(\
-			"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"\
-		).instance()
-	else:
-		_type_player = preload(\
-			"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn"\
-		).instance()
-	_dialog_tip = preload(\
-		"res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn"\
-	).instance()
+		_type_player = (
+			preload(
+				"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"
+			)
+			. instantiate()
+		)
+	_dialog_tip = (
+		preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn")
+		. instantiate()
+	)
 
-	_type_player.connect("say_finished", self, "_on_say_finished")
-	_type_player.connect("say_visible", self, "_on_say_visible")
+	_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) -> void:
-	state_machine.states_map["say"].initialize(self, global_id, text, type)
+
+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)
 	state_machine.states_map["say_fast"].initialize(self)
 	state_machine.states_map["say_finish"].initialize(self)
@@ -146,15 +162,17 @@ func _initialize_say_states(global_id: String, text: String, type: String) -> vo
 func _on_say_finished():
 	if not _should_preserve_dialog_box and _dialog_player.get_children().has(_type_player):
 		_dialog_player.remove_child(_type_player)
-		remove_dialop_tip()
 
+	hide_dialop_tip()
 	_is_saying = false
 
-	emit_signal("say_finished")
+	say_finished.emit()
+
 
 func _on_say_visible():
-	emit_signal("say_visible")
-	
+	escoria.game_scene.hide_tooltips()
+	say_visible.emit()
+
 
 # Present an option chooser to the player and sends the signal
 # `option_chosen` with the chosen dialog option
@@ -166,39 +184,51 @@ func _on_say_visible():
 func choose(dialog_player: Node, dialog: ESCDialog, type: String):
 	_dialog_player = dialog_player
 
-	escoria.game_scene.close_inventory()
 	state_machine.states_map["choices"].initialize(dialog_player, self, dialog, type)
 	state_machine._change_state("choices")
+	escoria.game_scene.clear_highlights()
 
 
 func do_choose(dialog_player: Node, dialog: ESCDialog, type: String = "simple"):
+	escoria.game_scene.hide_tooltips()
+
 	var chooser
 
 	if type == "simple" or type == "":
-		chooser = preload(\
-			"res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"\
-		).instance()
-	
+		chooser = (
+			preload(
+				"res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"
+			)
+			. instantiate()
+		)
+
 	dialog_player.add_child(chooser)
 	chooser.set_dialog(dialog)
 	chooser.show_chooser()
-	var option = yield(chooser, "option_chosen")
+
+	var option = await chooser.option_chosen
 	dialog_player.remove_child(chooser)
+
 	# MODIFIED FOR RETURN TO MONKEY UI
 	if option is ESCDialogOption:
-		escoria.globals_manager.set_global("ESC_DIALOG_CHOSEN_OPTION", option.option)
+		escoria.globals_manager.set_global("ESC_DIALOG_CHOSEN_OPTION", option)
 	# END MODIFIED FOR RETURN TO MONKEY UI
-	emit_signal("option_chosen", option)
+	option_chosen.emit(option)
+	escoria.game_scene.hide_tooltips()
+	escoria.game_scene.update_highlights()
+
 
 
 # Trigger running the dialogue faster
 func speedup():
+	(escoria.object_manager.get_object(escoria.object_manager.SPEECH).node as ESCSpeechPlayer).set_state("off")
 	if is_instance_valid(_type_player):
 		_type_player.speedup()
 
 
 # Trigger an instant finish of the current dialog
 func finish():
+	(escoria.object_manager.get_object(escoria.object_manager.SPEECH).node as ESCSpeechPlayer).set_state("off")
 	if is_instance_valid(_type_player):
 		_type_player.finish()
 
@@ -207,29 +237,35 @@ func finish():
 func interrupt():
 	if _dialog_player.get_children().has(_type_player):
 		(
-			escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
-			 as ESCSpeechPlayer
-		).set_state("off")
+			(
+				escoria.object_manager.get_object(escoria.object_manager.SPEECH).node
+				as ESCSpeechPlayer
+			)
+			. set_state("off")
+		)
 
 		if not _should_preserve_dialog_box and _dialog_player.get_children().has(_type_player):
 			_dialog_player.remove_child(_type_player)
-			remove_dialop_tip()
+			hide_dialop_tip()
 
-		emit_signal("say_finished")
-
-
-# To be called if voice audio has finished.
-func voice_audio_finished():
-	if is_instance_valid(_type_player):
-		_type_player.voice_audio_finished()
+		say_finished.emit()
 
 
 func add_dialog_tip():
 	if not _dialog_player.get_children().has(_dialog_tip):
 		_dialog_player.add_child(_dialog_tip)
+		_dialog_tip.visible = true
+
+
+func hide_dialop_tip():
+	if _dialog_player.get_children().has(_dialog_tip):
+		_dialog_tip.visible = false
 
-func remove_dialop_tip():
-	_dialog_player.remove_child(_dialog_tip)
 
 func _on_paused():
-	remove_dialop_tip()
+	hide_dialop_tip()
+
+## To be called if voice audio has finished.
+func voice_audio_finished():
+	if is_instance_valid(_type_player) and _type_player.has_method("voice_audio_finished"):
+		_type_player.voice_audio_finished()

addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd.uid

@@ -0,0 +1 @@
+uid://cn37lmbastinu

addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd

@@ -5,9 +5,17 @@ const SETTINGS_ROOT = "escoria/rtmi_dialog_simple"
 
 const AVATARS_PATH = "%s/avatars_path" % SETTINGS_ROOT
 const TEXT_TIME_PER_LETTER_MS = "%s/text_time_per_letter_ms" % SETTINGS_ROOT
+const TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE = 100
 const TEXT_TIME_PER_LETTER_MS_FAST = "%s/text_time_per_fast_letter_ms" % SETTINGS_ROOT
+const TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE = 25
+const SLOW_TEXT_MODE_KEY = "slow_text_mode"
+const SLOW_TEXT_MODE = "%s/slow_text_mode" % SETTINGS_ROOT
+const SLOW_TEXT_MODE_DEFAULT_VALUE = false
 const READING_SPEED_IN_WPM = "%s/reading_speed_in_wpm" % SETTINGS_ROOT
+const READING_SPEED_IN_WPM_DEFAULT_VALUE = 200
+const CLEAR_TEXT_BY_CLICK_ONLY_KEY = "clear_text_by_click_only"
 const CLEAR_TEXT_BY_CLICK_ONLY = "%s/clear_text_by_click_only" % SETTINGS_ROOT
+const CLEAR_TEXT_BY_CLICK_ONLY_DEFAULT_VALUE = false
 const LEFT_CLICK_ACTION = "%s/left_click_action" % SETTINGS_ROOT
 
 const STOP_TALKING_ANIMATION_ON = "%s/stop_talking_animation_on" % SETTINGS_ROOT

addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_settings.gd.uid

@@ -0,0 +1 @@
+uid://b6s8umo4wf644

addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd"
+extends StateMachine
 
 func _init():
 	_create_states()
@@ -6,8 +6,7 @@ func _init():
 
 	current_state_name = "idle"
 	START_STATE = states_map[current_state_name]
-
-	initialize(START_STATE)
+	initialize(states_map[current_state_name])
 
 
 # Creates the states for this state machine.

addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd.uid

@@ -0,0 +1 @@
+uid://iivljvomkr7q

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
 # The owning dialog player.
@@ -23,7 +23,7 @@ func initialize(dialog_player, dialog_chooser_ui: ESCDialogManager, dialog: ESCD
 func enter():
 	escoria.logger.trace(self, "Dialog State Machine: Entered 'choices'.")
 
-	if _dialog.options.empty():
+	if _dialog.options.is_empty():
 		escoria.logger.error(
 			self,
 			"Received dialog options array was empty."
@@ -36,9 +36,9 @@ func update(_delta):
 	if _ready_to_choose:
 		_ready_to_choose = false
 		_dialog_chooser_ui.do_choose(_dialog_player, _dialog, _type)
-		var option = yield(_dialog_chooser_ui, "option_chosen")
+		var option = await _dialog_chooser_ui.option_chosen
 
 		escoria.logger.trace(self, "Dialog State Machine: 'choices' -> 'idle'")
 
-		emit_signal("finished", "idle")
-		_dialog_player.emit_signal("option_chosen", option)
+		finished.emit("idle")
+		_dialog_player.option_chosen.emit(option)

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd.uid

@@ -0,0 +1 @@
+uid://dkymk83pahngj

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
 # Owning dialog player
@@ -17,5 +17,5 @@ func enter():
 
 func update(_delta):
 	escoria.logger.trace(self, "Dialog State Machine: 'finish' -> 'idle'")
-	emit_signal("finished", "idle")
-	_dialog_player.emit_signal("say_finished")
+	finished.emit("idle")
+	_dialog_player.say_finished.emit()

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd.uid

@@ -0,0 +1 @@
+uid://cy6bt6secukba

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 func enter():
 	escoria.logger.trace(self, "Dialog State Machine: Entered 'idle'.")

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd.uid

@@ -0,0 +1 @@
+uid://ci0cqim2bs0qk

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
 # Reference to the currently playing dialog manager
@@ -13,13 +13,12 @@ func enter():
 	escoria.logger.trace(self, "Dialog State Machine: Entered 'interrupt'.")
 
 	if _dialog_manager != null:
-		if not _dialog_manager.is_connected("say_finished", self, "_on_say_finished"):
-			_dialog_manager.connect("say_finished", self, "_on_say_finished")
+		if not _dialog_manager.say_finished.is_connected(_on_say_finished):
+			_dialog_manager.say_finished.connect(_on_say_finished)
 
 		_dialog_manager.interrupt()
 
 
 func _on_say_finished() -> void:
 	escoria.logger.trace(self, "Dialog State Machine: 'interrupt' -> 'finish'")
-	emit_signal("finished", "finish")
-
+	finished.emit("finish")

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd.uid

@@ -0,0 +1 @@
+uid://8r0bhwdf6yvh

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd

@@ -1,11 +1,7 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
-# A regular expression that separates the translation key from the text
-const KEYTEXT_REGEX = "^((?<key>[^:]+):)?\"(?<text>.+)\""
-
-
-# Reference to the currently playing dialog manager
+# Reference to the currently playing dialog manager 
 var _dialog_manager: ESCDialogManager = null
 
 # Character that is talking
@@ -14,33 +10,41 @@ var _character: String
 # UI to use for the dialog
 var _type: String
 
+# Translation key
+var _key: String = ""
+
 # Text to say
 var _text: String
 
-# Regular expression object for the separation of key and text
-var _keytext_regex: RegEx = RegEx.new()
-
 var _ready_to_say: bool
 
+# flag for whether the dialog manager has started to "say" to ensure that it has
+# prior to exiting this state as other states need this to happen to continue
+# (other states rely on the setup that the dialog manager does)
+var _say_started: bool
+
+var _has_audio: bool = false
+
 var _stop_talking_animation_on_option: String
 
 
-# Constructor
-func _init() -> void:
-	_keytext_regex.compile(KEYTEXT_REGEX)
-
-
-func initialize(dialog_manager: ESCDialogManager, character: String, text: String, type: String) -> void:
+func initialize(dialog_manager: ESCDialogManager, character: String, text: String, type: String, key: String) -> void:
 	_dialog_manager = dialog_manager
 	_character = character
 	_text = text
 	_type = type
+	_key = key
 	_stop_talking_animation_on_option = \
 		ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON)
 
 
 func handle_input(_event):
 	if _event is InputEventMouseButton and _event.pressed:
+		# MODIFIED FOR RTMI-UI: HACK FOR MENU/FULLSCREEN/MUSIC BUTTONS
+		var position: Vector2 = _event.global_position
+		if position.x > 1080 and position.y < 70:
+			return
+		# END MODIFIED FOR RTMI-UI
 		if escoria.inputs_manager.input_mode != \
 			escoria.inputs_manager.INPUT_NONE and \
 			_dialog_manager != null:
@@ -53,85 +57,81 @@ func handle_input(_event):
 func _handle_left_click_action(left_click_action: String) -> void:
 	match left_click_action:
 		RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP:
-			if _dialog_manager.is_connected("say_visible", self, "_on_say_visible"):
-				_dialog_manager.disconnect("say_visible", self, "_on_say_visible")
+			if _dialog_manager.say_visible.is_connected(_on_say_visible):
+				_dialog_manager.say_visible.disconnect(_on_say_visible)
 
 			escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_fast'")
-			emit_signal("finished", "say_fast")
+			finished.emit("say_fast")
 		RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH:
-			if _dialog_manager.is_connected("say_visible", self, "_on_say_visible"):
-				_dialog_manager.disconnect("say_visible", self, "_on_say_visible")
+			if _dialog_manager.say_visible.is_connected(_on_say_visible):
+				_dialog_manager.say_visible.disconnect(_on_say_visible)
 
 			escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_finish'")
-			emit_signal("finished", "say_finish")
+			finished.emit("say_finish")
 
-	get_tree().set_input_as_handled()
+	get_viewport().set_input_as_handled()
 
 
 func enter():
 	escoria.logger.trace(self, "Dialog State Machine: Entered 'say'.")
 
-	if not _dialog_manager.is_connected("say_visible", self, "_on_say_visible"):
-		_dialog_manager.connect("say_visible", self, "_on_say_visible")
+	_say_started = false
+	_has_audio = false
+	
+	if not _dialog_manager.say_visible.is_connected(_on_say_visible):
+		_dialog_manager.say_visible.connect(_on_say_visible)
 
-	var matches = _keytext_regex.search(_text)
-
-	if not matches:
-		escoria.logger.error(
-			self,
-			"Unexpected text encountered: %s." % _text
-		)
-
-	var key = matches.get_string("key")
-
-	if matches.get_string("key") != "":
-		var _speech_resource = _get_voice_file(
-			matches.get_string("key")
-		)
+	if _key and not _key.is_empty():
+		var _speech_resource = _get_voice_file(_key)
 
 		if _speech_resource == "":
 			escoria.logger.warn(
 				self,
-				"Unable to find voice file with key '%s'." % matches.get_string("key")
+				"Unable to find voice file with key '%s'." % _key
 			)
 		else:
 			(
 				escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
 				 as ESCSpeechPlayer
 			).set_state(_speech_resource)
+			_has_audio = true
 
 			if _stop_talking_animation_on_option == RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO:
 				if not (
 					escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
 					 as ESCSpeechPlayer
-				).stream.is_connected("finished", self, "_on_audio_finished"):
+				).stream.finished.is_connected(_on_audio_finished):
 
 					(
 						escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
 						 as ESCSpeechPlayer
-					).stream.connect("finished", self, "_on_audio_finished")
+					).stream.finished.connect(_on_audio_finished)
 
-		var translated_text: String = tr(matches.get_string("key"))
+		var translated_text: String = escoria.globals_manager.replace_globals(tr(_key))
 
 		# Only update the text if the translated text was found; otherwise, raise
 		# a warning and use the original, untranslated text.
-		if translated_text == matches.get_string("key"):
+		if translated_text == _key:
 			escoria.logger.warn(
 				self,
-				"Unable to find translation key '%s'. Using untranslated text." % matches.get_string("key")
+				"Unable to find translation key '%s'. Using untranslated text." % _key
 			)
-			_text = matches.get_string("text")
 		else:
 			_text = translated_text
-	else:
-		_text = matches.get_string("text")
 
 	_ready_to_say = true
 
 
+func exit() -> void:
+	if not _say_started:
+		_dialog_manager.do_say(_character, _text, _has_audio)
+		_say_started = true
+
+
 func update(_delta):
 	if _ready_to_say:
-		_dialog_manager.do_say(_character, _text)
+		_dialog_manager.do_say(_character, _text, _has_audio)
+		_say_started = true
 		_ready_to_say = false
 
 
@@ -148,15 +148,15 @@ func _get_voice_file(key: String, start: String = "") -> String:
 		start = ESCProjectSettingsManager.get_setting(
 			ESCProjectSettingsManager.SPEECH_FOLDER
 		)
-	var _dir = Directory.new()
-	if _dir.open(start) == OK:
-		_dir.list_dir_begin(true, true)
+	var _dir = DirAccess.open(start)
+	if _dir != null:
+		_dir.list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547
 		var file_name = _dir.get_next()
 		while file_name != "":
 			if _dir.current_is_dir():
 				var _voice_file = _get_voice_file(
 					key,
-					start.plus_file(file_name)
+					start.path_join(file_name)
 				)
 				if _voice_file != "":
 					return _voice_file
@@ -167,14 +167,14 @@ func _get_voice_file(key: String, start: String = "") -> String:
 						ESCProjectSettingsManager.SPEECH_EXTENSION
 					)
 				]:
-					return start.plus_file(file_name.trim_suffix(".import"))
+					return start.path_join(file_name.trim_suffix(".import"))
 			file_name = _dir.get_next()
 	return ""
 
 
 func _on_say_visible() -> void:
 	escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'visible'")
-	emit_signal("finished", "visible")
+	finished.emit("visible")
 
 
 func _on_audio_finished() -> void:

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd.uid

@@ -0,0 +1 @@
+uid://bh8a06uoe432e

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
 # Reference to the currently playing dialog manager
@@ -16,8 +16,8 @@ func enter():
 		escoria.inputs_manager.INPUT_NONE and \
 		_dialog_manager != null:
 
-		if not _dialog_manager.is_connected("say_visible", self, "_on_say_visible"):
-			_dialog_manager.connect("say_visible", self, "_on_say_visible")
+		if not _dialog_manager.say_visible.is_connected(_on_say_visible):
+			_dialog_manager.say_visible.connect(_on_say_visible)
 
 		_dialog_manager.speedup()
 	else:
@@ -26,4 +26,4 @@ func enter():
 
 func _on_say_visible() -> void:
 	escoria.logger.trace(self, "Dialog State Machine: 'say_fast' -> 'visible'")
-	emit_signal("finished", "visible")
+	finished.emit("visible")

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd.uid

@@ -0,0 +1 @@
+uid://b4dm1jk8q55fc

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
 # Reference to the currently playing dialog manager
@@ -16,8 +16,8 @@ func enter():
 		escoria.inputs_manager.INPUT_NONE and \
 		_dialog_manager != null:
 
-		if not _dialog_manager.is_connected("say_visible", self, "_on_say_visible"):
-			_dialog_manager.connect("say_visible", self, "_on_say_visible")
+		if not _dialog_manager.say_visible.is_connected(_on_say_visible):
+			_dialog_manager.say_visible.connect(_on_say_visible)
 
 		_dialog_manager.finish()
 	else:
@@ -26,4 +26,4 @@ func enter():
 
 func _on_say_visible() -> void:
 	escoria.logger.trace(self, "Dialog State Machine: 'say_finish' -> 'visible'")
-	emit_signal("finished", "visible")
+	finished.emit("visible")

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd.uid

@@ -0,0 +1 @@
+uid://bh1rpfjjpxgmp

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd

@@ -1,4 +1,4 @@
-extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd"
+extends State
 
 
 # Reference to the currently playing dialog manager
@@ -12,23 +12,29 @@ func initialize(dialog_manager: ESCDialogManager) -> void:
 func enter():
 	escoria.logger.trace(self, "Dialog State Machine: Entered 'visible'.")
 
-	if not _dialog_manager.is_connected("say_finished", self, "_on_say_finished"):
-		_dialog_manager.connect("say_finished", self, "_on_say_finished")
+	if not _dialog_manager.say_finished.is_connected(_on_say_finished):
+		_dialog_manager.say_finished.connect(_on_say_finished)
 
 
 func handle_input(_event):
-	if _event is InputEventMouseButton and _event.pressed:
-		if escoria.inputs_manager.input_mode != \
-			escoria.inputs_manager.INPUT_NONE:
+	if _event is not InputEventMouseButton:
+		return
 
-			if _dialog_manager.is_connected("say_finished", self, "_on_say_finished"):
-				_dialog_manager.disconnect("say_finished", self, "_on_say_finished")
+	if !_event.pressed:
+		return
 
-			emit_signal("finished", "interrupt")
-			get_tree().set_input_as_handled()
+	if escoria.inputs_manager.input_mode == \
+		escoria.inputs_manager.INPUT_NONE:
+		return
+
+	if _dialog_manager.say_finished.is_connected(_on_say_finished):
+		_dialog_manager.say_finished.disconnect(_on_say_finished)
+
+	finished.emit("interrupt")
+	#get_viewport().set_input_as_handled()
 
 
 # Handles the end of a say function after it has emitted say_finished.
 func _on_say_finished():
 	escoria.logger.trace(self, "Dialog State Machine: 'visible' -> 'finish'")
-	emit_signal("finished", "finish")
+	finished.emit("finish")

addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd.uid

@@ -0,0 +1 @@
+uid://dbawq8ee81noc

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

@@ -1,19 +1,42 @@
-[gd_resource type="Theme" load_steps=3 format=2]
+[gd_resource type="Theme" load_steps=4 format=3 uid="uid://dlo07cyfhpilq"]
 
-[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="DynamicFont" id=1]
+[sub_resource type="StyleBoxFlat" id="1"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0, 0, 0, 0.462745)
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+expand_margin_left = 19.0
 
-[sub_resource type="StyleBoxFlat" id=1]
-content_margin_left = 5.0
-content_margin_right = 5.0
-content_margin_top = 5.0
-content_margin_bottom = 5.0
-bg_color = Color( 0, 0, 0, 0.815686 )
-corner_radius_top_left = 8
-corner_radius_top_right = 8
-corner_radius_bottom_right = 8
-corner_radius_bottom_left = 8
+[sub_resource type="StyleBoxFlat" id="2"]
+bg_color = Color(0, 0, 0, 0.509804)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="3"]
+bg_color = Color(0, 0, 0, 0.388235)
+draw_center = false
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+expand_margin_left = 5.0
+expand_margin_top = 5.0
+expand_margin_right = 5.0
+expand_margin_bottom = 5.0
 
 [resource]
-default_font = ExtResource( 1 )
-RichTextLabel/styles/normal = SubResource( 1 )
-VBoxContainer/constants/separation = 1
+Label/colors/font_color = Color(1, 1, 1, 1)
+Label/colors/font_color_shadow = Color(0, 0, 0, 0)
+Label/colors/font_outline_modulate = Color(1, 0, 0, 1)
+Label/colors/label_box_bg = Color(0, 0, 0, 0.745098)
+Label/fonts/font = null
+Label/styles/normal = SubResource("1")
+RichTextLabel/font_sizes/font_size = 20
+RichTextLabel/fonts/normal_font = null
+RichTextLabel/styles/focus = SubResource("2")
+RichTextLabel/styles/normal = SubResource("3")

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

@@ -0,0 +1,34 @@
+[gd_resource type="Theme" load_steps=4 format=3 uid="uid://dvwfrnya2nhxu"]
+
+[sub_resource type="StyleBoxFlat" id="1"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0, 0, 0, 0.462745)
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+expand_margin_left = 19.0
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_yu8vd"]
+bg_color = Color(0, 0, 0, 0.607843)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hq7vb"]
+bg_color = Color(0, 0, 0, 0.65882355)
+corner_radius_top_left = 10
+corner_radius_top_right = 10
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[resource]
+Label/colors/font_color = Color(1, 1, 1, 1)
+Label/colors/font_color_shadow = Color(0, 0, 0, 0)
+Label/colors/font_outline_modulate = Color(1, 0, 0, 1)
+Label/colors/label_box_bg = Color(0, 0, 0, 0.745098)
+Label/styles/normal = SubResource("1")
+Panel/styles/panel = SubResource("StyleBoxFlat_yu8vd")
+PanelContainer/styles/panel = SubResource("StyleBoxFlat_hq7vb")

addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd

@@ -1,227 +0,0 @@
-# A dialog GUI showing a dialog box and character portraits
-extends Popup
-
-
-# Signal emitted when text has been said
-signal say_finished
-
-# Signal emitted when text has just become fully visible
-signal say_visible
-
-
-# The text speed per character for normal display
-var _text_time_per_character: float
-
-# The text speed per character if the dialog line is skipped
-var _fast_text_time_per_character: float
-
-# The reading speed to be used in determining the length of time text remains
-# on the screen.
-var _reading_speed_in_wpm: int
-
-# Used to extract words from lines of text.
-var _word_regex: RegEx = RegEx.new()
-
-# Whether the current dialog is speeding up
-var _is_speeding_up: bool = false
-
-# The current line of text being displayed.
-var _current_line: String
-
-
-# The node holding the avatar
-onready var avatar_node = $Panel/MarginContainer/HSplitContainer/VBoxContainer\
-		/avatar
-
-# The node showing the text
-onready var text_node = $Panel/MarginContainer/HSplitContainer/text
-
-# The tween node for text animations
-onready var tween = $Panel/MarginContainer/HSplitContainer/text/Tween
-
-# Whether the dialog manager is paused
-onready var is_paused: bool = true
-
-
-
-# Build up the UI
-func _ready():
-	_text_time_per_character = ProjectSettings.get_setting(
-		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS
-	)
-
-	if _text_time_per_character < 0:
-		escoria.logger.warn(
-			self,
-			"%s setting must be a non-negative number. Will use default value of %s." %
-				[
-					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS,
-					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
-				]
-		)
-
-		_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
-
-	_fast_text_time_per_character = ProjectSettings.get_setting(
-		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST
-	)
-
-	if _fast_text_time_per_character < 0:
-		escoria.logger.warn(
-			self,
-			"%s setting must be a non-negative number. Will use default value of %s." %
-				[
-					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST,
-					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
-				]
-		)
-
-		_fast_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
-
-	_reading_speed_in_wpm = ProjectSettings.get_setting(
-		RTMISimpleDialogSettings.READING_SPEED_IN_WPM
-	)
-
-	if _reading_speed_in_wpm <= 0:
-		escoria.logger.warn(
-			self,
-			"%s setting must be a positive number. Will use default value of %s." %
-				[
-					RTMISimpleDialogSettings.READING_SPEED_IN_WPM,
-					RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE
-				]
-		)
-
-		_reading_speed_in_wpm = RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE
-
-	_word_regex.compile("\\S+")
-
-	text_node.bbcode_enabled = true
-	tween.connect(
-		"tween_completed",
-		self,
-		"_on_dialog_line_typed"
-	)
-
-	escoria.connect("paused", self, "_on_paused")
-	escoria.connect("resumed", self, "_on_resumed")
-
-
-# Switch the current character
-#
-# #### Parameters
-# - name: The name of the current character
-func set_current_character(name: String):
-	if ProjectSettings.get_setting("escoria/dialog_simple/avatars_path").empty():
-		escoria.logger.warn(self, "Unable to load avatar '%s': Avatar path not specified" % name)
-		return
-
-	var avatar = "%s/%s.tres" % [
-		ProjectSettings.get_setting("escoria/dialog_simple/avatars_path"),
-		name
-	]
-	if ResourceLoader.exists(avatar):
-		avatar_node.texture = ResourceLoader.load(avatar)
-
-		if avatar_node.texture is AnimatedTexture:
-			avatar_node.texture.current_frame = 0
-			avatar_node.texture.pause = false
-	else:
-		escoria.logger.warn(self, "Unable to load avatar '%s': Resource not found in path '%s'" %
-			[name, ProjectSettings.get_setting("escoria/dialog_simple/avatars_path")])
-
-
-# Make a character say something
-#
-# #### Parameters
-# - character: The global id of the character speaking
-# - line: Line to say
-func say(character: String, line: String):
-	_current_line = line
-
-	_is_speeding_up = false
-	popup_centered()
-	set_current_character(character)
-
-	text_node.bbcode_text = tr(line)
-
-	text_node.percent_visible = 0.0
-	var time_show_full_text = _text_time_per_character / 1000 * len(line)
-
-	tween.interpolate_property(text_node, "percent_visible",
-		0.0, 1.0, time_show_full_text,
-		Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
-	tween.start()
-
-
-# Called by the dialog player when the
-func speedup():
-	if not _is_speeding_up:
-		_is_speeding_up = true
-		var time_show_full_text = _fast_text_time_per_character / 1000 * len(_current_line)
-		tween.remove_all()
-		tween.interpolate_property(text_node, "percent_visible",
-			text_node.percent_visible, 1.0, time_show_full_text,
-			Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
-		tween.start()
-
-
-# Called by the dialog player when user wants to finish dialogue immediately.
-func finish():
-	tween.remove_all()
-	tween.interpolate_property(text_node, "percent_visible",
-		text_node.percent_visible, 1.0, 0.0)
-	tween.start()
-
-
-# To be called if voice audio has finished.
-func voice_audio_finished():
-	if avatar_node and avatar_node.texture:
-		avatar_node.texture.current_frame = 0
-		avatar_node.texture.pause = true
-
-
-# The dialog line was printed, start the waiting time and then finish
-# the dialog
-func _on_dialog_line_typed(object, key):
-	if avatar_node.texture is AnimatedTexture:
-		avatar_node.texture.current_frame = 0
-		avatar_node.texture.pause = true
-
-	text_node.visible_characters = -1
-
-	var time_to_disappear: float = _calculate_time_to_disappear()
-	$Timer.start(time_to_disappear)
-	$Timer.connect("timeout", self, "_on_dialog_finished")
-
-	emit_signal("say_visible")
-
-
-func _calculate_time_to_disappear() -> float:
-	return (_get_number_of_words() / _reading_speed_in_wpm as float) * 60
-
-
-func _get_number_of_words() -> int:
-	return _word_regex.search_all(text_node.get_text()).size()
-
-
-# Ending the dialog
-func _on_dialog_finished():
-	# Only trigger to clear the text if we aren't limiting the clearing trigger to a click.
-	if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY):
-		emit_signal("say_finished")
-		queue_free()
-
-
-# Handler managing pause notification from Escoria
-func _on_paused():
-	if tween.is_active():
-		is_paused = true
-		tween.stop_all()
-
-
-# Handler managing resume notification from Escoria
-func _on_resumed():
-	if not tween.is_active():
-		is_paused = false
-		tween.resume_all()

addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd.uid

@@ -0,0 +1 @@
+uid://cfkvypxfuu2mt

addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn

@@ -1,68 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd" type="Script" id=1]
-
-[node name="dialog_box" type="Popup"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_right = -782.0
-margin_bottom = -734.0
-script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Timer" type="Timer" parent="."]
-
-[node name="Panel" type="Panel" parent="."]
-anchor_right = 1.0
-anchor_bottom = 1.0
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="MarginContainer" type="MarginContainer" parent="Panel"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-custom_constants/margin_right = 20
-custom_constants/margin_top = 20
-custom_constants/margin_left = 20
-custom_constants/margin_bottom = 20
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="HSplitContainer" type="HSplitContainer" parent="Panel/MarginContainer"]
-margin_left = 20.0
-margin_top = 20.0
-margin_right = 478.0
-margin_bottom = 146.0
-custom_constants/separation = 35
-dragger_visibility = 1
-
-[node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer/HSplitContainer"]
-margin_right = 88.0
-margin_bottom = 126.0
-size_flags_horizontal = 3
-size_flags_stretch_ratio = 0.3
-
-[node name="avatar" type="TextureRect" parent="Panel/MarginContainer/HSplitContainer/VBoxContainer"]
-margin_right = 88.0
-margin_bottom = 108.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-expand = true
-
-[node name="text" type="RichTextLabel" parent="Panel/MarginContainer/HSplitContainer"]
-margin_left = 123.0
-margin_right = 458.0
-margin_bottom = 126.0
-size_flags_horizontal = 3
-bbcode_enabled = true
-bbcode_text = "Here be some text"
-text = "Here be some text"
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Tween" type="Tween" parent="Panel/MarginContainer/HSplitContainer/text"]

addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd

@@ -1,6 +1,5 @@
-# A dialog UI using a label above the head of the character
-extends RichTextLabel
-
+# A dialog GUI showing a dialog box and character portraits
+extends Window
 
 # Signal emitted when text has been said
 signal say_finished
@@ -8,6 +7,15 @@ signal say_finished
 # Signal emitted when text has just become fully visible
 signal say_visible
 
+const SLOW_TEXT_MODE_MULTIPLIER: float = 2
+
+# Progress bar feature flag
+const PROGRESS_BAR_ENABLED: bool = false
+
+const MINIMUM_TALKING_TIME: float = 2.0
+const DEFAULT_SPEECH_SPEED_MULTIPLIER: float = 1.0
+
+@export var centered_text: bool
 
 # The text speed per character for normal display
 var _text_time_per_character: float
@@ -22,7 +30,6 @@ var _reading_speed_in_wpm: int
 # Used to extract words from lines of text.
 var _word_regex: RegEx = RegEx.new()
 
-
 # Current character speaking, to keep track of reference for animation purposes
 var _current_character
 
@@ -32,19 +39,47 @@ var _is_speeding_up: bool = false
 # The current line of text being displayed.
 var _current_line: String
 
+# If the current line has audio or not.
+var _has_audio: bool
 
-# Tween node for text animation
-onready var tween: Tween = $Tween
+# Timer for character talking
+var _talking_timer
 
-# The node showing the text
-onready var text_node: RichTextLabel = self
+# Timer for clearing the dialog
+var _clearing_timer
+
+var _x_position_offset: int = -10
+var _y_position_offset: int = -20
+
+var _dialog_location_node = null
+
+# Click to continue flag from settings.
+var _click_to_continue: bool = false
+
+# Slow text flag from settings.
+var _slow_text_mode: bool = false
+
+# Progress var Tween reference
+var _progress_tween: Tween
 
 # Whether the dialog manager is paused
-onready var is_paused: bool = true
+@onready var is_paused: bool = true
 
 
-# Enable bbcode and catch the signal when a tween completed
+# Build up the UI
 func _ready():
+	escoria.paused.connect(_on_paused)
+	escoria.resumed.connect(_on_resumed)
+
+	_click_to_continue = escoria.settings_manager.get_custom_setting(
+		RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY_KEY,
+		RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY_DEFAULT_VALUE
+	)
+	_slow_text_mode = escoria.settings_manager.get_custom_setting(
+		RTMISimpleDialogSettings.SLOW_TEXT_MODE_KEY,
+		RTMISimpleDialogSettings.SLOW_TEXT_MODE_DEFAULT_VALUE
+	)
+
 	_text_time_per_character = ProjectSettings.get_setting(
 		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS
 	)
@@ -52,14 +87,16 @@ func _ready():
 	if _text_time_per_character < 0:
 		escoria.logger.warn(
 			self,
-			"%s setting must be a non-negative number. Will use default value of %s." %
-				[
+			(
+				"%s setting must be a non-negative number. Will use default value of %s."
+				% [
 					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS,
-					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
+					escoria.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
 				]
+			)
 		)
 
-		_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
+		_text_time_per_character = escoria.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE
 
 	_fast_text_time_per_character = ProjectSettings.get_setting(
 		RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST
@@ -68,14 +105,16 @@ func _ready():
 	if _fast_text_time_per_character < 0:
 		escoria.logger.warn(
 			self,
-			"%s setting must be a non-negative number. Will use default value of %s." %
-				[
+			(
+				"%s setting must be a non-negative number. Will use default value of %s."
+				% [
 					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST,
-					RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
+					escoria.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
 				]
+			)
 		)
 
-		_fast_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
+		_fast_text_time_per_character = escoria.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE
 
 	_reading_speed_in_wpm = ProjectSettings.get_setting(
 		RTMISimpleDialogSettings.READING_SPEED_IN_WPM
@@ -84,44 +123,37 @@ func _ready():
 	if _reading_speed_in_wpm <= 0:
 		escoria.logger.warn(
 			self,
-			"%s setting must be a positive number. Will use default value of %s." %
-				[
+			(
+				"%s setting must be a positive number. Will use default value of %s."
+				% [
 					RTMISimpleDialogSettings.READING_SPEED_IN_WPM,
-					RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE
+					escoria.READING_SPEED_IN_WPM_DEFAULT_VALUE
 				]
+			)
 		)
 
-		_reading_speed_in_wpm = RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE
+		_reading_speed_in_wpm = escoria.READING_SPEED_IN_WPM_DEFAULT_VALUE
 
 	_word_regex.compile("\\S+")
 
-	bbcode_enabled = true
-	$Tween.connect("tween_completed", self, "_on_dialog_line_typed")
+	%text_node.bbcode_enabled = true
 
-	connect("tree_exiting", self, "_on_tree_exiting")
+	_talking_timer = Timer.new()
+	_talking_timer.one_shot = true
+	_talking_timer.timeout.connect(_on_dialog_line_typed)
+	add_child(_talking_timer)
 
-	escoria.connect("paused", self, "_on_paused")
-	escoria.connect("resumed", self, "_on_resumed")
+	_clearing_timer = Timer.new()
+	_clearing_timer.one_shot = true
+	_clearing_timer.timeout.connect(_on_dialog_finished)
+	add_child(_clearing_timer)
+
+	tree_exiting.connect(_on_tree_exiting)
 
 	_current_line = ""
 
-
-func _process(delta):
-	if _current_character.is_inside_tree() and \
-			_current_character.has_node("dialog_position"):
-		# Position the RichTextLabel on the character's dialog position, if any.
-		rect_position = _current_character.get_node("dialog_position") \
-			.get_global_transform_with_canvas().origin
-		rect_position.x -= rect_size.x / 2
-
-		if rect_position.x < 0:
-			rect_position.x = 0
-
-		var screen_margin = rect_position.x + rect_size.x - \
-				ProjectSettings.get("display/window/size/width")
-
-		if screen_margin > 0:
-			rect_position.x -= screen_margin
+	if PROGRESS_BAR_ENABLED:
+		_progress_tween = create_tween()
 
 
 # Make a character say something
@@ -129,130 +161,190 @@ func _process(delta):
 # #### Parameters
 # - character: The global id of the character speaking
 # - line: Line to say
-func say(character: String, line: String) :
+func say(character: String, line: String, has_audio: bool = false):
 	_current_line = line
+	_has_audio = has_audio
 
 	show()
+	# Hide in case the same box is used
+	%ClickToContinueTip.visible = true if _click_to_continue else false
 
 	_is_speeding_up = false
 
 	# Position the RichTextLabel on the character's dialog position, if any.
 	_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 Marker2D:
+			# Identify any Postion2D nodes
+			if c is ESCDialogLocation:
+				dialog_location_count += 1
+				_dialog_location_node = c
+
+	if dialog_location_count > 1:
+		escoria.logger.warn(
+			self,
+			(
+				"Multiple ESCDialogLocation nodes found "
+				+ "object %s. Last one will be used." % _current_character
+			)
+		)
+
 	# Set text color to color set in the actor
 	var text_color = _current_character.dialog_color
 	var text_color_html = text_color.to_html(false)
 
-	text_node.bbcode_text = "[center][color=#" + text_color_html + "]" \
-		.format([text_color_html]) + tr(line) + "[/color][center]"
+	%text_node.text = (
+		"[color=#" + text_color_html + "]".format([text_color_html]) + tr(line) + "[/color]"
+	)
+	if centered_text:
+		%text_node.text = "[center]" + %text_node.text + "[/center]"
+	if _current_character.is_inside_tree() and is_instance_valid(_dialog_location_node):
+		position = _dialog_location_node.get_global_transform_with_canvas().origin
 
-	if _current_character.is_inside_tree() and \
-			_current_character.has_node("dialog_position"):
-		rect_position = _current_character.get_node(
-			"dialog_position"
-		).get_global_transform_with_canvas().origin
-		rect_position.x -= rect_size.x / 2
+		position.x -= size.x / 2
 	else:
-		rect_position.x = 0
-		rect_size.x = ProjectSettings.get_setting("display/window/size/width")
+		position.x = 0
+		size.x = ProjectSettings.get_setting("display/window/size/viewport_width")
 
-	if rect_position.x < 0:
-		rect_position.x = 0
+	_account_for_margin_x()
 
-	var screen_margin = rect_position.x + rect_size.x - \
-			ProjectSettings.get("display/window/size/width")
-
-	if screen_margin > 0:
-		rect_position.x -= screen_margin
+	_account_for_margin_y()
 
 	_current_character.start_talking()
 
-	text_node.percent_visible = 0.0
-	var time_show_full_text = _text_time_per_character / 1000 * len(_current_line)
+	var slow_text_mode = ProjectSettings.get_setting(RTMISimpleDialogSettings.SLOW_TEXT_MODE)
+
+	var time_show_full_text = _calculate_talking_time()
+
+	# We keep the timer as a way to simulate reading time.
+	_talking_timer.start(time_show_full_text)
+
+	if PROGRESS_BAR_ENABLED:
+		var total_time: float = _calculate_total_time()
+		%ProgressBar.visible = true
+		%ProgressBar.value = 0
+		_progress_tween.tween_property(%ProgressBar, "value", 100, total_time)
 
-	tween.interpolate_property(text_node, "percent_visible",
-		0.0, 1.0, time_show_full_text,
-		Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
-	tween.start()
 	set_process(true)
 
 
-# Called by the dialog player when user wants to finish dialogue fast.
+# Called by the dialog player when the
 func speedup():
-	if not _is_speeding_up:
-		_is_speeding_up = true
-		var time_show_full_text = _fast_text_time_per_character / 1000 * len(_current_line)
-
-		tween.remove_all()
-		tween.interpolate_property(text_node, "percent_visible",
-			text_node.percent_visible, 1.0, time_show_full_text,
-			Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
-		tween.start()
+	say_visible.emit()
+	say_finished.emit()
 
 
 # Called by the dialog player when user wants to finish dialogue immediately.
 func finish():
-	tween.remove_all()
-	tween.interpolate_property(text_node, "percent_visible",
-		text_node.percent_visible, 1.0, 0.0)
-	tween.start()
+	say_visible.emit()
+	say_finished.emit()
 
 
 # To be called if voice audio has finished.
 func voice_audio_finished():
+	if not _click_to_continue:
 		_stop_character_talking()
+		finish();
+
+
+# Handler to deal with this node being removed
+func _on_tree_exiting() -> void:
+	_stop_character_talking()
 
 
 # The dialog line was printed, start the waiting time and then finish
 # the dialog
-func _on_dialog_line_typed(object, key):
+func _on_dialog_line_typed():
 	_stop_character_talking()
-	text_node.visible_characters = -1
 
-	var time_to_disappear: float = _calculate_time_to_disappear()
-	$Timer.start(time_to_disappear)
-	$Timer.connect("timeout", self, "_on_dialog_finished")
+	# This signal is for the core.
+	say_visible.emit()
 
-	emit_signal("say_visible")
+	# Start time to pass line, except click is required or line has audio.
+	if not _click_to_continue and not _has_audio:
+		var time_to_disappear: float = _calculate_time_to_disappear()
+		_clearing_timer.start(time_to_disappear)
+
+
+func _calculate_talking_time() -> float:
+	if _slow_text_mode:
+		escoria.logger.info(self, "Text in Slow mode")
+		_text_time_per_character = _text_time_per_character * SLOW_TEXT_MODE_MULTIPLIER
+
+	var time = _text_time_per_character / 1000 * len(_current_line)
+
+	var minimum_time = MINIMUM_TALKING_TIME
+	if _slow_text_mode:
+		minimum_time = MINIMUM_TALKING_TIME * SLOW_TEXT_MODE_MULTIPLIER
+	if time < minimum_time:
+		return minimum_time
+
+	return time
 
 
 func _calculate_time_to_disappear() -> float:
-	return (_get_number_of_words() / _reading_speed_in_wpm as float) * 60
+	return _get_number_of_words() as float / _reading_speed_in_wpm as float
+
+
+func _calculate_total_time() -> float:
+	return _calculate_talking_time() + _calculate_time_to_disappear()
 
 
 func _get_number_of_words() -> int:
-	return _word_regex.search_all(text_node.get_text()).size()
+	var a = _word_regex.search_all(%text_node.get_text())
+	var b = _word_regex.search_all(%text_node.get_text()).size()
+	return _word_regex.search_all(%text_node.get_text()).size()
 
 
 # Ending the dialog
 func _on_dialog_finished():
-	# Only trigger to clear the text if we aren't limiting the clearing trigger to a click.
-	if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY):
-		emit_signal("say_finished")
+	say_finished.emit()
 
 
 # Handler managing pause notification from Escoria
 func _on_paused():
-	if tween.is_active():
-		is_paused = true
-		visible = false
-		tween.stop_all()
+	_talking_timer.set_paused(true)
+	hide()
+
 
 
 # Handler managing resume notification from Escoria
 func _on_resumed():
-	if not tween.is_active():
-		is_paused = false
-		visible = true
-		tween.resume_all()
-
-
- # Handler to deal with this node being removed
-func _on_tree_exiting() -> void:
-	_stop_character_talking()
-
+	_talking_timer.set_paused(false)
+	show()
 
 func _stop_character_talking():
 	# Make the speaking item animation stop talking, if it is still alive
 	if is_instance_valid(_current_character) and _current_character != null:
 		_current_character.stop_talking()
+
+
+func _on_tree_exited():
+	_stop_character_talking()
+
+
+func _account_for_margin_x() -> void:
+	if position.x < 0:
+		position.x = 0
+
+	var screen_margin_x = (
+		position.x + size.x - ProjectSettings.get("display/window/size/viewport_width")
+	)
+
+	if screen_margin_x > 0:
+		position.x -= screen_margin_x + _x_position_offset
+
+
+func _account_for_margin_y() -> void:
+	if position.y < 0:
+		position.y = 0
+
+	var screen_margin_y = (
+		position.y + size.y - ProjectSettings.get("display/window/size/viewport_height")
+	)
+
+	if screen_margin_y > 0:
+		position.y -= screen_margin_y + _y_position_offset

addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd.uid

@@ -0,0 +1 @@
+uid://d12nyx86nlc6h

addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn

@@ -1,18 +1,81 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=7 format=3 uid="uid://cp75ofyuetxux"]
 
-[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd" type="Script" id=1]
-[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2]
+[ext_resource type="Script" uid="uid://d12nyx86nlc6h" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd" id="1"]
+[ext_resource type="Texture2D" uid="uid://cn1fjp4q7b5e0" path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" id="2_4itiw"]
+[ext_resource type="Theme" uid="uid://dvwfrnya2nhxu" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme/dialog.tres" id="2_7uovn"]
+[ext_resource type="Theme" uid="uid://dlo07cyfhpilq" path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" id="2_f1tsx"]
+[ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="3_xhqtt"]
 
-[node name="dialog_label" type="RichTextLabel"]
-margin_right = 672.0
-margin_bottom = 97.0
-theme = ExtResource( 2 )
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4itiw"]
+
+[node name="dialog_box" type="Window"]
+transparent_bg = true
+oversampling_override = 1.0
+size = Vector2i(600, 167)
+unresizable = true
+borderless = true
+transparent = true
+popup_window = true
+script = ExtResource("1")
+centered_text = true
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+custom_minimum_size = Vector2(600, 60)
+offset_right = 600.0
+offset_bottom = 60.0
+scale = Vector2(0.9775281, 1)
+theme = ExtResource("2_7uovn")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"]
+layout_mode = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 15
+theme_override_constants/margin_top = 15
+theme_override_constants/margin_right = 15
+theme_override_constants/margin_bottom = 15
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="text_node" type="RichTextLabel" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+clip_contents = false
+layout_mode = 2
+size_flags_horizontal = 3
+theme = ExtResource("2_f1tsx")
 bbcode_enabled = true
-bbcode_text = "[center]Here be some text.[/center]"
-text = "Here be some text."
-fit_content_height = true
-script = ExtResource( 1 )
+text = "Here be some text.Here be some text.Here be some text.[i]Here be some text.[/i]Here be some text.Here be some text.Here[b] be some[/b] text.Here be some text.Here be some text.Here be some text.Here be some text.Here be some text."
+fit_content = true
+scroll_active = false
+autowrap_mode = 2
+justification_flags = 171
 
-[node name="Tween" type="Tween" parent="."]
+[node name="ClickToContinueTip" type="HBoxContainer" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 8
+size_flags_vertical = 4
 
-[node name="Timer" type="Timer" parent="."]
+[node name="icon" type="Sprite2D" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ClickToContinueTip"]
+position = Vector2(1, 8)
+scale = Vector2(0.583333, 0.583333)
+texture = ExtResource("2_4itiw")
+offset = Vector2(-28, 1)
+
+[node name="label" type="Label" parent="PanelContainer/VBoxContainer/MarginContainer/VBoxContainer/ClickToContinueTip"]
+layout_mode = 2
+theme = ExtResource("3_xhqtt")
+theme_override_font_sizes/font_size = 12
+theme_override_styles/normal = SubResource("StyleBoxEmpty_4itiw")
+text = "CLICK_TO_CONTINUE_TIP"
+
+[node name="ProgressBar" type="ProgressBar" parent="PanelContainer/VBoxContainer"]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+value = 50.0
+rounded = true
+show_percentage = false

addons/escoria-ui-return-monkey-island/GymkhanaAutoload.gd

@@ -1,20 +0,0 @@
-extends Node
-
-var item_count_manager: ESCItemCountManager
-
-var tooltip_manager: ESCTootltipManager
-
-func get_item(global_id: String) -> ESCItem:
-	var object = escoria.object_manager.get_object(global_id)
-	if !object:
-		return null
-		
-	var node = object.node
-	if not node is ESCItem:
-		escoria.logger.error(
-		  "set_tootltip: invalid object",
-		  ["Object is not an ESCItem"]
-		)
-		return null
-
-	return node

addons/escoria-ui-return-monkey-island/MusicButton.gd

@@ -1,20 +0,0 @@
-extends TextureButton
-
-export(Texture) var musicEnabledTexture: Texture
-export(Texture) var musicEnabledHoverTexture: Texture
-
-export(Texture) var musicDisabledTexture: Texture
-export(Texture) var musicDisabledHoverTexture: Texture
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-func _process(delta: float):
-	if escoria.game_scene.musicEnabled == true:
-		texture_normal = musicEnabledTexture
-		texture_hover = musicEnabledHoverTexture
-	else:
-		texture_normal = musicDisabledTexture
-		texture_hover = musicDisabledHoverTexture
-		

addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.gd

@@ -0,0 +1,11 @@
+class_name RTMIAchievementSummaryMenu
+extends PanelContainer
+
+func ready() -> void:
+	%SummaryPanel.hide_position()
+
+func _on_rtmi_menu_button_pressed() -> void:
+	hide()
+
+func refresh() -> void:
+	%SummaryPanel.refresh()

addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.gd.uid

@@ -0,0 +1 @@
+uid://bp676ele1a2dk

addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.tscn

@@ -0,0 +1,54 @@
+[gd_scene load_steps=5 format=3 uid="uid://bcu6ik8qq0dl6"]
+
+[ext_resource type="PackedScene" uid="uid://cbq03pmsdusib" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.tscn" id="1_iv6go"]
+[ext_resource type="Script" uid="uid://bp676ele1a2dk" path="res://addons/escoria-ui-return-monkey-island/achievements/menu/rtmi_achievements_menu.gd" id="1_krbpm"]
+[ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_ntqhu"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_krbpm"]
+bg_color = Color(0.21960784, 0.21960784, 0.21960784, 1)
+
+[node name="AchievementsMenu" type="PanelContainer"]
+process_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_krbpm")
+script = ExtResource("1_krbpm")
+
+[node name="CenterContainer" type="CenterContainer" parent="."]
+layout_mode = 2
+
+[node name="PanelContainer" type="PanelContainer" parent="CenterContainer"]
+layout_mode = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 20
+theme_override_constants/margin_top = 20
+theme_override_constants/margin_right = 20
+theme_override_constants/margin_bottom = 20
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer"]
+custom_minimum_size = Vector2(300, 0)
+layout_mode = 2
+
+[node name="SummaryPanel" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer" instance=ExtResource("1_iv6go")]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="RichTextLabel" type="RichTextLabel" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer"]
+custom_minimum_size = Vector2(0, 50)
+layout_mode = 2
+theme_override_font_sizes/normal_font_size = 16
+text = "ACHIEVEMENTS_MENU_NOTE"
+vertical_alignment = 1
+
+[node name="Back" type="Button" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+text = "OPTIONS_BACK"
+script = ExtResource("2_ntqhu")
+metadata/_custom_type_script = "uid://elqkwjm0r5c7"
+
+[connection signal="pressed" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Back" to="." method="_on_rtmi_menu_button_pressed"]

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_manager.gd

@@ -0,0 +1,105 @@
+class_name RTMIAchievementManager
+
+signal unlocked(achievement_id)
+
+## Called each second
+signal time_updated(current_time)
+
+var time_tracker: RTMIAchievementTimeTracker
+var played_time: int:
+	get:
+		return time_tracker.time if time_tracker != null else 0
+
+var _game_achievements: Array = ProjectSettings.get(RTMIUiSettings.ACHIEVEMENT_LIST)
+
+## Track unlocked achievements
+var _achievement_tracker: Dictionary = {}
+
+
+func _init() -> void:
+	_load_achievements()
+	escoria.new_game_started.connect(_on_new_game_started)
+
+
+func _ready() -> void:
+	escoria.get_escoria().add_child(time_tracker)
+
+
+func _on_new_game_started() -> void:
+	if time_tracker == null:
+		time_tracker = RTMIAchievementTimeTracker.new()
+		escoria.main.add_child(time_tracker)
+
+
+func get_achievements() -> Dictionary:
+	return _achievement_tracker.duplicate()
+
+
+func get_achievements_total() -> int:
+	return _game_achievements.size()
+
+
+func get_unlocked_achievements_total() -> int:
+	var unlocked_achievements_total = 0
+	for key in _achievement_tracker:
+		if _achievement_tracker.get(key):
+			unlocked_achievements_total += 1
+	return unlocked_achievements_total
+
+func is_perfect_score() -> bool:
+	return get_achievements_total() == get_unlocked_achievements_total()
+
+func reset_achievements() -> void:
+	_achievement_tracker.clear()
+	_load_achievements()
+
+	time_tracker.restart()
+
+
+func _load_achievements() -> void:
+	for achievement_id in _game_achievements:
+		_achievement_tracker.set(achievement_id, false)
+
+
+func unlock_achievement(achievement_id) -> void:
+	if not is_unlocked(achievement_id):
+		escoria.logger.info(self, "Achievent '%s' unlocked." % achievement_id)
+		_achievement_tracker.set(achievement_id, true)
+		unlocked.emit(achievement_id)
+
+func is_unlocked(achievement_id: String) -> bool:
+	if not has(achievement_id):
+		escoria.logger.error(self, "Achievement '%s' not found.")
+		return false
+	return _achievement_tracker.get(achievement_id)
+
+
+func has(achievement_id: String) -> bool:
+	return _achievement_tracker.has(achievement_id)
+
+
+func generate_achievement_literal(achievement_id: String, variant: String = "_title") -> String:
+	var literal = "achievement_%s" % achievement_id
+	if variant != "":
+		literal += "_%s" % variant
+	return literal
+
+
+func start_tracking_time() -> void:
+	if not time_tracker == null:
+		time_tracker.restart()
+
+
+func pause_tracking_time() -> void:
+	if not time_tracker == null:
+		time_tracker.pause()
+
+
+func resume_tracking_time() -> void:
+	if not time_tracker == null:
+		time_tracker.resume()
+
+
+func stop_tracking_time() -> void:
+	if not time_tracker == null:
+		time_tracker.stop()

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_manager.gd.uid

@@ -0,0 +1 @@
+uid://dsyi6bph3dfai

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.gd

@@ -0,0 +1,50 @@
+class_name RTMIAchievementNotification
+extends Control
+
+const _FADE_IN_TIME: float = 0.5
+const _CLEAR_DELAY: float = 4
+const _FADE_OUT_TIME: float = 0.5
+
+var achievement_id: String:
+	get:
+		return achievement_id
+	set(p_achievement_id):
+		achievement_id = p_achievement_id
+		%AchievementTitle.text = tr(gymkhana.achievement_manager.generate_achievement_literal(
+			achievement_id, "title"
+		))
+		%AchievementCounter.text = "(%s/%s)" % [gymkhana.achievement_manager.get_unlocked_achievements_total(), gymkhana.achievement_manager.get_achievements_total()]
+
+var _timer: Timer = Timer.new()
+
+var _first_time = true
+
+
+func _enter_tree() -> void:
+	if _first_time:
+		var tween: Tween = create_tween()
+		tween.tween_property(self, "modulate:a", 1.0, _FADE_IN_TIME).from(0.0)
+
+		_timer.one_shot = true
+		_timer.timeout.connect(_clear_timer_timeout)
+		add_child(_timer)
+
+		_timer.start(_CLEAR_DELAY)
+		_first_time = false
+
+
+func _clear_timer_timeout() -> void:
+	var tween: Tween = create_tween()
+	tween.tween_property(self, "modulate:a", 0.0, _FADE_OUT_TIME).from(1.0)
+	tween.finished.connect(_fade_out_finished)
+
+
+func _fade_out_finished() -> void:
+	queue_free()
+
+
+func _on_clear_button_button_up() -> void:
+	_timer.stop()
+	var tween: Tween = create_tween()
+	tween.tween_property(self, "modulate:a", 0.0, _FADE_OUT_TIME).from(1.0)
+	tween.finished.connect(_fade_out_finished)

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.gd.uid

@@ -0,0 +1 @@
+uid://cbc01kasyr4uf

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.tscn

@@ -0,0 +1,63 @@
+[gd_scene load_steps=3 format=3 uid="uid://dip0jl80tklyg"]
+
+[ext_resource type="Script" uid="uid://cbc01kasyr4uf" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.gd" id="1_fsunq"]
+
+[sub_resource type="LabelSettings" id="LabelSettings_fw80s"]
+font_color = Color(1, 0.6166667, 0, 1)
+
+[node name="AchievementNotification" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_fsunq")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 15
+theme_override_constants/margin_bottom = 10
+
+[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer"]
+layout_mode = 2
+theme_override_constants/separation = 8
+
+[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer"]
+layout_mode = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT_UNLOCKED_NOTIFICATION_LABEL"
+
+[node name="AchievementCounter" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "(1/2)"
+horizontal_alignment = 2
+
+[node name="AchievementTitle" type="Label" parent="PanelContainer/MarginContainer/HBoxContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "ACHIEVEMENT_ACHIVEMENT_ID_TITLE"
+label_settings = SubResource("LabelSettings_fw80s")
+
+[node name="ClearButton" type="Button" parent="PanelContainer/MarginContainer/HBoxContainer"]
+visible = false
+custom_minimum_size = Vector2(30, 30)
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 0
+text = "X"
+
+[connection signal="button_up" from="PanelContainer/MarginContainer/HBoxContainer/ClearButton" to="." method="_on_clear_button_button_up"]

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.gd

@@ -0,0 +1,13 @@
+class_name RTMIAchievementNotificationContainer
+extends PanelContainer
+
+
+var _achievement_notification_scene = preload("res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification.tscn")
+
+func _ready() -> void:
+	gymkhana.achievement_manager.unlocked.connect(_achievement_unlocked)
+
+func _achievement_unlocked(achievement_id) -> void:
+	var achivement_notification = _achievement_notification_scene.instantiate() as RTMIAchievementNotification
+	achivement_notification.achievement_id = achievement_id
+	%Container.add_child(achivement_notification)

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.gd.uid

@@ -0,0 +1 @@
+uid://bsfo4u74sp5qn

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.tscn

@@ -0,0 +1,18 @@
+[gd_scene load_steps=3 format=3 uid="uid://d3kgkl2r5xe4d"]
+
+[ext_resource type="Script" uid="uid://bsfo4u74sp5qn" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_notification_container.gd" id="1_omhs5"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_117yv"]
+
+[node name="AchievementContainer" type="PanelContainer"]
+offset_right = 40.0
+offset_bottom = 40.0
+theme_override_styles/panel = SubResource("StyleBoxEmpty_117yv")
+script = ExtResource("1_omhs5")
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 2
+
+[node name="Container" type="VBoxContainer" parent="MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_time_tracker.gd

@@ -0,0 +1,54 @@
+class_name RTMIAchievementTimeTracker
+extends Node
+
+const TIMEOUT_TIME: float = 1.0
+
+## Timer node
+var _timer: Timer
+
+## Elapsed time tracker, in seconds.
+var _elapsed_seconds: int
+
+var time: int:
+	get:
+		return _elapsed_seconds
+
+
+func _ready():
+	process_mode = Node.PROCESS_MODE_ALWAYS
+
+func _enter_tree() -> void:
+	_timer = Timer.new()
+	_timer.timeout.connect(_timer_timeout)
+	add_child(_timer)
+	start()
+
+func _timer_timeout() -> void:
+	_elapsed_seconds += 1
+	gymkhana.achievement_manager.time_updated.emit(_elapsed_seconds)
+
+func elapsed_seconds() -> int:
+	return _elapsed_seconds
+
+func start() -> void:
+	_timer.start(TIMEOUT_TIME)
+
+func reset() -> void:
+	_elapsed_seconds = 0
+
+func stop() -> void:
+	_timer.stop()
+	_timer.timeout.disconnect(_timer_timeout)
+
+func pause() -> void:
+	_timer.paused = true
+
+func resume() -> void:
+	_timer.paused = false
+
+func restart() -> void:
+	reset()
+	start()
+
+func get_time() -> int:
+	return _elapsed_seconds

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievement_time_tracker.gd.uid

@@ -0,0 +1 @@
+uid://bpbe3rklkaddi

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievements_dev_tool.gd

@@ -0,0 +1,39 @@
+@tool
+extends Control
+
+
+func get_registry_id():
+	return "achievement_inspector"
+
+
+func _ready() -> void:
+	gymkhana.achievement_manager.unlocked.connect(_on_achievement_unlocked)
+	gymkhana.achievement_manager.time_updated.connect(_on_time_updated)
+	update()
+
+
+func _on_achievement_unlocked(_achievement_id: String) -> void:
+	update()
+
+
+func update() -> void:
+	clear()
+	var achievements = gymkhana.achievement_manager.get_achievements()
+	achievements.sort()
+	for key in achievements:
+		var variable: UIEscoriaVariable = UiEscoriaVariableBuilder.create(key, achievements[key])
+		variable.double_clicked.connect(_on_double_clicked)
+		%Container.add_child(variable)
+
+
+func clear() -> void:
+	for child in %Container.get_children():
+		%Container.remove_child(child)
+		child.queue_free()
+
+
+func _on_time_updated(elapsed_time_in_seconds: int) -> void:
+	%TimeTrackerLabel.text = str(elapsed_time_in_seconds)
+	
+func _on_double_clicked(achievement_id) -> void:
+	gymkhana.achievement_manager.unlock_achievement(achievement_id)

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievements_dev_tool.gd.uid

@@ -0,0 +1 @@
+uid://vqxa0p3tqchn

addons/escoria-ui-return-monkey-island/achievements/rtmi_achievements_dev_tool.tscn

@@ -0,0 +1,36 @@
+[gd_scene load_steps=2 format=3 uid="uid://diaqb8q4cula7"]
+
+[ext_resource type="Script" uid="uid://vqxa0p3tqchn" path="res://addons/escoria-ui-return-monkey-island/achievements/rtmi_achievements_dev_tool.gd" id="1_1st1v"]
+
+[node name="AchievementInspector" type="Control"]
+layout_mode = 3
+anchors_preset = 0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+script = ExtResource("1_1st1v")
+
+[node name="PanelContainer" type="PanelContainer" parent="."]
+layout_mode = 0
+offset_right = 4.0
+offset_bottom = 404.0
+
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 2
+theme_override_constants/margin_top = 2
+theme_override_constants/margin_right = 2
+theme_override_constants/margin_bottom = 2
+
+[node name="ScrollContainer" type="ScrollContainer" parent="PanelContainer/MarginContainer"]
+custom_minimum_size = Vector2(0, 400)
+layout_mode = 2
+horizontal_scroll_mode = 0
+
+[node name="Container" type="VBoxContainer" parent="PanelContainer/MarginContainer/ScrollContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="TimeTrackerLabel" type="Label" parent="PanelContainer/MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "00:00:00"

addons/escoria-ui-return-monkey-island/achievements/scoreboard/model/rtmi_score_row.gd

@@ -0,0 +1,13 @@
+class_name RTMIScoreRow
+
+var name: String
+
+var time: int
+
+var date: String
+
+
+func _init(document: Dictionary) -> void:
+	name = document.get("name")
+	time = document.get("time")
+	date = document.get("$createdAt")

addons/escoria-ui-return-monkey-island/achievements/scoreboard/model/rtmi_score_row.gd.uid

@@ -0,0 +1 @@
+uid://8c4xr4s71geu

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_score_manager.gd

@@ -0,0 +1,135 @@
+class_name RTMIScoreManager
+extends Node
+## Score manager to get and submit scores from and to Scoreboard web service.
+
+const PERFECT = "perfect"
+const FASTEST = "fastest"
+const SUBMIT = "submit"
+
+const API_CONFIG_PATH = "res://secret/api.cfg"
+const API_CONFIG_DB_SECTION = "score_db"
+const API_CONFIG_SUBMIT_SECTION = "score_submit"
+
+# Variables loaded from api.cfg
+var api_url: String
+var project_id: String
+var database_id: String
+var score_submit_url: String
+var score_submit_key: String
+
+# Session cookie used for authentication. Needed for score submitting. Stored encrypted in session_cookie.cfg
+# using session_cookie_encrypted_pass as key.
+var session_cookie: String = ""
+# Session cookie expiry date in seconds from Unix epoch.
+var session_cookie_expiry_date: int = -1
+
+var http_requests: Dictionary = {
+	PERFECT: HTTPRequest.new(),
+	FASTEST: HTTPRequest.new(),
+	SUBMIT: HTTPRequest.new(),
+}
+
+
+func _init(scene) -> void:
+	_load_api_config()
+
+	# TODO: remove when https://functions.app.fosil.eu has a valid certificate
+	http_requests[SUBMIT].set_tls_options(TLSOptions.client_unsafe())
+
+	scene.add_child(http_requests[PERFECT])
+	scene.add_child(http_requests[FASTEST])
+	scene.add_child(http_requests[SUBMIT])
+
+
+func _load_api_config() -> void:
+	var config = ConfigFile.new()
+	var error = config.load(API_CONFIG_PATH)
+	if error != OK:
+		push_error("An error occurred loading api config: error=%s" % error)
+		return
+
+	api_url = config.get_value(API_CONFIG_DB_SECTION, "url", "")
+	project_id = config.get_value(API_CONFIG_DB_SECTION, "project_id", "")
+	database_id = config.get_value(API_CONFIG_DB_SECTION, "database_id", "")
+	score_submit_url = config.get_value(API_CONFIG_SUBMIT_SECTION, "url", "")
+	score_submit_key = config.get_value(API_CONFIG_SUBMIT_SECTION, "key", "")
+
+
+func get_scores(collection: String) -> Array[RTMIScoreRow]:
+	var http_request = http_requests[collection]
+	var response_data = await _score_http_request(http_request, "%s/databases/%s/collections/%s/documents" % [api_url, database_id, collection])
+
+	if not response_data:
+		return []
+
+	# Map DB rows to RTMIScoreRow
+	var scores_untyped = response_data.get("documents").map(func(document): return RTMIScoreRow.new(document))
+	scores_untyped.sort_custom(func(first, last): return first.time < last.time)
+	# Array.map() does not support typing, we need to use Array.assign to set the type.
+	var scores: Array[RTMIScoreRow]
+	scores.assign(scores_untyped)
+	return scores
+
+
+func submit_score(collection: String, name: String, time: int) -> bool:
+	var hash = ("%s_%s_%s_%s" % [collection, name, time, score_submit_key]).sha256_text()
+	var url = "%s/%s/%s/%s/%s" % [score_submit_url, collection, name.uri_encode(), time, hash]
+	var response_data = await _score_http_request(http_requests[SUBMIT], url)
+
+	if response_data == null:
+		push_error("Error submitting score: response data is null")
+		return false
+
+	if not response_data.success:
+		push_error("Error submitting score: error=%s" % response_data.errorMsg)
+
+	return response_data.success
+
+
+## Calculates a certain time which position would have in scoreboard. First position is 0.
+func calculate_score_position(collection: String, time: int) -> int:
+	var scores: Array[RTMIScoreRow] = await get_scores(collection)
+	var pos = scores.find_custom(func(score): return time < score.time)
+	if pos < 0:
+		return scores.size()
+
+	return pos
+
+
+func _score_http_request(
+	http_request: HTTPRequest, url: String, method: int = HTTPClient.METHOD_GET, request_data: String = "", additional_headers: Array = []
+) -> Variant:
+	var headers = ["X-Appwrite-Project: %s" % project_id, "Content-Type: application/json"]
+	headers.append_array(additional_headers)
+
+	var error = http_request.request(url, headers, method, request_data)
+	if error:
+		push_error("An error occurred creating the HTTP request: error=%s" % error)
+		return null
+
+	var response: Array = await http_request.request_completed
+	var result: int = response[0]
+	var http_status: int = response[1]
+	var response_body: PackedByteArray = response[3]
+
+	if result != HTTPRequest.RESULT_SUCCESS or http_status < 200 or http_status >= 300:
+		push_error("HTTP request returned an error: result=%s http_status=%s body=%s" % [result, http_status, response_body.get_string_from_utf8()])
+		return null
+
+	var response_data = JSON.parse_string(response_body.get_string_from_utf8())
+	if not response_data:
+		push_error("Error parsing HTTP response body.")
+		return null
+
+	return response_data
+
+
+static func format_time(time: int) -> String:
+	var hours = time / 3600
+	var minutes = (time % 3600) / 60
+	var seconds = time % 60
+
+	if hours:
+		return "%dh %02dm %02ds" % [hours, minutes, seconds]
+
+	return "%dm %02ds" % [minutes, seconds]

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_score_manager.gd.uid

@@ -0,0 +1 @@
+uid://br2xa7lcrals3

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard.gd

@@ -0,0 +1,16 @@
+extends Control
+
+func _ready() -> void:
+	refresh()
+
+func refresh():
+	%FastestScores.refresh()
+	%PerfectScores.refresh()
+
+
+func _on_back_pressed() -> void:
+	hide()
+
+
+func _on_refresh_pressed() -> void:
+	refresh()

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard.gd.uid

@@ -0,0 +1 @@
+uid://bhi02d1pasur4

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard.tscn

@@ -0,0 +1,64 @@
+[gd_scene load_steps=5 format=3 uid="uid://cqgluci3f3v3n"]
+
+[ext_resource type="Script" uid="uid://bhi02d1pasur4" path="res://addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard.gd" id="1_efvuy"]
+[ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_ip2kf"]
+[ext_resource type="PackedScene" uid="uid://ooknv238745j" path="res://addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.tscn" id="1_o5uv4"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_efvuy"]
+bg_color = Color(0.22, 0.22, 0.22, 1)
+
+[node name="RtmiScoreboard" type="PanelContainer"]
+process_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme = ExtResource("1_ip2kf")
+theme_override_styles/panel = SubResource("StyleBoxFlat_efvuy")
+script = ExtResource("1_efvuy")
+
+[node name="CenterContainer" type="CenterContainer" parent="."]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+alignment = 1
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+layout_mode = 2
+
+[node name="FastestScores" parent="CenterContainer/VBoxContainer/HBoxContainer2" instance=ExtResource("1_o5uv4")]
+unique_name_in_owner = true
+layout_mode = 2
+collection = "fastest"
+
+[node name="PerfectScores" parent="CenterContainer/VBoxContainer/HBoxContainer2" instance=ExtResource("1_o5uv4")]
+unique_name_in_owner = true
+layout_mode = 2
+collection = "perfect"
+
+[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"]
+layout_mode = 2
+text = "SCOREBOARD_NOTE"
+horizontal_alignment = 1
+
+[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+layout_mode = 2
+alignment = 1
+
+[node name="Back" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(300, 50)
+layout_mode = 2
+text = "SCOREBOARD_BACK"
+
+[node name="Refresh" type="Button" parent="CenterContainer/VBoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(300, 50)
+layout_mode = 2
+text = "SCOREBOARD_REFRESH"
+
+[connection signal="pressed" from="CenterContainer/VBoxContainer/HBoxContainer/Back" to="." method="_on_back_pressed"]
+[connection signal="pressed" from="CenterContainer/VBoxContainer/HBoxContainer/Refresh" to="." method="_on_refresh_pressed"]

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.gd

@@ -0,0 +1,115 @@
+@tool
+class_name RTMISocoreboardPanel
+extends PanelContainer
+
+const RECORDS_PER_PAGE: int = 10
+
+@export var collection: String
+
+var scores: Array[RTMIScoreRow]
+var total_records: int = 0
+var current_page: int = 0
+var total_pages: int = 0
+
+@onready var prev_button: RTMIMenuButton = %PrevButton
+@onready var next_button: RTMIMenuButton = %NextButton
+@onready var spinner: Spinner = %Spinner
+
+
+func _ready() -> void:
+	%Title.text = str("SCOREBOARD_%s_TITLE" % collection).to_upper()
+	spinner.hide()
+	prev_button.pressed.connect(_prev_page)
+	next_button.pressed.connect(_next_page)
+
+
+func refresh() -> void:
+	current_page = 0
+	total_records = 0
+	spinner.show()
+	await _get_scores()
+	spinner.hide()
+	_fill_scores()
+
+
+func _fill_scores():
+	_clear_scores()
+
+	total_records = scores.size()
+	total_pages = total_records / RECORDS_PER_PAGE
+	if total_records % RECORDS_PER_PAGE > 0:
+		total_pages += 1
+	_update_pager()
+
+	if scores.is_empty():
+		return
+
+	var start_score = current_page * RECORDS_PER_PAGE
+	var end_score = (current_page + 1) * RECORDS_PER_PAGE
+	if end_score >= total_records:
+		end_score = total_records + 1
+	var scores_slice = scores.slice(start_score, end_score)
+
+	var pos: int = RECORDS_PER_PAGE * current_page + 1
+	for score in scores_slice:
+		# ToDo create and add rich label
+		var label = Label.new()
+		label.add_theme_font_override("font", load("res://addons/escoria-ui-return-monkey-island/fonts/SpaceMono-Regular.ttf"))
+		label.text = (" %2s. %-24s %10s %19s" % [pos, score.name.to_upper(), _format_time(score.time), _format_date(score.date)])
+		%Scores.add_child(label)
+		pos += 1
+
+
+func _clear_scores() -> void:
+	for child in %Scores.get_children():
+		%Scores.remove_child(child)
+		child.queue_free()
+
+
+func _get_scores() -> void:
+	if gymkhana.score_manager == null:
+		return
+
+	scores = await gymkhana.score_manager.get_scores(collection)
+
+
+func _prev_page() -> void:
+	if current_page > 0:
+		current_page -= 1
+		_fill_scores()
+
+
+func _next_page() -> void:
+	if current_page < total_pages - 1:
+		current_page += 1
+		_fill_scores()
+
+
+func _update_pager() -> void:
+	prev_button.disabled = true
+	prev_button.focus_mode = FOCUS_NONE
+
+	next_button.disabled = true
+	next_button.focus_mode = FOCUS_NONE
+
+	if current_page > 0:
+		prev_button.disabled = false
+
+	if current_page < total_pages - 1:
+		next_button.disabled = false
+
+
+func _format_date(iso_date: String) -> String:
+	var date = Time.get_datetime_dict_from_datetime_string(iso_date, false)
+	return "%s/%02d/%02d %02d:%02d" % [date["year"], date["month"], date["day"], date["hour"], date["minute"]]
+
+
+func _format_time(time: int) -> String:
+	var hours = time / 3600
+	var minutes = (time % 3600) / 60
+	var seconds = time % 60
+
+	if hours:
+		return "%dh %02dm %02ds" % [hours, minutes, seconds]
+
+	return "%dm %02ds" % [minutes, seconds]

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.gd.uid

@@ -0,0 +1 @@
+uid://cxvhsdqap7w1b

addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.tscn

@@ -0,0 +1,194 @@
+[gd_scene load_steps=8 format=3 uid="uid://ooknv238745j"]
+
+[ext_resource type="Script" uid="uid://cxvhsdqap7w1b" path="res://addons/escoria-ui-return-monkey-island/achievements/scoreboard/rtmi_scoreboard_panel.gd" id="1_35c2h"]
+[ext_resource type="Theme" uid="uid://djtwqnfbbt5t8" path="res://addons/escoria-ui-return-monkey-island/theme/menu.tres" id="1_ine7w"]
+[ext_resource type="FontFile" uid="uid://bq0vin2knt0or" path="res://addons/escoria-ui-return-monkey-island/fonts/SpaceMono-Regular.ttf" id="2_bn406"]
+[ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_hgepf"]
+[ext_resource type="Script" uid="uid://doqt8bqgwakt" path="res://addons/tattomoosa.spinner/spinner.gd" id="4_bn406"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ine7w"]
+bg_color = Color(0.2520276, 0.25202766, 0.25202754, 1)
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_hgepf"]
+
+[node name="ScoreBoardPanel" type="PanelContainer"]
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme = ExtResource("1_ine7w")
+theme_override_styles/panel = SubResource("StyleBoxFlat_ine7w")
+script = ExtResource("1_35c2h")
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 2
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+layout_mode = 2
+
+[node name="Title" type="Label" parent="MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_fonts/font = ExtResource("2_bn406")
+theme_override_font_sizes/font_size = 23
+text = "SCOREBOARD__TITLE"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Scores" type="VBoxContainer" parent="MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(600, 280)
+layout_mode = 2
+
+[node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+scroll_active = false
+horizontal_alignment = 1
+
+[node name="RichTextLabel2" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel3" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel4" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel5" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel6" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel7" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel8" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel9" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="RichTextLabel10" type="RichTextLabel" parent="MarginContainer/VBoxContainer/Scores"]
+layout_mode = 2
+text = "PLAYER_NAME - TIME - DATE"
+fit_content = true
+horizontal_alignment = 1
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer"]
+layout_mode = 2
+alignment = 1
+
+[node name="PrevButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_styles/focus = SubResource("StyleBoxEmpty_hgepf")
+text = "< "
+script = ExtResource("2_hgepf")
+metadata/_custom_type_script = "uid://elqkwjm0r5c7"
+
+[node name="NextButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 3
+text = ">"
+script = ExtResource("2_hgepf")
+metadata/_custom_type_script = "uid://elqkwjm0r5c7"
+
+[node name="Spinner" type="Range" parent="."]
+_import_path = NodePath("")
+unique_name_in_owner = true
+process_mode = 0
+process_priority = 0
+process_physics_priority = 0
+process_thread_group = 0
+physics_interpolation_mode = 2
+auto_translate_mode = 0
+editor_description = ""
+visible = false
+modulate = Color(1, 1, 1, 1)
+self_modulate = Color(1, 1, 1, 1)
+show_behind_parent = false
+top_level = false
+clip_children = 0
+light_mask = 1
+visibility_layer = 1
+z_index = 0
+z_as_relative = true
+y_sort_enabled = false
+texture_filter = 0
+texture_repeat = 0
+material = null
+use_parent_material = false
+clip_contents = true
+custom_minimum_size = Vector2(100, 100)
+layout_direction = 0
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+size_flags_stretch_ratio = 1.0
+localize_numeral_system = true
+tooltip_text = ""
+tooltip_auto_translate_mode = 0
+focus_neighbor_left = NodePath("")
+focus_neighbor_top = NodePath("")
+focus_neighbor_right = NodePath("")
+focus_neighbor_bottom = NodePath("")
+focus_next = NodePath("")
+focus_previous = NodePath("")
+focus_mode = 0
+focus_behavior_recursive = 0
+mouse_filter = 0
+mouse_behavior_recursive = 0
+mouse_force_pass_scroll_events = true
+mouse_default_cursor_shape = 0
+accessibility_name = ""
+accessibility_description = ""
+accessibility_live = 0
+accessibility_controls_nodes = Array[NodePath]([])
+accessibility_described_by_nodes = Array[NodePath]([])
+accessibility_labeled_by_nodes = Array[NodePath]([])
+accessibility_flow_to_nodes = Array[NodePath]([])
+theme = null
+theme_type_variation = &""
+min_value = 0.0
+max_value = 100.0
+step = 1.0
+value = 0.0
+exp_edit = false
+rounded = false
+allow_greater = false
+allow_lesser = false
+script = ExtResource("4_bn406")
+spin_fill_percent = 0.091
+color_progress = Color(1, 1, 1, 1)
+color_background = Color(0, 0, 0, 0)

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.gd

@@ -0,0 +1,103 @@
+class_name RTMIAchievementSummaryContainer
+extends PanelContainer
+
+signal score_submitted()
+
+const CHARACTER_LIMIT: int = 32
+const ALLOWED_CHARACTERS = "[à-ÿÀ-ŸA-Za-z0-9 _-]"
+
+var collection: String
+
+@onready var input_name: LineEdit = %InputName
+@onready var submit_button: RTMIMenuButton = %SubmitButton
+@onready var spinner: Spinner = %Spinner
+@onready var summary_panel: RTMIAchievementSummaryPanel =  %SummaryPanel
+
+func _ready() -> void:
+	input_name.text_changed.connect(_on_input_name_changed)
+	input_name.grab_focus()
+	summary_panel.show_position()
+	check_perfect()
+	check_score()
+
+func _input(event: InputEvent) -> void:
+	if event.is_action_pressed("ui_enter"):
+		_on_submit_button_up()
+
+func check_perfect():
+	if gymkhana.achievement_manager.is_perfect_score():
+		escoria.game_scene.launch_confetti()
+		escoria.globals_manager.set_global("turno_cocina_perfect_score", true)
+		submit_button.text = tr("SUBMIT_PERFECT_SCORE")
+	
+func check_score():
+	var played_time = floor(randf() * 1000)
+	collection = gymkhana.score_manager.PERFECT if gymkhana.achievement_manager.is_perfect_score() else gymkhana.score_manager.FASTEST
+
+	var pos_int = await gymkhana.score_manager.calculate_score_position(collection, gymkhana.achievement_manager.played_time)
+	summary_panel.score_position = pos_int + 1
+	
+
+
+
+func _on_input_name_changed(_new_text: String):
+	var valid = _validate_name()
+	if not valid:
+		_set_label_error()
+		return
+	_set_label_no_error()
+
+
+func _on_submit_button_up() -> void:
+	var valid = _validate_name()
+	if not valid:
+		_set_label_error()
+		return
+
+	spinner.show()
+	var success: bool = await gymkhana.score_manager.submit_score(collection, input_name.text, gymkhana.achievement_manager.played_time)
+	if success:
+		_set_submit_ok()
+		input_name.editable = false
+		input_name.selecting_enabled = false
+		input_name.focus_mode = FOCUS_NONE
+		submit_button.disabled = true
+		submit_button.focus_mode = FOCUS_NONE
+		score_submitted.emit()
+	else:
+		_set_submit_error()
+	spinner.hide()
+
+
+func _validate_name() -> bool:
+	if input_name.text == "":
+		return false
+
+	var regex = RegEx.new()
+	regex.compile(ALLOWED_CHARACTERS)
+	var result = regex.sub(input_name.text, "", true)
+
+	var valid_name = ""
+	for char in regex.search_all(input_name.text):
+		valid_name += char.get_string()
+
+	input_name.text = valid_name
+	input_name.caret_column = valid_name.length()
+
+	return true
+
+
+func _set_label_error() -> void:
+	input_name.modulate = Color.RED
+
+
+func _set_label_no_error() -> void:
+	input_name.modulate = Color.WHITE
+
+
+func _set_submit_ok() -> void:
+	submit_button.modulate = Color.GREEN
+
+
+func _set_submit_error() -> void:
+	submit_button.modulate = Color.RED

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.gd.uid

@@ -0,0 +1 @@
+uid://wor3bvk7tdh0

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.tscn

@@ -0,0 +1,137 @@
+[gd_scene load_steps=6 format=3 uid="uid://ch5d4emoxq6t4"]
+
+[ext_resource type="Script" uid="uid://wor3bvk7tdh0" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary.gd" id="1_vcqj7"]
+[ext_resource type="PackedScene" uid="uid://cbq03pmsdusib" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.tscn" id="2_0xx2m"]
+[ext_resource type="Script" uid="uid://elqkwjm0r5c7" path="res://addons/escoria-ui-return-monkey-island/menus/rtmi_menu_button.gd" id="2_3d1qx"]
+[ext_resource type="Script" uid="uid://doqt8bqgwakt" path="res://addons/tattomoosa.spinner/spinner.gd" id="3_co5jd"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_co5jd"]
+
+[node name="AchievementSummary" type="PanelContainer"]
+custom_minimum_size = Vector2(300, 0)
+offset_right = 40.0
+offset_bottom = 40.0
+script = ExtResource("1_vcqj7")
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 2
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+layout_mode = 2
+
+[node name="SummaryPanel" parent="MarginContainer/VBoxContainer" instance=ExtResource("2_0xx2m")]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="HSeparator3" type="HSeparator" parent="MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
+
+[node name="InputName" type="LineEdit" parent="MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 60)
+layout_mode = 2
+placeholder_text = "NAME_PLACEHOLDER"
+clear_button_enabled = true
+caret_blink = true
+
+[node name="HSeparator2" type="HSeparator" parent="MarginContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
+
+[node name="SubmitButton" type="Button" parent="MarginContainer/VBoxContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 60)
+layout_mode = 2
+text = "SUBMIT_SCORE"
+script = ExtResource("2_3d1qx")
+metadata/_custom_type_script = "uid://elqkwjm0r5c7"
+
+[node name="Spinner" type="Range" parent="MarginContainer/VBoxContainer/SubmitButton"]
+_import_path = NodePath("")
+unique_name_in_owner = true
+process_mode = 0
+process_priority = 0
+process_physics_priority = 0
+process_thread_group = 0
+physics_interpolation_mode = 2
+auto_translate_mode = 0
+editor_description = ""
+visible = false
+modulate = Color(1, 1, 1, 1)
+self_modulate = Color(1, 1, 1, 1)
+show_behind_parent = false
+top_level = false
+clip_children = 0
+light_mask = 1
+visibility_layer = 1
+z_index = 0
+z_as_relative = true
+y_sort_enabled = false
+texture_filter = 0
+texture_repeat = 0
+material = null
+use_parent_material = false
+clip_contents = true
+custom_minimum_size = Vector2(16, 16)
+layout_direction = 0
+layout_mode = 1
+anchors_preset = 4
+anchor_left = 0.0
+anchor_top = 0.5
+anchor_right = 0.0
+anchor_bottom = 0.5
+offset_left = 20.0
+offset_top = -20.0
+offset_right = 60.0
+offset_bottom = 20.0
+grow_horizontal = 1
+grow_vertical = 2
+rotation = 0.0
+scale = Vector2(1, 1)
+pivot_offset = Vector2(0, 0)
+size_flags_horizontal = 1
+size_flags_vertical = 1
+size_flags_stretch_ratio = 1.0
+localize_numeral_system = true
+tooltip_text = ""
+tooltip_auto_translate_mode = 0
+focus_neighbor_left = NodePath("")
+focus_neighbor_top = NodePath("")
+focus_neighbor_right = NodePath("")
+focus_neighbor_bottom = NodePath("")
+focus_next = NodePath("")
+focus_previous = NodePath("")
+focus_mode = 0
+focus_behavior_recursive = 0
+mouse_filter = 0
+mouse_behavior_recursive = 0
+mouse_force_pass_scroll_events = true
+mouse_default_cursor_shape = 0
+accessibility_name = ""
+accessibility_description = ""
+accessibility_live = 0
+accessibility_controls_nodes = Array[NodePath]([])
+accessibility_described_by_nodes = Array[NodePath]([])
+accessibility_labeled_by_nodes = Array[NodePath]([])
+accessibility_flow_to_nodes = Array[NodePath]([])
+theme = null
+theme_type_variation = &""
+min_value = 0.0
+max_value = 100.0
+step = 1.0
+value = 0.0
+exp_edit = false
+rounded = false
+allow_greater = false
+allow_lesser = false
+script = ExtResource("3_co5jd")
+color_progress = Color(0.98, 0.98, 0.98, 1)
+color_background = Color(0, 0, 0, 0)
+metadata/_custom_type_script = "uid://doqt8bqgwakt"
+
+[connection signal="button_up" from="MarginContainer/VBoxContainer/SubmitButton" to="." method="_on_submit_button_up"]

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.gd

@@ -0,0 +1,48 @@
+class_name RTMIAchievementSummaryPanel
+extends VBoxContainer
+
+@onready var total_time: Label = %TotalTime
+@onready var pos: Label = %Position
+@onready var achievement_count: Label = %AchievementCount
+@onready var unlocked_achievements_container: VBoxContainer = %UnlockedAchievementsContainer
+
+var score_position: int = 0:
+	set(new_value):
+		score_position = new_value
+		%Position.text = "#%d" % new_value
+		
+
+func _ready() -> void:
+	_fill()
+
+func refresh() -> void:
+	_fill()
+
+func _fill():
+	_clear()
+	total_time.text = RTMIScoreManager.format_time(gymkhana.achievement_manager.played_time)
+	var achievements = gymkhana.achievement_manager.get_achievements()
+	for achievement_key in achievements:
+		var label = Label.new()
+		label.text = tr(gymkhana.achievement_manager.generate_achievement_literal(
+			achievement_key, "title"
+		))
+		label.add_theme_color_override("font_color", Color.DIM_GRAY)
+		if achievements.get(achievement_key):
+			label.add_theme_color_override("font_color", Color.GREEN)
+		unlocked_achievements_container.add_child(label)
+
+	achievement_count.text = "%s / %s" % [gymkhana.achievement_manager.get_unlocked_achievements_total(), achievements.size()]
+
+	
+func _clear() -> void:
+	for child in unlocked_achievements_container.get_children():
+		unlocked_achievements_container.remove_child(child)
+		child.queue_free()
+
+func show_position() -> void:
+	%PositionContainer.show()
+
+
+func hide_position() -> void:
+	%PositionContainer.hide()

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.gd.uid

@@ -0,0 +1 @@
+uid://b7llgro3vx5rr

addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.tscn

@@ -0,0 +1,105 @@
+[gd_scene load_steps=3 format=3 uid="uid://cbq03pmsdusib"]
+
+[ext_resource type="Script" uid="uid://b7llgro3vx5rr" path="res://addons/escoria-ui-return-monkey-island/achievements/summary/rtmi_achievement_summary_panel.gd" id="1_cgp0k"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_co5jd"]
+
+[node name="SummaryPanel" type="VBoxContainer"]
+script = ExtResource("1_cgp0k")
+
+[node name="HBoxContainer" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="TotalTimeLabel" type="Label" parent="HBoxContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 20
+text = "TOTAL_TIME"
+horizontal_alignment = 1
+
+[node name="TotalTime" type="Label" parent="HBoxContainer/VBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 24
+text = "0h 00m 00s"
+horizontal_alignment = 1
+vertical_alignment = 2
+
+[node name="PositionContainer" type="VBoxContainer" parent="HBoxContainer"]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="PositionLabel" type="Label" parent="HBoxContainer/PositionContainer"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 20
+text = "POSITION"
+horizontal_alignment = 1
+
+[node name="Position" type="Label" parent="HBoxContainer/PositionContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 24
+text = "-"
+horizontal_alignment = 1
+vertical_alignment = 2
+
+[node name="HSeparator" type="HSeparator" parent="."]
+layout_mode = 2
+theme_override_styles/separator = SubResource("StyleBoxEmpty_co5jd")
+
+[node name="MarginContainer2" type="MarginContainer" parent="."]
+layout_mode = 2
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="AchievementTitle" type="Label" parent="HBoxContainer2"]
+layout_mode = 2
+theme_override_font_sizes/font_size = 12
+text = "ACHIEVEMENT_SUMMARY"
+
+[node name="AchievementCount" type="Label" parent="HBoxContainer2"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_font_sizes/font_size = 12
+text = "1 / 7"
+horizontal_alignment = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+layout_mode = 2
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="UnlockedAchievementsContainer" type="VBoxContainer" parent="MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/separation = 4
+
+[node name="Label" type="Label" parent="MarginContainer/UnlockedAchievementsContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label2" type="Label" parent="MarginContainer/UnlockedAchievementsContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label3" type="Label" parent="MarginContainer/UnlockedAchievementsContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label4" type="Label" parent="MarginContainer/UnlockedAchievementsContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label5" type="Label" parent="MarginContainer/UnlockedAchievementsContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"
+
+[node name="Label6" type="Label" parent="MarginContainer/UnlockedAchievementsContainer"]
+layout_mode = 2
+text = "ACHIEVEMENT TEXT PLACEHOLDER"

addons/escoria-ui-return-monkey-island/buttons/MusicButton.gd

@@ -1,10 +0,0 @@
-extends Button
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta):
-#	pass