Skip to content

Commit b46a4fb

Browse files
committed
player: Remove repel_deprecated fallback path
This removes the fallback added in commit 96876c9. repel_deprecated only animated the player, not the AirStream and AirStreamCollision that implements the repel function. All in-tree quests have now been updated to define the attack_02 animation. Remove this incomplete fallback path. Resolves #1305
1 parent 2117298 commit b46a4fb

2 files changed

Lines changed: 1 addition & 33 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")

0 commit comments

Comments
 (0)