Skip to content

Commit dc57595

Browse files
manuqmanuq
authored
Merge pull request #1307 from endlessm/player-remove-attack_01-fallback
Remove fallback to attack_01 for repel action
2 parents f0a4185 + b46a4fb commit dc57595

9 files changed

Lines changed: 11 additions & 274 deletions

File tree

‎scenes/game_elements/characters/player/components/animation_player.gd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ func _process(_delta: float) -> void:
3030

3131

3232
func _get_repel_animation() -> StringName:
33-
if not player_sprite.sprite_frames.has_animation(&"attack_02"):
34-
return &"repel_deprecated"
3533
return &"repel"
3634

3735

‎scenes/game_elements/characters/player/player.tscn‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=39 format=3 uid="uid://iu2q66clupc6"]
1+
[gd_scene load_steps=38 format=3 uid="uid://iu2q66clupc6"]
22

33
[ext_resource type="Script" uid="uid://bwllxup305eib" path="res://scenes/game_elements/characters/player/components/player.gd" id="1_g2els"]
44
[ext_resource type="SpriteFrames" uid="uid://vwf8e1v8brdp" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player.tres" id="2_blfj0"]
@@ -379,35 +379,6 @@ tracks/8/keys = {
379379
}
380380
tracks/8/use_blend = true
381381

382-
[sub_resource type="Animation" id="Animation_j0tly"]
383-
resource_name = "repel_deprecated"
384-
length = 0.4
385-
step = 0.1
386-
tracks/0/type = "value"
387-
tracks/0/imported = false
388-
tracks/0/enabled = true
389-
tracks/0/path = NodePath("PlayerSprite:animation")
390-
tracks/0/interp = 1
391-
tracks/0/loop_wrap = true
392-
tracks/0/keys = {
393-
"times": PackedFloat32Array(0),
394-
"transitions": PackedFloat32Array(1),
395-
"update": 0,
396-
"values": [&"attack_01"]
397-
}
398-
tracks/1/type = "value"
399-
tracks/1/imported = false
400-
tracks/1/enabled = true
401-
tracks/1/path = NodePath("PlayerSprite:frame")
402-
tracks/1/interp = 1
403-
tracks/1/loop_wrap = true
404-
tracks/1/keys = {
405-
"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4),
406-
"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
407-
"update": 0,
408-
"values": [0, 1, 2, 3, 3]
409-
}
410-
411382
[sub_resource type="Animation" id="Animation_nrnyj"]
412383
resource_name = "run"
413384
length = 0.6
@@ -527,7 +498,6 @@ _data = {
527498
&"defeated": SubResource("Animation_blfj0"),
528499
&"idle": SubResource("Animation_75vfm"),
529500
&"repel": SubResource("Animation_u5klv"),
530-
&"repel_deprecated": SubResource("Animation_j0tly"),
531501
&"run": SubResource("Animation_nrnyj"),
532502
&"throw_string": SubResource("Animation_4nivu"),
533503
&"walk": SubResource("Animation_qek5x")

‎scenes/quests/story_quests/el_juguete_perdido/player_components/apolo_components/apolo_player.tres‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,8 @@
1-
[gd_resource type="SpriteFrames" load_steps=20 format=3 uid="uid://d0ci8wkfqhcai"]
1+
[gd_resource type="SpriteFrames" load_steps=12 format=3 uid="uid://d0ci8wkfqhcai"]
22

3-
[ext_resource type="Texture2D" uid="uid://c0itxt8w3yml0" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player_attack_01.png" id="1_0i27h"]
4-
[ext_resource type="Texture2D" uid="uid://dly3ikrx05f0x" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player_defeated.png" id="2_ia3rb"]
53
[ext_resource type="Texture2D" uid="uid://bldx32fdrbw7a" path="res://scenes/quests/story_quests/el_juguete_perdido/player_components/apolo_components/apolo_idle.png" id="3_68i8b"]
64
[ext_resource type="Texture2D" uid="uid://d00jve3jiy4rr" path="res://scenes/quests/story_quests/el_juguete_perdido/player_components/apolo_components/apolo_walk.png" id="4_notwh"]
75

8-
[sub_resource type="AtlasTexture" id="AtlasTexture_yg72c"]
9-
atlas = ExtResource("1_0i27h")
10-
region = Rect2(0, 0, 192, 192)
11-
12-
[sub_resource type="AtlasTexture" id="AtlasTexture_ydd7j"]
13-
atlas = ExtResource("1_0i27h")
14-
region = Rect2(192, 0, 192, 192)
15-
16-
[sub_resource type="AtlasTexture" id="AtlasTexture_f8lfs"]
17-
atlas = ExtResource("1_0i27h")
18-
region = Rect2(384, 0, 192, 192)
19-
20-
[sub_resource type="AtlasTexture" id="AtlasTexture_scyt1"]
21-
atlas = ExtResource("1_0i27h")
22-
region = Rect2(576, 0, 192, 192)
23-
24-
[sub_resource type="AtlasTexture" id="AtlasTexture_cu6lk"]
25-
atlas = ExtResource("2_ia3rb")
26-
region = Rect2(0, 0, 192, 192)
27-
28-
[sub_resource type="AtlasTexture" id="AtlasTexture_icahe"]
29-
atlas = ExtResource("2_ia3rb")
30-
region = Rect2(192, 0, 192, 192)
31-
326
[sub_resource type="AtlasTexture" id="AtlasTexture_e55eb"]
337
atlas = ExtResource("3_68i8b")
348
region = Rect2(0, 0, 192, 192)
@@ -69,61 +43,6 @@ region = Rect2(384, 0, 192, 192)
6943
animations = [{
7044
"frames": [{
7145
"duration": 1.0,
72-
"texture": SubResource("AtlasTexture_yg72c")
73-
}, {
74-
"duration": 1.0,
75-
"texture": SubResource("AtlasTexture_ydd7j")
76-
}, {
77-
"duration": 1.0,
78-
"texture": SubResource("AtlasTexture_f8lfs")
79-
}, {
80-
"duration": 1.0,
81-
"texture": SubResource("AtlasTexture_scyt1")
82-
}],
83-
"loop": true,
84-
"name": &"attack_01",
85-
"speed": 10.0
86-
}, {
87-
"frames": [{
88-
"duration": 1.0,
89-
"texture": SubResource("AtlasTexture_cu6lk")
90-
}, {
91-
"duration": 1.0,
92-
"texture": SubResource("AtlasTexture_icahe")
93-
}, {
94-
"duration": 1.0,
95-
"texture": SubResource("AtlasTexture_cu6lk")
96-
}, {
97-
"duration": 1.0,
98-
"texture": SubResource("AtlasTexture_icahe")
99-
}, {
100-
"duration": 1.0,
101-
"texture": SubResource("AtlasTexture_cu6lk")
102-
}, {
103-
"duration": 1.0,
104-
"texture": SubResource("AtlasTexture_icahe")
105-
}, {
106-
"duration": 1.0,
107-
"texture": SubResource("AtlasTexture_cu6lk")
108-
}, {
109-
"duration": 1.0,
110-
"texture": SubResource("AtlasTexture_icahe")
111-
}, {
112-
"duration": 1.0,
113-
"texture": SubResource("AtlasTexture_cu6lk")
114-
}, {
115-
"duration": 1.0,
116-
"texture": SubResource("AtlasTexture_icahe")
117-
}, {
118-
"duration": 1.0,
119-
"texture": SubResource("AtlasTexture_cu6lk")
120-
}],
121-
"loop": true,
122-
"name": &"defeated",
123-
"speed": 5.0
124-
}, {
125-
"frames": [{
126-
"duration": 1.0,
12746
"texture": SubResource("AtlasTexture_e55eb")
12847
}, {
12948
"duration": 1.0,

‎scenes/quests/story_quests/el_juguete_perdido/player_components/apolo_components/apolo_toy.tres‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,8 @@
1-
[gd_resource type="SpriteFrames" load_steps=20 format=3 uid="uid://ddpc5h6jtt6uq"]
1+
[gd_resource type="SpriteFrames" load_steps=12 format=3 uid="uid://ddpc5h6jtt6uq"]
22

3-
[ext_resource type="Texture2D" uid="uid://c0itxt8w3yml0" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player_attack_01.png" id="1_tejsx"]
4-
[ext_resource type="Texture2D" uid="uid://dly3ikrx05f0x" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player_defeated.png" id="2_ywuc5"]
53
[ext_resource type="Texture2D" uid="uid://dscena446rcx7" path="res://scenes/quests/story_quests/el_juguete_perdido/player_components/apolo_components/apolo_toy_idle.png" id="3_tejsx"]
64
[ext_resource type="Texture2D" uid="uid://d00jve3jiy4rr" path="res://scenes/quests/story_quests/el_juguete_perdido/player_components/apolo_components/apolo_walk.png" id="4_udpr3"]
75

8-
[sub_resource type="AtlasTexture" id="AtlasTexture_yg72c"]
9-
atlas = ExtResource("1_tejsx")
10-
region = Rect2(0, 0, 192, 192)
11-
12-
[sub_resource type="AtlasTexture" id="AtlasTexture_ydd7j"]
13-
atlas = ExtResource("1_tejsx")
14-
region = Rect2(192, 0, 192, 192)
15-
16-
[sub_resource type="AtlasTexture" id="AtlasTexture_f8lfs"]
17-
atlas = ExtResource("1_tejsx")
18-
region = Rect2(384, 0, 192, 192)
19-
20-
[sub_resource type="AtlasTexture" id="AtlasTexture_scyt1"]
21-
atlas = ExtResource("1_tejsx")
22-
region = Rect2(576, 0, 192, 192)
23-
24-
[sub_resource type="AtlasTexture" id="AtlasTexture_cu6lk"]
25-
atlas = ExtResource("2_ywuc5")
26-
region = Rect2(0, 0, 192, 192)
27-
28-
[sub_resource type="AtlasTexture" id="AtlasTexture_icahe"]
29-
atlas = ExtResource("2_ywuc5")
30-
region = Rect2(192, 0, 192, 192)
31-
326
[sub_resource type="AtlasTexture" id="AtlasTexture_ywuc5"]
337
atlas = ExtResource("3_tejsx")
348
region = Rect2(0, 0, 192, 192)
@@ -69,61 +43,6 @@ region = Rect2(384, 0, 192, 192)
6943
animations = [{
7044
"frames": [{
7145
"duration": 1.0,
72-
"texture": SubResource("AtlasTexture_yg72c")
73-
}, {
74-
"duration": 1.0,
75-
"texture": SubResource("AtlasTexture_ydd7j")
76-
}, {
77-
"duration": 1.0,
78-
"texture": SubResource("AtlasTexture_f8lfs")
79-
}, {
80-
"duration": 1.0,
81-
"texture": SubResource("AtlasTexture_scyt1")
82-
}],
83-
"loop": true,
84-
"name": &"attack_01",
85-
"speed": 10.0
86-
}, {
87-
"frames": [{
88-
"duration": 1.0,
89-
"texture": SubResource("AtlasTexture_cu6lk")
90-
}, {
91-
"duration": 1.0,
92-
"texture": SubResource("AtlasTexture_icahe")
93-
}, {
94-
"duration": 1.0,
95-
"texture": SubResource("AtlasTexture_cu6lk")
96-
}, {
97-
"duration": 1.0,
98-
"texture": SubResource("AtlasTexture_icahe")
99-
}, {
100-
"duration": 1.0,
101-
"texture": SubResource("AtlasTexture_cu6lk")
102-
}, {
103-
"duration": 1.0,
104-
"texture": SubResource("AtlasTexture_icahe")
105-
}, {
106-
"duration": 1.0,
107-
"texture": SubResource("AtlasTexture_cu6lk")
108-
}, {
109-
"duration": 1.0,
110-
"texture": SubResource("AtlasTexture_icahe")
111-
}, {
112-
"duration": 1.0,
113-
"texture": SubResource("AtlasTexture_cu6lk")
114-
}, {
115-
"duration": 1.0,
116-
"texture": SubResource("AtlasTexture_icahe")
117-
}, {
118-
"duration": 1.0,
119-
"texture": SubResource("AtlasTexture_cu6lk")
120-
}],
121-
"loop": true,
122-
"name": &"defeated",
123-
"speed": 5.0
124-
}, {
125-
"frames": [{
126-
"duration": 1.0,
12746
"texture": SubResource("AtlasTexture_ywuc5")
12847
}, {
12948
"duration": 1.0,

‎scenes/quests/story_quests/shjourney/7_shjourney_combate/template_playerFight.tres‎

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="SpriteFrames" load_steps=43 format=3 uid="uid://blbgeo0jjttf4"]
1+
[gd_resource type="SpriteFrames" load_steps=34 format=3 uid="uid://blbgeo0jjttf4"]
22

33
[ext_resource type="Texture2D" uid="uid://c71mojxxxxfvj" path="res://scenes/quests/story_quests/shjourney/4_Laberinto/personajes/PJ_attack.png" id="1_5nfxk"]
44
[ext_resource type="Texture2D" uid="uid://dp2c5hcg44j3d" path="res://scenes/quests/story_quests/shjourney/4_Laberinto/personajes/TimDefeated.png" id="2_5nfxk"]
@@ -85,42 +85,6 @@ region = Rect2(576, 0, 64, 64)
8585
atlas = ExtResource("3_k32gq")
8686
region = Rect2(640, 0, 64, 64)
8787

88-
[sub_resource type="AtlasTexture" id="AtlasTexture_dnk7a"]
89-
atlas = ExtResource("4_r0ucd")
90-
region = Rect2(0, 0, 64, 64)
91-
92-
[sub_resource type="AtlasTexture" id="AtlasTexture_gsmi1"]
93-
atlas = ExtResource("4_r0ucd")
94-
region = Rect2(64, 0, 64, 64)
95-
96-
[sub_resource type="AtlasTexture" id="AtlasTexture_5p04k"]
97-
atlas = ExtResource("4_r0ucd")
98-
region = Rect2(128, 0, 64, 64)
99-
100-
[sub_resource type="AtlasTexture" id="AtlasTexture_2mty5"]
101-
atlas = ExtResource("4_r0ucd")
102-
region = Rect2(192, 0, 64, 64)
103-
104-
[sub_resource type="AtlasTexture" id="AtlasTexture_j6opw"]
105-
atlas = ExtResource("4_r0ucd")
106-
region = Rect2(256, 0, 64, 64)
107-
108-
[sub_resource type="AtlasTexture" id="AtlasTexture_pykfg"]
109-
atlas = ExtResource("4_r0ucd")
110-
region = Rect2(320, 0, 64, 64)
111-
112-
[sub_resource type="AtlasTexture" id="AtlasTexture_jngqd"]
113-
atlas = ExtResource("4_r0ucd")
114-
region = Rect2(384, 0, 64, 64)
115-
116-
[sub_resource type="AtlasTexture" id="AtlasTexture_smmnl"]
117-
atlas = ExtResource("4_r0ucd")
118-
region = Rect2(448, 0, 64, 64)
119-
120-
[sub_resource type="AtlasTexture" id="AtlasTexture_hxv85"]
121-
atlas = ExtResource("4_r0ucd")
122-
region = Rect2(512, 0, 64, 64)
123-
12488
[sub_resource type="AtlasTexture" id="AtlasTexture_qc4lu"]
12589
atlas = ExtResource("4_r0ucd")
12690
region = Rect2(0, 0, 64, 64)
@@ -182,7 +146,7 @@ animations = [{
182146
"texture": SubResource("AtlasTexture_i7pte")
183147
}],
184148
"loop": true,
185-
"name": &"attack_01",
149+
"name": &"attack_02",
186150
"speed": 10.0
187151
}, {
188152
"frames": [{
@@ -236,38 +200,6 @@ animations = [{
236200
}, {
237201
"frames": [{
238202
"duration": 1.0,
239-
"texture": SubResource("AtlasTexture_dnk7a")
240-
}, {
241-
"duration": 1.0,
242-
"texture": SubResource("AtlasTexture_gsmi1")
243-
}, {
244-
"duration": 1.0,
245-
"texture": SubResource("AtlasTexture_5p04k")
246-
}, {
247-
"duration": 1.0,
248-
"texture": SubResource("AtlasTexture_2mty5")
249-
}, {
250-
"duration": 1.0,
251-
"texture": SubResource("AtlasTexture_j6opw")
252-
}, {
253-
"duration": 1.0,
254-
"texture": SubResource("AtlasTexture_pykfg")
255-
}, {
256-
"duration": 1.0,
257-
"texture": SubResource("AtlasTexture_jngqd")
258-
}, {
259-
"duration": 1.0,
260-
"texture": SubResource("AtlasTexture_smmnl")
261-
}, {
262-
"duration": 1.0,
263-
"texture": SubResource("AtlasTexture_hxv85")
264-
}],
265-
"loop": true,
266-
"name": &"sprint",
267-
"speed": 10.0
268-
}, {
269-
"frames": [{
270-
"duration": 1.0,
271203
"texture": SubResource("AtlasTexture_qc4lu")
272204
}, {
273205
"duration": 1.0,

‎scenes/quests/story_quests/stella/2_stella_combat/stella_combat.tscn‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ size = Vector2(101, 91.5)
6060

6161
[sub_resource type="Resource" id="Resource_a51xm"]
6262
script = ExtResource("9_chxci")
63-
name = ""
6463
type = 1
6564
metadata/_custom_type_script = "uid://bgmwplmj3bfls"
6665

@@ -193,8 +192,8 @@ editor_draw_limits = true
193192

194193
[node name="Talker" parent="." instance=ExtResource("14_asncp")]
195194
position = Vector2(1319, 275)
196-
npc_name = "Fisherman"
197195
dialogue = ExtResource("2_awu4o")
196+
npc_name = "Fisherman"
198197
sprite_frames = ExtResource("14_e46so")
199198

200199
[connection signal="goal_reached" from="FillGameLogic" to="OnTheGround/CollectibleItem" method="reveal"]

‎scenes/quests/story_quests/stella/stella_player_components/stella_player.tres‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_resource type="SpriteFrames" load_steps=36 format=3 uid="uid://dn0ivusgamrg3"]
22

3-
[ext_resource type="Texture2D" uid="uid://clt7i8qakhxxd" path="res://scenes/quests/story_quests/stella/stella_player_components/stella_player_attack_01.png" id="1_caovh"]
3+
[ext_resource type="Texture2D" uid="uid://clt7i8qakhxxd" path="res://scenes/quests/story_quests/stella/stella_player_components/stella_player_attack_02.png" id="1_caovh"]
44
[ext_resource type="Texture2D" uid="uid://c8yx8g48wcyx" path="res://scenes/quests/story_quests/stella/stella_player_components/stella_player_defeated.png" id="2_caxau"]
55
[ext_resource type="Texture2D" uid="uid://b5b3f8rk5ctfk" path="res://scenes/quests/story_quests/stella/stella_player_components/stella_player_idle.png" id="3_caovh"]
66
[ext_resource type="Texture2D" uid="uid://dkkq0lfjandks" path="res://scenes/quests/story_quests/stella/stella_player_components/stella_player_walk.png" id="4_caovh"]
@@ -145,7 +145,7 @@ animations = [{
145145
"texture": SubResource("AtlasTexture_c4x3s")
146146
}],
147147
"loop": true,
148-
"name": &"attack_01",
148+
"name": &"attack_02",
149149
"speed": 10.0
150150
}, {
151151
"frames": [{

scenes/quests/story_quests/stella/stella_player_components/stella_player_attack_01.png renamed to scenes/quests/story_quests/stella/stella_player_components/stella_player_attack_02.png

File renamed without changes.

0 commit comments

Comments
 (0)