Skip to content
Closed

Diana #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
dc4c53e
Duplicate and rename template and all files
Un-player0 May 25, 2026
d8a8383
Merge pull request
Un-player0 May 25, 2026
5be55de
minijuego2 pista y jugador
Un-player0 Jun 3, 2026
14e2b37
Merge pull request #44 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/rama-mateo
Un-player0 Jun 3, 2026
1ab989a
cambios
dianacopacondori Jun 5, 2026
d0d9623
dialogo
dianacopacondori Jun 5, 2026
96c6765
Minigame 3 Preview
ronaldoEnciso Jun 5, 2026
2512943
Merge pull request #45 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/diana
Un-player0 Jun 5, 2026
3eb9fc2
Merge pull request #46 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/branch-…
Un-player0 Jun 5, 2026
811d1ac
Avance cortito antes de jalar cambios
Un-player0 Jun 5, 2026
c13648c
Merge pull request #47 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/main
Un-player0 Jun 5, 2026
84541f9
Merge branch 'rama-mateo' of https://github.com/Game-Lab-6-0-UTP-Grup…
Un-player0 Jun 5, 2026
212efbf
feat: avance del nivel 1, mapeado y mecanicas listas para ordenar el …
Mipuim Jun 8, 2026
c8aa31a
Merge branch 'main' into rama-sara
Un-player0 Jun 8, 2026
25f38d3
Merge pull request #48 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/rama-sara
Un-player0 Jun 8, 2026
0e3c439
Avance del nivel dos, principalmente añadido de sprites
Un-player0 Jun 8, 2026
205bd0c
Merge branch 'main' of https://github.com/Game-Lab-6-0-UTP-Grupo-6-Eq…
Un-player0 Jun 8, 2026
e74a469
Prueba tiles and mechanics Minigame 3
ronaldoEnciso Jun 8, 2026
64a6bca
Avance nivel 2, espero no haber roto nada
Un-player0 Jun 10, 2026
76002b5
Todo deberia estar arreglado
Un-player0 Jun 10, 2026
53aa2fb
Merge pull request #49 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/rama-mateo
Un-player0 Jun 10, 2026
4c57b59
feat:add new scene final preview
ronaldoEnciso Jun 10, 2026
6f7aae0
Merge pull request #50 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/branch-…
Un-player0 Jun 10, 2026
1fccdc0
Dialogo outro
dianacopacondori Jun 10, 2026
1e70534
Cambios creo, solo un par
Un-player0 Jun 11, 2026
607cfbb
feat:add new mechanics(lifes-spawnLasers) for minigame 3
ronaldoEnciso Jun 12, 2026
d263a61
Merge pull request #51 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/branch-…
Un-player0 Jun 12, 2026
d83754d
Merge pull request #52 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/rama-mateo
Un-player0 Jun 12, 2026
2389382
Arreglo de bug en nivel 3
Un-player0 Jun 12, 2026
6e2fe25
Merge pull request #53 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/rama-mateo
Un-player0 Jun 12, 2026
cb265da
Minijuego2 buen avance, ademas ya esta la intro
Un-player0 Jun 13, 2026
ae4c289
Merge pull request #54 from Game-Lab-6-0-UTP-Grupo-6-Equipo-3/rama-mateo
Un-player0 Jun 13, 2026
78bcf3d
Merge main
dianacopacondori Jun 15, 2026
cd451eb
dialogo outro
dianacopacondori Jun 15, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
extends AnimatedSprite2D

var velocidad := 20.0
var caminando := true
var destino_x := -400

func _ready() -> void:
position = Vector2(-650, 470)
play("walk")

func _process(delta: float) -> void:
if caminando:
position.x += velocidad * delta

if position.x >= destino_x:
position.x = destino_x
caminando = false

