Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
8be1990
Duplicate and rename template and all files para equipo_1
edwardvilcamonje-max May 26, 2026
7f13d5e
Merge pull request #43 from GameLab6-UTP-Grupo5-Equipo1/copy-rename-t…
edwardvilcamonje-max May 26, 2026
1aa830a
Avance de la introducción del juego
DiegoVilchezS Jun 3, 2026
0344131
Actualización introducción
DiegoVilchezS Jun 3, 2026
50c590d
Implementación de personaje intro
DiegoVilchezS Jun 3, 2026
c7a2ec9
Revert "Act
DiegoVilchezS Jun 5, 2026
65af6ad
Merge pull request #44 from GameLab6-UTP-Grupo5-Equipo1/rama_diego
DiegoVilchezS Jun 5, 2026
903f801
Agregando la mecanica del viento y los items recolectables
TheWeebCrafter10010 Jun 6, 2026
c07f4c9
Creacion de mapa nivel 1
DiegoVilchezS Jun 6, 2026
271cc6c
Merge branch 'rama_alonso' into rama_diego2
TheWeebCrafter10010 Jun 6, 2026
6cb3d3c
Merge de las mecanicas y el mapa
TheWeebCrafter10010 Jun 6, 2026
230c41a
agregando dialogos, agregando npc para finalizar el nivel, resolviend…
TheWeebCrafter10010 Jun 10, 2026
be804b4
Merge pull request #46 from GameLab6-UTP-Grupo5-Equipo1/rama_alonso
TheWeebCrafter10010 Jun 10, 2026
281489b
Introduccion, juego1 y outro
DiegoVilchezS Jun 14, 2026
0c45e82
Actualizacion intro,juego1,final y outro
DiegoVilchezS Jun 15, 2026
3bdd641
agregando mecanicas del minijuego 2
TheWeebCrafter10010 Jun 16, 2026
fdc4c88
Terminando todas las mecanicas del minijuego 2
TheWeebCrafter10010 Jun 17, 2026
99619da
Merge branch 'rama_diego4' into rama_alonso
TheWeebCrafter10010 Jun 17, 2026
6b7be81
Merge pull request #48 from GameLab6-UTP-Grupo5-Equipo1/rama_alonso
TheWeebCrafter10010 Jun 17, 2026
d096a7c
terminando juego 1, preparando mecanicas para finalizacion de juego 2
TheWeebCrafter10010 Jun 17, 2026
0aa7232
Merge pull request #49 from GameLab6-UTP-Grupo5-Equipo1/rama_alonso
TheWeebCrafter10010 Jun 17, 2026
d3353a6
agregando assets, sonido batalla final y solucionando error mapa 3
DiegoVilchezS Jun 17, 2026
e68d336
Merge pull request #50 from GameLab6-UTP-Grupo5-Equipo1/rama_diego6
DiegoVilchezS Jun 17, 2026
b129364
Puliendo minijuego 1 y terminandolo
TheWeebCrafter10010 Jun 18, 2026
2d18b03
Merge pull request #51 from GameLab6-UTP-Grupo5-Equipo1/rama_alonso3
TheWeebCrafter10010 Jun 18, 2026
5ecd647
Remove _dialogo_final function
TheWeebCrafter10010 Jun 18, 2026
e580531
Merge pull request #52 from GameLab6-UTP-Grupo5-Equipo1/TheWeebCrafte…
TheWeebCrafter10010 Jun 18, 2026
9d5f60f
empezando mecanicas del boss final
TheWeebCrafter10010 Jun 18, 2026
12420c5
agregando mecanica de disparo de barrido
TheWeebCrafter10010 Jun 18, 2026
23a58fd
agregando mecanica de varios ataques
TheWeebCrafter10010 Jun 18, 2026
6e9debc
añadiendo efecto parar el tiempo minijuego 3
TheWeebCrafter10010 Jun 18, 2026
8815d90
finalizando mecanicas del boss, añadiendo timer a la accion repeler
TheWeebCrafter10010 Jun 19, 2026
e3eb06d
Merge pull request #53 from GameLab6-UTP-Grupo5-Equipo1/boss_final
TheWeebCrafter10010 Jun 19, 2026
fb9fa28
Agrega nuevas texturas de piso y minijuegos al equipo 1
kath144 Jun 19, 2026
2dc8155
Merge pull request #54 from GameLab6-UTP-Grupo5-Equipo1/kath-cambios
kath144 Jun 19, 2026
aa3645d
terminando mecanicas del boss final
TheWeebCrafter10010 Jun 19, 2026
0d7e47b
minijuego 3
kath144 Jun 19, 2026
ea48d26
Merge pull request #55 from GameLab6-UTP-Grupo5-Equipo1/kath-cambios
kath144 Jun 19, 2026
c7e7631
conectando minijuegos y poniendo la posicion correcta
TheWeebCrafter10010 Jun 19, 2026
21fbc60
Merge branch 'main' of https://github.com/GameLab6-UTP-Grupo5-Equipo1…
TheWeebCrafter10010 Jun 19, 2026
843e1b7
merge branch 'rama_alonso5'
TheWeebCrafter10010 Jun 19, 2026
9cfccd4
Terminando mecanicas y conectando juegos
TheWeebCrafter10010 Jun 20, 2026
8464eea
Merge pull request #56 from GameLab6-UTP-Grupo5-Equipo1/final_juego1
TheWeebCrafter10010 Jun 20, 2026
c630761
mejorando jefe final
TheWeebCrafter10010 Jun 20, 2026
e87d6cc
terminando boss final, con nuevas mecanicas
TheWeebCrafter10010 Jun 20, 2026
d4d7159
Merge pull request #57 from GameLab6-UTP-Grupo5-Equipo1/final_juego1
TheWeebCrafter10010 Jun 20, 2026
f2797dc
agregando sonidos y efectos a la batalla final, arreglando bug de sin…
TheWeebCrafter10010 Jun 21, 2026
882b4b4
Merge pull request #58 from GameLab6-UTP-Grupo5-Equipo1/final_juego1
TheWeebCrafter10010 Jun 21, 2026
29255f5
intro and outro
kath144 Jun 22, 2026
272fa97
Merge pull request #59 from GameLab6-UTP-Grupo5-Equipo1/kath-cambios
kath144 Jun 22, 2026
96330ca
arreglando bugs, añadiendo sprites y efectos de sonido
TheWeebCrafter10010 Jun 22, 2026
2be4f73
Merge pull request #60 from GameLab6-UTP-Grupo5-Equipo1/final_juego3
TheWeebCrafter10010 Jun 22, 2026
c0fd87f
cambiando volumen de musica, cambiando color barras, añadiendo descri…
TheWeebCrafter10010 Jun 24, 2026
d17c9b0
Merge pull request #61 from GameLab6-UTP-Grupo5-Equipo1/final_juego4
TheWeebCrafter10010 Jun 24, 2026
b2ba91b
moviendo archivos a carpeta equipo_1
TheWeebCrafter10010 Jun 24, 2026
76900b2
Agregando canciones intro/outro, ajustando volumen, revirtiendo cambi…
TheWeebCrafter10010 Jun 24, 2026
1c0f593
añadiendo dialogos al jefe final y sonido de daño
TheWeebCrafter10010 Jun 24, 2026
2a42eb9
Merge pull request #62 from GameLab6-UTP-Grupo5-Equipo1/final_juego5
TheWeebCrafter10010 Jun 24, 2026
6f18019
Delete scenes/quests/story_quests/equipo_1/musica_juego/parar_tiempo.mp3
karenzc2323-sudo Jun 24, 2026
b5e4e32
Merge pull request #63 from GameLab6-UTP-Grupo5-Equipo1/karenzc2323-s…
TheWeebCrafter10010 Jun 24, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
324 changes: 324 additions & 0 deletions scenes/quests/story_quests/equipo_1/0_intro/equipo_1_intro.tscn

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0

