Add leaves to tileset

This commit is contained in:
dariasteam 2017-08-18 12:17:55 +01:00
parent dba4877bf4
commit b081f48cb5
7 changed files with 207 additions and 64 deletions

View file

@ -120,14 +120,13 @@ func _fixed_process(delta):
velocity.y += delta * GRAVITY
# Salto
if (can_jump and jump_key_pressed):
if (can_jump and jump_key_pressed):
velocity.y = - JUMP_SPEED
jumping = true
jump_time = MAX_JUMP_TIME
can_jump = false
if (jumping and can_jump_more() and jump_key_pressed):
velocity.y = - JUMP_SPEED + (MAX_JUMP_TIME - jump_time) * 20
jumping = true
velocity.y = - JUMP_SPEED + (MAX_JUMP_TIME - jump_time) * 20
# Movimiento horizontal
if (!right and !left):
@ -153,19 +152,21 @@ func _fixed_process(delta):
if (is_colliding()):
var normal = get_collision_normal()
if (normal.y < -0.35):
# Está en el suelo
# Está en el suelo
if (!jumping):
can_jump = true
jumping = false
can_jump = true
motion.y = 0
if (normal.y > -0.9):
motion.x += motion.x * (-normal.y)
motion = normal.slide(motion)
velocity.y = 0
else:
# Está chocándose contra techo o apred
# Está chocándose contra techo o pared
can_jump = false
motion = normal.slide(motion)
jump_time = 0
velocity.y = 0
move(motion)
else:
can_jump = false
@ -219,8 +220,12 @@ func _input(ev):
# Agacharse
if (ev.is_action_pressed("ui_down")):
get_node("Collision_Agachado").set_trigger(false)
get_node("Collision_Normal").set_trigger(true)
set_collision_mask_bit(11, 0)
elif (ev.is_action_released("ui_down")):
get_node("Collision_Normal").set_trigger(false)
get_node("Collision_Agachado").set_trigger(true)
set_collision_mask_bit(11, 1)
# Saltar

View file

@ -6,7 +6,7 @@
[ext_resource path="res://Sprites/Charasets/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]
[sub_resource type="ConvexPolygonShape2D" id=4]
custom_solver_bias = 0.0
points = Vector2Array( -13.2061, 7.63341, -13.1494, -10.328, 11.2943, -10.3627, 11.4077, 7.42536, 1.19923, 13.0773, -3.50803, 13.0773 )
@ -14,7 +14,7 @@ points = Vector2Array( -13.2061, 7.63341, -13.1494, -10.328, 11.2943, -10.3627,
[sub_resource type="RectangleShape2D" id=2]
custom_solver_bias = 0.0
extents = Vector2( 12.363, 15.2052 )
extents = Vector2( 9.93203, 15.2052 )
[sub_resource type="Animation" id=3]
@ -38,11 +38,11 @@ tracks/0/keys = {
transform/scale = Vector2( 2, 2 )
z/relative = false
input/pickable = true
shapes/0/shape = SubResource( 1 )
shapes/0/shape = SubResource( 4 )
shapes/0/transform = Matrix32( 1.89755, 0, 0, 3.10364, 2.93931, -4.91934 )
shapes/0/trigger = false
shapes/1/shape = SubResource( 2 )
shapes/1/transform = Matrix32( 2.31574, 0, 0, 1.23398, -0.18514, 15.1934 )
shapes/1/transform = Matrix32( 2.31574, 0, 0, 1.23398, 1.5, 17 )
shapes/1/trigger = true
collision/layers = 1057
collision/mask = 2066
@ -80,7 +80,7 @@ trigger = false
[node name="Collision_Agachado" type="CollisionShape2D" parent="."]
transform/pos = Vector2( -0.18514, 15.1934 )
transform/pos = Vector2( 1.5, 17 )
transform/scale = Vector2( 2.31574, 1.23398 )
shape = SubResource( 2 )
trigger = true
@ -113,7 +113,7 @@ autoplay = "idle"
[node name="Camera2D" type="Camera2D" parent="sprite"]
transform/pos = Vector2( -16.1907, 15.3196 )
transform/pos = Vector2( -16, 16 )
transform/scale = Vector2( 23.4375, 45.3125 )
z/relative = false
offset = Vector2( 0, -80 )

File diff suppressed because one or more lines are too long

View file

@ -800,7 +800,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 9
region_rect = Rect2( 0, 256, 64, 64 )
@ -834,7 +834,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 14
region_rect = Rect2( 0, 256, 64, 64 )
@ -846,7 +846,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 31
region_rect = Rect2( 0, 256, 64, 64 )
@ -879,7 +879,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 36
region_rect = Rect2( 0, 256, 64, 64 )
@ -890,7 +890,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 28
region_rect = Rect2( 0, 256, 64, 64 )
@ -901,7 +901,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 27
region_rect = Rect2( 0, 256, 64, 64 )
@ -912,7 +912,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 29
region_rect = Rect2( 0, 256, 64, 64 )
@ -923,7 +923,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 26
region_rect = Rect2( 0, 256, 64, 64 )
@ -934,7 +934,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 25
region_rect = Rect2( 0, 256, 64, 64 )
@ -946,7 +946,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 30
region_rect = Rect2( 0, 256, 64, 64 )
@ -982,7 +982,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 35
region_rect = Rect2( 0, 256, 64, 64 )
@ -994,7 +994,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 33
region_rect = Rect2( 0, 256, 64, 64 )
@ -1031,7 +1031,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 34
region_rect = Rect2( 0, 256, 64, 64 )
@ -1068,7 +1068,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 40
region_rect = Rect2( 0, 256, 64, 64 )
@ -1102,7 +1102,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 41
region_rect = Rect2( 0, 256, 64, 64 )
@ -1136,7 +1136,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 42
region_rect = Rect2( 0, 256, 64, 64 )
@ -1181,7 +1181,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 44
region_rect = Rect2( 0, 256, 64, 64 )
@ -1224,7 +1224,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 43
region_rect = Rect2( 0, 256, 64, 64 )
@ -1259,7 +1259,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 39
region_rect = Rect2( 0, 256, 64, 64 )
@ -1294,7 +1294,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 45
region_rect = Rect2( 0, 256, 64, 64 )
@ -1309,7 +1309,7 @@ shapes/0/trigger = false
collision/layers = 0
collision/mask = 0
one_way_collision/direction = Vector2( 0, 1 )
one_way_collision/max_depth = 20.0
one_way_collision/max_depth = 1.0
constant_linear_velocity = Vector2( 0, 0 )
constant_angular_velocity = 0.0
friction = 0.0
@ -1329,7 +1329,7 @@ visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 46
region_rect = Rect2( 0, 256, 64, 64 )
@ -1373,30 +1373,87 @@ trigger = false
[node name="hoja_1" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 47
frame = 50
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_2" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 48
frame = 51
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_3" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 11
vframes = 13
hframes = 5
frame = 52
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_4" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 13
hframes = 5
frame = 55
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_5" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 13
hframes = 5
frame = 56
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_6" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 13
hframes = 5
frame = 57
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_7" type="Sprite" parent="."]
visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 13
hframes = 5
frame = 58
region_rect = Rect2( 0, 256, 64, 64 )
[node name="hoja_8" type="Sprite" parent="."]
transform/pos = Vector2( -64, -64 )
z/z = 3
texture = ExtResource( 1 )
vframes = 13
hframes = 5
frame = 49
region_rect = Rect2( 0, 256, 64, 64 )

View file

@ -722,7 +722,7 @@
<resource resource_type="Shape2D" path="local://39"> </resource>
</array>
<vector2 name="37/one_way_collision_direction"> 0, 1 </vector2>
<real name="37/one_way_collision_max_depth"> 20 </real>
<real name="37/one_way_collision_max_depth"> 1 </real>
<string name="38/name"> "Tronco_rama_doble" </string>
<resource name="38/texture" external="0"> </resource>
<vector2 name="38/tex_offset"> 0, 0 </vector2>
@ -745,7 +745,7 @@
<resource name="39/texture" external="0"> </resource>
<vector2 name="39/tex_offset"> 0, 0 </vector2>
<resource name="39/material"></resource> <color name="39/modulate"> 1, 1, 1, 1 </color>
<rect2 name="39/region"> 128, 576, 64, 64 </rect2>
<rect2 name="39/region"> 0, 640, 64, 64 </rect2>
<vector2 name="39/occluder_offset"> 32, 32 </vector2>
<resource name="39/occluder"></resource> <vector2 name="39/navigation_offset"> 32, 32 </vector2>
<resource name="39/navigation"></resource> <vector2 name="39/shape_offset"> 0, 0 </vector2>
@ -757,7 +757,7 @@
<resource name="40/texture" external="0"> </resource>
<vector2 name="40/tex_offset"> 0, 0 </vector2>
<resource name="40/material"></resource> <color name="40/modulate"> 1, 1, 1, 1 </color>
<rect2 name="40/region"> 192, 576, 64, 64 </rect2>
<rect2 name="40/region"> 64, 640, 64, 64 </rect2>
<vector2 name="40/occluder_offset"> 32, 32 </vector2>
<resource name="40/occluder"></resource> <vector2 name="40/navigation_offset"> 32, 32 </vector2>
<resource name="40/navigation"></resource> <vector2 name="40/shape_offset"> 0, 0 </vector2>
@ -769,7 +769,7 @@
<resource name="41/texture" external="0"> </resource>
<vector2 name="41/tex_offset"> 0, 0 </vector2>
<resource name="41/material"></resource> <color name="41/modulate"> 1, 1, 1, 1 </color>
<rect2 name="41/region"> 256, 576, 64, 64 </rect2>
<rect2 name="41/region"> 128, 640, 64, 64 </rect2>
<vector2 name="41/occluder_offset"> 32, 32 </vector2>
<resource name="41/occluder"></resource> <vector2 name="41/navigation_offset"> 32, 32 </vector2>
<resource name="41/navigation"></resource> <vector2 name="41/shape_offset"> 0, 0 </vector2>
@ -777,6 +777,66 @@
</array>
<vector2 name="41/one_way_collision_direction"> 0, 0 </vector2>
<real name="41/one_way_collision_max_depth"> 0 </real>
<string name="42/name"> "hoja_4" </string>
<resource name="42/texture" external="0"> </resource>
<vector2 name="42/tex_offset"> 0, 0 </vector2>
<resource name="42/material"></resource> <color name="42/modulate"> 1, 1, 1, 1 </color>
<rect2 name="42/region"> 0, 704, 64, 64 </rect2>
<vector2 name="42/occluder_offset"> 32, 32 </vector2>
<resource name="42/occluder"></resource> <vector2 name="42/navigation_offset"> 32, 32 </vector2>
<resource name="42/navigation"></resource> <vector2 name="42/shape_offset"> 0, 0 </vector2>
<array name="42/shapes" len="0" shared="false">
</array>
<vector2 name="42/one_way_collision_direction"> 0, 0 </vector2>
<real name="42/one_way_collision_max_depth"> 0 </real>
<string name="43/name"> "hoja_5" </string>
<resource name="43/texture" external="0"> </resource>
<vector2 name="43/tex_offset"> 0, 0 </vector2>
<resource name="43/material"></resource> <color name="43/modulate"> 1, 1, 1, 1 </color>
<rect2 name="43/region"> 64, 704, 64, 64 </rect2>
<vector2 name="43/occluder_offset"> 32, 32 </vector2>
<resource name="43/occluder"></resource> <vector2 name="43/navigation_offset"> 32, 32 </vector2>
<resource name="43/navigation"></resource> <vector2 name="43/shape_offset"> 0, 0 </vector2>
<array name="43/shapes" len="0" shared="false">
</array>
<vector2 name="43/one_way_collision_direction"> 0, 0 </vector2>
<real name="43/one_way_collision_max_depth"> 0 </real>
<string name="44/name"> "hoja_6" </string>
<resource name="44/texture" external="0"> </resource>
<vector2 name="44/tex_offset"> 0, 0 </vector2>
<resource name="44/material"></resource> <color name="44/modulate"> 1, 1, 1, 1 </color>
<rect2 name="44/region"> 128, 704, 64, 64 </rect2>
<vector2 name="44/occluder_offset"> 32, 32 </vector2>
<resource name="44/occluder"></resource> <vector2 name="44/navigation_offset"> 32, 32 </vector2>
<resource name="44/navigation"></resource> <vector2 name="44/shape_offset"> 0, 0 </vector2>
<array name="44/shapes" len="0" shared="false">
</array>
<vector2 name="44/one_way_collision_direction"> 0, 0 </vector2>
<real name="44/one_way_collision_max_depth"> 0 </real>
<string name="45/name"> "hoja_7" </string>
<resource name="45/texture" external="0"> </resource>
<vector2 name="45/tex_offset"> 0, 0 </vector2>
<resource name="45/material"></resource> <color name="45/modulate"> 1, 1, 1, 1 </color>
<rect2 name="45/region"> 192, 704, 64, 64 </rect2>
<vector2 name="45/occluder_offset"> 32, 32 </vector2>
<resource name="45/occluder"></resource> <vector2 name="45/navigation_offset"> 32, 32 </vector2>
<resource name="45/navigation"></resource> <vector2 name="45/shape_offset"> 0, 0 </vector2>
<array name="45/shapes" len="0" shared="false">
</array>
<vector2 name="45/one_way_collision_direction"> 0, 0 </vector2>
<real name="45/one_way_collision_max_depth"> 0 </real>
<string name="46/name"> "hoja_8" </string>
<resource name="46/texture" external="0"> </resource>
<vector2 name="46/tex_offset"> 0, 0 </vector2>
<resource name="46/material"></resource> <color name="46/modulate"> 1, 1, 1, 1 </color>
<rect2 name="46/region"> 256, 576, 64, 64 </rect2>
<vector2 name="46/occluder_offset"> 32, 32 </vector2>
<resource name="46/occluder"></resource> <vector2 name="46/navigation_offset"> 32, 32 </vector2>
<resource name="46/navigation"></resource> <vector2 name="46/shape_offset"> 0, 0 </vector2>
<array name="46/shapes" len="0" shared="false">
</array>
<vector2 name="46/one_way_collision_direction"> 0, 0 </vector2>
<real name="46/one_way_collision_max_depth"> 0 </real>
</main_resource>
</resource_file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Before After
Before After

View file

@ -10,6 +10,7 @@ global="*res://Scenes/Menu/global.gd"
[debug]
force_fps=60
print_fps=true
[display]