Skip to content

Add 3 Patitas StoryQuest #2488

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.

Sign up for GitHub

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

Closed
gachiby-sys wants to merge 4 commits into from
Closed

Add 3 Patitas StoryQuest #2488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e457a20
carga archivo 3Patitas proyecto
andreagit1 Jun 1, 2026
b13b3c8
Merge pull request #43 from Game-Lab-6-0-UTP-Grupo-1-Equipo-3/Andrea
andreagit1 Jun 1, 2026
20c69bf
Intro y Game1
Jun 15, 2026
c266bf3
Modificacion de proyectiles y narrativa minijuego 2
Jun 17, 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
235 changes: 17 additions & 218 deletions scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,278 +1,77 @@
[gd_resource type="SpriteFrames" format=3 uid="uid://dtoylirwywk0j"]

[ext_resource type="Texture2D" uid="uid://nwjrfnnav0lk" path="res://scenes/game_elements/characters/player/components/storyweaver_blue_attack_01.png" id="1_h7p10"]
[ext_resource type="Texture2D" uid="uid://dgmobjvp2gcxu" path="res://scenes/game_elements/characters/player/components/storyweaver_blue_attack_02.png" id="2_bgej0"]
[ext_resource type="Texture2D" uid="uid://f0ujlnlolad7" path="res://scenes/game_elements/characters/player/components/storyweaver_blue_defeated.png" id="3_fmekh"]
[ext_resource type="Texture2D" uid="uid://ceiyxl0dy2cg1" path="res://scenes/game_elements/characters/player/components/storyweaver_blue_idle.png" id="3_lo7nh"]
[ext_resource type="Texture2D" uid="uid://dmvl71i6783rk" path="res://scenes/game_elements/characters/player/components/storyweaver_blue_walk.png" id="4_3nn5s"]