~ start
do animation_player.play(&"walk_on")
do animation_player.animation_finished

Balder: Mi reino....
Balder: Está....destruido....
Balder: Todo comenzó cuando el tiempo se rompió.
Balder: No el tiempo del mundo... sino el mío.

Narrador: Acompaña a Balder en esta historia....
Narrador: Donde la sanación y la búsqueda de redención...
Narrador: Es la única alternativa.


do animation_player.play(&"walk_off")
do animation_player.animation_finished

Narrador: Antes de iniciar este camino...
Narrador: Recuerda algo noble caballero...
Narrador: El cambio siempre está dentro de ti...
do animation_player.play(&"walk_off_2")
do animation_player.animation_finished

=> END
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://cjxjsprxapwhi"
path="res://.godot/imported/equipo_1_intro.dialogue-3c0cd7aa7ee909c7151fea02520c911c.tres"

[deps]

source_file="res://scenes/quests/story_quests/equipo_1/0_intro/intro_components/equipo_1_intro.dialogue"
dest_files=["res://.godot/imported/equipo_1_intro.dialogue-3c0cd7aa7ee909c7151fea02520c911c.tres"]

[params]

defaults=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
extends Node
var enemigos:Array =[]
@onready var vidas = 3
@onready var can_take_damage = true;
@onready var viento=%VientoScript
signal derrota;

