-
Notifications
You must be signed in to change notification settings - Fork 404
Add PhantomToy StoryQuest #2502
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Rafiqui12345
wants to merge
107
commits into
endlessm:main
Choose a base branch
from
Game-Lab-6-0-UTP-Grupo-6-Equipo-5:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
107 commits
Select commit
Hold shift + click to select a range
58f325d
Duplicar y renombrar template y tosdos los archivos
Luccio2005 866fd16
Merge pull request #43 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/copy-re…
Luccio2005 8eb6b1e
Narrativa e introduccion del juego
Luccio2005 6aea30d
Merge pull request #44 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/intro-n…
Luccio2005 2cca1fc
feat(phantom-toy): add narrative text for minigame 3 (#31)
c74ec93
feat(phantom-toy): add narrative text for minigame 3 (#31)
Rafiqui12345 749edd1
assets
sam0xs 8582add
Merge branch 'copy-rename-template' of https://github.com/Game-Lab-6-…
sam0xs 8ef13af
feat: set up corruption defense minigame structure
577f494
avance minijuego
FaDc17 ec806c3
añadi carpetas de imagenes
sam0xs 39fd1c2
Merge branch 'copy-rename-template' of https://github.com/Game-Lab-6-…
sam0xs 843bc45
Merge branch 'copy-rename-template' into minijuego1
FaDc17 9f4ae8f
4/06/2026
FaDc17 592ef35
feat: implement basic corruption manager and zones
74c3cfe
feat: add corruption zones and shadow escape mechanics
a214427
feat: implement corruption defense minigame core mechanics
8efbc20
agregue movimientos y mas elementos de feria
sam0xs b347775
añadi run,steady&crawl para sombra
sam0xs 45ad9c9
añadi requerimientos de raphael
sam0xs 427155b
merge copy-rename-template
FaDc17 dcfabae
arreglo cine
FaDc17 c6ae0e7
Implement corruption defense minigame core gameplay loop
362de54
arreglando escenas
6a645c8
arreglo de escenas
2106e05
Merge pull request #47 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/feature…
Rafiqui12345 f112007
implement decoration's map
fe4539c
añadi marmol en assets
sam0xs 9ebdb8b
feat: implement altar state system linked to shadow movement
acf271b
Revert bad changes in main
Arebuayon 9dfb9b3
Merge pull request #48 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/revert-…
Arebuayon b8e8ae0
Add custom corruption player and fix altar reload behavior
d313ef6
arreglar hitbox del oso
3102451
merge copy-rename-template
FaDc17 edb8f46
enemigo finalizado(agregar sprites) y los fragmentos(imagen referenci…
FaDc17 87bb39d
Complete corruption defense gameplay and visual polish
cf96e55
Polish corruption defense visuals and companion behavior
d78b97c
feat: add shadow entity and enhance corruption defense immersion
1d93017
implement arrow and shadow
Rafiqui12345 7eb4fd7
Merge branch 'copy-rename-template' into minijuego1
FaDc17 9875136
finalizar sonidos del mapa
a32af1a
feat: finalize phantom toy corruption defense experience
6942821
implementar sonidos minijuego 3
Rafiqui12345 cb95445
añadi espejos y piso de vidrio, fragmento y niño defeated
sam0xs 96728dd
feat/implement defeat player texture
3cef3d1
añadi madera
sam0xs ff4976f
avance intro cinematica y assets
Luccio2005 e3d40fe
intro terminada
Luccio2005 0ac44e8
Laberinto creado
fabriciocrispin12-commits 6c5a434
detalles a los pisos
FaDc17 3666a38
laberinto modificado
fabriciocrispin12-commits b6563fc
Merge pull request #51 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/rediseñ…
fabriciocrispin12-commits c32a062
avance de almas
FaDc17 3a49447
completa outro cinematica y dialogos
Luccio2005 3b89647
Finalizar outro
Luccio2005 07c8bad
Agregar assets y finalizar outro
Luccio2005 ed72880
fix floor resource conflict and revert conflicting merge
10ea5e6
Finalize Phantom Toy intro and outro
Luccio2005 24ed623
Fix outro phantom toy
Luccio2005 2b8b5e2
Revetir cambios, dejar listo para merge
Arebuayon 7866266
Revertir cambios y acomodar archivos donde van
Arebuayon 8ceca84
Merge remote-tracking branch 'origin/copy-rename-template' into intro
Arebuayon 0b76471
cambiado la intro de mini1
FaDc17 f5e34bc
sombra y persoanje con luz y mapa oscuro
fabriciocrispin12-commits a9a778f
avance con problema despues de independisar
fabriciocrispin12-commits fdf4ed8
avance de dialogo y enemigo corregido
FaDc17 08e9352
Merge branch 'minijuego1' of https://github.com/Game-Lab-6-0-UTP-Grup…
FaDc17 185bf6d
Arreglar deteccion de guardia en minijuego de sigilo
Arebuayon 05f9b03
minijuego2 acabado
fabriciocrispin12-commits 6526736
Merge branch 'copy-rename-template' into recuperacion
Rafiqui12345 31d8400
merge rama(recuperacion) con copy-rename
Rafiqui12345 4567f61
Revert "rama Recuperacion"
Rafiqui12345 7582386
Merge pull request #53 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/revert-…
Rafiqui12345 8849589
Merge pull request #54 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/intro
Rafiqui12345 3abe2d0
Merge pull request #55 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/minijuego1
Rafiqui12345 62faaac
rutear intro con mini1
7012e69
esena luz prendida
fabriciocrispin12-commits 2bac3cc
Merge branch 'copy-rename-template' into recuperacion2
Rafiqui12345 46dd30d
conectado todo sin mini2
77ba435
Merge branch 'main' into copy-rename-template
Rafiqui12345 391394b
Merge pull request #57 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/copy-re…
Rafiqui12345 74f9993
Fix minigame2
Arebuayon 72e4ff0
Ultimos detalles_mini1
FaDc17 dbe65e7
musica y frames del bicho
fabriciocrispin12-commits 65abac9
Merge pull request #56 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/recuper…
Rafiqui12345 d908976
Merge pull request #58 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/musica-…
Rafiqui12345 f08f0b8
implement player's walk
ae62c51
fix gameplay flow
3208c49
Merge pull request #59 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/copy-re…
Rafiqui12345 30837b5
fix enemy sound
f547cd9
Merge pull request #60 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/ultimo_…
Rafiqui12345 ff64cfe
implement quest description
c0f3667
Merge pull request #61 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/questFinal
Rafiqui12345 37f8066
arreglar problemas de pantalla cortada
132a68d
Merge pull request #62 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/fix-intro
Rafiqui12345 6407bc4
integrar unicamente 2 fragmentos
7b49955
fix mini1 dialogue
d830e49
Merge pull request #63 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/fixiquest
Rafiqui12345 aee1d43
musica con licencia cc0
fabriciocrispin12-commits 185f26e
musica con bucle
fabriciocrispin12-commits 47f7963
anadir musica
Rafiqui12345 e7aa27c
Merge pull request #64 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/añadirM…
Rafiqui12345 b537d16
Merge pull request #65 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/musica-…
fabriciocrispin12-commits 19ebc7e
ULTIMO CAMBIO DE MUSICA-MINIJUEGO1
FaDc17 4b846b7
Merge pull request #66 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/cambio-…
FaDc17 f3c5fd8
fix finalmini3
Rafiqui12345 8fb503a
Merge pull request #67 from Game-Lab-6-0-UTP-Grupo-6-Equipo-5/cambios…
Rafiqui12345 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| extends AnimatedSprite2D | ||
|
|
||
| func play_idle(): | ||
| play("idle") | ||
|
|
||
| func play_walk(): | ||
| play("walk") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| uid://diiicne7g56gu |
16 changes: 16 additions & 0 deletions
16
scenes/quests/story_quests/phantom_toy/0_intro/character.gd
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| extends AnimatedSprite2D | ||
|
|
||
| func play_idle(): | ||
| play("idle") | ||
|
|
||
| func play_attack_01(): | ||
| play("attack_01") | ||
|
|
||
| func play_walk(): | ||
| play("walk") | ||
|
|
||
| func play_attack_02(): | ||
| play("attack_02") | ||
|
|
||
| func play_defeated(): | ||
| play("defeated") |
1 change: 1 addition & 0 deletions
1
scenes/quests/story_quests/phantom_toy/0_intro/character.gd.uid
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| uid://bjgdn047ijy5s |
8 changes: 8 additions & 0 deletions
8
scenes/quests/story_quests/phantom_toy/0_intro/intro_components/into2.dialogue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # SPDX-FileCopyrightText: The Threadbare Authors | ||
| # SPDX-License-Identifier: MPL-2.0 | ||
| ~ start | ||
| Entre los colores y las luces de la feria había un viejo peluche abandonado. | ||
| Parecía fuera de lugar. Como si no perteneciera a ese sitio. | ||
| Apenas lo toqué... | ||
| Todo cambió. | ||
| => END |
16 changes: 16 additions & 0 deletions
16
scenes/quests/story_quests/phantom_toy/0_intro/intro_components/into2.dialogue.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| [remap] | ||
|
|
||
| importer="dialogue_manager" | ||
| importer_version=15 | ||
| type="Resource" | ||
| uid="uid://0hifl2cl5os8" | ||
| path="res://.godot/imported/into2.dialogue-04af51278a3e9770713262a1b568810f.tres" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/phantom_toy/0_intro/intro_components/into2.dialogue" | ||
| dest_files=["res://.godot/imported/into2.dialogue-04af51278a3e9770713262a1b568810f.tres"] | ||
|
|
||
| [params] | ||
|
|
||
| defaults=true |
32 changes: 32 additions & 0 deletions
32
scenes/quests/story_quests/phantom_toy/0_intro/intro_components/intro3.dialogue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # SPDX-FileCopyrightText: The Threadbare Authors | ||
| # SPDX-License-Identifier: MPL-2.0 | ||
| ~ start | ||
| #animacion de agarrar peluche o peluche desapareciendo | ||
| Las luces se apagaron. La música se desvaneció. | ||
| Y cuando levanté la vista... La feria estaba vacía. | ||
| Niño: ¿Qué...? ¿Dónde está todo el mundo? | ||
| ???: Por fin... | ||
| Niño: ¿Quién dijo eso? | ||
| ???: Aquí abajo. | ||
| Niño: ¿El peluche habló? | ||
| Peluche: No hay mucho tiempo para explicaciones. Necesito tu ayuda. | ||
| Niño: ¿Qué está pasando? ¿Dónde están mis padres? | ||
| Peluche: Están a salvo. Pero este lugar no lo estará por mucho tiempo. | ||
| Niño: No entiendo nada. | ||
| Peluche: Lo sé. Y aun así eres la única persona que puede ayudarme. | ||
| Niño: ¿Ayudarte a hacer qué? | ||
| Peluche: Hace mucho tiempo fui separado de algo muy importante. Fragmentos de mi alma fueron dispersados y quedaron atrapados en distintos lugares. | ||
| Niño: ¿Fragmentos de tu alma? | ||
| Peluche: Sí. Mientras permanezcan separados, jamás podré ser libre. Y cada día que pasa se vuelven más difíciles de encontrar. | ||
| Niño: ¿Por qué yo? | ||
| Peluche: Porque fuiste capaz de encontrarme. Y porque ahora también formas parte de esto. | ||
| Niño: ¿Y si me niego? | ||
| Peluche: Entonces ambos quedaremos atrapados aquí. | ||
| Peluche: Ayúdame a recuperar los fragmentos. | ||
| Peluche: Cuando los reunamos, entenderás todo lo que ha ocurrido. | ||
| Niño: ... | ||
| Niño: Está bien. Te ayudaré. | ||
| Peluche: Entonces debemos comenzar ahora. El primer fragmento nos está esperando. | ||
| do animation_player.play(&"walk_off") | ||
| do animation_player.animation_finished | ||
| => END |
16 changes: 16 additions & 0 deletions
16
scenes/quests/story_quests/phantom_toy/0_intro/intro_components/intro3.dialogue.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| [remap] | ||
|
|
||
| importer="dialogue_manager" | ||
| importer_version=15 | ||
| type="Resource" | ||
| uid="uid://ek5sbqofj3rf" | ||
| path="res://.godot/imported/intro3.dialogue-ba8a16a167d89cfa73a2756244943b2d.tres" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/phantom_toy/0_intro/intro_components/intro3.dialogue" | ||
| dest_files=["res://.godot/imported/intro3.dialogue-ba8a16a167d89cfa73a2756244943b2d.tres"] | ||
|
|
||
| [params] | ||
|
|
||
| defaults=true |
41 changes: 41 additions & 0 deletions
41
scenes/quests/story_quests/phantom_toy/0_intro/intro_components/phantom_toy_intro.dialogue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # SPDX-FileCopyrightText: The Threadbare Authors | ||
| # SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| ~ start | ||
| Había esperado este día durante semanas. | ||
| La feria estaba llena de luces, música y personas caminando de un lado a otro. | ||
| Mis padres observaban algunos puestos mientras yo recorría los alrededores. | ||
| Todo parecía normal... Hasta que algo llamó mi atención. | ||
| do animation_player.play(&"walk_on") | ||
| do animation_player.animation_finished | ||
| Entre los puestos había un viejo peluche abandonado. | ||
| Parecía fuera de lugar. | ||
| Cuando me acerqué... Todo cambió. | ||
| do animation_player.play(&"world_change") | ||
| do animation_player.animation_finished | ||
| Las luces se apagaron. La música se desvaneció. | ||
| Y cuando levanté la vista... La feria estaba vacía. | ||
| Niño: ¿Qué...? ¿Dónde está todo el mundo? | ||
| ???: Por fin... | ||
| Niño: ¿Quién dijo eso? | ||
| ???: Aquí abajo. | ||
| Niño: ¿Tú acabas de hablar? | ||
| Peluche: Necesito tu ayuda. | ||
| Niño: ¿Qué está pasando? ¿Dónde están mis padres? | ||
| Peluche: Están a salvo. Pero este lugar no lo estará por mucho tiempo. | ||
| Niño: No entiendo nada. | ||
| Peluche: Lo sé. Pero eres el único que puede ayudarme. | ||
| Niño: ¿Ayudarte a hacer qué? | ||
| Peluche: Fragmentos de mi alma fueron dispersados hace mucho tiempo. Debemos encontrarlos antes de que sea demasiado tarde. | ||
| Niño: ¿Por qué yo? | ||
| Peluche: Porque fuiste capaz de encontrarme. Y porque ahora también formas parte de esto. | ||
| Niño: ¿Y si me niego? | ||
| Peluche: Entonces ambos quedaremos atrapados aquí. | ||
| Niño: ... | ||
| Niño: Está bien. Te ayudaré. | ||
| Peluche: El primer fragmento nos está esperando. | ||
| do animation_player.play(&"walk_off") | ||
| do animation_player.animation_finished | ||
| do animation_player.play(&"sombra") | ||
| do animation_player.animation_finished | ||
| => END |
16 changes: 16 additions & 0 deletions
16
...uests/story_quests/phantom_toy/0_intro/intro_components/phantom_toy_intro.dialogue.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| [remap] | ||
|
|
||
| importer="dialogue_manager" | ||
| importer_version=15 | ||
| type="Resource" | ||
| uid="uid://dxbwa6x1i3bvo" | ||
| path="res://.godot/imported/phantom_toy_intro.dialogue-307ae4ed02f443da52a446d72c4884b8.tres" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/phantom_toy/0_intro/intro_components/phantom_toy_intro.dialogue" | ||
| dest_files=["res://.godot/imported/phantom_toy_intro.dialogue-307ae4ed02f443da52a446d72c4884b8.tres"] | ||
|
|
||
| [params] | ||
|
|
||
| defaults=true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| extends AnimatedSprite2D | ||
|
|
||
| func play_default(): | ||
| play("default") | ||
|
|
||
| func play_walk1(): | ||
| play("walk_right") | ||
|
|
||
| func play_steady2(): | ||
| play("steady_left") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| uid://dd2px54ntsc7y |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file does not seem to be used and can be deleted