[sub_resource type="AtlasTexture" id="AtlasTexture_007i1"]
atlas = ExtResource("1_h7p10")
region = Rect2(0, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_6cv16"]
atlas = ExtResource("1_h7p10")
region = Rect2(192, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_j4nxn"]
atlas = ExtResource("1_h7p10")
region = Rect2(384, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_28m0y"]
atlas = ExtResource("1_h7p10")
region = Rect2(576, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_bbmj2"]
atlas = ExtResource("2_bgej0")
region = Rect2(0, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_kxw46"]
atlas = ExtResource("2_bgej0")
region = Rect2(192, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_8qxvo"]
atlas = ExtResource("2_bgej0")
region = Rect2(384, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_5q8fn"]
atlas = ExtResource("2_bgej0")
region = Rect2(576, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_5c6ie"]
atlas = ExtResource("3_fmekh")
region = Rect2(0, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_tcdtl"]
atlas = ExtResource("3_fmekh")
region = Rect2(192, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_8a2yc"]
atlas = ExtResource("3_fmekh")
region = Rect2(384, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_0k2r4"]
atlas = ExtResource("3_fmekh")
region = Rect2(576, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_8410a"]
atlas = ExtResource("3_fmekh")
region = Rect2(768, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_xol17"]
atlas = ExtResource("3_fmekh")
region = Rect2(960, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_iflks"]
atlas = ExtResource("3_fmekh")
region = Rect2(1152, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_71e06"]
atlas = ExtResource("3_fmekh")
region = Rect2(1344, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_kpp0b"]
atlas = ExtResource("3_fmekh")
region = Rect2(1536, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_7f782"]
atlas = ExtResource("3_fmekh")
region = Rect2(1728, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_nemgu"]
atlas = ExtResource("3_fmekh")
region = Rect2(1920, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_fcs02"]
atlas = ExtResource("3_lo7nh")
region = Rect2(0, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_myrg7"]
atlas = ExtResource("3_lo7nh")
region = Rect2(192, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_kvlxm"]
atlas = ExtResource("3_lo7nh")
region = Rect2(384, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_uf5tr"]
atlas = ExtResource("3_lo7nh")
region = Rect2(576, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_lgqa7"]
atlas = ExtResource("3_lo7nh")
region = Rect2(768, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_8ydkj"]
atlas = ExtResource("3_lo7nh")
region = Rect2(960, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_3j4b4"]
atlas = ExtResource("3_lo7nh")
region = Rect2(1152, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_yj68g"]
atlas = ExtResource("3_lo7nh")
region = Rect2(1344, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_ioxgp"]
atlas = ExtResource("3_lo7nh")
region = Rect2(1536, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_cnsyf"]
atlas = ExtResource("3_lo7nh")
region = Rect2(1728, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_uniwh"]
atlas = ExtResource("4_3nn5s")
region = Rect2(0, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_iqsei"]
atlas = ExtResource("4_3nn5s")
region = Rect2(192, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_tffgl"]
atlas = ExtResource("4_3nn5s")
region = Rect2(384, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_pk8ii"]
atlas = ExtResource("4_3nn5s")
region = Rect2(576, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_5mf0n"]
atlas = ExtResource("4_3nn5s")
region = Rect2(768, 0, 192, 192)

[sub_resource type="AtlasTexture" id="AtlasTexture_4hvnv"]
atlas = ExtResource("4_3nn5s")
region = Rect2(960, 0, 192, 192)
[ext_resource type="Texture2D" uid="uid://2y4oibv0s1da" path="res://scenes/quests/story_quests/3_patitas/player_components/personaje01.png" id="4_5nl38"]

[resource]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_007i1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_6cv16")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_j4nxn")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_28m0y")
"texture": ExtResource("4_5nl38")
}],
"loop": true,
"name": &"attack_01",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_bbmj2")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_kxw46")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8qxvo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_5q8fn")
"texture": ExtResource("4_5nl38")
}],
"loop": true,
"name": &"attack_02",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_5c6ie")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_tcdtl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8a2yc")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_0k2r4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8410a")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_xol17")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_iflks")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_71e06")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_kpp0b")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_7f782")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_nemgu")
"texture": ExtResource("4_5nl38")
}],
"loop": false,
"name": &"defeated",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_fcs02")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_myrg7")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_kvlxm")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_uf5tr")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_lgqa7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8ydkj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3j4b4")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_yj68g")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ioxgp")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_cnsyf")
"texture": ExtResource("4_5nl38")
}],
"loop": true,
"name": &"idle",
"speed": 10.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_uniwh")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_iqsei")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_tffgl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_pk8ii")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_5mf0n")
"texture": ExtResource("4_5nl38")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4hvnv")
"texture": ExtResource("4_5nl38")
}],
"loop": true,
"name": &"walk",
Expand Down
4 changes: 2 additions & 2 deletions scenes/game_elements/characters/enemies/guard/guard.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ offset = Vector2(377.88, 10.7686)
script = ExtResource("4_lptvm")

[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="DetectionArea" unique_id=1176393945]
position = Vector2(-29.3333, -132)
polygon = PackedVector2Array(302, 48, 283, 52, 279, 52, 101, 114, 98, 114, 79, 124, 77, 124, 72, 131, 71, 131, 71, 138, 78, 145, 78, 146, 95, 154, 95, 155, 275, 226, 275, 227, 292, 231, 292, 232, 312, 230, 316, 230, 330, 222, 332, 222, 340, 214, 341, 214, 346, 205, 347, 205, 351, 185, 351, 100, 347, 82, 347, 79, 338, 67, 338, 65, 325, 55, 325, 54, 302, 47)
position = Vector2(-37, -137)
polygon = PackedVector2Array(329.3333, -16, 318.3333, -33, 290.3333, -51, 101, 114, 98, 114, 79, 124, 77, 124, 72, 131, 71, 131, 71, 138, 78, 145, 78, 146, 95, 154, 95, 155, 275, 226, 275, 227, 292, 231, 292, 232, 312, 230, 322, 240, 345, 232, 332, 235, 351, 223, 341, 214, 369, 208, 358, 217, 389, 187, 416, 137, 394, 64, 383, 45, 374, 34, 369, 24, 358, 17, 357, 9, 349.3333, -11)

[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=616054452]
unique_name_in_owner = true
Expand Down
4 changes: 2 additions & 2 deletions scenes/game_elements/characters/enemies/throwing_enemy/components/throwing_enemy.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ const WALK_TARGET_SKIP_RANGE: float = 0.25

## The speed of the projectile initial impulse and the projectile bouncing impulse.
@export_range(10., 100., 5., "or_greater", "or_less", "suffix:m/s")
var projectile_speed: float = 30.0
var projectile_speed: float = 80.0

## The life span of the projectile.
@export_range(0., 10., 0.1, "or_greater", "suffix:s") var projectile_duration: float = 5.0
@export_range(0., 10., 0.1, "or_greater", "suffix:s") var projectile_duration: float = 10.0

## If true, the projectile will constantly adjust itself to target the player.
@export var projectile_follows_player: bool = false
Expand Down
1 change: 1 addition & 0 deletions scenes/game_elements/characters/player/player.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ process_material = SubResource("ParticleProcessMaterial_nrnyj")
[node name="PlayerSprite" type="AnimatedSprite2D" parent="." unique_id=1785485617]
unique_name_in_owner = true
position = Vector2(0, -17)
scale = Vector2(0.3, 0.3)
sprite_frames = ExtResource("2_blfj0")
animation = &"idle"
autoplay = "idle"
Expand Down
Loading
Loading