func _ready() -> void:
enemigos = get_children()


func _activar_enemigos()->void:
viento._set_estado_viento(500,3)##fuerza de 500 hacia atras y se activa cada 3 segundos

for e in enemigos:
e.visible= true
e.start();

func _desactivar_enemigos()->void:
can_take_damage = false
for e in enemigos:
e.remove();

func _reducir_vida_jugador(body:Node2D)->void:
if(!can_take_damage):
return
body = body as Projectile
if not body:
return
vidas=vidas-1;
if(vidas <1):
derrota.emit()
for e in enemigos:
e.visible= false

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://c3gulnwmq53s1
20 changes: 20 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/collectables.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
extends Node

var items_count: int
var items_collected: int
signal open_path
signal dialogue_start
signal dialogue_finished
func _ready():
items_count = get_child_count(false)
items_collected = 0;
for item in get_children(false):
item.collected.connect(item_collected)

func item_collected(item:CollectibleItem)->void:
dialogue_start.emit()
items_collected+=1;
if items_collected==items_count:
open_path.emit();
await DialogueManager.dialogue_ended
dialogue_finished.emit()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://b6j30swrf7u7x
12 changes: 12 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/delete_blocks.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
extends Node2D
@onready var stones = $Stone;

var bloques_a_borrar=[
Vector2i(44,27),
Vector2i(44,28),
Vector2i(44,29),
Vector2i(44,30),
]
func delete_stones()->void:
for b in bloques_a_borrar:
stones.set_cell(b,-1);
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://d0r83xn1mxjck
454 changes: 454 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/equipo_1_stealth.tscn

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extends CollectibleItem
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cng5qkjqowd1s
15 changes: 15 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/movilidad.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
extends Node2D


# Called when the node enters the scene tree for the first time.
func _ready() -> void:
pass # Replace with function body.


