Añadido tronco

This commit is contained in:
dariasteam 2017-07-30 17:43:05 +01:00
parent 7a0119dd68
commit 2cd1e57f33
9 changed files with 94 additions and 44 deletions

View file

@ -8,7 +8,7 @@
[ext_resource path="res://icon.png" type="Texture" id=6]
[ext_resource path="res://btn_shoot.png" type="Texture" id=7]
[sub_resource type="Environment" id=2]
[sub_resource type="Environment" id=1]
ambient_light/enabled = false
ambient_light/color = Color( 0, 0, 0, 1 )
@ -52,9 +52,9 @@ bcs/contrast = 1.0
bcs/saturation = 1.0
srgb/enabled = false
[sub_resource type="World" id=3]
[sub_resource type="World" id=2]
environment = SubResource( 2 )
environment = SubResource( 1 )
[node name="Node2D" type="Node2D" groups=[
"control",
@ -80,7 +80,7 @@ margin/bottom = 768.0
rect = Rect2( 0, 0, 1280, 768 )
own_world = false
world = SubResource( 3 )
world = SubResource( 2 )
transparent_bg = false
render_target/enabled = false
render_target/v_flip = false
@ -123,8 +123,6 @@ region_rect = Rect2( 180, 140, 145, 150 )
[node name="Buttons" type="Node2D" parent="Control"]
editor/display_folded = true
[node name="Bttn_U" type="TouchScreenButton" parent="Control/Buttons"]
visibility/opacity = 0.9
@ -158,7 +156,7 @@ visibility_mode = 0
[node name="Bttn_AS" type="TouchScreenButton" parent="Control/Buttons"]
visibility/opacity = 0.5
transform/pos = Vector2( 1088, 416 )
transform/pos = Vector2( 1088, 384 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 6 )
pressed = null

View file

@ -35,6 +35,7 @@ func dissapear():
set_fixed_process(false)
set_layer_mask_bit(2,false)
hit_single.set_emitting(true)
var t = Timer.new()
t.set_wait_time(hit_single.get_lifetime())
t.set_one_shot(true)
@ -103,7 +104,7 @@ func _on_area_body_body_enter( body ):
emit_signal("damage", damage)
func _on_area_head_body_enter( body ):
if (body.is_in_group("player") and body.can_receive_damage()):
if (body.is_in_group("player")):
if (body.foots.get_global_pos().y > area_head.get_global_pos().y and body.is_falling()):
print ("cabeza")
life = 0

View file

@ -157,7 +157,7 @@ trigger = true
transform/pos = Vector2( 3.8147e-06, 0 )
frames = SubResource( 8 )
animation = "walking"
frame = 7
frame = 3
playing = true
[node name="hit_ray_particle" type="Particles2D" parent="."]

View file

@ -104,7 +104,7 @@ _update_shape_index = 1
frames = SubResource( 3 )
animation = "walk"
frame = 15
frame = 10
playing = true
[node name="Camera2D" type="Camera2D" parent="sprite"]

View file

@ -1,19 +1,20 @@
[gd_scene load_steps=21 format=1]
[gd_scene load_steps=23 format=1]
[ext_resource path="res://tile full.tex" type="Texture" id=1]
[sub_resource type="ConvexPolygonShape2D" id=20]
custom_solver_bias = 0.0
points = Vector2Array( -21.2298, -23.8952, -16.2848, -26.453, -9.37893, -26.9645, 32, -28, 32, 32, -27, 32, -26.601, -15.7957, -24.4696, -20.3144 )
[ext_resource path="res://árbol.png" type="Texture" id=2]
[sub_resource type="ConvexPolygonShape2D" id=21]
custom_solver_bias = 0.0
points = Vector2Array( -32, -28, 32, -28, 32, 32, -32, 32 )
points = Vector2Array( -21.2298, -23.8952, -16.2848, -26.453, -9.37893, -26.9645, 32, -28, 32, 32, -27, 32, -26.601, -15.7957, -24.4696, -20.3144 )
[sub_resource type="ConvexPolygonShape2D" id=22]
custom_solver_bias = 0.0
points = Vector2Array( -32, -28, 32, -28, 32, 32, -32, 32 )
[sub_resource type="ConvexPolygonShape2D" id=23]
custom_solver_bias = 0.0
points = Vector2Array( -32, -28, 13.8965, -27.135, 19.9498, -24.2363, 24.2127, -19.4618, 25.4063, -15.7105, 26, 32, -32, 32 )
@ -97,6 +98,11 @@ points = Vector2Array( -32, -32, 27, -32, -32, 28 )
custom_solver_bias = 0.0
points = Vector2Array( 32, -32, 32, 28, -28, -32 )
[sub_resource type="ConvexPolygonShape2D" id=24]
custom_solver_bias = 0.0
points = Vector2Array( 16, 16, 22, 19, 22, 26, 18, 32, -20, 32, -23, 27, -23, 22, -19, 16 )
[node name="Node2D" type="Node2D"]
transform/pos = Vector2( 32, 32 )
@ -111,7 +117,7 @@ region_rect = Rect2( 0, 0, 64, 64 )
[node name="StaticBody2D" type="StaticBody2D" parent="Arriba_Izquierda"]
input/pickable = false
shapes/0/shape = SubResource( 20 )
shapes/0/shape = SubResource( 21 )
shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
shapes/0/trigger = false
collision/layers = 2
@ -138,7 +144,7 @@ region_rect = Rect2( 64, 0, 64, 64 )
transform/pos = Vector2( -0.0852547, -0.0852585 )
input/pickable = false
shapes/0/shape = SubResource( 21 )
shapes/0/shape = SubResource( 22 )
shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 )
shapes/0/trigger = false
collision/layers = 2
@ -168,7 +174,7 @@ region_rect = Rect2( 128, 0, 64, 64 )
transform/pos = Vector2( -0.0852547, -0.0852585 )
input/pickable = false
shapes/0/shape = SubResource( 22 )
shapes/0/shape = SubResource( 23 )
shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 )
shapes/0/trigger = false
collision/layers = 2
@ -641,4 +647,32 @@ polygon = Vector2Array( 32, -32, 32, 28, -28, -32 )
shape_range = Vector2( 0, 0 )
trigger = false
[node name="Tronco" type="Sprite" parent="."]
transform/pos = Vector2( -64, -64 )
texture = ExtResource( 2 )
region_rect = Rect2( 0, 256, 64, 64 )
[node name="StaticBody2D1" type="StaticBody2D" parent="Tronco"]
transform/pos = Vector2( -0.0852547, -0.0852585 )
input/pickable = false
shapes/0/shape = SubResource( 24 )
shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 )
shapes/0/trigger = false
collision/layers = 2
collision/mask = 15
constant_linear_velocity = Vector2( 0, 0 )
constant_angular_velocity = 0.0
friction = 0.0
bounce = 0.0
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Tronco/StaticBody2D1"]
transform/pos = Vector2( 0.0852547, 0.0852585 )
build_mode = 0
polygon = Vector2Array( -19, 16, -23, 22, -23, 27, -20, 32, 18, 32, 22, 26, 22, 19, 16, 16 )
shape_range = Vector2( 0, 0 )
trigger = false

