team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

Added animation to help anticipate turning block turning

Browse source
This commit is contained in:
pennyrigate 2023-01-23 00:19:54 -05:00
parent 56e56a5cff
commit 3a8e9b757c
4 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
maps/canopy.tscn
View file

File diff suppressed because one or more lines are too long

8
maps/test_room.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=2] [gd_scene load_steps=14 format=2]
[ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
@ -11,6 +11,7 @@
[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=9]
[ext_resource path="res://objects/enemy/slime.tscn" type="PackedScene" id=10] [ext_resource path="res://objects/enemy/slime.tscn" type="PackedScene" id=10]
[ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://maps/map.gd" type="Script" id=11]
[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=12]
[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13]
[node name="Map" type="Node2D" groups=["map"]] [node name="Map" type="Node2D" groups=["map"]]
@ -47,7 +48,7 @@ position = Vector2( 84, -7 )
position = Vector2( 184, 163 ) position = Vector2( 184, 163 )
[node name="Player" parent="." instance=ExtResource( 1 )] [node name="Player" parent="." instance=ExtResource( 1 )]
position = Vector2( 144, 104 ) position = Vector2( 72, 160 )
[node name="Ladder3" parent="." instance=ExtResource( 8 )] [node name="Ladder3" parent="." instance=ExtResource( 8 )]
position = Vector2( 40, 136 ) position = Vector2( 40, 136 )
@ -65,3 +66,6 @@ visible = false
tile_set = ExtResource( 5 ) tile_set = ExtResource( 5 )
cell_size = Vector2( 8, 8 ) cell_size = Vector2( 8, 8 )
format = 1 format = 1
[node name="Turniwood5" parent="." instance=ExtResource( 12 )]
position = Vector2( 88, 136 )

10
objects/environment/turniwood/turniwood.gd
View file

@ -3,20 +3,22 @@ onready var anims = $AnimationPlayer
onready var timer = $Timer onready var timer = $Timer
export var time:float = 60 export var time:float = 60
export(int, "Wood", "Yellow") var color export(int, "Wood", "Yellow") var color
onready var time_frames = time * 0.0166666666666667 # Time is converted from ms to frames @ 60fps onready var time_ms = time * 0.0166666666666667 # Time is converted from frames @ 60fps to ms
func _ready(): func _ready():
#Autostart animationplayer #Autostart animationplayer
anims.play("idle") anims.play("idle")
timer.set_wait_time(time_frames) timer.start(time_ms)
timer.start()
func _physics_process(delta):
pass
#Debug.print(timer.)
func _on_AnimationPlayer_animation_finished(anim_name): func _on_AnimationPlayer_animation_finished(anim_name):
#Return to idle after turn animation #Return to idle after turn animation
if anim_name == "turn": if anim_name == "turn":
anims.play("idle") anims.play("idle")
timer.set_wait_time(time_frames) timer.start(time_ms)
func _on_Timer_timeout(): func _on_Timer_timeout():

22
objects/environment/turniwood/turniwood.tscn
View file

@ -49,8 +49,8 @@ tracks/2/keys = {
[sub_resource type="Animation" id=3] [sub_resource type="Animation" id=3]
resource_name = "turn" resource_name = "turn"
length = 0.5 length = 0.9
step = 0.125 step = 0.05
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("StaticBody2D/CollisionShape2D:disabled") tracks/0/path = NodePath("StaticBody2D/CollisionShape2D:disabled")
tracks/0/interp = 1 tracks/0/interp = 1
@ -58,7 +58,7 @@ tracks/0/loop_wrap = true
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/keys = { tracks/0/keys = {
"times": PoolRealArray( 0, 0.125, 0.5 ), "times": PoolRealArray( 0.4, 0.55, 0.9 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1 ),
"update": 1, "update": 1,
"values": [ false, true, false ] "values": [ false, true, false ]
@ -70,7 +70,7 @@ tracks/1/loop_wrap = true
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/keys = { tracks/1/keys = {
"times": PoolRealArray( 0, 0.125, 0.25, 0.375, 0.5 ), "times": PoolRealArray( 0.4, 0.55, 0.65, 0.8, 0.9 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
"update": 1, "update": 1,
"values": [ Rect2( 0, 0, 8, 8 ), Rect2( 8, 0, 8, 8 ), Rect2( 0, 0, 8, 8 ), Rect2( 8, 0, 8, 8 ), Rect2( 0, 0, 8, 8 ) ] "values": [ Rect2( 0, 0, 8, 8 ), Rect2( 8, 0, 8, 8 ), Rect2( 0, 0, 8, 8 ), Rect2( 8, 0, 8, 8 ), Rect2( 0, 0, 8, 8 ) ]
@ -82,11 +82,23 @@ tracks/2/loop_wrap = true
tracks/2/imported = false tracks/2/imported = false
tracks/2/enabled = true tracks/2/enabled = true
tracks/2/keys = { tracks/2/keys = {
"times": PoolRealArray( 0, 0.125, 0.25, 0.375, 0.5 ), "times": PoolRealArray( 0.4, 0.55, 0.65, 0.8, 0.9 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
"update": 1, "update": 1,
"values": [ 0.0, 90.0, 90.0, 0.0, 0.0 ] "values": [ 0.0, 90.0, 90.0, 0.0, 0.0 ]
} }
tracks/3/type = "value"
tracks/3/path = NodePath("Sprite:position")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0.15, 0.2, 0.35, 0.4 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 0,
"values": [ Vector2( 4, 4 ), Vector2( 5, 4 ), Vector2( 3, 4 ), Vector2( 4, 4 ) ]
}
[node name="Turniwood" type="Node2D"] [node name="Turniwood" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )