diff --git a/Locales/.~lock.locales.csv# b/Locales/.~lock.locales.csv#
index c70c373..a0e0ea3 100644
--- a/Locales/.~lock.locales.csv#
+++ b/Locales/.~lock.locales.csv#
@@ -1 +1 @@
-,darias,darias-laptop,25.02.2018 19:40,file:///home/darias/.config/libreoffice/4;
\ No newline at end of file
+,darias,darias-laptop,25.02.2018 19:49,file:///home/darias/.config/libreoffice/4;
\ No newline at end of file
diff --git a/Locales/locales.csv b/Locales/locales.csv
index 4a82e27..f8a9e5d 100644
--- a/Locales/locales.csv
+++ b/Locales/locales.csv
@@ -20,7 +20,7 @@ EP2,Gatear antes de caminar,Crawl before you walk
EP3,Independizándose,Independence
EP4,Una ubre y sus consecuencias,An udder and her consequences
EP5,Siempre fiel,Always faithful
-UFO_JAIL_COUNTER,Vuelve cuando hayas salvado a todas las gallinas. Te quedan: ,Come back when you have rescued all chickens. You are left:
+UFO_JAIL_COUNTER,Vuelve cuando hayas salvado a todas las gallinas. Te quedan: ,Come back when you have rescued all the hen. Remaining:
DANIEL_INFO,"dariasteam94@gmail.com
Mastodo.social/@darias
@@ -58,8 +58,8 @@ BTTN_RESET_LEVEL,Reinicia nivel,Reset level
BTTN_MAIN_MENU,Ir al menú principal,Go to main menu
TUT_0,Este camino está bloqueado. Busca otra forma de desplazarte.,This way is blocked. Find another path.
TUT_1,Utiliza las teclas de dirección para moverte,Use arrows buttons to move
-TUT_7,Pulsa A o el botón del resorte para saltar por encima de estos bloques.,Press A or the spring button to jump above these blocks
-TUT_8,Puedes subir a las ramas de los árboles saltando desde abajo,You can climb to the branches jumping from below
+TUT_2,Pulsa A o el botón del resorte para saltar por encima de estos bloques.,Press A or the spring button to jump above these blocks
+TUT_3,Puedes subir a las ramas de los árboles saltando desde abajo,You can climb to the branches jumping from below
TUT_4,Salta!,Jump!
TUT_5,Puedes volver a bajar pulsando abajo,You can go down by pessing down button
TUT_6,"Recoge cencerros para obtener mejoras.
@@ -83,4 +83,4 @@ TUT_16,"Menudo pasillo más largo, ¿eh?","Such a long corridor, uh?"
TUT_17,Rompe la jaula acercándote a ella para liberar a los animales,Break the cage by touching it to free the animals
TUT_18,Vuelve a la nave y pulsa la tecla arriba para ser abducido,Get back to the ship and press up to be abducted
TUT_19,En este juego NO respetamos las leyes de la física. Puedes saltar y en el aire modificar tu dirección.,In this game we DON'T obey the laws of physics. You can jump and change your direction in the air.
-TUT_20,,
+MAP3_TEXT0,A veces la maleza es tan densa que te impide ver. ¡Abre bien los ojos!,Sometimes the bushes is so dense don't allow you to see beyond. Keep your ayes open!
diff --git a/Locales/locales.en.xl b/Locales/locales.en.xl
index f73d323..179e62e 100644
Binary files a/Locales/locales.en.xl and b/Locales/locales.en.xl differ
diff --git a/Locales/locales.es.xl b/Locales/locales.es.xl
index 55c876d..2eaa122 100644
Binary files a/Locales/locales.es.xl and b/Locales/locales.es.xl differ
diff --git a/Scenes/Events/flying_platform.tscn b/Scenes/Events/flying_platform.tscn
new file mode 100644
index 0000000..542cbd7
--- /dev/null
+++ b/Scenes/Events/flying_platform.tscn
@@ -0,0 +1,141 @@
+[gd_scene load_steps=5 format=1]
+
+[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=1]
+
+[sub_resource type="Curve2D" id=1]
+
+bake_interval = 5.0
+_data = {
+"points": Vector2Array( 0, 0, -230.834, 2.30383, 938.809, -146.193, 0, 0, -123.884, 6.53277, 628.191, -146.193, 0, 0, -313.991, 8.94618, 30.2831, -142.51, 0, 0, 0, 0, -514.832, -133.916 )
+}
+
+[sub_resource type="Animation" id=2]
+
+resource/name = "Nueva animación"
+length = 2.0
+loop = true
+step = 0.1
+tracks/0/type = "value"
+tracks/0/path = NodePath(".:offset")
+tracks/0/interp = 1
+tracks/0/imported = false
+tracks/0/keys = {
+"times": FloatArray( ),
+"transitions": FloatArray( ),
+"update": 0,
+"values": [ ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath(".:unit_offset")
+tracks/1/interp = 1
+tracks/1/imported = false
+tracks/1/keys = {
+"times": FloatArray( 0, 1, 2 ),
+"transitions": FloatArray( 1, 1, 1 ),
+"update": 0,
+"values": [ 0.0, 0.99, 0.0 ]
+}
+
+[sub_resource type="RectangleShape2D" id=3]
+
+custom_solver_bias = 0.0
+extents = Vector2( 67.9999, 7 )
+
+[node name="Node2D" type="Node2D"]
+
+transform/pos = Vector2( 640, 320 )
+
+[node name="Path2D" type="Path2D" parent="."]
+
+transform/pos = Vector2( 20, 9 )
+curve = SubResource( 1 )
+
+[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
+
+transform/pos = Vector2( 317.777, -141.948 )
+transform/rot = -179.531
+offset = 620.742
+h_offset = 0.0
+v_offset = 0.0
+rotate = false
+cubic_interp = true
+loop = true
+lookahead = 4.0
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Path2D/PathFollow2D"]
+
+playback/process_mode = 1
+playback/default_blend_time = 0.0
+root/root = NodePath("..")
+"anims/Nueva animación" = SubResource( 2 )
+playback/active = true
+playback/speed = 1.0
+blend_times = [ ]
+autoplay = "Nueva animación"
+
+[node name="platform" type="Node2D" parent="Path2D/PathFollow2D"]
+
+transform/pos = Vector2( 19.9257, 9.16351 )
+transform/rot = -180.0
+
+[node name="Sprite" type="Sprite" parent="Path2D/PathFollow2D/platform"]
+
+texture = ExtResource( 1 )
+vframes = 13
+hframes = 5
+frame = 45
+
+[node name="Sprite3" type="Sprite" parent="Path2D/PathFollow2D/platform"]
+
+transform/pos = Vector2( -63.9978, -0.524231 )
+texture = ExtResource( 1 )
+vframes = 13
+hframes = 5
+frame = 45
+
+[node name="Sprite1" type="Sprite" parent="Path2D/PathFollow2D/platform"]
+
+transform/pos = Vector2( 63.9979, 0.524231 )
+texture = ExtResource( 1 )
+vframes = 13
+hframes = 5
+frame = 43
+
+[node name="Sprite2" type="Sprite" parent="Path2D/PathFollow2D/platform"]
+
+transform/pos = Vector2( -127.996, -1.04849 )
+transform/rot = 3.57518e-06
+texture = ExtResource( 1 )
+vframes = 13
+hframes = 5
+frame = 39
+
+[node name="Sprite4" type="Sprite" parent="Path2D/PathFollow2D/platform"]
+
+transform/rot = 3.57518e-06
+texture = ExtResource( 1 )
+vframes = 13
+hframes = 5
+frame = 50
+
+[node name="RigidBody2D" type="KinematicBody2D" parent="Path2D/PathFollow2D/platform"]
+
+transform/pos = Vector2( -187.449, 81.4165 )
+transform/rot = -0.469333
+input/pickable = false
+shapes/0/shape = SubResource( 3 )
+shapes/0/transform = Matrix32( 1, -5.95581e-06, 5.95581e-06, 1, 154.999, -88.001 )
+shapes/0/trigger = false
+collision/layers = 2
+collision/mask = 15
+collision/margin = 0.08
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Path2D/PathFollow2D/platform/RigidBody2D"]
+
+transform/pos = Vector2( 154.999, -88.001 )
+transform/rot = 0.000341243
+shape = SubResource( 3 )
+trigger = false
+_update_shape_index = 0
+
+
diff --git a/Scenes/Events/jail.tscn b/Scenes/Events/jail.tscn
index bdb71a8..8271701 100644
--- a/Scenes/Events/jail.tscn
+++ b/Scenes/Events/jail.tscn
@@ -98,7 +98,7 @@ stream/buffering_ms = 500
frames = SubResource( 2 )
animation = "Idle"
-frame = 2
+frame = 4
playing = true
[node name="Bars" type="Particles2D" parent="."]
diff --git a/Scenes/Events/player.gd b/Scenes/Events/player.gd
index 81fcf85..076759c 100644
--- a/Scenes/Events/player.gd
+++ b/Scenes/Events/player.gd
@@ -51,6 +51,11 @@ export var JUMP_SPEED = 400
export var altitude = 0.5
export(int) var cages_open = 0
+func _integrate_forces(s):
+ print ("a")
+ var lv = s.get_linear_velocity()
+ var step = s.get_step()
+
func open_cage(var number):
cages_open += number
@@ -149,7 +154,6 @@ func _fixed_process(delta):
if (jumping and can_jump_more() and jump_key_pressed):
velocity.y = - JUMP_SPEED + (MAX_JUMP_TIME - jump_time) * 20
-
# Movimiento horizontal
if (!right and !left):
if (velocity.x > SLIDE_LEVEL):
@@ -158,7 +162,6 @@ func _fixed_process(delta):
velocity.x += SLIDE_LEVEL
else:
velocity.x = 0
- walk_speed = 0
var motion = velocity * delta
@@ -176,8 +179,16 @@ func _fixed_process(delta):
# Control de colisiones
if (is_colliding()):
- var normal = get_collision_normal()
+ var normal = get_collision_normal()
+
if (normal.y < -0.35):
+
+ var floor_velocity = get_collider_velocity()
+ if (floor_velocity != Vector2()):
+ move(Vector2(floor_velocity.x / 60, 0))
+ motion.y = 0
+ velocity.y = 0
+
# Está en el suelo
if (!jumping and jump_key_released):
on_ground = true
@@ -188,6 +199,7 @@ func _fixed_process(delta):
motion.x += motion.x * (-normal.y)
motion = normal.slide(motion)
velocity.y = 0
+
else:
# Está chocándose contra techo o pared
can_jump = false
diff --git a/Scenes/Events/player.tscn b/Scenes/Events/player.tscn
index 58bb536..307a12d 100644
--- a/Scenes/Events/player.tscn
+++ b/Scenes/Events/player.tscn
@@ -8,12 +8,12 @@
[ext_resource path="res://Scenes/Events/cowbell_collector.gd" type="Script" id=6]
[ext_resource path="res://Sound/player_jump.ogg" type="AudioStream" id=7]
-[sub_resource type="ConvexPolygonShape2D" id=4]
+[sub_resource type="ConvexPolygonShape2D" id=1]
custom_solver_bias = 0.0
points = Vector2Array( -13.26, -5.39603, -9.45393, -8.08105, 6.94148, -8.08105, 11.3331, -5.21703, 11.3331, 4.27004, 9.28368, 8.56607, 1.37875, 13.0411, -3.59843, 13.0411, -11.7961, 8.38707, -13.26, 4.44904 )
-[sub_resource type="ConvexPolygonShape2D" id=5]
+[sub_resource type="ConvexPolygonShape2D" id=2]
custom_solver_bias = 0.0
points = Vector2Array( -2.35073, 6.94769, -10.0513, 0.602652, -10.1458, -14.3403, 9.69616, -14.1336, 9.7198, 0.41664, 1.64128, 6.92704 )
@@ -42,10 +42,10 @@ tracks/0/keys = {
transform/scale = Vector2( 1.8, 1.8 )
z/relative = false
input/pickable = true
-shapes/0/shape = SubResource( 4 )
+shapes/0/shape = SubResource( 1 )
shapes/0/transform = Matrix32( 1.89755, 0, 0, 3.10364, 2.93931, -4.91934 )
shapes/0/trigger = false
-shapes/1/shape = SubResource( 5 )
+shapes/1/shape = SubResource( 2 )
shapes/1/transform = Matrix32( 2.35192, 0, 0, 2.68801, 1.63985, 16.8801 )
shapes/1/trigger = true
collision/layers = 1057
diff --git a/Scenes/Maps/map_0.tscn b/Scenes/Maps/map_0.tscn
index 4849720..3f1655c 100644
--- a/Scenes/Maps/map_0.tscn
+++ b/Scenes/Maps/map_0.tscn
@@ -1168,108 +1168,101 @@ transform/pos = Vector2( -1890, -3020 )
[node name="Area2D" parent="Tips" instance=ExtResource( 14 )]
-text = "Este camino está bloqueado. Busca otra forma de desplazarte."
+text = "TUT_0"
[node name="Area2D1" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 640, 20 )
-text = "Utiliza las teclas de dirección para moverte"
+text = "TUT_1"
[node name="Area2D2" parent="Tips" instance=ExtResource( 14 )]
-transform/pos = Vector2( 1524.07, 44.6611 )
+transform/pos = Vector2( 1520, 30 )
text = "Pulsa A o el botón del resorte para saltar por encima de estos bloques."
[node name="Area2D3" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 2110, 30 )
-text = "Puedes subir a las ramas de los árboles saltando desde abajo"
+text = "TUT_3"
[node name="Area2D4" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 2550, 30 )
-text = "Salta!"
+text = "TUT_4"
[node name="Area2D5" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 2550, -370 )
-text = "Puedes volver a bajar pulsando abajo"
+text = "TUT_5"
[node name="Area2D6" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 3570, -60 )
-text = "Recoge cencerros para obtener mejoras.
-"
+text = "TUT_6"
[node name="Area2D7" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 3900, -60 )
-text = "Bien hecho!"
+text = "TUT_7"
[node name="Area2D8" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 4010, 370 )
-text = "Si recoges muchos cencerros en muy poco tiempo conseguirás bonificaciones!
-"
+text = "TUT_8"
[node name="Area2D19" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 4340, 730 )
-text = "Puedes guardar los cencerros en la nave volviendo a ella para ser abducido en cualquier momento.
-"
+text = "TUT_9"
[node name="Area2D9" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 4790, 1050 )
-text = "A veces es más seguro no continuar avanzando si nada indica que el camino continúa
-"
+text = "TUT_10"
[node name="Area2D10" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 4920, 1340 )
-text = "Esta vez era broma, pero no vuelvas a hacerlo!"
+text = "TUT_11"
[node name="Area2D11" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 4300, 1790 )
-text = "¡Cuidado! Eso que ves es un carnicero, para aniquilarlo salta sobre su cabeza"
+text = "TUT_12"
[node name="Area2D12" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 3560, 1790 )
-text = "Si has perdido vida puedes recuperarla recogiendo corazones
-"
+text = "TUT_13"
[node name="Area2D13" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 3590, 700 )
-text = "Recoge manzanas para poder producir leche con la que atacar
-"
+text = "TUT_14"
[node name="Area2D14" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 2940, 370 )
-text = "Ataca con la tecla S o el botón de la ubre. Conmuta entre leche desnatada o semidesnatada con R o el botón en blanco.
-"
+text = "TUT_15"
[node name="Area2D15" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 1380, 500 )
-text = "Menudo pasillo más largo, ¿eh?"
+text = "TUT_16"
[node name="Area2D16" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 380, 370 )
-text = "Rompe la jaula acercándote a ella para liberar a los animales"
+text = "TUT_17"
[node name="Area2D17" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( -340, -710 )
-text = "Vuelve a la nave y pulsa la tecla arriba para ser abducido"
+text = "TUT_18"
[node name="Area2D18" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( -340, -60 )
-text = "En este juego NO respetamos las leyes de la física. Puedes saltar y en el aire modificar tu dirección."
+text = "TUT_19"
diff --git a/Scenes/Maps/map_1.tscn b/Scenes/Maps/map_1.tscn
index 0a4e8ae..d14cc89 100644
--- a/Scenes/Maps/map_1.tscn
+++ b/Scenes/Maps/map_1.tscn
@@ -13,7 +13,7 @@
[ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11]
[ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12]
[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13]
-[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=14]
+[ext_resource path="res://Scenes/Events/flying_platform.tscn" type="PackedScene" id=14]
[node name="Level" type="Node2D" groups=[
"level",
@@ -116,7 +116,7 @@ collision/bounce = 0.0
collision/layers = 2
collision/mask = 15
occluder/light_mask = 1
-tile_data = IntArray( -1703956, 32, -1638420, 31, -1638413, 14, -1638412, 1, -1638411, 15, -1572884, 31, -1572878, 14, -1572877, 9, -1572876, 10, -1572875, 12, -1572874, 15, -1638395, 32, -1507348, 31, -1507343, 14, -1507342, 9, -1507341, 16, -1507339, 17, -1507338, 12, -1507337, 15, -1572859, 31, -1441825, 32, -1441812, 30, -1441808, 14, -1441807, 9, -1441806, 16, -1441802, 17, -1441801, 4, -1441800, 15, -1507323, 31, -1376289, 31, -1376285, 13, -1376283, 13, -1376280, 14, -1376279, 1, -1376278, 1, -1376277, 1, -1376276, 1, -1376275, 1, -1376274, 1, -1376273, 1, -1376272, 9, -1376271, 16, -1376268, 31, -1376265, 17, -1376264, 12, -1376263, 1, -1376262, 1, -1376261, 1, -1376260, 1, -1376259, 15, -1441787, 31, -1310753, 31, -1310751, 32, -1310744, 17, -1310743, 7, -1310742, 7, -1310741, 7, -1310740, 7, -1310739, 7, -1310738, 7, -1310737, 7, -1310736, 16, -1310732, 31, -1310728, 17, -1310727, 7, -1310726, 7, -1310725, 7, -1310724, 7, -1310723, 16, -1376256, 20, -1376251, 31, -1245217, 31, -1245215, 31, -1245213, 0, -1245212, 1, -1245211, 1, -1245210, 2, -1245209, 13, -1245199, 18, -1245196, 30, -1245195, 13, -1245189, 29, -1245186, 14, -1245185, 1, -1310720, 1, -1310719, 1, -1310718, 2, -1310715, 31, -1179681, 31, -1179679, 31, -1179677, 3, -1179676, 11, -1179675, 10, -1179674, 5, -1179671, 14, -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, 9, -1179649, 4, -1245184, 4, -1245183, 4, -1245182, 5, -1245179, 31, -1114145, 31, -1114143, 31, -1114141, 3, -1114140, 5, -1114139, 3, -1114138, 5, -1114136, 14, -1114135, 9, -1114134, 11, -1114133, 7, -1114132, 7, -1114131, 7, -1114130, 7, -1114129, 7, -1114128, 7, -1114127, 7, -1114126, 7, -1114125, 7, -1114124, 7, -1114123, 7, -1114122, 7, -1114121, 7, -1114120, 7, -1114119, 7, -1114118, 7, -1114117, 7, -1114116, 7, -1114115, 7, -1114114, 7, -1114113, 7, -1179648, 7, -1179647, 7, -1179646, 8, -1179643, 31, -1048609, 31, -1048607, 31, -1048605, 3, -1048604, 12, -1048603, 9, -1048602, 5, -1048600, 6, -1048599, 7, -1048598, 8, -1048597, 32, -1114110, 13, -1114107, 31, -983073, 31, -983071, 31, -983069, 6, -983068, 7, -983067, 7, -983066, 8, -983061, 31, -1048574, 13, -1048571, 31, -917537, 31, -917535, 30, -917534, 13, -917525, 30, -983035, 31, -852001, 31, -851999, 13, -851998, 32, -851996, 0, -851995, 1, -851994, 1, -851993, 1, -851992, 1, -851991, 1, -851990, 1, -851989, 1, -851988, 1, -851987, 2, -851986, 0, -851985, 2, -851983, 0, -851982, 2, -851979, 0, -851978, 2, -851975, 0, -851974, 2, -851972, 13, -917499, 31, -786465, 31, -786462, 31, -786460, 6, -786459, 7, -786458, 7, -786457, 7, -786456, 7, -786455, 7, -786454, 7, -786453, 7, -786452, 7, -786451, 8, -786450, 6, -786449, 8, -786447, 6, -786446, 8, -786443, 6, -786442, 8, -786439, 3, -786438, 5, -786436, 13, -851966, 13, -851963, 31, -720929, 31, -720926, 30, -720904, 14, -720903, 9, -720902, 16, -720900, 13, -786430, 13, -786427, 31, -655393, 31, -655391, 0, -655390, 2, -655385, 13, -655379, 13, -655369, 14, -655368, 9, -655367, 16, -655363, 0, -655362, 1, -655361, 1, -720896, 1, -720895, 2, -720894, 13, -720893, 13, -720892, 13, -720891, 31, -589857, 31, -589855, 3, -589854, 12, -589853, 1, -589852, 1, -589851, 1, -589850, 1, -589849, 1, -589848, 15, -589844, 14, -589843, 1, -589842, 1, -589841, 1, -589840, 1, -589839, 1, -589838, 1, -589837, 1, -589836, 1, -589835, 1, -589834, 1, -589833, 9, -589832, 16, -589826, 7, -589825, 7, -655360, 7, -655355, 31, -524321, 31, -524319, 6, -524318, 7, -524317, 7, -524316, 7, -524315, 7, -524314, 7, -524313, 7, -524312, 12, -524311, 15, -524309, 14, -524308, 9, -524307, 7, -524306, 7, -524305, 7, -524304, 7, -524303, 7, -524302, 7, -524301, 7, -524300, 7, -524299, 7, -524298, 7, -524297, 16, -589819, 30, -458785, 31, -458776, 3, -458775, 5, -458773, 3, -458772, 5, -524283, 13, -524282, 13, -524278, 13, -393249, 31, -393242, 14, -393241, 1, -393240, 9, -393239, 5, -393237, 3, -393236, 12, -393235, 1, -393234, 15, -393217, 14, -458752, 15, -458743, 14, -458742, 15, -327713, 31, -327706, 17, -327705, 7, -327704, 7, -327703, 16, -327701, 17, -327700, 7, -327699, 7, -327698, 16, -327696, 13, -327694, 13, -327682, 14, -327681, 9, -393216, 9, -393215, 15, -393208, 14, -393207, 9, -393206, 12, -393205, 15, -262177, 31, -262176, 13, -262175, 13, -262153, 13, -262147, 14, -262146, 9, -262145, 4, -327680, 4, -327679, 12, -327678, 15, -327676, 14, -327675, 15, -327673, 14, -327672, 9, -327671, 4, -327670, 4, -327669, 5, -196641, 31, -196639, 13, -196611, 3, -196610, 4, -196609, 4, -262144, 4, -262143, 4, -262142, 12, -262141, 1, -262140, 9, -262139, 12, -262138, 1, -262137, 9, -262136, 4, -262135, 4, -262134, 4, -262133, 5, -131105, 31, -131103, 13, -131075, 3, -131074, 4, -131073, 4, -196608, 4, -196607, 4, -196606, 4, -196605, 4, -196604, 4, -196603, 4, -196602, 4, -196601, 4, -196600, 4, -196599, 4, -196598, 4, -196597, 5, -65569, 31, -65539, 6, -65538, 7, -65537, 7, -131072, 7, -131071, 7, -131070, 7, -131069, 7, -131068, 7, -131067, 7, -131066, 7, -131065, 7, -131064, 7, -131063, 7, -131062, 7, -131061, 8, -33, 31 )
+tile_data = IntArray( -1703956, 32, -1638420, 31, -1638413, 14, -1638412, 1, -1638411, 15, -1572884, 31, -1572878, 14, -1572877, 9, -1572876, 7, -1572875, 12, -1572874, 15, -1638395, 32, -1507348, 31, -1507343, 14, -1507342, 9, -1507341, 16, -1507339, 17, -1507338, 12, -1507337, 15, -1572859, 31, -1441825, 32, -1441812, 30, -1441808, 14, -1441807, 9, -1441806, 16, -1441802, 17, -1441801, 12, -1441800, 15, -1507323, 31, -1376289, 31, -1376285, 13, -1376283, 13, -1376280, 14, -1376279, 1, -1376278, 1, -1376277, 1, -1376276, 1, -1376275, 1, -1376274, 1, -1376273, 1, -1376272, 9, -1376271, 16, -1376268, 31, -1376265, 17, -1376264, 12, -1376263, 1, -1376262, 1, -1376261, 1, -1376260, 1, -1376259, 15, -1441787, 31, -1310753, 31, -1310751, 32, -1310744, 17, -1310743, 7, -1310742, 7, -1310741, 7, -1310740, 7, -1310739, 7, -1310738, 7, -1310737, 7, -1310736, 16, -1310732, 31, -1310728, 17, -1310727, 7, -1310726, 7, -1310725, 7, -1310724, 7, -1310723, 16, -1376256, 20, -1376251, 31, -1245217, 31, -1245215, 31, -1245213, 0, -1245212, 1, -1245211, 1, -1245210, 2, -1245209, 13, -1245199, 18, -1245196, 30, -1245195, 13, -1245189, 29, -1245186, 14, -1245185, 1, -1310720, 1, -1310719, 1, -1310718, 2, -1310715, 31, -1179681, 31, -1179679, 31, -1179677, 3, -1179676, 11, -1179675, 10, -1179674, 5, -1179671, 14, -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, 9, -1179649, 4, -1245184, 4, -1245183, 4, -1245182, 5, -1245179, 31, -1114145, 31, -1114143, 31, -1114141, 3, -1114140, 5, -1114139, 3, -1114138, 5, -1114136, 14, -1114135, 9, -1114134, 11, -1114133, 7, -1114132, 7, -1114131, 7, -1114130, 7, -1114129, 7, -1114128, 7, -1114127, 7, -1114126, 7, -1114125, 7, -1114124, 7, -1114123, 7, -1114122, 7, -1114121, 7, -1114120, 7, -1114119, 7, -1114118, 7, -1114117, 7, -1114116, 7, -1114115, 7, -1114114, 7, -1114113, 7, -1179648, 7, -1179647, 7, -1179646, 8, -1179643, 31, -1048609, 31, -1048607, 31, -1048605, 3, -1048604, 12, -1048603, 9, -1048602, 5, -1048600, 6, -1048599, 7, -1048598, 8, -1048597, 32, -1114110, 13, -1114107, 31, -983073, 31, -983071, 31, -983069, 6, -983068, 7, -983067, 7, -983066, 8, -983061, 31, -1048574, 13, -1048571, 31, -917537, 31, -917535, 30, -917534, 13, -917525, 30, -983035, 31, -852001, 31, -851999, 13, -851998, 32, -851996, 0, -851995, 1, -851994, 1, -851993, 1, -851992, 1, -851991, 1, -851990, 1, -851989, 1, -851988, 1, -851987, 2, -851986, 0, -851985, 2, -851983, 0, -851982, 2, -851979, 0, -851978, 2, -851975, 0, -851974, 2, -851972, 13, -917499, 31, -786465, 31, -786462, 31, -786460, 6, -786459, 7, -786458, 7, -786457, 7, -786456, 7, -786455, 7, -786454, 7, -786453, 7, -786452, 7, -786451, 8, -786450, 6, -786449, 8, -786447, 6, -786446, 8, -786443, 6, -786442, 8, -786439, 3, -786438, 5, -786436, 13, -851966, 13, -851963, 31, -720929, 31, -720926, 30, -720904, 14, -720903, 9, -720902, 16, -720900, 13, -786430, 13, -786427, 31, -655393, 31, -655391, 0, -655390, 2, -655385, 13, -655379, 13, -655369, 14, -655368, 9, -655367, 16, -655363, 0, -655362, 1, -655361, 1, -720896, 1, -720895, 2, -720894, 13, -720893, 13, -720892, 13, -720891, 31, -589857, 31, -589855, 3, -589854, 12, -589853, 1, -589852, 1, -589851, 1, -589850, 1, -589849, 1, -589848, 15, -589844, 14, -589843, 1, -589842, 1, -589841, 1, -589840, 1, -589839, 1, -589838, 1, -589837, 1, -589836, 1, -589835, 1, -589834, 1, -589833, 9, -589832, 16, -589826, 7, -589825, 7, -655360, 7, -655355, 31, -524321, 31, -524319, 6, -524318, 7, -524317, 7, -524316, 7, -524315, 7, -524314, 7, -524313, 7, -524312, 12, -524311, 15, -524309, 14, -524308, 9, -524307, 7, -524306, 7, -524305, 7, -524304, 7, -524303, 7, -524302, 7, -524301, 7, -524300, 7, -524299, 7, -524298, 7, -524297, 16, -589819, 30, -458785, 31, -458776, 3, -458775, 5, -458773, 3, -458772, 5, -524283, 13, -524282, 13, -524278, 13, -393249, 31, -393242, 14, -393241, 1, -393240, 9, -393239, 5, -393237, 3, -393236, 12, -393235, 1, -393234, 15, -393217, 14, -458752, 15, -458743, 14, -458742, 15, -327713, 31, -327706, 17, -327705, 7, -327704, 7, -327703, 16, -327701, 17, -327700, 7, -327699, 7, -327698, 16, -327696, 13, -327694, 13, -327682, 14, -327681, 9, -393216, 9, -393215, 15, -393208, 14, -393207, 9, -393206, 12, -393205, 15, -262177, 31, -262176, 13, -262175, 13, -262153, 13, -262147, 14, -262146, 9, -262145, 4, -327680, 4, -327679, 12, -327678, 15, -327676, 14, -327675, 15, -327673, 14, -327672, 9, -327671, 4, -327670, 4, -327669, 5, -196641, 31, -196639, 13, -196611, 3, -196610, 4, -196609, 4, -262144, 4, -262143, 4, -262142, 12, -262141, 1, -262140, 9, -262139, 12, -262138, 1, -262137, 9, -262136, 4, -262135, 4, -262134, 4, -262133, 5, -131105, 31, -131103, 13, -131075, 3, -131074, 4, -131073, 4, -196608, 4, -196607, 4, -196606, 4, -196605, 4, -196604, 4, -196603, 4, -196602, 4, -196601, 4, -196600, 4, -196599, 4, -196598, 4, -196597, 5, -65569, 31, -65539, 6, -65538, 7, -65537, 7, -131072, 7, -131071, 7, -131070, 7, -131069, 7, -131068, 7, -131067, 7, -131066, 7, -131065, 7, -131064, 7, -131063, 7, -131062, 7, -131061, 8, -33, 31 )
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
@@ -206,6 +206,7 @@ region_rect = Rect2( -1000, 0, 2048, 128 )
[node name="enemies" type="Node2D" parent="."]
+editor/display_folded = true
transform/pos = Vector2( 2140, -960 )
transform/scale = Vector2( 1.7, 1.7 )
@@ -283,6 +284,7 @@ transform/pos = Vector2( 0, -790 )
[node name="cowbells" type="Node2D" parent="."]
+editor/display_folded = true
transform/pos = Vector2( 500, 560 )
[node name="Cowbell" parent="cowbells" instance=ExtResource( 9 )]
@@ -1564,6 +1566,8 @@ stream/buffering_ms = 500
[node name="Cages" type="Node2D" parent="."]
+editor/display_folded = true
+
[node name="jail" parent="Cages" instance=ExtResource( 13 )]
transform/pos = Vector2( -1250, -2410 )
@@ -1613,14 +1617,19 @@ transform/scale = Vector2( 1.7, 1.7 )
transform/pos = Vector2( -1890, -3020 )
-[node name="Area2D" parent="Tips" instance=ExtResource( 14 )]
+[node name="moving_platforms" type="Node2D" parent="."]
-transform/pos = Vector2( 2160, 820 )
-text = "Venga tírate a ver si eres tan valiente"
+[node name="Node2D" parent="moving_platforms" instance=ExtResource( 14 )]
-[node name="Area2D2" parent="Tips" instance=ExtResource( 14 )]
+transform/pos = Vector2( -638.025, -2683.9 )
-transform/pos = Vector2( -2060, 560 )
-text = "Jajajaja, de aquí ya solo puedes salir muriendo"
+[node name="PathFollow2D" parent="moving_platforms/Node2D/Path2D"]
+
+transform/pos = Vector2( 317.777, -141.948 )
+
+[node name="AnimationPlayer" parent="moving_platforms/Node2D/Path2D/PathFollow2D"]
+
+playback/speed = 0.4
+[editable path="moving_platforms/Node2D"]
diff --git a/Scenes/Maps/map_2.tscn b/Scenes/Maps/map_2.tscn
index 6d57054..b276f45 100644
--- a/Scenes/Maps/map_2.tscn
+++ b/Scenes/Maps/map_2.tscn
@@ -226,6 +226,7 @@ region_rect = Rect2( -1000, 0, 2048, 128 )
[node name="enemies" type="Node2D" parent="."]
+editor/display_folded = true
transform/pos = Vector2( 2140, -960 )
transform/scale = Vector2( 1.7, 1.7 )
diff --git a/Scenes/Maps/map_3.tscn b/Scenes/Maps/map_3.tscn
index 9989c34..8346a6c 100644
--- a/Scenes/Maps/map_3.tscn
+++ b/Scenes/Maps/map_3.tscn
@@ -1410,6 +1410,6 @@ transform/pos = Vector2( -1890, -3020 )
[node name="Area2D" parent="Tips" instance=ExtResource( 14 )]
transform/pos = Vector2( 4340, 1360 )
-text = "A veces la maleza es tan densa que te impide ver. ¡Abre bien los ojos!"
+text = "MAP3_TEXT0"
diff --git a/Scenes/Maps/map_4.tscn b/Scenes/Maps/map_4.tscn
index 72ca346..0522375 100644
--- a/Scenes/Maps/map_4.tscn
+++ b/Scenes/Maps/map_4.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 format=1]
+[gd_scene load_steps=14 format=1]
[ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1]
[ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2]
@@ -13,7 +13,6 @@
[ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11]
[ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12]
[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13]
-[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=14]
[node name="Level" type="Node2D" groups=[
"level",
@@ -36,7 +35,7 @@ collision/bounce = 0.0
collision/layers = 0
collision/mask = 0
occluder/light_mask = 1
-tile_data = IntArray( -2424869, 26, -2359309, 39, -2293772, 41, -2162721, 41, -1966098, 26, -1966097, 40, -1966085, 39, -1900573, 23, -1900572, 24, -1835044, 26, -1769492, 39, -1769489, 41, -1769486, 46, -1769481, 46, -1769480, 46, -1769475, 41, -1703960, 26, -1638433, 23, -1638432, 22, -1638431, 22, -1638430, 24, -1507348, 41, -1507345, 46, -1441814, 40, -1310723, 46, -1179671, 39, -1048598, 46, -917522, 42, -917521, 43, -917520, 44, -917519, 44, -917518, 44, -917517, 43, -917516, 45, -917512, 40, -655366, 23, -655365, 22, -655364, 22, -655363, 21, -655362, 22, -655361, 24 )
+tile_data = IntArray( -2424869, 26, -2359309, 39, -2293772, 41, -2162721, 41, -1966098, 26, -1966097, 40, -1966085, 39, -1900573, 23, -1900572, 24, -1835044, 26, -1769492, 39, -1769489, 41, -1769486, 46, -1769481, 46, -1769480, 46, -1769475, 41, -1703960, 26, -1638433, 23, -1638432, 22, -1638431, 22, -1638430, 24, -1507348, 41, -1507345, 46, -1441814, 40, -1179671, 39, -1048598, 46, -917522, 42, -917521, 43, -917520, 44, -917519, 44, -917518, 44, -917517, 43, -917516, 45, -917512, 40, -655366, 23, -655365, 22, -655364, 22, -655363, 21, -655362, 22, -655361, 24 )
[node name="leaves_background" type="TileMap" parent="."]
@@ -56,7 +55,7 @@ collision/bounce = 0.0
collision/layers = 0
collision/mask = 0
occluder/light_mask = 1
-tile_data = IntArray( -1966086, 35, -1769486, 536870958, -1769481, 536870958, -1769480, 536870958, -1310723, 536870958 )
+tile_data = IntArray( -1966086, 35, -1769486, 536870958, -1769481, 536870958, -1769480, 536870958 )
[node name="one_way_platforms1" type="TileMap" parent="."]
@@ -116,7 +115,7 @@ collision/bounce = 0.0
collision/layers = 2
collision/mask = 15
occluder/light_mask = 1
-tile_data = IntArray( -2490404, 13, -2424869, 13, -2424868, 13, -2359334, 13, -2359332, 13, -2359309, 32, -2293796, 13, -2293773, 31, -2293771, 13, -2293770, 13, -2293769, 13, -2293768, 13, -2228259, 0, -2228258, 2, -2228247, 13, -2228244, 13, -2228239, 13, -2228237, 30, -2228231, 13, -2162727, 13, -2162723, 3, -2162722, 5, -2162720, 13, -2162717, 13, -2162714, 13, -2162708, 0, -2162707, 1, -2162706, 1, -2162705, 1, -2162704, 1, -2162703, 2, -2162701, 13, -2162698, 0, -2162697, 2, -2162695, 0, -2162694, 1, -2162693, 1, -2162692, 15, -2162690, 32, -2228224, 31, -2097187, 3, -2097186, 5, -2097172, 6, -2097171, 7, -2097170, 7, -2097169, 7, -2097168, 7, -2097167, 8, -2097162, 3, -2097161, 5, -2097159, 17, -2097158, 7, -2097157, 7, -2097156, 8, -2097154, 31, -2162688, 31, -2031653, 13, -2031651, 3, -2031650, 5, -2031648, 13, -2031636, 13, -2031626, 3, -2031625, 12, -2031624, 15, -2031618, 31, -2097152, 31, -1966115, 3, -1966114, 5, -1966102, 13, -1966098, 13, -1966096, 0, -1966095, 2, -1966090, 17, -1966089, 10, -1966088, 5, -1966086, 13, -1966085, 13, -1966084, 13, -1966083, 13, -1966082, 31, -2031616, 31, -1900579, 3, -1900578, 12, -1900577, 1, -1900576, 1, -1900575, 1, -1900574, 1, -1900573, 1, -1900572, 1, -1900571, 1, -1900570, 1, -1900569, 1, -1900568, 1, -1900567, 1, -1900566, 2, -1900560, 3, -1900559, 5, -1900553, 3, -1900552, 5, -1900546, 31, -1966080, 31, -1835044, 13, -1835043, 6, -1835042, 7, -1835041, 7, -1835040, 7, -1835039, 7, -1835038, 7, -1835037, 7, -1835036, 7, -1835035, 7, -1835034, 7, -1835033, 7, -1835032, 7, -1835031, 7, -1835030, 8, -1835029, 32, -1835024, 3, -1835023, 5, -1835017, 6, -1835016, 8, -1835010, 31, -1900544, 31, -1769493, 31, -1769490, 13, -1769488, 3, -1769487, 5, -1769478, 13, -1769474, 31, -1835008, 31, -1703974, 13, -1703973, 13, -1703965, 20, -1703960, 13, -1703957, 31, -1703954, 13, -1703952, 17, -1703951, 12, -1703950, 15, -1703946, 14, -1703945, 1, -1703944, 1, -1703943, 1, -1703942, 2, -1703938, 30, -1769472, 31, -1638437, 13, -1638436, 0, -1638435, 1, -1638434, 1, -1638433, 1, -1638432, 1, -1638431, 1, -1638430, 1, -1638429, 1, -1638428, 1, -1638427, 1, -1638426, 1, -1638425, 1, -1638424, 2, -1638423, 32, -1638421, 31, -1638418, 13, -1638415, 17, -1638414, 16, -1638413, 13, -1638412, 13, -1638411, 13, -1638410, 3, -1638409, 4, -1638408, 11, -1638407, 7, -1638406, 8, -1638403, 0, -1638402, 2, -1703936, 31, -1572900, 6, -1572899, 7, -1572898, 7, -1572897, 7, -1572896, 7, -1572895, 7, -1572894, 7, -1572893, 7, -1572892, 7, -1572891, 7, -1572890, 7, -1572889, 7, -1572888, 8, -1572887, 31, -1572885, 31, -1572881, 32, -1572874, 17, -1572873, 7, -1572872, 16, -1572868, 32, -1572867, 17, -1572866, 16, -1638400, 31, -1507351, 31, -1507349, 31, -1507345, 30, -1507341, 13, -1507340, 13, -1507339, 13, -1507338, 13, -1507334, 18, -1507332, 30, -1572864, 31, -1441815, 31, -1441813, 31, -1441810, 0, -1441809, 2, -1441806, 29, -1441800, 14, -1441799, 1, -1441798, 1, -1441797, 1, -1441796, 2, -1507328, 31, -1376279, 31, -1376277, 31, -1376274, 3, -1376273, 5, -1376271, 0, -1376270, 2, -1376268, 0, -1376267, 1, -1376266, 1, -1376265, 1, -1376264, 9, -1376263, 7, -1376262, 7, -1376261, 7, -1376260, 8, -1441792, 31, -1310743, 31, -1310741, 30, -1310738, 6, -1310737, 8, -1310735, 6, -1310734, 8, -1310732, 6, -1310731, 7, -1310730, 7, -1310729, 10, -1310728, 5, -1310722, 13, -1376256, 31, -1245207, 31, -1245205, 0, -1245204, 2, -1245193, 3, -1245192, 12, -1245191, 1, -1245190, 1, -1245189, 1, -1245188, 1, -1245187, 2, -1310720, 31, -1179671, 31, -1179669, 3, -1179668, 5, -1179664, 20, -1179657, 6, -1179656, 7, -1179655, 7, -1179654, 7, -1179653, 7, -1179652, 7, -1179651, 8, -1245184, 31, -1114135, 31, -1114133, 3, -1114132, 12, -1114131, 1, -1114130, 1, -1114129, 1, -1114128, 1, -1114127, 1, -1114126, 1, -1114125, 1, -1114124, 1, -1114123, 1, -1114122, 1, -1114121, 2, -1179648, 30, -1048599, 31, -1048597, 6, -1048596, 7, -1048595, 7, -1048594, 7, -1048593, 7, -1048592, 7, -1048591, 7, -1048590, 7, -1048589, 7, -1048588, 7, -1048587, 7, -1048586, 7, -1048585, 16, -1048583, 0, -1048582, 1, -1048581, 1, -1048580, 1, -1048579, 1, -1048578, 1, -1048577, 1, -1114112, 1, -1114111, 2, -983063, 31, -983047, 6, -983046, 7, -983045, 7, -983044, 7, -983043, 7, -983042, 7, -983041, 7, -1048576, 7, -1048575, 8, -917527, 31, -851991, 31, -786455, 31, -786450, 13, -786440, 13, -720913, 13, -720903, 13, -720899, 20, -655376, 0, -655375, 2, -655366, 0, -655365, 1, -655364, 1, -655363, 1, -655362, 1, -655361, 1, -720896, 1, -720895, 1, -720894, 2, -589840, 6, -589839, 8, -589830, 6, -589829, 7, -589828, 7, -589827, 7, -589826, 7, -589825, 7, -655360, 7, -655359, 7, -655358, 8 )
+tile_data = IntArray( -2490404, 13, -2424869, 13, -2424868, 13, -2359334, 13, -2359332, 13, -2359309, 32, -2293800, 13, -2293796, 13, -2293773, 31, -2293771, 13, -2293770, 13, -2293769, 13, -2293768, 13, -2228259, 0, -2228258, 2, -2228247, 13, -2228244, 13, -2228239, 13, -2228237, 30, -2228231, 13, -2162727, 13, -2162723, 3, -2162722, 5, -2162720, 13, -2162717, 13, -2162714, 13, -2162708, 0, -2162707, 1, -2162706, 1, -2162705, 1, -2162704, 1, -2162703, 2, -2162701, 13, -2162698, 0, -2162697, 2, -2162695, 0, -2162694, 1, -2162693, 1, -2162692, 15, -2162690, 32, -2228224, 31, -2097187, 3, -2097186, 5, -2097172, 6, -2097171, 7, -2097170, 7, -2097169, 7, -2097168, 7, -2097167, 8, -2097162, 3, -2097161, 5, -2097159, 17, -2097158, 7, -2097157, 7, -2097156, 8, -2097154, 31, -2162688, 31, -2031653, 13, -2031651, 3, -2031650, 5, -2031648, 13, -2031636, 13, -2031626, 3, -2031625, 12, -2031624, 15, -2031618, 31, -2097152, 31, -1966115, 3, -1966114, 5, -1966102, 13, -1966098, 13, -1966096, 0, -1966095, 2, -1966090, 17, -1966089, 10, -1966088, 5, -1966086, 13, -1966085, 13, -1966084, 13, -1966083, 13, -1966082, 31, -2031616, 31, -1900582, 13, -1900579, 3, -1900578, 12, -1900577, 1, -1900576, 1, -1900575, 1, -1900574, 1, -1900573, 1, -1900572, 1, -1900571, 1, -1900570, 1, -1900569, 1, -1900568, 1, -1900567, 1, -1900566, 2, -1900560, 3, -1900559, 5, -1900553, 3, -1900552, 5, -1900546, 31, -1966080, 31, -1835044, 13, -1835043, 6, -1835042, 7, -1835041, 7, -1835040, 7, -1835039, 7, -1835038, 7, -1835037, 7, -1835036, 7, -1835035, 7, -1835034, 7, -1835033, 7, -1835032, 7, -1835031, 7, -1835030, 8, -1835029, 32, -1835024, 3, -1835023, 5, -1835017, 6, -1835016, 8, -1835010, 31, -1900544, 31, -1769512, 13, -1769493, 31, -1769490, 13, -1769488, 3, -1769487, 5, -1769478, 13, -1769474, 31, -1835008, 31, -1703974, 13, -1703973, 13, -1703965, 20, -1703960, 13, -1703957, 31, -1703954, 13, -1703952, 17, -1703951, 12, -1703950, 15, -1703946, 14, -1703945, 1, -1703944, 1, -1703943, 1, -1703942, 2, -1703938, 30, -1769472, 31, -1638437, 13, -1638436, 0, -1638435, 1, -1638434, 1, -1638433, 1, -1638432, 1, -1638431, 1, -1638430, 1, -1638429, 1, -1638428, 1, -1638427, 1, -1638426, 1, -1638425, 1, -1638424, 2, -1638423, 32, -1638421, 31, -1638418, 13, -1638415, 17, -1638414, 16, -1638413, 13, -1638412, 13, -1638411, 13, -1638410, 3, -1638409, 4, -1638408, 11, -1638407, 7, -1638406, 8, -1638403, 0, -1638402, 2, -1703936, 31, -1572900, 6, -1572899, 7, -1572898, 7, -1572897, 7, -1572896, 7, -1572895, 7, -1572894, 7, -1572893, 7, -1572892, 7, -1572891, 7, -1572890, 7, -1572889, 7, -1572888, 8, -1572887, 31, -1572885, 31, -1572881, 32, -1572874, 17, -1572873, 7, -1572872, 16, -1572868, 32, -1572867, 17, -1572866, 16, -1638400, 31, -1507351, 31, -1507349, 31, -1507345, 30, -1507341, 13, -1507340, 13, -1507339, 13, -1507338, 13, -1507334, 18, -1507332, 30, -1572864, 31, -1441815, 31, -1441813, 31, -1441810, 0, -1441809, 2, -1441806, 29, -1441800, 14, -1441799, 1, -1441798, 1, -1441797, 1, -1441796, 2, -1507328, 31, -1376279, 31, -1376277, 31, -1376274, 3, -1376273, 5, -1376271, 0, -1376270, 2, -1376268, 0, -1376267, 1, -1376266, 1, -1376265, 1, -1376264, 9, -1376263, 7, -1376262, 7, -1376261, 7, -1376260, 16, -1441792, 31, -1310743, 31, -1310741, 30, -1310738, 6, -1310737, 8, -1310735, 6, -1310734, 8, -1310732, 6, -1310731, 7, -1310730, 7, -1310729, 10, -1310728, 5, -1310722, 13, -1376256, 31, -1245207, 31, -1245205, 0, -1245204, 2, -1245193, 3, -1245192, 12, -1245191, 1, -1245190, 1, -1245189, 1, -1245188, 1, -1245187, 2, -1310720, 31, -1179671, 31, -1179669, 3, -1179668, 5, -1179664, 20, -1179657, 6, -1179656, 7, -1179655, 7, -1179654, 7, -1179653, 7, -1179652, 7, -1179651, 8, -1245184, 31, -1114135, 31, -1114133, 3, -1114132, 12, -1114131, 1, -1114130, 1, -1114129, 1, -1114128, 1, -1114127, 1, -1114126, 1, -1114125, 1, -1114124, 1, -1114123, 1, -1114122, 1, -1114121, 2, -1179648, 30, -1048599, 31, -1048597, 6, -1048596, 7, -1048595, 7, -1048594, 7, -1048593, 7, -1048592, 7, -1048591, 7, -1048590, 7, -1048589, 7, -1048588, 7, -1048587, 7, -1048586, 7, -1048585, 16, -1048583, 0, -1048582, 1, -1048581, 1, -1048580, 1, -1048579, 1, -1048578, 1, -1048577, 1, -1114112, 1, -1114111, 2, -983063, 31, -983047, 6, -983046, 7, -983045, 7, -983044, 7, -983043, 7, -983042, 7, -983041, 7, -1048576, 7, -1048575, 8, -917527, 31, -851991, 31, -786455, 31, -786450, 13, -786440, 13, -720913, 13, -720903, 13, -720899, 20, -655376, 0, -655375, 2, -655366, 0, -655365, 1, -655364, 1, -655363, 1, -655362, 1, -655361, 1, -720896, 1, -720895, 1, -720894, 2, -589840, 6, -589839, 8, -589830, 6, -589829, 7, -589828, 7, -589827, 7, -589826, 7, -589825, 7, -655360, 7, -655359, 7, -655358, 8 )
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
@@ -285,6 +284,12 @@ transform/pos = Vector2( 3199.3, -276.187 )
z/z = -2
amount = 20
+[node name="Apple5" parent="apples" instance=ExtResource( 7 )]
+
+transform/pos = Vector2( 3383.08, 1853.15 )
+z/z = -2
+amount = 20
+
[node name="Apple4" parent="apples" instance=ExtResource( 7 )]
transform/pos = Vector2( 2417.57, 2110.73 )
@@ -311,6 +316,7 @@ transform/pos = Vector2( -3435.65, -3726.35 )
[node name="cowbells" type="Node2D" parent="."]
+editor/display_folded = true
transform/pos = Vector2( 500, 560 )
[node name="Cowbell" parent="cowbells" instance=ExtResource( 9 )]
@@ -1757,7 +1763,7 @@ transform/scale = Vector2( 1.7, 1.7 )
[node name="jail3" parent="Cages" instance=ExtResource( 13 )]
-transform/pos = Vector2( -1905.6, -3405.6 )
+transform/pos = Vector2( -1631.6, -3410.6 )
transform/scale = Vector2( 1.7, 1.7 )
[node name="jail1" parent="Cages" instance=ExtResource( 13 )]
@@ -1799,9 +1805,4 @@ transform/scale = Vector2( 1.7, 1.7 )
transform/pos = Vector2( -1890, -3020 )
-[node name="Area2D" parent="Tips" instance=ExtResource( 14 )]
-
-transform/pos = Vector2( 190, 500 )
-text = "Este camino está bloqueado. Busca otra forma de desplazarte."
-
diff --git a/Scenes/Maps/tileset.tscn b/Scenes/Maps/tileset.tscn
index d6236b2..cd889af 100644
--- a/Scenes/Maps/tileset.tscn
+++ b/Scenes/Maps/tileset.tscn
@@ -150,39 +150,39 @@ points = Vector2Array( 16, -31, 16, 30, -9, 30, -9, -31 )
[sub_resource type="ConvexPolygonShape2D" id=30]
custom_solver_bias = 0.0
-points = Vector2Array( -9, -34, 16, -34, 16, -19, -9, 30 )
+points = Vector2Array( -9, -34, 16, -34, 16, -12, -9, 30 )
[sub_resource type="ConvexPolygonShape2D" id=31]
custom_solver_bias = 0.0
-points = Vector2Array( -9, 30, 16, -19, 23, -12, 24, 3, 16, 17 )
+points = Vector2Array( 23, -12, 35, -12, 35, -1, 24, 3 )
[sub_resource type="ConvexPolygonShape2D" id=32]
custom_solver_bias = 0.0
-points = Vector2Array( 23, -12, 35, -12, 35, -1, 24, 3 )
+points = Vector2Array( 16, 17, 16, 30, -9, 30 )
[sub_resource type="ConvexPolygonShape2D" id=33]
custom_solver_bias = 0.0
-points = Vector2Array( -9, 30, 16, 17, 16, 30 )
+points = Vector2Array( 24, 3, 16, 17, -9, 30, 16, -12, 23, -12 )
-[sub_resource type="ConvexPolygonShape2D" id=34]
+[sub_resource type="ConvexPolygonShape2D" id=46]
custom_solver_bias = 0.0
-points = Vector2Array( -9, -34, 16, -34, 16, 30, -9, -18 )
+points = Vector2Array( -9, -34, 16, -34, 16, 30, -9, -12 )
-[sub_resource type="ConvexPolygonShape2D" id=35]
-
-custom_solver_bias = 0.0
-points = Vector2Array( -16, -12, -9, -18, 16, 30, -9, 14, -15, 4 )
-
-[sub_resource type="ConvexPolygonShape2D" id=36]
+[sub_resource type="ConvexPolygonShape2D" id=47]
custom_solver_bias = 0.0
points = Vector2Array( 16, 30, -9, 30, -9, 14 )
-[sub_resource type="ConvexPolygonShape2D" id=37]
+[sub_resource type="ConvexPolygonShape2D" id=48]
+
+custom_solver_bias = 0.0
+points = Vector2Array( -9, -12, 16, 30, -9, 14, -15, 4, -16, -12 )
+
+[sub_resource type="ConvexPolygonShape2D" id=49]
custom_solver_bias = 0.0
points = Vector2Array( -16, -12, -15, 4, -29, -1, -29, -12 )
@@ -1131,6 +1131,7 @@ trigger = false
[node name="Tronco_rama_right" type="Sprite" parent="."]
+visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
@@ -1141,6 +1142,7 @@ region_rect = Rect2( 0, 256, 64, 64 )
[node name="StaticBody2D1" type="StaticBody2D" parent="Tronco_rama_right"]
+visibility/visible = false
transform/pos = Vector2( -3, 0 )
input/pickable = false
shapes/0/shape = SubResource( 30 )
@@ -1168,13 +1170,12 @@ bounce = 0.0
transform/pos = Vector2( 0, 2 )
build_mode = 0
-polygon = Vector2Array( 16, -34, 16, -19, 23, -12, 35, -12, 35, -1, 24, 3, 16, 17, 16, 30, -9, 30, -9, -34 )
+polygon = Vector2Array( 16, -34, 16, -12, 23, -12, 35, -12, 35, -1, 24, 3, 16, 17, 16, 30, -9, 30, -9, -34 )
shape_range = Vector2( 0, 3 )
trigger = false
[node name="Tronco_rama_left" type="Sprite" parent="."]
-visibility/visible = false
transform/pos = Vector2( -64, -64 )
z/z = 2
texture = ExtResource( 1 )
@@ -1187,16 +1188,16 @@ region_rect = Rect2( 0, 256, 64, 64 )
transform/pos = Vector2( -3, 0 )
input/pickable = false
-shapes/0/shape = SubResource( 34 )
+shapes/0/shape = SubResource( 46 )
shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 2 )
shapes/0/trigger = false
-shapes/1/shape = SubResource( 35 )
+shapes/1/shape = SubResource( 47 )
shapes/1/transform = Matrix32( 1, 0, 0, 1, 0, 2 )
shapes/1/trigger = false
-shapes/2/shape = SubResource( 36 )
+shapes/2/shape = SubResource( 48 )
shapes/2/transform = Matrix32( 1, 0, 0, 1, 0, 2 )
shapes/2/trigger = false
-shapes/3/shape = SubResource( 37 )
+shapes/3/shape = SubResource( 49 )
shapes/3/transform = Matrix32( 1, 0, 0, 1, 0, 2 )
shapes/3/trigger = false
collision/layers = 2
@@ -1212,7 +1213,7 @@ bounce = 0.0
transform/pos = Vector2( 0, 2 )
build_mode = 0
-polygon = Vector2Array( 16, -34, 16, 30, -9, 30, -9, 14, -15, 4, -29, -1, -29, -12, -16, -12, -9, -18, -9, -34 )
+polygon = Vector2Array( 16, -34, 16, 30, -9, 30, -9, 14, -15, 4, -29, -1, -29, -12, -16, -12, -9, -12, -9, -34 )
shape_range = Vector2( 0, 3 )
trigger = false
diff --git a/Scenes/Maps/tileset.xml b/Scenes/Maps/tileset.xml
index 449d6a0..3cd0e1a 100644
--- a/Scenes/Maps/tileset.xml
+++ b/Scenes/Maps/tileset.xml
@@ -113,40 +113,40 @@
0
- -9, -34, 16, -34, 16, -19, -9, 30
+ -9, -34, 16, -34, 16, -12, -9, 30
0
- -9, 30, 16, -19, 23, -12, 24, 3, 16, 17
+ 23, -12, 35, -12, 35, -1, 24, 3
0
- 23, -12, 35, -12, 35, -1, 24, 3
+ 16, 17, 16, 30, -9, 30
0
- -9, 30, 16, 17, 16, 30
+ 24, 3, 16, 17, -9, 30, 16, -12, 23, -12
-
+
0
- -9, -34, 16, -34, 16, 30, -9, -18
+ -9, -34, 16, -34, 16, 30, -9, -12
-
- 0
- -16, -12, -9, -18, 16, 30, -9, 14, -15, 4
-
-
-
+
0
16, 30, -9, 30, -9, 14
-
+
+ 0
+ -9, -12, 16, 30, -9, 14, -15, 4, -16, -12
+
+
+
0
-16, -12, -15, 4, -29, -1, -29, -12
@@ -677,10 +677,10 @@
29, 32
29, 32
-
-
-
-
+
+
+
+
0, 1
1