diff --git a/All.tscn b/All.tscn
index 8fb006c..99145dd 100644
--- a/All.tscn
+++ b/All.tscn
@@ -44,6 +44,7 @@ gui/disable_input = false
[node name="Life" type="Node2D" parent="Control"]
+editor/display_folded = true
transform/pos = Vector2( 64, 64 )
[node name="life1" type="Sprite" parent="Control/Life"]
@@ -63,10 +64,9 @@ texture = ExtResource( 3 )
[node name="Buttons" type="Node2D" parent="Control"]
-editor/display_folded = true
-
[node name="Bttn_U" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 160, 320 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -81,6 +81,7 @@ visibility_mode = 0
[node name="Bttn_A" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 1088, 576 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -95,6 +96,7 @@ visibility_mode = 0
[node name="Bttn_AS" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 1088, 416 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -109,6 +111,7 @@ visibility_mode = 0
[node name="Bttn_S" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 896, 576 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -123,6 +126,7 @@ visibility_mode = 0
[node name="Bttn_D" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 160, 576 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -137,6 +141,7 @@ visibility_mode = 0
[node name="Bttn_DR" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 288, 576 )
transform/scale = Vector2( 0.25, 0.25 )
normal = ExtResource( 4 )
@@ -151,6 +156,7 @@ visibility_mode = 0
[node name="Bttn_DL" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 32, 576 )
transform/scale = Vector2( 0.25, 0.25 )
normal = ExtResource( 4 )
@@ -165,6 +171,7 @@ visibility_mode = 0
[node name="Bttn_R" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 288, 448 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -179,6 +186,7 @@ visibility_mode = 0
[node name="Bttn_L" type="TouchScreenButton" parent="Control/Buttons"]
+visibility/opacity = 0.5
transform/pos = Vector2( 32, 448 )
transform/scale = Vector2( 2, 2 )
normal = ExtResource( 3 )
@@ -228,4 +236,3 @@ visibility_mode = 0
[connection signal="released" from="Control/Buttons/Bttn_L" to="." method="_on_Bttn_L_released"]
-[editable path="Control/Viewport/Node2D"]
diff --git a/Movimiento.gd b/Movimiento.gd
index b2b2ead..f81164e 100644
--- a/Movimiento.gd
+++ b/Movimiento.gd
@@ -6,10 +6,11 @@ signal looking_right
const GRAVITY = 3000.0
const FLYING_MOVEMENT_SPEED = 1
-const JUMP_SPEED = 500
+export var JUMP_SPEED = 500
const SLIDE_LEVEL = 40
const MAX_JUMP_TIME = 60
-const JUMP_CORRECTION_LEVEL = 1
+
+export var altitude = 0.5
const MAX_WALK_SPEED = 350
const WALK_SPEED_INCREMENT = 20
@@ -26,7 +27,7 @@ var jump_key_pressed = false
var last_collition_pos = Vector2(100000,10000)
-func can_jump_more ():
+func can_jump_more ():
return jump_time > 0
func horizontal_movement_amount ():
@@ -41,7 +42,7 @@ func _fixed_process(delta):
if (jumping):
- jump_time -= JUMP_CORRECTION_LEVEL
+ jump_time -= altitude
velocity.y += delta * GRAVITY
# Salto
@@ -62,10 +63,11 @@ func _fixed_process(delta):
if (Input.is_action_pressed("ui_left")):
emit_signal("looking_left");
velocity.x = - horizontal_movement_amount()
-
+ sprite.set_flip_h(true)
elif (Input.is_action_pressed("ui_right")):
velocity.x = horizontal_movement_amount()
emit_signal("looking_right");
+ sprite.set_flip_h(false)
else:
if (velocity.x > SLIDE_LEVEL):
velocity.x -= SLIDE_LEVEL
@@ -79,7 +81,7 @@ func _fixed_process(delta):
if (Input.is_action_pressed("ui_down")):
get_node("Collision_Normal").set_trigger(true)
get_node("Collision_Agachado").set_trigger(false)
- else:
+ else:
get_node("Collision_Normal").set_trigger(false)
get_node("Collision_Agachado").set_trigger(true)
diff --git a/enemy_1.gd b/enemy_1.gd
index ca0bc4c..6c0f26b 100644
--- a/enemy_1.gd
+++ b/enemy_1.gd
@@ -7,13 +7,10 @@ signal damage
# var b = "textvar"
const GRAVITY = 3000.0
-const JUMP_SPEED = 500
-const SLIDE_LEVEL = 40
+export var velocity = 250
+var v = Vector2(velocity, 0)
-const MAX_WALK_SPEED = 350
-const WALK_SPEED_INCREMENT = 20
-var walk_speed = 0
-var velocity = Vector2(100, 0)
+onready var sprite = get_node("Sprite")
export var damage = 1
@@ -23,27 +20,30 @@ func _ready():
func _fixed_process(delta):
- var motion = velocity * delta
+ var motion = v * delta
motion = move(motion)
- velocity.y += delta * GRAVITY
+ v.y += delta * GRAVITY
if (is_colliding()):
var normal = get_collision_normal();
- if (get_collider().is_in_group("player")):
- if (get_collision_normal().y < 1):
+ var collider = get_collider()
+ if (collider.is_in_group("player")):
+ if (normal.y < 1):
emit_signal("damage", damage)
queue_free()
else:
queue_free()
- elif (get_collider().is_in_group("bullet")):
+ elif (collider.is_in_group("bullet")):
+ collider.queue_free()
queue_free()
else:
if (normal.y == -1):
- # Está en el suelo
var n = get_collision_normal()
motion = n.slide(motion)
- velocity = n.slide(velocity)
+ v = n.slide(v)
move(motion)
if (normal.x < 0):
- velocity = Vector2(-100,0)
+ sprite.set_flip_h(false)
+ v = Vector2(-velocity,0)
elif (normal.x > 0):
- velocity = Vector2(100,0)
\ No newline at end of file
+ sprite.set_flip_h(true)
+ v = Vector2(velocity,0)
\ No newline at end of file
diff --git a/enemy_1.tscn b/enemy_1.tscn
index 09e89a6..9968d34 100644
--- a/enemy_1.tscn
+++ b/enemy_1.tscn
@@ -1,38 +1,43 @@
[gd_scene load_steps=4 format=1]
[ext_resource path="res://enemy_1.gd" type="Script" id=1]
-[ext_resource path="res://tile.png" type="Texture" id=2]
+[ext_resource path="res://malvado.png" type="Texture" id=2]
[sub_resource type="RectangleShape2D" id=1]
custom_solver_bias = 0.0
-extents = Vector2( 13, 13 )
+extents = Vector2( 16, 14.2637 )
[node name="KinematicBody2D 2" type="KinematicBody2D" groups=[
"enemy_1",
"enemy",
]]
-transform/scale = Vector2( 0.5, 0.499999 )
+transform/pos = Vector2( 64, -80 )
+transform/scale = Vector2( 2, 2.5 )
input/pickable = false
shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 2.46373, 0, 0, 2.46154, -0.0285072, 1.9908e-05 )
+shapes/0/transform = Matrix32( 1.68421, 0, 0, 1.85361, 0, -3.8147e-06 )
shapes/0/trigger = false
collision/layers = 4
collision/mask = 5
collision/margin = 0.08
script/script = ExtResource( 1 )
+velocity = 250
+damage = 1
[node name="Sprite" type="Sprite" parent="."]
-transform/pos = Vector2( 2.14577e-06, 5.62668e-05 )
-transform/scale = Vector2( 0.125, 0.125 )
+transform/pos = Vector2( 2.86102e-06, -4.76837e-07 )
+transform/scale = Vector2( 0.0441379, 0.0284444 )
texture = ExtResource( 2 )
+region = true
+region_rect = Rect2( 180, 150, 1450, 2250 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-transform/pos = Vector2( -0.0285072, 1.9908e-05 )
-transform/scale = Vector2( 2.46373, 2.46154 )
+transform/pos = Vector2( 0, -3.8147e-06 )
+transform/scale = Vector2( 1.68421, 1.85361 )
shape = SubResource( 1 )
trigger = false
_update_shape_index = 0
diff --git a/engine.cfg b/engine.cfg
index 851b545..cad6f5e 100644
--- a/engine.cfg
+++ b/engine.cfg
@@ -1,7 +1,7 @@
[application]
name="express"
-main_scene="res://All.tscn"
+main_scene="res://menu.tscn"
icon="res://icon.png"
[display]
diff --git a/malvado.png b/malvado.png
new file mode 100644
index 0000000..1810647
Binary files /dev/null and b/malvado.png differ
diff --git a/map_1.tscn b/map_1.tscn
index aade823..bc0c037 100644
--- a/map_1.tscn
+++ b/map_1.tscn
@@ -15,8 +15,8 @@ shader/shading_mode = 0
mode = 0
tile_set = ExtResource( 1 )
-cell/size = Vector2( 32, 32 )
-cell/quadrant_size = 16
+cell/size = Vector2( 64, 64 )
+cell/quadrant_size = 32
cell/custom_transform = Matrix32( 1, 0, 0, 1, 0, 0 )
cell/half_offset = 2
cell/tile_origin = 0
@@ -27,33 +27,30 @@ collision/bounce = 0.0
collision/layers = 1
collision/mask = 1
occluder/light_mask = 1
-tile_data = IntArray( -2031636, 1, -1966074, 1610612737, -1966073, 1610612737, -1966072, 1610612737, -1966071, 1610612737, -1966070, 1610612737, -1835025, 1, -1835007, 1610612737, -1835006, 1610612737, -1835005, 1610612737, -1835004, 1610612737, -1703949, 1, -1638420, 1, -1638413, 1, -1638405, 1610612740, -1638404, 1610612737, -1638403, 1610612737, -1638402, 1610612737, -1572877, 1, -1572870, 1610612740, -1507341, 1, -1507335, 1610612740, -1441809, 1, -1441808, 1, -1441807, 1, -1441806, 1, -1441805, 1, -1441800, 1610612740, -1376269, 1, -1376265, 1610612740, -1441788, 1, -1441784, 1, -1441781, 1, -1441778, 1, -1441775, 1, -1441773, 1, -1441771, 1, -1441765, 1, -1310745, 1, -1310733, 1, -1245189, 1, -1310719, 1, -1310690, 1, -1179676, 1, -1179670, 1, -1179669, 1, -1179668, 1, -1179667, 1, -1179666, 1, -1179665, 1, -1179664, 1, -1179663, 1, -1179662, 1, -1179661, 1, -1179660, 1, -1179659, 1, -1179658, 1, -1179657, 1, -1179656, 1, -1179655, 1, -1179654, 1, -1179653, 1, -1179652, 1, -1179651, 1, -1179650, 1, -1179649, 1, -1245184, 1, -1245183, 1, -1179615, 1, -1048607, 1, -1048596, 0, -1048595, 0, -1048594, 0, -1048593, 0, -1048592, 0, -1048591, 0, -1048590, 0, -1048589, 0, -1048588, 0, -1048587, 0, -1048586, 0, -1048585, 0, -1048584, 0, -1048583, 0, -1048582, 0, -983022, 1, -983018, 1, -983014, 1, -983010, 1, -983009, 1, -983001, 1, -852001, 1, -852000, 1, -851999, 1, -851998, 1, -851997, 1, -851996, 1, -851995, 1, -917466, 1, -917465, 1, -786459, 1, -786458, 1, -851930, 1, -720922, 1, -720921, 1, -720920, 1, -786395, 1, -786394, 1, -655384, 1, -655383, 1, -655382, 1, -655381, 1, -655380, 1, -655379, 1, -720859, 1, -589843, 1, -589842, 1, -655324, 1, -655323, 1, -524306, 1, -524305, 1, -524304, 1, -524303, 1, -524302, 1, -524301, 1, -524300, 1, -524299, 1, -524298, 1, -524297, 1, -524296, 1, -589790, 1, -589789, 1, -589788, 1, -458759, 1, -458758, 1, -458757, 1, -458756, 1, -458755, 1, -458754, 1, -458753, 1, -524288, 1, -524287, 1, -524286, 1, -524285, 1, -524284, 1, -524283, 1, -524282, 1, -524281, 1, -524254, 1, -458745, 1, -458744, 1, -458743, 1, -458742, 1, -458741, 1, -458740, 1, -458739, 1, -458738, 1, -458737, 1, -458736, 1, -458735, 1, -458734, 1, -458733, 1, -458732, 1, -458731, 1, -458730, 1, -458729, 1, -458728, 1, -458727, 1, -458726, 1, -458725, 1, -458724, 1, -458723, 1, -458722, 1, -458721, 1, -458720, 1, -458719, 1, 65535, 0, 0, 1, 589829, 1610612737, 589830, 1610612737, 589831, 1610612737, 589832, 1610612737, 589833, 1610612737, 589834, 1610612737, 589836, 1610612737, 589837, 1610612737, 589838, 1610612737, 589839, 1610612737, 589840, 1610612737, 589841, 1610612737, 589842, 1610612737, 589843, 1610612737, 589844, 1610612737, 589845, 1610612737, 589846, 1610612737, 589847, 1610612737, 589848, 1610612737, 589849, 1610612737 )
+tile_data = IntArray( -2031636, 1, -1966074, 1610612737, -1966073, 1610612737, -1966072, 1610612737, -1966071, 1610612737, -1966070, 1610612737, -1835025, 1, -1835007, 1610612737, -1835006, 1610612737, -1835005, 1610612737, -1835004, 1610612737, -1703949, 1, -1638420, 1, -1638413, 1, -1638405, 1610612740, -1638404, 1610612737, -1638403, 1610612737, -1638402, 1610612737, -1572877, 1, -1572870, 1610612740, -1507341, 1, -1507335, 1610612740, -1441812, 1, -1441811, 1, -1441810, 1, -1441809, 1, -1441808, 1, -1441807, 1, -1441806, 1, -1441805, 1, -1441800, 1610612740, -1376269, 1, -1376265, 1610612740, -1441788, 1, -1441784, 1, -1441781, 1, -1441778, 1, -1441775, 1, -1441773, 1, -1441771, 1, -1441765, 1, -1310745, 1, -1310733, 1, -1245189, 1, -1310719, 1, -1310690, 1, -1179676, 1, -1179670, 1, -1179669, 1, -1179668, 1, -1179667, 1, -1179666, 1, -1179665, 1, -1179664, 1, -1179663, 1, -1179662, 1, -1179661, 1, -1179660, 1, -1179659, 1, -1179658, 1, -1179657, 1, -1179656, 1, -1179655, 1, -1179654, 1, -1179653, 1, -1179652, 1, -1179651, 1, -1179650, 1, -1179649, 1, -1245184, 1, -1245183, 1, -1179615, 1, -1048607, 1, -1048596, 0, -1048595, 0, -1048594, 0, -1048593, 0, -1048592, 0, -1048591, 0, -1048590, 0, -1048589, 0, -1048588, 0, -1048587, 0, -1048586, 0, -1048585, 0, -1048584, 0, -1048583, 0, -1048582, 0, -983022, 1, -983018, 1, -983014, 1, -983010, 1, -983009, 1, -983001, 1, -852001, 1, -852000, 1, -851999, 1, -851998, 1, -851997, 1, -851996, 1, -851995, 1, -917466, 1, -917465, 1, -786459, 1, -786458, 1, -851930, 1, -720922, 1, -720921, 1, -720920, 1, -786395, 1, -786394, 1, -655384, 1, -655383, 1, -655382, 1, -655381, 1, -655380, 1, -655379, 1, -720859, 1, -589843, 1, -589842, 1, -655324, 1, -655323, 1, -524306, 1, -524305, 1, -524304, 1, -524303, 1, -524302, 1, -524301, 1, -524300, 1, -524299, 1, -524298, 1, -524297, 1, -524296, 1, -589790, 1, -589789, 1, -589788, 1, -458759, 1, -458758, 1, -458757, 1, -458756, 1, -458755, 1, -458754, 1, -458753, 1, -524288, 1, -524287, 1, -524286, 1, -524285, 1, -524284, 1, -524283, 1, -524282, 1, -524281, 1, -524254, 1, -458745, 1, -458744, 1, -458743, 1, -458742, 1, -458741, 1, -458740, 1, -458739, 1, -458738, 1, -458737, 1, -458736, 1, -458735, 1, -458734, 1, -458733, 1, -458732, 1, -458731, 1, -458730, 1, -458729, 1, -458728, 1, -458727, 1, -458726, 1, -458725, 1, -458724, 1, -458723, 1, -458722, 1, -458721, 1, -458720, 1, -458719, 1, 65535, 0, 0, 1, 589829, 1610612737, 589830, 1610612737, 589831, 1610612737, 589832, 1610612737, 589833, 1610612737, 589834, 1610612737, 589836, 1610612737, 589837, 1610612737, 589838, 1610612737, 589839, 1610612737, 589840, 1610612737, 589841, 1610612737, 589842, 1610612737, 589843, 1610612737, 589844, 1610612737, 589845, 1610612737, 589846, 1610612737, 589847, 1610612737, 589848, 1610612737, 589849, 1610612737 )
[node name="Player" parent="." groups=[
"player",
] instance=ExtResource( 2 )]
editor/display_folded = true
+JUMP_SPEED = 500
[node name="Enemy" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( -128, -896 )
-damage = 1
[node name="Enemy1" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( -64, -896 )
-damage = 1
[node name="Enemy2" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( 0, -960 )
-damage = 1
[node name="Enemy3" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( -480, -928 )
-damage = 1
[node name="CanvasLayer" type="CanvasLayer" parent="."]
@@ -77,6 +74,7 @@ scroll/ignore_camera_zoom = true
[node name="ParallaxLayer" type="ParallaxLayer" parent="CanvasLayer/ParallaxBackground"]
+visibility/visible = false
visibility/behind_parent = true
material/material = SubResource( 1 )
z/z = -1
@@ -86,7 +84,8 @@ motion/mirroring = Vector2( 0, 1 )
[node name="Sprite" type="Sprite" parent="CanvasLayer/ParallaxBackground/ParallaxLayer"]
-transform/scale = Vector2( 100, 100 )
+visibility/visible = false
+transform/scale = Vector2( 5, 5 )
texture = ExtResource( 4 )
diff --git a/player.tscn b/player.tscn
index 4dc3c38..9cc7bd0 100644
--- a/player.tscn
+++ b/player.tscn
@@ -2,47 +2,54 @@
[ext_resource path="res://Movimiento.gd" type="Script" id=1]
[ext_resource path="res://shooter.gd" type="Script" id=2]
-[ext_resource path="res://icon.png" type="Texture" id=3]
+[ext_resource path="res://vaca.png" type="Texture" id=3]
[sub_resource type="RectangleShape2D" id=1]
custom_solver_bias = 0.0
-extents = Vector2( 10, 10 )
+extents = Vector2( 13.6814, 12.3123 )
[sub_resource type="RectangleShape2D" id=2]
custom_solver_bias = 0.0
-extents = Vector2( 13.6667, 17.1855 )
+extents = Vector2( 13.6667, 15.2052 )
[node name="Player" type="KinematicBody2D"]
-transform/pos = Vector2( -320, -768 )
-transform/scale = Vector2( 0.999999, 1 )
+transform/pos = Vector2( 64, 96 )
+transform/scale = Vector2( 2, 3 )
input/pickable = false
shapes/0/shape = SubResource( 1 )
-shapes/0/transform = Matrix32( 3, 0, 0, 3, -0.04422, -0.0804443 )
+shapes/0/transform = Matrix32( 2.33894, 0, 0, 2.12638, 4.76837e-07, -3.20919 )
shapes/0/trigger = false
shapes/1/shape = SubResource( 2 )
-shapes/1/transform = Matrix32( 2.34146, 0, 0, 0.931014, 0, 16 )
+shapes/1/transform = Matrix32( 2.34146, 0, 0, 0.848696, -0.0332489, 10.0762 )
shapes/1/trigger = true
collision/layers = 1
collision/mask = 0
collision/margin = 0.08
script/script = ExtResource( 1 )
+JUMP_SPEED = 1000
+altitude = 0.5
[node name="shooter" type="Node2D" parent="."]
-transform/pos = Vector2( 50, 0 )
+transform/pos = Vector2( 32, 0 )
transform/scale = Vector2( 0.5, 0.5 )
script/script = ExtResource( 2 )
[node name="sprite" type="Sprite" parent="."]
+transform/pos = Vector2( -1.43051e-06, -9.53674e-07 )
+transform/scale = Vector2( 0.0426667, 0.022069 )
texture = ExtResource( 3 )
+region = true
+region_rect = Rect2( 200, 450, 1500, 2900 )
[node name="Camera2D" type="Camera2D" parent="."]
-transform/pos = Vector2( 1.15633e-05, 0.669312 )
+visibility/visible = false
+transform/pos = Vector2( 1.15633e-05, 1.07288e-06 )
transform/scale = Vector2( 1, 1 )
anchor_mode = 1
rotating = false
@@ -63,16 +70,16 @@ drag_margin/bottom = 0.2
[node name="Collision_Normal" type="CollisionShape2D" parent="."]
-transform/pos = Vector2( -0.04422, -0.0804443 )
-transform/scale = Vector2( 3, 3 )
+transform/pos = Vector2( 4.76837e-07, -3.20919 )
+transform/scale = Vector2( 2.33894, 2.12638 )
shape = SubResource( 1 )
trigger = false
_update_shape_index = 0
[node name="Collision_Agachado" type="CollisionShape2D" parent="."]
-transform/pos = Vector2( 0, 16 )
-transform/scale = Vector2( 2.34146, 0.931014 )
+transform/pos = Vector2( -0.0332489, 10.0762 )
+transform/scale = Vector2( 2.34146, 0.848696 )
shape = SubResource( 2 )
trigger = true
_update_shape_index = 1
diff --git a/tile.png.flags b/tile.png.flags
index efb2b8c..95647b2 100644
--- a/tile.png.flags
+++ b/tile.png.flags
@@ -1 +1,4 @@
filter=false
+gen_mipmaps=false
+repeat=true
+mirroredrepeat=true
diff --git a/tiles.tscn b/tiles.tscn
index 88d0d98..ba880f7 100644
--- a/tiles.tscn
+++ b/tiles.tscn
@@ -36,7 +36,7 @@ transform/scale = Vector2( 0.5, 0.5 )
[node name="Esquina" type="Sprite" parent="."]
visibility/visible = false
-transform/scale = Vector2( 2, 2 )
+transform/scale = Vector2( 4, 4 )
texture = ExtResource( 1 )
region = true
region_rect = Rect2( 0, 0, 32, 32 )
@@ -67,15 +67,16 @@ trigger = false
[node name="Suelo" type="Sprite" parent="."]
-visibility/visible = false
-transform/scale = Vector2( 2, 2 )
+transform/pos = Vector2( -32, -32 )
texture = ExtResource( 1 )
+centered = false
region = true
-region_rect = Rect2( 32, 32, 32, 32 )
+region_rect = Rect2( 32, 32, 64, 64 )
[node name="StaticBody2D" type="StaticBody2D" parent="Suelo"]
-transform/scale = Vector2( 0.5, 0.5 )
+visibility/visible = false
+transform/pos = Vector2( 32, 32 )
input/pickable = false
shapes/0/shape = SubResource( 3 )
shapes/0/transform = Matrix32( 3.83209, 0, 0, 3.42399, 0, 0 )
@@ -89,6 +90,7 @@ bounce = 0.0
[node name="CollisionShape2D" type="CollisionShape2D" parent="Suelo/StaticBody2D"]
+visibility/visible = false
transform/scale = Vector2( 3.83209, 3.42399 )
shape = SubResource( 3 )
trigger = false
@@ -97,7 +99,8 @@ _update_shape_index = 0
[node name="Arbusto" type="Sprite" parent="."]
visibility/visible = false
-transform/scale = Vector2( 2, 2 )
+transform/pos = Vector2( 32, 32 )
+transform/scale = Vector2( 4, 4 )
texture = ExtResource( 1 )
region = true
region_rect = Rect2( 64, 128, 32, 32 )
@@ -126,14 +129,16 @@ _update_shape_index = 0
[node name="Rampa" type="Sprite" parent="."]
-transform/scale = Vector2( 2, 2 )
+visibility/visible = false
+transform/pos = Vector2( 32, 32 )
+transform/scale = Vector2( 4, 4 )
texture = ExtResource( 1 )
region = true
region_rect = Rect2( 128, 256, 32, 32 )
[node name="StaticBody2D" type="StaticBody2D" parent="Rampa"]
-transform/pos = Vector2( 16, 16 )
+transform/pos = Vector2( 0, 4.76837e-07 )
transform/scale = Vector2( 0.5, 0.5 )
input/pickable = false
shapes/0/shape = SubResource( 5 )
diff --git a/tileset.xml b/tileset.xml
index b31581f..7dd864e 100644
--- a/tileset.xml
+++ b/tileset.xml
@@ -49,10 +49,10 @@
0, 0
1, 1, 1, 1
- 32, 32, 32, 32
- 16, 16
- 16, 16
- 16, 16
+ 32, 32, 64, 64
+ -0, -0
+ -0, -0
+ -0, -0
diff --git a/top.tscn b/top.tscn
index 6fe36f6..88f2416 100644
--- a/top.tscn
+++ b/top.tscn
@@ -11,45 +11,47 @@
mode = 0
tile_set = ExtResource( 1 )
-cell/size = Vector2( 32, 32 )
-cell/quadrant_size = 16
+cell/size = Vector2( 64, 64 )
+cell/quadrant_size = 32
cell/custom_transform = Matrix32( 1, 0, 0, 1, 0, 0 )
cell/half_offset = 2
cell/tile_origin = 0
cell/y_sort = false
collision/use_kinematic = false
-collision/friction = 1.0
+collision/friction = 0.0
collision/bounce = 0.0
collision/layers = 1
collision/mask = 1
occluder/light_mask = 1
-tile_data = IntArray( -2031636, 1, -1966074, 1610612737, -1966073, 1610612737, -1966072, 1610612737, -1966071, 1610612737, -1966070, 1610612737, -1835025, 1, -1835007, 1610612737, -1835006, 1610612737, -1835005, 1610612737, -1835004, 1610612737, -1703949, 1, -1638420, 1, -1638413, 1, -1638405, 1610612740, -1638404, 1610612737, -1638403, 1610612737, -1638402, 1610612737, -1572877, 1, -1572870, 1610612740, -1507341, 1, -1507335, 1610612740, -1441809, 1, -1441808, 1, -1441807, 1, -1441806, 1, -1441805, 1, -1441800, 1610612740, -1376269, 1, -1376265, 1610612740, -1441788, 1, -1441784, 1, -1441781, 1, -1441778, 1, -1441775, 1, -1441773, 1, -1441771, 1, -1441765, 1, -1310745, 1, -1310733, 1, -1245189, 1, -1310719, 1, -1310690, 1, -1179676, 1, -1179670, 1, -1179669, 1, -1179668, 1, -1179667, 1, -1179666, 1, -1179665, 1, -1179664, 1, -1179663, 1, -1179662, 1, -1179661, 1, -1179660, 1, -1179659, 1, -1179658, 1, -1179657, 1, -1179656, 1, -1179655, 1, -1179654, 1, -1179653, 1, -1179652, 1, -1179651, 1, -1179650, 1, -1179649, 1, -1245184, 1, -1245183, 1, -1179615, 1, -1048607, 1, -1048596, 0, -1048595, 0, -1048594, 0, -1048593, 0, -1048592, 0, -1048591, 0, -1048590, 0, -1048589, 0, -1048588, 0, -1048587, 0, -1048586, 0, -1048585, 0, -1048584, 0, -1048583, 0, -1048582, 0, -983022, 1, -983018, 1, -983014, 1, -983010, 1, -983009, 1, -983001, 1, -852001, 1, -852000, 1, -851999, 1, -851998, 1, -851997, 1, -851996, 1, -851995, 1, -917466, 1, -917465, 1, -786459, 1, -786458, 1, -851930, 1, -720922, 1, -720921, 1, -720920, 1, -786395, 1, -786394, 1, -655384, 1, -655383, 1, -655382, 1, -655381, 1, -655380, 1, -655379, 1, -720859, 1, -589843, 1, -589842, 1, -655324, 1, -655323, 1, -524306, 1, -524305, 1, -524304, 1, -524303, 1, -524302, 1, -524301, 1, -524300, 1, -524299, 1, -524298, 1, -524297, 1, -524296, 1, -589790, 1, -589789, 1, -589788, 1, -458759, 1, -458758, 1, -458757, 1, -458756, 1, -458755, 1, -458754, 1, -458753, 1, -524288, 1, -524287, 1, -524286, 1, -524285, 1, -524284, 1, -524283, 1, -524282, 1, -524281, 1, -524254, 1, -458745, 1, -458744, 1, -458743, 1, -458742, 1, -458741, 1, -458740, 1, -458739, 1, -458738, 1, -458737, 1, -458736, 1, -458735, 1, -458734, 1, -458733, 1, -458732, 1, -458731, 1, -458730, 1, -458729, 1, -458728, 1, -458727, 1, -458726, 1, -458725, 1, -458724, 1, -458723, 1, -458722, 1, -458721, 1, -458720, 1, -458719, 1, 65535, 0, 0, 1, 589829, 1610612737, 589830, 1610612737, 589831, 1610612737, 589832, 1610612737, 589833, 1610612737, 589834, 1610612737, 589836, 1610612737, 589837, 1610612737, 589838, 1610612737, 589839, 1610612737, 589840, 1610612737, 589841, 1610612737, 589842, 1610612737, 589843, 1610612737, 589844, 1610612737, 589845, 1610612737, 589846, 1610612737, 589847, 1610612737, 589848, 1610612737, 589849, 1610612737 )
+tile_data = IntArray( -2031636, 1, -1966074, 1610612737, -1966073, 1610612737, -1966072, 1610612737, -1966071, 1610612737, -1966070, 1610612737, -1835025, 1, -1835007, 1610612737, -1835006, 1610612737, -1835005, 1610612737, -1835004, 1610612737, -1703949, 1, -1638420, 1, -1638413, 1, -1638405, 1610612740, -1638404, 1610612737, -1638403, 1610612737, -1638402, 1610612737, -1572877, 1, -1572870, 1610612740, -1507341, 1, -1507335, 1610612740, -1441809, 1, -1441808, 1, -1441807, 1, -1441806, 1, -1441805, 1, -1441800, 1610612740, -1376269, 1, -1376265, 1610612740, -1441788, 1, -1441784, 1, -1441781, 1, -1441778, 1, -1441775, 1, -1441773, 1, -1441771, 1, -1441765, 1, -1310745, 1, -1310733, 1, -1245189, 1, -1310719, 1, -1310690, 1, -1179676, 1, -1179670, 1, -1179669, 1, -1179668, 1, -1179667, 1, -1179666, 1, -1179665, 1, -1179664, 1, -1179663, 1, -1179662, 1, -1179661, 1, -1179660, 1, -1179659, 1, -1179658, 1, -1179657, 1, -1179656, 1, -1179655, 1, -1179654, 1, -1179653, 1, -1179652, 1, -1179651, 1, -1179650, 1, -1179649, 1, -1245184, 1, -1245183, 1, -1179615, 1, -1048607, 1, -1048596, 0, -1048595, 0, -1048594, 0, -1048593, 0, -1048592, 0, -1048591, 0, -1048590, 0, -1048589, 0, -1048588, 0, -1048587, 0, -1048586, 0, -1048585, 0, -1048584, 0, -1048583, 0, -1048582, 0, -983022, 1, -983018, 1, -983014, 1, -983010, 1, -983009, 1, -983001, 1, -852001, 1, -852000, 1, -851999, 1, -851998, 1, -851997, 1, -851996, 1, -851995, 1, -917466, 1, -917465, 1, -786459, 1, -786458, 1, -851930, 1, -720922, 1, -720921, 1, -720920, 1, -786395, 1, -786394, 1, -655384, 1, -655383, 1, -655382, 1, -655381, 1, -655380, 1, -655379, 1, -720859, 1, -589843, 1, -589842, 1, -655324, 1, -655323, 1, -524306, 1, -524305, 1, -524304, 1, -524303, 1, -524302, 1, -524301, 1, -524300, 1, -524299, 1, -524298, 1, -524297, 1, -524296, 1, -524292, 1, -589808, 1, -589790, 1, -589789, 1, -589788, 1, -458759, 1, -458758, 1, -458757, 1, -458756, 1, -458755, 1, -458754, 1, -458753, 1, -524288, 1, -524287, 1, -524286, 1, -524285, 1, -524284, 1, -524283, 1, -524282, 1, -524281, 1, -524272, 1, -524254, 1, -458745, 1, -458744, 1, -458743, 1, -458742, 1, -458741, 1, -458740, 1, -458739, 1, -458738, 1, -458737, 1, -458736, 1, -458735, 1, -458734, 1, -458733, 1, -458732, 1, -458731, 1, -458730, 1, -458729, 1, -458728, 1, -458727, 1, -458726, 1, -458725, 1, -458724, 1, -458723, 1, -458722, 1, -458721, 1, -458720, 1, -458719, 1, 65535, 0, 0, 1, 589829, 1610612737, 589830, 1610612737, 589831, 1610612737, 589832, 1610612737, 589833, 1610612737, 589834, 1610612737, 589836, 1610612737, 589837, 1610612737, 589838, 1610612737, 589839, 1610612737, 589840, 1610612737, 589841, 1610612737, 589842, 1610612737, 589843, 1610612737, 589844, 1610612737, 589845, 1610612737, 589846, 1610612737, 589847, 1610612737, 589848, 1610612737, 589849, 1610612737 )
[node name="Player" parent="." groups=[
"player",
] instance=ExtResource( 2 )]
editor/display_folded = true
+transform/pos = Vector2( 256, -640 )
+JUMP_SPEED = 500
[node name="Enemy" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( -128, -896 )
-damage = 1
+velocity = 200
[node name="Enemy1" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( -64, -896 )
-damage = 1
+velocity = 200
[node name="Enemy2" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( 0, -960 )
-damage = 1
+velocity = 200
[node name="Enemy3" parent="." instance=ExtResource( 3 )]
transform/pos = Vector2( -480, -928 )
-damage = 1
+velocity = 200
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
@@ -74,7 +76,7 @@ motion/mirroring = Vector2( 0, 1 )
[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer"]
-transform/scale = Vector2( 20, 20 )
+transform/scale = Vector2( 10, 10 )
texture = ExtResource( 4 )
diff --git a/vaca.png b/vaca.png
new file mode 100644
index 0000000..a11b3b8
Binary files /dev/null and b/vaca.png differ