TeaSanctuary/1bit-game-jam
4
0
Fork 0
Code Issues 1 Pull requests Projects Releases 2 Packages Wiki Activity

Исправление анимации шипов, а также изменение их логики (исправление логики при закрытии, увеличение времени в убранном состоянии, уменьшение коллайдера)

Browse source
This commit is contained in:
Евгений Титаренко 2023-08-21 17:28:40 +03:00
parent f2675313f7
commit 3e60215e11
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
prefabs/entities/spikes.tscn
View file

@ -4,7 +4,7 @@
[ext_resource type="SpriteFrames" uid="uid://uith5rxps4s" path="res://sprites/tiles/floor/spikes/spikes.tres" id="2_t76h0"] [ext_resource type="SpriteFrames" uid="uid://uith5rxps4s" path="res://sprites/tiles/floor/spikes/spikes.tres" id="2_t76h0"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_guqiy"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_guqiy"]
size = Vector2(32, 32) size = Vector2(24, 24)
[node name="spikes" type="Area2D"] [node name="spikes" type="Area2D"]
z_index = -1 z_index = -1
@ -12,8 +12,6 @@ script = ExtResource("1_r27mb")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = ExtResource("2_t76h0") sprite_frames = ExtResource("2_t76h0")
frame = 2
frame_progress = 1.0
[node name="Sprite2D" type="Sprite2D" parent="AnimatedSprite2D"] [node name="Sprite2D" type="Sprite2D" parent="AnimatedSprite2D"]

9
scripts/entities/Spikes.cs
View file

@ -13,7 +13,7 @@ public partial class Spikes : Area2D
} }
[Export] public bool Enabled = false; [Export] public bool Enabled = false;
[Export] public float SpikesTimeout = 1f; [Export] public float SpikesTimeout = 2f;
[Export] public float StartOffset = 0f; [Export] public float StartOffset = 0f;
private AnimatedSprite2D _sprite; private AnimatedSprite2D _sprite;
private State _state = State.Waiting; private State _state = State.Waiting;
@ -40,7 +40,7 @@ public partial class Spikes : Area2D
switch (_state) switch (_state)
{ {
case State.Waiting: case State.Waiting:
_sprite.Stop(); _sprite.Play("default");
_timeSinceState += (float)delta; _timeSinceState += (float)delta;
if (_timeSinceState > SpikesTimeout) if (_timeSinceState > SpikesTimeout)
{ {
@ -49,11 +49,12 @@ public partial class Spikes : Area2D
} }
break; break;
case State.Opening: case State.Opening:
_sprite.Play("default"); _sprite.Play("activated");
KillBodiesOnButton(); KillBodiesOnButton();
break; break;
case State.Closing: case State.Closing:
_sprite.PlayBackwards("default"); _sprite.PlayBackwards("activated");
KillBodiesOnButton();
break; break;
} }
} }

21
sprites/tiles/floor/spikes/spikes.tres
View file

@ -2,10 +2,6 @@
[ext_resource type="Texture2D" uid="uid://l3v1hs32uxfp" path="res://sprites/tiles/floor/spikes/spikes_0001-sheet.png" id="1_xhodh"] [ext_resource type="Texture2D" uid="uid://l3v1hs32uxfp" path="res://sprites/tiles/floor/spikes/spikes_0001-sheet.png" id="1_xhodh"]
[sub_resource type="AtlasTexture" id="AtlasTexture_ebjk6"]
atlas = ExtResource("1_xhodh")
region = Rect2(64, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_my1hb"] [sub_resource type="AtlasTexture" id="AtlasTexture_my1hb"]
atlas = ExtResource("1_xhodh") atlas = ExtResource("1_xhodh")
region = Rect2(32, 0, 32, 32) region = Rect2(32, 0, 32, 32)
@ -14,19 +10,28 @@ region = Rect2(32, 0, 32, 32)
atlas = ExtResource("1_xhodh") atlas = ExtResource("1_xhodh")
region = Rect2(0, 0, 32, 32) region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_qhlyu"]
atlas = ExtResource("1_xhodh")
region = Rect2(64, 0, 32, 32)
[resource] [resource]
animations = [{ animations = [{
"frames": [{ "frames": [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_ebjk6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_my1hb") "texture": SubResource("AtlasTexture_my1hb")
}, { }, {
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_nfdn1") "texture": SubResource("AtlasTexture_nfdn1")
}], }],
"loop": false, "loop": false,
"name": &"activated",
"speed": 2.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_qhlyu")
}],
"loop": true,
"name": &"default", "name": &"default",
"speed": 3.0 "speed": 5.0
}] }]