func caminar_hasta(x: float):
destino_x = x
caminando = true

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://0dfq4egtmqoy
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://drvwu3qcbvm03"
path="res://.godot/imported/fondo.png-583a03fa7cc0524da239845adb78b7d0.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/last_coordinates/0_intro/intro_components/fondo.png"
dest_files=["res://.godot/imported/fondo.png-583a03fa7cc0524da239845adb78b7d0.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,15 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0

~ start
do animation_player.play(&"walk_on")
do animation_player.animation_finished
Protagonista: Otro día tranquilo... Nada parece haber cambiado.
Sistema: Advertencia. Corrupción detectada en nodos cercanos.
Protagonista: ¿Corrupción? Nunca había visto una alerta de ese tipo.
Sistema: Origen desconocido. Propagación activa.
Sistema: Tres fragmentos de coordenadas han sido localizados.
Protagonista: Entonces encontraré esos fragmentos. Y descubriré qué está causando todo esto.


=> 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://605yq2704do"
path="res://.godot/imported/intro.dialogue-ff6dae69856f53fa6672858a9896b7fa.tres"

[deps]

source_file="res://scenes/quests/story_quests/last_coordinates/0_intro/intro_components/intro.dialogue"
dest_files=["res://.godot/imported/intro.dialogue-ff6dae69856f53fa6672858a9896b7fa.tres"]

[params]

defaults=true
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://buu7m61y8wqdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[gd_scene format=3 uid="uid://cr7y2hgx0mr5e"]

[ext_resource type="Script" uid="uid://cggc1bfe40mu1" path="res://scenes/quests/story_quests/last_coordinates/0_intro/level_0_intro.gd" id="1_004mb"]
[ext_resource type="Texture2D" uid="uid://drvwu3qcbvm03" path="res://scenes/quests/story_quests/last_coordinates/0_intro/intro_components/fondo.png" id="2_guibc"]
[ext_resource type="Script" uid="uid://x1mxt6bmei2o" path="res://scenes/ui_elements/cinematic/cinematic.gd" id="4_r4foc"]
[ext_resource type="AudioStream" uid="uid://l8a6k3jepllx" path="res://scenes/quests/story_quests/last_coordinates/assets/sounds/wind.wav" id="5_004mb"]
[ext_resource type="Resource" uid="uid://605yq2704do" path="res://scenes/quests/story_quests/last_coordinates/0_intro/intro_components/intro.dialogue" id="5_mnl0q"]

[node name="Intro" type="Control" unique_id=1365488581 node_paths=PackedStringArray("camera", "background")]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_004mb")
camera = NodePath("Camera")
background = NodePath("MovableBackground")
duration = 45.0

[node name="Camera" type="Camera2D" parent="." unique_id=1731394362]
position = Vector2(644, 388)
limit_left = 0
limit_top = 0
limit_right = 100
limit_bottom = 1536
limit_smoothed = true

[node name="MovableBackground" type="TextureRect" parent="." unique_id=107219556]
layout_mode = 0
offset_right = 320.0
offset_bottom = 384.0
scale = Vector2(4, 4)
texture = ExtResource("2_guibc")

[node name="Cinematic" type="Node2D" parent="." unique_id=1548480762]
script = ExtResource("4_r4foc")
dialogue = ExtResource("5_mnl0q")
metadata/_custom_type_script = "uid://x1mxt6bmei2o"

[node name="Wind" type="AudioStreamPlayer" parent="." unique_id=1655218587]
stream = ExtResource("5_004mb")
volume_db = -15.0
autoplay = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Script used to move the bacgroun while dialogue runs

extends Control

var speed : float = 0.0
@warning_ignore("narrowing_conversion")
var y_length : int = 0.0
@warning_ignore("narrowing_conversion")
var x_length : int = 0.0

## Camera
@export var camera : Camera2D

## Background
@export var background : TextureRect

## Duration in seconds of moving background
@export var duration : float = 10.0



func _ready() -> void:
y_length = (int)(background.size.y * background.scale.y)
x_length = (int)(background.size.x * background.scale.x)
# limiting the camera
camera.limit_bottom = y_length
camera.limit_right = x_length
speed = y_length / duration
pass




# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
camera.move_local_y(speed * delta)

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cggc1bfe40mu1

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading