Skip to content
Closed

Jade #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
92e695c
duplicate folder
EduGAH21 May 25, 2026
d9a62b2
duplicate folder
EduGAH21 May 25, 2026
ddcbb22
Merge pull request #43 from GameLab6-UTP-Grupo5-Equipo2/createfolder
LauraGomezLinares May 29, 2026
0583fe3
<agrege al personaje y pasto en la introduccion y cierre>
KarmDK Jun 2, 2026
8bd7ec9
cambios jade
KarmDK Jun 3, 2026
2ba63de
Revert "cambios jade"
KarmDK Jun 3, 2026
2019b9a
Revert "<agrege al personaje y pasto en la introduccion y cierre>"
KarmDK Jun 3, 2026
96d9bac
animacion y grass
KarmDK Jun 3, 2026
c8a6c16
Merge pull request #44 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 3, 2026
f257e9f
diseño minigame2 falta logica y algunas cosas mas
LauraGomezLinares Jun 8, 2026
0a737f2
Programación: Crear character del personaje
JSobero Jun 8, 2026
7cb33c3
Merge pull request #45 from GameLab6-UTP-Grupo5-Equipo2/droxgame2
LauraGomezLinares Jun 8, 2026
b4338a8
mapa 1
KarmDK Jun 8, 2026
9d82f69
Merge branch 'main' into jade
KarmDK Jun 8, 2026
fcc086e
Intro narracion y escena
DafneIncio Jun 8, 2026
be3a49d
Merge pull request #46 from GameLab6-UTP-Grupo5-Equipo2/dafne
DafneIncio Jun 8, 2026
f7285ef
avance intro y mapa nivel 1
KarmDK Jun 9, 2026
ad1a811
Merge branch 'main' into jade
KarmDK Jun 9, 2026
ab96b5e
Merge pull request #48 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 9, 2026
5566c24
arreglo mapa1
KarmDK Jun 9, 2026
018a28b
Merge branch 'jade' of https://github.com/GameLab6-UTP-Grupo5-Equipo2…
KarmDK Jun 9, 2026
1f05f31
Fix: Corregir archivos en conflictos
JSobero Jun 9, 2026
d33e0fb
animaciones_nuevas_enemigos
KarmDK Jun 12, 2026
b01129a
Merge pull request #49 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 12, 2026
a360664
Merge branch 'main' of https://github.com/GameLab6-UTP-Grupo5-Equipo2…
JSobero Jun 12, 2026
e9df4fb
logica de juego finalizado, falta coso pequeño del agua
LauraGomezLinares Jun 12, 2026
b3bdf04
Merge pull request #50 from GameLab6-UTP-Grupo5-Equipo2/droxgame2
LauraGomezLinares Jun 12, 2026
65c8ce2
Minijuego3
EduGAH21 Jun 12, 2026
085c36c
Minijuego3
EduGAH21 Jun 12, 2026
f07057c
make: minijuego 1 (mécanicas y programación)
JSobero Jun 12, 2026
72df1b8
Merge pull request #51 from GameLab6-UTP-Grupo5-Equipo2/joaquin
JSobero Jun 12, 2026
43186c0
arreglo de error
EduGAH21 Jun 12, 2026
2402b5c
Merge pull request #52 from GameLab6-UTP-Grupo5-Equipo2/eduardogah
EduGAH21 Jun 12, 2026
f0a90e4
mapa de minijuego 1 y 3 actualizado
KarmDK Jun 14, 2026
91f1c0c
animaciones
KarmDK 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
245 changes: 133 additions & 112 deletions scenes/game_elements/characters/enemies/guard/components/guard.gd

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions scenes/game_elements/characters/enemies/guard/guard.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[ext_resource type="Texture2D" uid="uid://c75ofhy3swhj3" path="res://scenes/game_elements/characters/enemies/guard/components/exclamation_mark.png" id="3_pnkgp"]
[ext_resource type="Script" uid="uid://cxsi2xqcdyw7g" path="res://scenes/game_elements/characters/enemies/guard/components/light.gd" id="4_lptvm"]
[ext_resource type="Script" uid="uid://bnbt0iw1a1w6" path="res://scenes/game_elements/characters/enemies/guard/components/detection_area.gd" id="4_mswbt"]
[ext_resource type="SpriteFrames" uid="uid://ovu5wqo15s5g" path="res://scenes/quests/template_quests/NO_EDIT/1_NO_EDIT_stealth/NO_EDIT_stealth_components/NO_EDIT_guard_enemy.tres" id="5_mswbt"]
[ext_resource type="SpriteFrames" uid="uid://bygykppwcxh32" path="res://scenes/quests/story_quests/legends_without_name/1_stealth/stealth_components/legends_without_name_guard_enemy.tres" id="6_8vt0k"]
[ext_resource type="Script" uid="uid://dy68p7gf07pi3" path="res://scenes/game_logic/sprite_behaviors/character_sprite_behavior.gd" id="7_klpct"]
[ext_resource type="Script" uid="uid://b3hx1n2yl88qr" path="res://scenes/game_logic/character_animation_player_behavior.gd" id="9_8vt0k"]

