diff --git a/.gdlintrc b/.gdlintrc new file mode 100644 index 0000000..b2d74e2 --- /dev/null +++ b/.gdlintrc @@ -0,0 +1,2 @@ +max-line-length = 120 +indent-size = 4 \ No newline at end of file diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml new file mode 100644 index 0000000..e16dc31 --- /dev/null +++ b/.github/workflows/license-check.yml @@ -0,0 +1,77 @@ +name: Godot Addons License & Lint Check + +on: + push: + branches: [ main, develop ] + pull_request: + branches: [ main, develop ] + +jobs: + check: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.11' # Versión estable + + - name: Cache pip + uses: actions/cache@v4 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-license-${{ hashFiles('**/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip-license- + + - name: Check each addon has LICENSE + run: | + missing=false + for dir in addons/*; do + if [ -d "$dir" ]; then + # Busca cualquier archivo que empiece por "LICENSE" (insensible a mayúsculas/minúsculas) + if ! find "$dir" -maxdepth 1 -iname "license*" -print -quit | grep -q .; then + echo "Missing LICENSE file in $dir" + missing=true + fi + fi + done + if [ "$missing" = true ]; then + exit 1 + fi + + - name: Install ScanCode Toolkit + run: | + pip install --upgrade pip + pip install scancode-toolkit + + - name: Scan licenses + run: | + scancode --license --json licenses.json addons/ + + - name: Fail if license is not allowed + run: | + ALLOWED="MIT|BSD-2-Clause|BSD-3-Clause|Apache-2.0|GPL-2.0|GPL-3.0" + # Usa jq para extraer todas las claves de licencia (más robusto) + forbidden=$(jq -r '.files[].licenses[].key' licenses.json 2>/dev/null | grep -vE "$ALLOWED" | sort -u || true) + if [ -n "$forbidden" ]; then + echo "Forbidden licenses detected:" + echo "$forbidden" + exit 1 + fi + + - name: Install gdtoolkit (lint) + run: | + pip install gdtoolkit==4.4.0 + + - name: Debug config file (optional) + run: | + echo "=== .gdlintrc content (if exists) ===" + cat .gdlintrc || echo "No .gdlintrc file" + + - name: Run gdlint + run: | + gdlint . \ No newline at end of file diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml new file mode 100644 index 0000000..9138d69 --- /dev/null +++ b/.github/workflows/linter.yml @@ -0,0 +1,41 @@ +name: GDScript Linter + +on: + pull_request: + branches: [ main, develop ] + push: + branches: [ main, develop ] + +jobs: + lint: + runs-on: ubuntu-latest + + steps: + - name: Checkout código + uses: actions/checkout@v4 + + - name: Instalar Python + uses: actions/setup-python@v5 + with: + python-version: '3.11' # Versión estable + + - name: Cache pip + uses: actions/cache@v4 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-linter-${{ hashFiles('**/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip-linter- + + - name: Instalar gdtoolkit (versión fija) + run: pip install gdtoolkit==4.4.0 + + - name: Depurar configuración (opcional) + run: | + echo "=== Archivos de configuración ===" + ls -la .gdlintrc* pyproject.toml 2>/dev/null || echo "No config files" + echo "=== Contenido de .gdlintrc ===" + cat .gdlintrc 2>/dev/null || echo "Archivo .gdlintrc no encontrado" + + - name: Ejecutar gdlint + run: gdlint . \ No newline at end of file diff --git a/LICENSE b/addons/dialogic/LICENSE similarity index 100% rename from LICENSE rename to addons/dialogic/LICENSE diff --git a/dialogos/estiloDrapy.tres b/dialogos/estiloDrapy.tres index 637d7d2..45437d8 100644 --- a/dialogos/estiloDrapy.tres +++ b/dialogos/estiloDrapy.tres @@ -55,4 +55,4 @@ base_overrides = { "global_font_size": "16.0" } layers = Array[ExtResource("1_j61f0")]([SubResource("Resource_pwsi6"), SubResource("Resource_fn38d"), SubResource("Resource_gkqe6"), SubResource("Resource_02wlt"), SubResource("Resource_ouurs"), SubResource("Resource_yfcxw"), SubResource("Resource_sijlv")]) -metadata/_latest_layer = -1 +metadata/_latest_layer = 0 diff --git a/dialogos/hoguera2.dtl b/dialogos/hoguera2.dtl index 7d17d0b..ae00610 100644 --- a/dialogos/hoguera2.dtl +++ b/dialogos/hoguera2.dtl @@ -1,6 +1,8 @@ +[music path="res://addons/dialogic/Example Assets/sound-effects/typing1.wav" fade="10.0" volume="0.0"] +[sound path="res://addons/dialogic/Example Assets/sound-effects/typing1.wav" volume="1.0"] Klep: Anda, Zuri, por fin vuelves con las cerillas. Vermillion: Eso, y con quien vienes ahora Zuri? Scanf: Pues no se muy bien quien es, pero dice que viene para asegurarse de que hacemos las cosas bien por aquí. Vermillion: Bueno si, menos cháchara y más hacer la hoguera. -Tú: Un momento, vais a dejar así la hoguera? Podrías quemar el bosque entero si no sois cuidadosos. +Tú: Un momento, vais a dejar así la hoguera? Podrías quemar el bosque entero si no sois cuidadosos. Tú: Deberías de colocar unas piedras alrededor de la hoguera para que el fuego no se propague. diff --git a/project.godot b/project.godot index 78d8b9b..9ca313e 100644 --- a/project.godot +++ b/project.godot @@ -63,6 +63,11 @@ choices/reveal_by_input=false save/autosave_delay=60.0 save/encryption_on_exports_only=true text/autopauses={} +event_default_overrides={ +"Sound": { +"loop": false +} +} [editor_plugins]