View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<resource_file type="TileSet" subresource_count="24" version="2.1" version_name="Godot Engine v2.1.3.stable.official">
<resource_file type="TileSet" subresource_count="26" version="2.1" version_name="Godot Engine v2.1.3.stable.official">
<ext_resource path="res://tile full.tex" type="Texture" index="0"></ext_resource>
<ext_resource path="res://árbol.png" type="Texture" index="1"></ext_resource>
<resource type="ConvexPolygonShape2D" path="local://1">
<real name="custom_solver_bias"> 0 </real>
<vector2_array name="points" len="5"> -32, -32, 32, -32, 32, 32, -32, 32, -32, -32 </vector2_array>
@ -76,17 +77,22 @@
<vector2_array name="points" len="3"> 32, -32, 32, 28, -28, -32 </vector2_array>
</resource>
<resource type="ConvexPolygonShape2D" path="local://20">
<resource type="ConvexPolygonShape2D" path="local://24">
<real name="custom_solver_bias"> 0 </real>
<vector2_array name="points" len="8"> -21.2298, -23.8952, -16.2848, -26.453, -9.37893, -26.9645, 32, -28, 32, 32, -27, 32, -26.601, -15.7957, -24.4696, -20.3144 </vector2_array>
<vector2_array name="points" len="8"> 16, 16, 22, 19, 22, 26, 18, 32, -20, 32, -23, 27, -23, 22, -19, 16 </vector2_array>
</resource>
<resource type="ConvexPolygonShape2D" path="local://21">
<real name="custom_solver_bias"> 0 </real>
<vector2_array name="points" len="4"> -32, -28, 32, -28, 32, 32, -32, 32 </vector2_array>
<vector2_array name="points" len="8"> -21.2298, -23.8952, -16.2848, -26.453, -9.37893, -26.9645, 32, -28, 32, 32, -27, 32, -26.601, -15.7957, -24.4696, -20.3144 </vector2_array>
</resource>
<resource type="ConvexPolygonShape2D" path="local://22">
<real name="custom_solver_bias"> 0 </real>
<vector2_array name="points" len="4"> -32, -28, 32, -28, 32, 32, -32, 32 </vector2_array>
</resource>
<resource type="ConvexPolygonShape2D" path="local://23">
<real name="custom_solver_bias"> 0 </real>
<vector2_array name="points" len="7"> -32, -28, 13.8965, -27.135, 19.9498, -24.2363, 24.2127, -19.4618, 25.4063, -15.7105, 26, 32, -32, 32 </vector2_array>
@ -154,7 +160,7 @@
<resource name="3/occluder"></resource> <vector2 name="3/navigation_offset"> 32, 32 </vector2>
<resource name="3/navigation"></resource> <vector2 name="3/shape_offset"> 32, 32 </vector2>
<array name="3/shapes" len="1" shared="false">
<resource resource_type="Shape2D" path="local://20"> </resource>
<resource resource_type="Shape2D" path="local://21"> </resource>
</array>
<string name="4/name"> "Arriba" </string>
<resource name="4/texture" external="0"> </resource>
@ -165,7 +171,7 @@
<resource name="4/occluder"></resource> <vector2 name="4/navigation_offset"> 32, 32 </vector2>
<resource name="4/navigation"></resource> <vector2 name="4/shape_offset"> 32, 32 </vector2>
<array name="4/shapes" len="1" shared="false">
<resource resource_type="Shape2D" path="local://21"> </resource>
<resource resource_type="Shape2D" path="local://22"> </resource>
</array>
<string name="5/name"> "Arriba_Derecha" </string>
<resource name="5/texture" external="0"> </resource>
@ -176,7 +182,7 @@
<resource name="5/occluder"></resource> <vector2 name="5/navigation_offset"> 32, 32 </vector2>
<resource name="5/navigation"></resource> <vector2 name="5/shape_offset"> 32, 32 </vector2>
<array name="5/shapes" len="1" shared="false">
<resource resource_type="Shape2D" path="local://22"> </resource>
<resource resource_type="Shape2D" path="local://23"> </resource>
</array>
<string name="6/name"> "Izquierda" </string>
<resource name="6/texture" external="0"> </resource>
@ -344,6 +350,17 @@
<array name="20/shapes" len="1" shared="false">
<resource resource_type="Shape2D" path="local://19"> </resource>
</array>
<string name="21/name"> "Tronco" </string>
<resource name="21/texture" external="1"> </resource>
<vector2 name="21/tex_offset"> 0, 0 </vector2>
<resource name="21/material"></resource> <color name="21/modulate"> 1, 1, 1, 1 </color>
<rect2 name="21/region"> 0, 0, 64, 64 </rect2>
<vector2 name="21/occluder_offset"> 32, 32 </vector2>
<resource name="21/occluder"></resource> <vector2 name="21/navigation_offset"> 32, 32 </vector2>
<resource name="21/navigation"></resource> <vector2 name="21/shape_offset"> 32, 32 </vector2>
<array name="21/shapes" len="1" shared="false">
<resource resource_type="Shape2D" path="local://24"> </resource>
</array>
</main_resource>
</resource_file>

File diff suppressed because one or more lines are too long

BIN
árbol.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 923 B

BIN
árbol.png~ Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 891 B