Skip to content

Commit

Permalink
When commit messages are funny legend says they aren't pro
Browse files Browse the repository at this point in the history
    - Added an idle animation for coins
    - Added in and out animations for the game
  • Loading branch information
ObaniGemini committed Nov 19, 2017
1 parent e31a072 commit 3c9a6f6
Show file tree
Hide file tree
Showing 8 changed files with 244 additions and 16 deletions.
9 changes: 9 additions & 0 deletions assets/items/coin.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
extends Area2D

onready var idle = get_node("idle").get_animation("idle").duplicate()

func _ready():
var angle = deg2rad(randi() % 360)
idle.track_set_key_value(0, 0, Vector2(4*cos(angle), 4*sin(angle)))
idle.track_set_key_value(0, 1, Vector2(-4*cos(angle), -4*sin(angle)))
idle.track_set_key_value(0, 2, Vector2(4*cos(angle), 4*sin(angle)))
get_node("idle").add_animation("idle_bis", idle)
get_node("idle").set_speed(rand_range(0.5, 0.75))
get_node("idle").play("idle_bis")
set_fixed_process(true)

func _fixed_process(delta):
Expand Down
30 changes: 29 additions & 1 deletion assets/items/coin.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=6 format=1]
[gd_scene load_steps=7 format=1]

[ext_resource path="res://assets/items/coin.gd" type="Script" id=1]
[ext_resource path="res://assets/items/coinGold.png" type="Texture" id=2]
Expand Down Expand Up @@ -72,6 +72,23 @@ tracks/2/keys = {
"values": [ -360.0, 0.0 ]
}

[sub_resource type="Animation" id=4]

resource/name = "idle"
length = 1.0
loop = true
step = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:transform/pos")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = {
"times": FloatArray( 0, 0.5, 1 ),
"transitions": FloatArray( 1, 1, 1 ),
"update": 0,
"values": [ Vector2( -4, 0 ), Vector2( 4, 0 ), Vector2( -4, 0 ) ]
}

[node name="coin" type="Area2D"]

input/pickable = true
Expand Down Expand Up @@ -135,6 +152,17 @@ playback/speed = 1.0
blend_times = [ ]
autoplay = ""

[node name="idle" type="AnimationPlayer" parent="."]

playback/process_mode = 1
playback/default_blend_time = 0.0
root/root = NodePath("..")
anims/idle = SubResource( 4 )
playback/active = true
playback/speed = 1.0
blend_times = [ ]
autoplay = ""

[connection signal="area_enter" from="." to="." method="_on_coin_area_enter"]

[connection signal="body_enter" from="." to="." method="_on_coin_body_enter"]
Expand Down
Binary file added assets/misc/square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/swords/sword.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ _update_shape_index = 0

config/amount = 32
config/lifetime = 0.1
config/emitting = false
config/process_mode = 1
config/local_space = false
config/texture = ExtResource( 2 )
Expand Down
4 changes: 3 additions & 1 deletion main.gd
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ func create_random():
add_child(tile_new)

func _on_restart_pressed():
get_tree().reload_current_scene()
get_node("gui/restart").set_disabled(true)
get_node("CanvasLayer/AnimationPlayer").connect("finished", get_tree(), "reload_current_scene")
get_node("CanvasLayer/AnimationPlayer").play("stop")


func _on_random_tile_timeout():
Expand Down
66 changes: 65 additions & 1 deletion main.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=13 format=1]
[gd_scene load_steps=16 format=1]

[ext_resource path="res://main.gd" type="Script" id=1]
[ext_resource path="res://assets/knight/knight.tscn" type="PackedScene" id=2]
Expand All @@ -9,6 +9,7 @@
[ext_resource path="res://assets/icons/jump.png" type="Texture" id=7]
[ext_resource path="res://assets/icons/jump_cool.png" type="Texture" id=8]
[ext_resource path="res://assets/fonts/amaranth_32_black.fnt" type="BitmapFont" id=9]
[ext_resource path="res://assets/misc/square.png" type="Texture" id=10]

[sub_resource type="Animation" id=1]

Expand Down Expand Up @@ -91,6 +92,40 @@ tracks/1/keys = {
"values": [ Vector2( 1034, 0 ), Vector2( 1146, 12 ) ]
}

[sub_resource type="Animation" id=4]

resource/name = "start"
length = 0.7
loop = false
step = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:transform/pos")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = {
"times": FloatArray( 0, 0.1, 0.7 ),
"transitions": FloatArray( 1, 0.25, 1 ),
"update": 0,
"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 1280, 0 ) ]
}

[sub_resource type="Animation" id=5]

resource/name = "stop"
length = 0.6
loop = false
step = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:transform/pos")
tracks/0/interp = 1
tracks/0/imported = false
tracks/0/keys = {
"times": FloatArray( 0, 0.6 ),
"transitions": FloatArray( 0.25, 1 ),
"update": 0,
"values": [ Vector2( -1280, 0 ), Vector2( 0, 0 ) ]
}

[node name="main" type="Node2D"]

script/script = ExtResource( 1 )
Expand All @@ -108,6 +143,7 @@ autostart = true

[node name="ParallaxBackground" type="ParallaxBackground" parent="."]

editor/display_folded = true
layer = -1
offset = Vector2( 0, 0 )
rotation = 0.0
Expand All @@ -133,6 +169,7 @@ centered = false

[node name="gui" type="CanvasLayer" parent="."]

editor/display_folded = true
layer = 1
offset = Vector2( 0, 0 )
rotation = 0.0
Expand Down Expand Up @@ -311,6 +348,33 @@ wait_time = 10.0
one_shot = true
autostart = false

[node name="CanvasLayer" type="CanvasLayer" parent="."]

editor/display_folded = true
layer = 2
offset = Vector2( 0, 0 )
rotation = 0.0
scale = Vector2( 1, 1 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasLayer"]

playback/process_mode = 1
playback/default_blend_time = 0.0
root/root = NodePath("..")
anims/start = SubResource( 4 )
anims/stop = SubResource( 5 )
playback/active = true
playback/speed = 1.0
blend_times = [ ]
autoplay = "start"

[node name="Sprite" type="Sprite" parent="CanvasLayer"]

transform/scale = Vector2( 1280, 720 )
texture = ExtResource( 10 )
centered = false
modulate = Color( 0, 0, 0, 1 )

[connection signal="timeout" from="random_tile" to="." method="_on_random_tile_timeout"]

[connection signal="pressed" from="gui/restart" to="." method="_on_restart_pressed"]
Expand Down
5 changes: 3 additions & 2 deletions main_menu.gd
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
extends Node2D


func _ready():
var config = ConfigFile.new()
config.load("user://settings.cfg")
var highscore = config.get_value("general","highscore",0)
get_node("high_score").set_text(str(highscore))

func _on_play_pressed():
get_tree().change_scene("res://main.tscn")
if not get_node("AnimationPlayer").is_playing():
get_node("AnimationPlayer").connect("finished", get_tree(), "change_scene", ["res://main.tscn"])
get_node("AnimationPlayer").play("start")
Loading

0 comments on commit 3c9a6f6

Please sign in to comment.