Expand Down Expand Up @@ -64,7 +64,7 @@ tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"walk"]
"values": [&"walk_2"]
}
tracks/3/type = "value"
tracks/3/imported = false
Expand Down Expand Up @@ -106,7 +106,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"alerted"]
"values": [&"alerted_2"]
}
tracks/2/type = "value"
tracks/2/imported = false
Expand Down Expand Up @@ -135,7 +135,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"idle"]
"values": [&"idle_2"]
}
tracks/1/type = "value"
tracks/1/imported = false
Expand Down Expand Up @@ -177,7 +177,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"walk"]
"values": [&"walk_2"]
}
tracks/2/type = "value"
tracks/2/imported = false
Expand All @@ -201,6 +201,7 @@ _data = {
}

[node name="Guard" type="CharacterBody2D" unique_id=689832587 groups=["guard_enemy"]]
scale = Vector2(1.5, 1.5)
collision_layer = 0
collision_mask = 528
motion_mode = 1
Expand Down Expand Up @@ -248,9 +249,8 @@ polygon = PackedVector2Array(302, 48, 283, 52, 279, 52, 101, 114, 98, 114, 79, 1
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=616054452]
unique_name_in_owner = true
position = Vector2(0, -16)
sprite_frames = ExtResource("5_mswbt")
animation = &"walk"
autoplay = "idle"
sprite_frames = ExtResource("6_8vt0k")
animation = &"walk_2"

[node name="CharacterSpriteBehavior" type="Node2D" parent="AnimatedSprite2D" unique_id=971917766 node_paths=PackedStringArray("character", "sprite")]
script = ExtResource("7_klpct")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene format=3 uid="uid://b82nsrh332syj"]

[ext_resource type="Script" uid="uid://dfj3625owet5p" path="res://scenes/game_elements/characters/enemies/throwing_enemy/components/throwing_enemy.gd" id="1_ffq0m"]
[ext_resource type="SpriteFrames" uid="uid://deosvk5k4su5f" path="res://scenes/quests/template_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_throwing_enemy.tres" id="2_cvpou"]
[ext_resource type="PackedScene" uid="uid://j8mqjkg0rvai" path="res://scenes/quests/template_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_projectile.tscn" id="2_yhlrh"]
[ext_resource type="SpriteFrames" uid="uid://cd86phryjrk0e" path="res://scenes/quests/story_quests/legends_without_name/2_combat/combat_components/legends_without_name_throwing_enemy.tres" id="3_yhlrh"]

[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_3vyb7"]
height = 42.0
Expand Down Expand Up @@ -249,7 +249,7 @@ projectile_scene = ExtResource("2_yhlrh")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1865971466]
unique_name_in_owner = true
position = Vector2(0, -30)
sprite_frames = ExtResource("2_cvpou")
sprite_frames = ExtResource("3_yhlrh")
animation = &"walk"
autoplay = "idle"
flip_h = true
Expand Down
6 changes: 3 additions & 3 deletions scenes/game_elements/characters/player/components/player.gd
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ enum Mode {
const REQUIRED_ANIMATION_FRAMES: Dictionary[StringName, int] = {
&"idle": 10,
&"walk": 6,
&"attack_01": 4,
&"attack_02": 4,
&"defeated": 11,
#&"attack_01": 4,
#&"attack_02": 4,
#&"defeated": 11,
}

## Optional animations which, if provided by [member sprite_frames], must have the corresponding
Expand Down
21 changes: 12 additions & 9 deletions scenes/game_elements/characters/player/player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
[ext_resource type="Script" uid="uid://bwllxup305eib" path="res://scenes/game_elements/characters/player/components/player.gd" id="1_g2els"]
[ext_resource type="Script" uid="uid://c8xbryhknipab" path="res://scenes/game_logic/walk_behaviors/input_walk_behavior.gd" id="2_5lbww"]
[ext_resource type="Script" uid="uid://dajod2qsesqte" path="res://scenes/game_elements/characters/player/components/player_harm.gd" id="2_8jhju"]
[ext_resource type="SpriteFrames" uid="uid://vwf8e1v8brdp" path="res://scenes/quests/template_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player.tres" id="2_blfj0"]
[ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="3_cvb4d"]
[ext_resource type="Script" uid="uid://bpu6jo4kvehlg" path="res://scenes/game_elements/characters/player/components/player_interaction.gd" id="3_dqkch"]
[ext_resource type="Script" uid="uid://qro4uo83ba8f" path="res://scenes/game_elements/characters/player/components/player_sprite.gd" id="3_qlg0r"]
[ext_resource type="SpriteFrames" uid="uid://bwkgg4cx1qwd5" path="res://scenes/quests/story_quests/legends_without_name/player_components/legends_without_name_player.tres" id="5_4nivu"]
[ext_resource type="Script" uid="uid://necvar42rnih" path="res://scenes/game_elements/props/character_sight/character_sight.gd" id="6_3in67"]
[ext_resource type="Script" uid="uid://e78f8iq448e1" path="res://scenes/game_elements/characters/player/components/animation_player.gd" id="7_0owmy"]
[ext_resource type="AudioStream" uid="uid://cx6jv2cflrmqu" path="res://assets/third_party/sounds/characters/player/Foot.ogg" id="11_blfj0"]
Expand Down Expand Up @@ -66,7 +66,8 @@ anim_speed_min = 1.0
anim_speed_max = 1.0

[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_3vyb7"]
height = 42.0
radius = 10.000004
height = 51.999985

[sub_resource type="RectangleShape2D" id="RectangleShape2D_blfj0"]
size = Vector2(110, 80)
Expand Down Expand Up @@ -95,7 +96,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [&"idle"]
"values": [&"reposo"]
}

[sub_resource type="Animation" id="Animation_blfj0"]
Expand Down Expand Up @@ -124,7 +125,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [&"defeated"]
"values": [&"asustado"]
}

