Skip to content
This repository was archived by the owner on Nov 25, 2021. It is now read-only.

Commit 007992b

Browse files
committed
Blink before unevolving and animate aloe vera
1 parent 3764ff5 commit 007992b

File tree

3 files changed

+49
-11
lines changed

3 files changed

+49
-11
lines changed

Enteties/Chameleon/Chameleon.tscn

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
[sub_resource type="SpriteFrames" id=1]
1919
animations = [ {
20-
"frames": [ ExtResource( 6 ), ExtResource( 9 ) ],
20+
"frames": [ ExtResource( 8 ) ],
2121
"loop": true,
22-
"name": "Walk_evolved",
23-
"speed": 6.0
22+
"name": "Idle_evolved",
23+
"speed": 5.0
2424
}, {
2525
"frames": [ ExtResource( 10 ) ],
2626
"loop": false,
@@ -42,10 +42,10 @@ animations = [ {
4242
"name": "Idle",
4343
"speed": 1.0
4444
}, {
45-
"frames": [ ExtResource( 8 ) ],
45+
"frames": [ ExtResource( 6 ), ExtResource( 9 ) ],
4646
"loop": true,
47-
"name": "Idle_evolved",
48-
"speed": 5.0
47+
"name": "Walk_evolved",
48+
"speed": 6.0
4949
} ]
5050

5151
[sub_resource type="CapsuleShape2D" id=2]
@@ -111,7 +111,11 @@ script = ExtResource( 12 )
111111
[node name="ShiftTween" type="Tween" parent="Camera2D"]
112112

113113
[node name="EvolveTimer" type="Timer" parent="."]
114-
wait_time = 15.0
114+
wait_time = 14.75
115+
one_shot = true
116+
117+
[node name="SubTimer" type="Timer" parent="EvolveTimer"]
118+
wait_time = 0.25
115119
one_shot = true
116120

117121
[node name="CanvasLayer" type="CanvasLayer" parent="."]
@@ -183,7 +187,8 @@ custom_fonts/font = SubResource( 6 )
183187
text = " Exit to titlescreen "
184188
[connection signal="on_grounded_updated" from="." to="Camera2D" method="_on_Chameleon_on_grounded_updated"]
185189
[connection signal="timeout" from="Camouflage/Timer" to="Camouflage" method="_on_Timer_timeout"]
186-
[connection signal="timeout" from="EvolveTimer" to="." method="_on_Evolve_timeout"]
190+
[connection signal="timeout" from="EvolveTimer" to="." method="_on_Initial_timeout"]
191+
[connection signal="timeout" from="EvolveTimer/SubTimer" to="." method="_on_Evolve_timeout"]
187192
[connection signal="pressed" from="CanvasLayer/CenterContainer/MenuPopup/VBoxContainer/Resume" to="CanvasLayer/CenterContainer/MenuPopup" method="_on_Resume_pressed"]
188193
[connection signal="pressed" from="CanvasLayer/CenterContainer/MenuPopup/VBoxContainer/Restart" to="CanvasLayer/CenterContainer/MenuPopup" method="_on_Restart_pressed"]
189194
[connection signal="pressed" from="CanvasLayer/CenterContainer/MenuPopup/VBoxContainer/Exit" to="CanvasLayer/CenterContainer/MenuPopup" method="_on_Exit_pressed"]

Enteties/Chameleon/chameleon.gd

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ onready var sprite = $AnimatedSprite
88
onready var camo = $Camouflage
99
onready var shape = $CollisionShape2D.shape
1010
onready var evolve_timer = $EvolveTimer
11+
onready var evolve_sub_timer = $EvolveTimer/SubTimer
1112

1213
var hidden = false
1314

@@ -26,6 +27,19 @@ var velocity = Vector2()
2627
var evolve_anim = ""
2728
var flip_h = true
2829

30+
func _on_Initial_timeout():
31+
# Flicker 4 times
32+
for i in 4:
33+
sprite.modulate.a = 0.1
34+
for j in 15:
35+
yield(get_tree(), "idle_frame")
36+
37+
sprite.modulate.a = 1.0
38+
for j in 15:
39+
yield(get_tree(), "idle_frame")
40+
41+
evolve_sub_timer.start()
42+
2943
func _on_Evolve_timeout():
3044
shape.height = 45
3145
evolve_anim = ""
@@ -86,3 +100,4 @@ func _physics_process(delta: float):
86100

87101
if was_grounded == null || is_grounded != was_grounded:
88102
emit_signal("on_grounded_updated", is_grounded)
103+

Enteties/Enemies/AloeVera/AloeVera.tscn

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,34 @@
1-
[gd_scene load_steps=4 format=2]
1+
[gd_scene load_steps=6 format=2]
22

33
[ext_resource path="res://Enteties/Enemies/AloeVera/Sprites/aloe-vera-1.png" type="Texture" id=1]
44
[ext_resource path="res://Enteties/Enemies/AloeVera/aloevera.gd" type="Script" id=2]
55

6-
[sub_resource type="CircleShape2D" id=1]
6+
[sub_resource type="Shader" id=1]
7+
code = "shader_type canvas_item;
8+
9+
uniform float amplitude = 3f;
10+
uniform float speed = 2f;
11+
12+
void vertex() {
13+
VERTEX.x += amplitude * sin((1f-UV.y) * speed * TIME);
14+
}
15+
16+
"
17+
18+
[sub_resource type="ShaderMaterial" id=2]
19+
shader = SubResource( 1 )
20+
shader_param/amplitude = 3.0
21+
shader_param/speed = 2.0
22+
23+
[sub_resource type="CircleShape2D" id=3]
724
radius = 25.0
825

926
[node name="AloeVera" type="StaticBody2D"]
1027
collision_layer = 2
1128
script = ExtResource( 2 )
1229

1330
[node name="Sprite" type="Sprite" parent="."]
31+
material = SubResource( 2 )
1432
texture = ExtResource( 1 )
1533

1634
[node name="Hitbox" type="CollisionPolygon2D" parent="."]
@@ -20,7 +38,7 @@ polygon = PoolVector2Array( 0.655499, -20.8804, 20.388, -4.06145, 22.9042, 6.400
2038

2139
[node name="Hitbox2" type="CollisionShape2D" parent="Area2D"]
2240
position = Vector2( 0, 1 )
23-
shape = SubResource( 1 )
41+
shape = SubResource( 3 )
2442

2543
[node name="VisibilityEnabler2D" type="VisibilityEnabler2D" parent="."]
2644
process_parent = true

0 commit comments

Comments
 (0)