diff --git a/Scenes/Events/player.gd b/Scenes/Events/player.gd index d4ffc46..1ac2d56 100644 --- a/Scenes/Events/player.gd +++ b/Scenes/Events/player.gd @@ -22,6 +22,7 @@ var walk_speed = 0 onready var shooter = get_node("shooter") onready var sprite = get_node("sprite") +onready var animation = get_node("sprite/animations") onready var foots = get_node("foots") onready var camera = get_node("sprite/Camera2D") @@ -130,7 +131,6 @@ func _fixed_process(delta): # Movimiento horizontal if (!right and !left): - sprite.set_animation("Idle") if (velocity.x > SLIDE_LEVEL): velocity.x -= SLIDE_LEVEL elif (velocity.x < -SLIDE_LEVEL): @@ -171,6 +171,7 @@ func _fixed_process(delta): can_jump = false func _ready(): + connect("set_max_milk",hud_milk,"on_set_max_milk") connect("update_milk",hud_milk,"on_update_milk_bar") @@ -192,7 +193,7 @@ func _input(ev): # Movimiento horizontal if (ev.is_action_pressed("ui_left")): left = true - sprite.set_animation("walk") + animation.play("walk") emit_signal("looking_left") velocity.x = -MAX_WALK_SPEED sprite.set_flip_h(true) @@ -201,13 +202,15 @@ func _input(ev): if (ev.is_action_pressed("ui_right")): right = true - sprite.set_animation("walk") + animation.play("walk") velocity.x = MAX_WALK_SPEED emit_signal("looking_right") sprite.set_flip_h(false) elif (ev.is_action_released("ui_right")): right = false + if (!right and !left): + animation.play("idle") # Arriba if (ev.is_action_pressed("ui_up")): print("ui_up on") diff --git a/Scenes/Events/player.tscn b/Scenes/Events/player.tscn index a783a11..a02516a 100644 --- a/Scenes/Events/player.tscn +++ b/Scenes/Events/player.tscn @@ -1,31 +1,10 @@ -[gd_scene load_steps=27 format=1] +[gd_scene load_steps=9 format=1] [ext_resource path="res://Scenes/Events/player.gd" type="Script" id=1] [ext_resource path="res://Scenes/Events/shooter.gd" type="Script" id=2] [ext_resource path="res://Scenes/Events/ray_milk.tscn" type="PackedScene" id=3] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk1.png" type="Texture" id=4] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk2.png" type="Texture" id=5] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk3.png" type="Texture" id=6] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk4.png" type="Texture" id=7] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk5.png" type="Texture" id=8] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk6.png" type="Texture" id=9] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk7.png" type="Texture" id=10] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk8.png" type="Texture" id=11] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk9.png" type="Texture" id=12] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk10.png" type="Texture" id=13] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk11.png" type="Texture" id=14] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk12.png" type="Texture" id=15] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk13.png" type="Texture" id=16] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk14.png" type="Texture" id=17] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk15.png" type="Texture" id=18] -[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk16.png" type="Texture" id=19] -[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle1.png" type="Texture" id=20] -[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle2.png" type="Texture" id=21] -[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle3.png" type="Texture" id=22] -[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle4.png" type="Texture" id=23] - - - +[ext_resource path="res://Sprites/Charasets/Player/cow.png" type="Texture" id=4] +[ext_resource path="res://Scenes/Events/player_animations.tres" type="Animation" id=5] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -37,24 +16,22 @@ points = Vector2Array( -13.2061, 7.63341, -13.1494, -10.328, 11.2943, -10.3627, custom_solver_bias = 0.0 extents = Vector2( 12.363, 15.2052 ) -[sub_resource type="SpriteFrames" id=3] +[sub_resource type="Animation" id=5] -animations = [ { -"frames": [ ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ) ], -"loop": true, -"name": "walk", -"speed": 27.0 -}, { -"frames": [ ExtResource( 17 ) ], -"loop": true, -"name": "jump", -"speed": 5.0 -}, { -"frames": [ ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 22 ), ExtResource( 21 ) ], -"loop": true, -"name": "Idle", -"speed": 10.0 -} ] +resource/name = "idle" +length = 0.6 +loop = true +step = 0.1 +tracks/0/type = "value" +tracks/0/path = NodePath(".:frame") +tracks/0/interp = 1 +tracks/0/imported = false +tracks/0/keys = { +"times": FloatArray( 0, 0.1, 0.2, 0.3, 0.4, 0.5 ), +"transitions": FloatArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 0, 1, 2, 3, 2, 1 ] +} [node name="Player" type="KinematicBody2D"] @@ -109,11 +86,30 @@ shape = SubResource( 2 ) trigger = true _update_shape_index = 1 -[node name="sprite" type="AnimatedSprite" parent="."] +[node name="foots" type="Node2D" parent="."] -frames = SubResource( 3 ) -animation = "jump" -playing = true +transform/pos = Vector2( -0.0271127, 37.1198 ) +transform/scale = Vector2( 0.885237, 0.0763853 ) + +[node name="sprite" type="Sprite" parent="."] + +texture = ExtResource( 4 ) +vframes = 6 +hframes = 6 +frame = 6 +region_rect = Rect2( 0, 0, 96, 96 ) + +[node name="animations" type="AnimationPlayer" parent="sprite"] + +playback/process_mode = 0 +playback/default_blend_time = 0.2 +root/root = NodePath("..") +anims/idle = SubResource( 5 ) +anims/walk = ExtResource( 5 ) +playback/active = true +playback/speed = 1.0 +blend_times = [ ] +autoplay = "idle" [node name="Camera2D" type="Camera2D" parent="sprite"] @@ -138,11 +134,6 @@ drag_margin/top = 0.2 drag_margin/right = 0.05 drag_margin/bottom = 0.2 -[node name="foots" type="Node2D" parent="."] - -transform/pos = Vector2( -0.0271127, 37.1198 ) -transform/scale = Vector2( 0.885237, 0.0763853 ) - [connection signal="looking_left" from="." to="shooter" method="_on_KinematicBody2D_looking_left"] [connection signal="looking_right" from="." to="shooter" method="_on_KinematicBody2D_looking_right"] diff --git a/Scenes/Events/player_animations.tres b/Scenes/Events/player_animations.tres new file mode 100644 index 0000000..df0c108 --- /dev/null +++ b/Scenes/Events/player_animations.tres @@ -0,0 +1,19 @@ +[gd_resource type="Animation" format=1] + +[resource] + +resource/name = "walk" +length = 0.52 +loop = true +step = 0.12 +tracks/0/type = "value" +tracks/0/path = NodePath(".:frame") +tracks/0/interp = 1 +tracks/0/imported = false +tracks/0/keys = { +"times": FloatArray( 0, 0.12, 0.24, 0.36, 0.48 ), +"transitions": FloatArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 6, 7, 8, 9, 10 ] +} + diff --git a/Sprites/Charasets/Player/cow.png b/Sprites/Charasets/Player/cow.png new file mode 100644 index 0000000..c41b21f Binary files /dev/null and b/Sprites/Charasets/Player/cow.png differ diff --git a/Sprites/Charasets/Player/cow.png~ b/Sprites/Charasets/Player/cow.png~ new file mode 100644 index 0000000..d34ba82 Binary files /dev/null and b/Sprites/Charasets/Player/cow.png~ differ diff --git a/Sprites/Charasets/Player/idle/player_idle1.png b/Sprites/Charasets/Player/idle/player_idle1.png deleted file mode 100644 index fef464e..0000000 Binary files a/Sprites/Charasets/Player/idle/player_idle1.png and /dev/null differ diff --git a/Sprites/Charasets/Player/idle/player_idle2.png b/Sprites/Charasets/Player/idle/player_idle2.png deleted file mode 100644 index 4d19518..0000000 Binary files a/Sprites/Charasets/Player/idle/player_idle2.png and /dev/null differ diff --git a/Sprites/Charasets/Player/idle/player_idle3.png b/Sprites/Charasets/Player/idle/player_idle3.png deleted file mode 100644 index 6d2815b..0000000 Binary files a/Sprites/Charasets/Player/idle/player_idle3.png and /dev/null differ diff --git a/Sprites/Charasets/Player/idle/player_idle4.png b/Sprites/Charasets/Player/idle/player_idle4.png deleted file mode 100644 index 0f97ab8..0000000 Binary files a/Sprites/Charasets/Player/idle/player_idle4.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk1.png b/Sprites/Charasets/Player/walk/player_walk1.png deleted file mode 100644 index 1f1dca3..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk1.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk10.png b/Sprites/Charasets/Player/walk/player_walk10.png deleted file mode 100644 index 55a32fb..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk10.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk11.png b/Sprites/Charasets/Player/walk/player_walk11.png deleted file mode 100644 index 55a32fb..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk11.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk12.png b/Sprites/Charasets/Player/walk/player_walk12.png deleted file mode 100644 index 55a32fb..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk12.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk13.png b/Sprites/Charasets/Player/walk/player_walk13.png deleted file mode 100644 index 8a7b205..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk13.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk14.png b/Sprites/Charasets/Player/walk/player_walk14.png deleted file mode 100644 index 8a7b205..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk14.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk15.png b/Sprites/Charasets/Player/walk/player_walk15.png deleted file mode 100644 index 8a7b205..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk15.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk16.png b/Sprites/Charasets/Player/walk/player_walk16.png deleted file mode 100644 index 16a867f..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk16.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk2.png b/Sprites/Charasets/Player/walk/player_walk2.png deleted file mode 100644 index 1f1dca3..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk2.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk3.png b/Sprites/Charasets/Player/walk/player_walk3.png deleted file mode 100644 index 1f1dca3..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk3.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk4.png b/Sprites/Charasets/Player/walk/player_walk4.png deleted file mode 100644 index 5be3603..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk4.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk5.png b/Sprites/Charasets/Player/walk/player_walk5.png deleted file mode 100644 index 5be3603..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk5.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk6.png b/Sprites/Charasets/Player/walk/player_walk6.png deleted file mode 100644 index 5be3603..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk6.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk7.png b/Sprites/Charasets/Player/walk/player_walk7.png deleted file mode 100644 index 268a32b..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk7.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk8.png b/Sprites/Charasets/Player/walk/player_walk8.png deleted file mode 100644 index 268a32b..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk8.png and /dev/null differ diff --git a/Sprites/Charasets/Player/walk/player_walk9.png b/Sprites/Charasets/Player/walk/player_walk9.png deleted file mode 100644 index 268a32b..0000000 Binary files a/Sprites/Charasets/Player/walk/player_walk9.png and /dev/null differ