[sub_resource type="Animation" id="Animation_75vfm"]
Expand Down Expand Up @@ -153,7 +154,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [&"idle"]
"values": [&"reposo"]
}

[sub_resource type="Animation" id="Animation_u5klv"]
Expand Down Expand Up @@ -283,7 +284,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [&"walk"]
"values": [&"nwalk"]
}
tracks/2/type = "value"
tracks/2/imported = false
Expand Down Expand Up @@ -380,12 +381,14 @@ process_material = SubResource("ParticleProcessMaterial_nrnyj")
[node name="PlayerSprite" type="AnimatedSprite2D" parent="." unique_id=1785485617]
unique_name_in_owner = true
position = Vector2(0, -17)
sprite_frames = ExtResource("2_blfj0")
animation = &"idle"
autoplay = "idle"
scale = Vector2(1.25, 1.25)
sprite_frames = ExtResource("5_4nivu")
animation = &"reposo"
autoplay = "reposo"
script = ExtResource("3_qlg0r")

[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=874691694]
position = Vector2(1, 11)
rotation = -1.5708
shape = SubResource("CapsuleShape2D_3vyb7")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

[ext_resource type="Script" uid="uid://be7lr8ty24cix" path="res://scenes/game_elements/props/collectible_item/components/collectible_item.gd" id="1_7ff3m"]
[ext_resource type="Script" uid="uid://du8wfijr35r35" path="res://scenes/game_elements/props/interact_area/interact_area.gd" id="2_1kegn"]
[ext_resource type="Texture2D" uid="uid://bdhfcs6igu6di" path="res://assets/third_party/tiny-swords/Deco/14.png" id="4_hhgm5"]
[ext_resource type="AudioStream" uid="uid://bhgpds38q0j4r" path="res://assets/third_party/sounds/collectibles/MemoryCollectable.ogg" id="5_hhgm5"]
[ext_resource type="AudioStream" uid="uid://38xwdjm46478" path="res://assets/third_party/sounds/collectibles/CollectibleAppear.ogg" id="5_oh62b"]

Expand Down Expand Up @@ -322,6 +323,7 @@ libraries/ = SubResource("AnimationLibrary_8dm1m")
[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1620327010]
visible = false
modulate = Color(1, 1, 1, 0)
texture = ExtResource("4_hhgm5")

[node name="CollectedSound" type="AudioStreamPlayer" parent="." unique_id=420528907]
unique_name_in_owner = true
Expand Down
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://c7jd3g3ecgltl"
path="res://.godot/imported/aea-rock.png-057a1da628b6dea5940c7ef514730505.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/legends_without_name/0_intro/imagen/aea-rock.png"
dest_files=["res://.godot/imported/aea-rock.png-057a1da628b6dea5940c7ef514730505.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
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://c1x60p6wnw26w"
path="res://.godot/imported/aea-tree.png-7061624b5c0886be70d6786d683dfcee.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/legends_without_name/0_intro/imagen/aea-tree.png"
dest_files=["res://.godot/imported/aea-tree.png-7061624b5c0886be70d6786d683dfcee.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,13 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0

~ start
do animation_player.play(&"walk_on")
do animation_player.animation_finished
Tras un largo viaje, el caballerito llega a un bosque misterioso.
Entre los árboles descubre un cartel que ofrece una gran recompensa para quien logre llegar hasta el final de un siniestro castillo.

Decidido a demostrar su valor, va en busca de cumplir esa misión, sin imaginar que acaba de entrar en un lugar dominado por una poderosa magia oscura.
do animation_player.play(&"walk_off")

=> 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://fcfjwudr112g"
path="res://.godot/imported/legends_without_name_intro.dialogue-45115e96023c4fa85bec0b9f9aec9c68.tres"

[deps]

source_file="res://scenes/quests/story_quests/legends_without_name/0_intro/intro_components/legends_without_name_intro.dialogue"
dest_files=["res://.godot/imported/legends_without_name_intro.dialogue-45115e96023c4fa85bec0b9f9aec9c68.tres"]

[params]

defaults=true
Loading