# Called every frame. 'delta' is the elapsed time since the previous frame.
#delta -> tiempo que se ejecuta (0.014seg)
#fun _process -> la más importante
func _process(delta: float) -> void:
pass
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dtm4qmrod7h3g
3 changes: 3 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/piso1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/piso1.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://qokof78qgo2s"
path="res://.godot/imported/piso1.png-8a1aec53eaf95193f524c84de478140a.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/equipo_1/1_stealth/piso1.png"
dest_files=["res://.godot/imported/piso1.png-8a1aec53eaf95193f524c84de478140a.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
extends Area2D
var se_uso = false;
@export_category("Dialogue")
@export var dialogue_title = "start";
@export var pre_final_dialogue: DialogueResource:
set(new_value):
pre_final_dialogue = new_value
notify_property_list_changed()
signal dialogue_start;
signal dialogue_finished;

func _ready() -> void:
body_entered.connect(_on_body_entered);

func _on_body_entered(body:Node2D) -> void:
if se_uso:
return

if body is Player:
dialogue_start.emit();
se_uso = true;
var player: Player = body;
player.take_control(self)
if(pre_final_dialogue):
DialogueManager.show_dialogue_balloon(pre_final_dialogue, dialogue_title, [self, player])
await DialogueManager.dialogue_ended
player.return_control(self)
dialogue_finished.emit();
queue_free();
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cu0ee4qkfakqe
52 changes: 52 additions & 0 deletions scenes/quests/story_quests/equipo_1/1_stealth/signal_script.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
extends Node2D
@onready var mapa = $TileMapLayers;
@onready var items = $Collectables;

@onready var final_area = $%FinalArea

@onready var viento_script =$%VientoScript
@onready var mensaje_pre_final = $%Mensaje
@export_file("*.tscn") var next_scene: String

@export_category("Dialogue")
@export var dialogue_title = "start";

@export var final_dialogue: DialogueResource:
set(new_value):
final_dialogue = new_value
notify_property_list_changed()


func _ready() -> void:
##conectamos la señal para borrar las piedras
items.open_path.connect(mapa.delete_stones)

##conectamos la señal del area interactuable con nuestra funcion
##para mostrar el dialogo final
final_area.interaction_started.connect(_on_player_interaction);

##conectamos la señal de inicio y fin de mensaje e items
##para que la mecanica no se active durante un dialogo
items.dialogue_start.connect(_disable_wind)
items.dialogue_finished.connect(_enable_wind)

mensaje_pre_final.dialogue_start.connect(_disable_wind)
mensaje_pre_final.dialogue_finished.connect(_enable_wind)

func _on_player_interaction(player: Player, from_right: bool)->void:
if final_dialogue:
DialogueManager.show_dialogue_balloon(final_dialogue, dialogue_title, [self, player])
await DialogueManager.dialogue_ended
final_area.end_interaction()
queue_free()

if next_scene:
GameState.set_challenge_start_scene(next_scene)
SceneSwitcher.change_to_file_with_transition(next_scene)

func _disable_wind()->void:
viento_script.empezar = false;
viento_script._reset_all_attributes();
func _enable_wind()->void:
viento_script.empezar = true;

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://owqe8byf5r8
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
~ start
Niño: ¡Palabras vacías!
Niño: ¡Las promesas también se cortan como el cristal!
=> END
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://3mq3rqvh1ov6"
path="res://.godot/imported/carta_collected.dialogue-1778814de56d23f9ef42182bf41740d2.tres"

[deps]

source_file="res://scenes/quests/story_quests/equipo_1/1_stealth/stealth_components/carta_collected.dialogue"
dest_files=["res://.godot/imported/carta_collected.dialogue-1778814de56d23f9ef42182bf41740d2.tres"]

[params]

defaults=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
extends CollectibleItem

signal collected;

@export var es_textura_custom:bool = false
@export var textura_custom:Texture2D
func _ready() -> void:
super._ready();

func _on_interacted(player: Player, _from_right: bool) -> void:
collected.emit(self);
super(player,_from_right)


func _set_item(new_value: InventoryItem) -> void:
item = new_value

if sprite_2d:
if not es_textura_custom:
sprite_2d.texture = item.get_world_texture() if item else null
else:
sprite_2d.texture = textura_custom

if interact_area:
interact_area.action = "Collect " + item.type_name() if item else "Collect"

update_configuration_warnings()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://bo0ffu4a87byu
Loading
Loading