diff --git a/.directory b/.directory index 006f928..1c34d2b 100644 --- a/.directory +++ b/.directory @@ -1,7 +1,4 @@ [Dolphin] PreviewsShown=true -Timestamp=2017,7,30,22,3,44 +Timestamp=2017,8,3,21,6,26 Version=4 - -[Settings] -HiddenFilesShown=true diff --git a/All.tscn b/All.tscn index ce58dc3..1f76956 100644 --- a/All.tscn +++ b/All.tscn @@ -4,15 +4,15 @@ [ext_resource path="res://life_hud.gd" type="Script" id=2] [ext_resource path="res://corazon2.tex" type="Texture" id=3] [ext_resource path="res://buttons_hud.gd" type="Script" id=4] -[ext_resource path="res://flexa.png" type="Texture" id=5] -[ext_resource path="res://btn_jump.png" type="Texture" id=6] -[ext_resource path="res://icon.png" type="Texture" id=7] -[ext_resource path="res://btn_shoot.png" type="Texture" id=8] +[ext_resource path="res://Sprites/GUI/Buttons/bttn_arrow.png" type="Texture" id=5] +[ext_resource path="res://Sprites/GUI/Buttons/bttn_jump.png" type="Texture" id=6] +[ext_resource path="res://Sprites/GUI/Buttons/bttn.png" type="Texture" id=7] +[ext_resource path="res://Sprites/GUI/Buttons/btn_shoot.png" type="Texture" id=8] [ext_resource path="res://milk_botte_hud.gd" type="Script" id=9] -[ext_resource path="res://leite,kra.png" type="Texture" id=10] -[ext_resource path="res://boterosadito.png" type="Texture" id=11] -[ext_resource path="res://boteasul.png" type="Texture" id=12] -[ext_resource path="res://botejeje.png" type="Texture" id=13] +[ext_resource path="res://Sprites/GUI/HUD/milbar_outter_2.png" type="Texture" id=10] +[ext_resource path="res://Sprites/GUI/HUD/milkbar_outter_3.png" type="Texture" id=11] +[ext_resource path="res://Sprites/GUI/HUD/milkbar_outter_1.png" type="Texture" id=12] +[ext_resource path="res://Sprites/GUI/HUD/milkbar_inner.png" type="Texture" id=13] [sub_resource type="Environment" id=1] @@ -126,7 +126,6 @@ region_rect = Rect2( 180, 140, 145, 150 ) "buttons_hud", ]] -editor/display_folded = true script/script = ExtResource( 4 ) [node name="Bttn_U" type="TouchScreenButton" parent="Control/Buttons"] @@ -161,9 +160,9 @@ visibility_mode = 0 [node name="Bttn_AS" type="TouchScreenButton" parent="Control/Buttons"] -visibility/opacity = 0.5 +visibility/opacity = 0.8 transform/pos = Vector2( 1088, 384 ) -transform/scale = Vector2( 2, 2 ) +transform/scale = Vector2( 0.474074, 0.481203 ) normal = ExtResource( 7 ) pressed = null bitmask = null @@ -271,6 +270,7 @@ visibility_mode = 0 "milk_hud", ]] +editor/display_folded = true transform/pos = Vector2( 1205, 73 ) transform/scale = Vector2( 2, 2 ) script/script = ExtResource( 9 ) @@ -478,9 +478,9 @@ radial_fill/center_offset = Vector2( 0, 0 ) [connection signal="released" from="Control/Buttons/Bttn_A" to="Control/Buttons" method="_on_Bttn_A_released"] -[connection signal="pressed" from="Control/Buttons/Bttn_AS" to="." method="_on_Bttn_AS_pressed"] +[connection signal="pressed" from="Control/Buttons/Bttn_AS" to="Control/Buttons" method="_on_Bttn_AS_pressed"] -[connection signal="released" from="Control/Buttons/Bttn_AS" to="." method="_on_Bttn_AS_released"] +[connection signal="released" from="Control/Buttons/Bttn_AS" to="Control/Buttons" method="_on_Bttn_AS_released"] [connection signal="pressed" from="Control/Buttons/Bttn_S" to="Control/Buttons" method="_on_Bttn_S_pressed"] diff --git a/temazo.ogg b/Music/main_music.ogg similarity index 100% rename from temazo.ogg rename to Music/main_music.ogg diff --git a/loop_1.ogg b/Music/main_music_loop.ogg similarity index 100% rename from loop_1.ogg rename to Music/main_music_loop.ogg diff --git a/Splash.tscn b/Splash.tscn index 0ad630b..9cf08d6 100644 --- a/Splash.tscn +++ b/Splash.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=1] -[ext_resource path="res://leche.png" type="Texture" id=1] +[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=1] [node name="Splash" type="Particles2D"] diff --git a/fondo_3.png b/Sprites/Background/night_outside_a.png similarity index 100% rename from fondo_3.png rename to Sprites/Background/night_outside_a.png diff --git a/fondo_3.png.flags b/Sprites/Background/night_outside_a.png.flags similarity index 100% rename from fondo_3.png.flags rename to Sprites/Background/night_outside_a.png.flags diff --git a/Sprites/Background/night_outside_b.png b/Sprites/Background/night_outside_b.png new file mode 100644 index 0000000..f033917 Binary files /dev/null and b/Sprites/Background/night_outside_b.png differ diff --git a/milk_ray/middle/milk_ray_middle0000.png.flags b/Sprites/Background/night_outside_b.png.flags similarity index 100% rename from milk_ray/middle/milk_ray_middle0000.png.flags rename to Sprites/Background/night_outside_b.png.flags diff --git a/Sprites/Background/night_outside_c.png b/Sprites/Background/night_outside_c.png new file mode 100644 index 0000000..fa07055 Binary files /dev/null and b/Sprites/Background/night_outside_c.png differ diff --git a/Sprites/Background/night_outside_c.png.flags b/Sprites/Background/night_outside_c.png.flags new file mode 100644 index 0000000..d5476d5 --- /dev/null +++ b/Sprites/Background/night_outside_c.png.flags @@ -0,0 +1 @@ +repeat=true diff --git a/Sprites/Background/night_outside_d.png b/Sprites/Background/night_outside_d.png new file mode 100644 index 0000000..b851082 Binary files /dev/null and b/Sprites/Background/night_outside_d.png differ diff --git a/Sprites/Background/night_outside_d.png.flags b/Sprites/Background/night_outside_d.png.flags new file mode 100644 index 0000000..d5476d5 --- /dev/null +++ b/Sprites/Background/night_outside_d.png.flags @@ -0,0 +1 @@ +repeat=true diff --git a/Sprites/Charasets/Enemy_1/enemy_walk1.png b/Sprites/Charasets/Enemy_1/enemy_walk1.png new file mode 100755 index 0000000..b6cda8f Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk1.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk10.png b/Sprites/Charasets/Enemy_1/enemy_walk10.png new file mode 100755 index 0000000..ee0a08d Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk10.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk2.png b/Sprites/Charasets/Enemy_1/enemy_walk2.png new file mode 100755 index 0000000..2918fde Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk2.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk3.png b/Sprites/Charasets/Enemy_1/enemy_walk3.png new file mode 100755 index 0000000..e8e0ce1 Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk3.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk4.png b/Sprites/Charasets/Enemy_1/enemy_walk4.png new file mode 100755 index 0000000..9e5ab36 Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk4.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk5.png b/Sprites/Charasets/Enemy_1/enemy_walk5.png new file mode 100755 index 0000000..9e8ec4e Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk5.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk6.png b/Sprites/Charasets/Enemy_1/enemy_walk6.png new file mode 100755 index 0000000..26f2d7c Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk6.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk7.png b/Sprites/Charasets/Enemy_1/enemy_walk7.png new file mode 100755 index 0000000..8373a68 Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk7.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk8.png b/Sprites/Charasets/Enemy_1/enemy_walk8.png new file mode 100755 index 0000000..9913ea8 Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk8.png differ diff --git a/Sprites/Charasets/Enemy_1/enemy_walk9.png b/Sprites/Charasets/Enemy_1/enemy_walk9.png new file mode 100755 index 0000000..6514073 Binary files /dev/null and b/Sprites/Charasets/Enemy_1/enemy_walk9.png differ diff --git a/vaca_idle_1.png b/Sprites/Charasets/Player/idle/player_idle1.png similarity index 100% rename from vaca_idle_1.png rename to Sprites/Charasets/Player/idle/player_idle1.png diff --git a/vaca_idle_2.png b/Sprites/Charasets/Player/idle/player_idle2.png similarity index 100% rename from vaca_idle_2.png rename to Sprites/Charasets/Player/idle/player_idle2.png diff --git a/vaca_idle_3.png b/Sprites/Charasets/Player/idle/player_idle3.png similarity index 100% rename from vaca_idle_3.png rename to Sprites/Charasets/Player/idle/player_idle3.png diff --git a/vaca_idle_4.png b/Sprites/Charasets/Player/idle/player_idle4.png similarity index 100% rename from vaca_idle_4.png rename to Sprites/Charasets/Player/idle/player_idle4.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0005.png b/Sprites/Charasets/Player/walk/player_walk1.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0005.png rename to Sprites/Charasets/Player/walk/player_walk1.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0014.png b/Sprites/Charasets/Player/walk/player_walk10.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0014.png rename to Sprites/Charasets/Player/walk/player_walk10.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0015.png b/Sprites/Charasets/Player/walk/player_walk11.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0015.png rename to Sprites/Charasets/Player/walk/player_walk11.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0016.png b/Sprites/Charasets/Player/walk/player_walk12.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0016.png rename to Sprites/Charasets/Player/walk/player_walk12.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0017.png b/Sprites/Charasets/Player/walk/player_walk13.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0017.png rename to Sprites/Charasets/Player/walk/player_walk13.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0018.png b/Sprites/Charasets/Player/walk/player_walk14.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0018.png rename to Sprites/Charasets/Player/walk/player_walk14.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0019.png b/Sprites/Charasets/Player/walk/player_walk15.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0019.png rename to Sprites/Charasets/Player/walk/player_walk15.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0020.png b/Sprites/Charasets/Player/walk/player_walk16.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0020.png rename to Sprites/Charasets/Player/walk/player_walk16.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0006.png b/Sprites/Charasets/Player/walk/player_walk2.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0006.png rename to Sprites/Charasets/Player/walk/player_walk2.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0007.png b/Sprites/Charasets/Player/walk/player_walk3.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0007.png rename to Sprites/Charasets/Player/walk/player_walk3.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0008.png b/Sprites/Charasets/Player/walk/player_walk4.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0008.png rename to Sprites/Charasets/Player/walk/player_walk4.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0009.png b/Sprites/Charasets/Player/walk/player_walk5.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0009.png rename to Sprites/Charasets/Player/walk/player_walk5.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0010.png b/Sprites/Charasets/Player/walk/player_walk6.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0010.png rename to Sprites/Charasets/Player/walk/player_walk6.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0011.png b/Sprites/Charasets/Player/walk/player_walk7.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0011.png rename to Sprites/Charasets/Player/walk/player_walk7.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0012.png b/Sprites/Charasets/Player/walk/player_walk8.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0012.png rename to Sprites/Charasets/Player/walk/player_walk8.png diff --git a/vaca_walk/Cow Revenge.tar (3)/vakacaminar0013.png b/Sprites/Charasets/Player/walk/player_walk9.png similarity index 100% rename from vaca_walk/Cow Revenge.tar (3)/vakacaminar0013.png rename to Sprites/Charasets/Player/walk/player_walk9.png diff --git a/manzana.png~ b/Sprites/Charasets/manzana.png similarity index 100% rename from manzana.png~ rename to Sprites/Charasets/manzana.png diff --git a/manzana.png.flags b/Sprites/Charasets/manzana.png.flags similarity index 100% rename from manzana.png.flags rename to Sprites/Charasets/manzana.png.flags diff --git a/leche.png b/Sprites/Effects/leche.png similarity index 100% rename from leche.png rename to Sprites/Effects/leche.png diff --git a/milk_ray/middle/milk_ray_middle0000.png b/Sprites/Effects/milk_ray.png similarity index 100% rename from milk_ray/middle/milk_ray_middle0000.png rename to Sprites/Effects/milk_ray.png diff --git a/Sprites/Effects/milk_ray.png.flags b/Sprites/Effects/milk_ray.png.flags new file mode 100644 index 0000000..d5476d5 --- /dev/null +++ b/Sprites/Effects/milk_ray.png.flags @@ -0,0 +1 @@ +repeat=true diff --git a/sangre.png b/Sprites/Effects/sangre.png similarity index 100% rename from sangre.png rename to Sprites/Effects/sangre.png diff --git a/btn_shoot.png b/Sprites/GUI/Buttons/btn_shoot.png similarity index 100% rename from btn_shoot.png rename to Sprites/GUI/Buttons/btn_shoot.png diff --git a/bttn.png b/Sprites/GUI/Buttons/bttn.png similarity index 100% rename from bttn.png rename to Sprites/GUI/Buttons/bttn.png diff --git a/flexa.png b/Sprites/GUI/Buttons/bttn_arrow.png similarity index 100% rename from flexa.png rename to Sprites/GUI/Buttons/bttn_arrow.png diff --git a/btn_jump.png b/Sprites/GUI/Buttons/bttn_jump.png similarity index 100% rename from btn_jump.png rename to Sprites/GUI/Buttons/bttn_jump.png diff --git a/corazon2.png~ b/Sprites/GUI/HUD/heart_full.png similarity index 100% rename from corazon2.png~ rename to Sprites/GUI/HUD/heart_full.png diff --git a/corazon_vacio.png b/Sprites/GUI/HUD/heart_outter.png similarity index 100% rename from corazon_vacio.png rename to Sprites/GUI/HUD/heart_outter.png diff --git a/leite,kra.png b/Sprites/GUI/HUD/milbar_outter_2.png similarity index 100% rename from leite,kra.png rename to Sprites/GUI/HUD/milbar_outter_2.png diff --git a/botejeje.png b/Sprites/GUI/HUD/milkbar_inner.png similarity index 100% rename from botejeje.png rename to Sprites/GUI/HUD/milkbar_inner.png diff --git a/boteasul.png b/Sprites/GUI/HUD/milkbar_outter_1.png similarity index 100% rename from boteasul.png rename to Sprites/GUI/HUD/milkbar_outter_1.png diff --git a/boterosadito.png b/Sprites/GUI/HUD/milkbar_outter_3.png similarity index 100% rename from boterosadito.png rename to Sprites/GUI/HUD/milkbar_outter_3.png diff --git a/cochinada_alone.png b/Sprites/Tilesets/dirt_alone.png similarity index 100% rename from cochinada_alone.png rename to Sprites/Tilesets/dirt_alone.png diff --git a/cochinada_right.png b/Sprites/Tilesets/dirt_left.png similarity index 100% rename from cochinada_right.png rename to Sprites/Tilesets/dirt_left.png diff --git a/cochinada_left.png b/Sprites/Tilesets/dirt_right.png similarity index 100% rename from cochinada_left.png rename to Sprites/Tilesets/dirt_right.png diff --git a/cochinada.png~ b/Sprites/Tilesets/dirt_single.png similarity index 100% rename from cochinada.png~ rename to Sprites/Tilesets/dirt_single.png diff --git a/cochinada.png b/Sprites/Tilesets/dirt_tiling.png similarity index 100% rename from cochinada.png rename to Sprites/Tilesets/dirt_tiling.png diff --git a/Sprites/Tilesets/tile full.png b/Sprites/Tilesets/tile full.png new file mode 100755 index 0000000..852b371 Binary files /dev/null and b/Sprites/Tilesets/tile full.png differ diff --git a/arbol.png b/Sprites/Tilesets/tree.png similarity index 100% rename from arbol.png rename to Sprites/Tilesets/tree.png diff --git a/apple.tscn b/apple.tscn index 11a3d67..67ed850 100644 --- a/apple.tscn +++ b/apple.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=1] [ext_resource path="res://manzana.gd" type="Script" id=1] -[ext_resource path="res://manzana.tex" type="Texture" id=2] +[ext_resource path="res://Sprites/Charasets/manzana.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] diff --git a/bullet.tscn b/bullet.tscn index 193a2ad..b4e741b 100644 --- a/bullet.tscn +++ b/bullet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=1] [ext_resource path="res://bullet.gd" type="Script" id=1] -[ext_resource path="res://leche.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=2] [ext_resource path="res://Splash.tscn" type="PackedScene" id=3] [sub_resource type="CircleShape2D" id=1] diff --git a/cochinada_single.png b/cochinada_single.png deleted file mode 100644 index 0f029ad..0000000 Binary files a/cochinada_single.png and /dev/null differ diff --git a/corazon.png.flags b/corazon.png.flags deleted file mode 100644 index efb2b8c..0000000 --- a/corazon.png.flags +++ /dev/null @@ -1 +0,0 @@ -filter=false diff --git a/corazon_vacio.png.flags b/corazon_vacio.png.flags deleted file mode 100644 index 8b08f35..0000000 --- a/corazon_vacio.png.flags +++ /dev/null @@ -1,3 +0,0 @@ -filter=false -gen_mipmaps=false -repeat=true diff --git a/enemy_1.gd b/enemy_1.gd index ab6ebb2..2bc67a2 100644 --- a/enemy_1.gd +++ b/enemy_1.gd @@ -22,13 +22,12 @@ func reverse_direction(): dir_left = !dir_left v = Vector2(-v.x,0) -func _ready(): +func _ready(): if (!dir_left): reverse_direction() set_fixed_process(true) #set_process(true) - func dissapear(): sprite.set_opacity(0) set_fixed_process(false) @@ -78,9 +77,6 @@ func decrease_life (value): life -= value if (life <= 0): die() - - -#func _fixed_process(delta): func restore_velocity(): if(dir_left): @@ -115,7 +111,7 @@ func _fixed_process(delta): reverse_direction() func _on_area_body_body_enter( body ): - if (body.is_in_group("player") and life > 0 and body.can_receive_damage()): + if (body.is_in_group("player") and life > 0): body.on_receive_damage(damage) func _on_area_head_body_enter( body ): diff --git a/enemy_1.tscn b/enemy_1.tscn index 504f849..8da94d3 100644 --- a/enemy_1.tscn +++ b/enemy_1.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=22 format=1] [ext_resource path="res://enemy_1.gd" type="Script" id=1] -[ext_resource path="res://malvado_caminando0000.tex" type="Texture" id=2] -[ext_resource path="res://malvado_caminando0001.tex" type="Texture" id=3] -[ext_resource path="res://malvado_caminando0002.tex" type="Texture" id=4] -[ext_resource path="res://malvado_caminando0003.tex" type="Texture" id=5] -[ext_resource path="res://malvado_caminando0004.tex" type="Texture" id=6] -[ext_resource path="res://malvado_caminando0005.tex" type="Texture" id=7] -[ext_resource path="res://malvado_caminando0006.tex" type="Texture" id=8] -[ext_resource path="res://malvado_caminando0007.tex" type="Texture" id=9] -[ext_resource path="res://malvado_caminando0008.tex" type="Texture" id=10] -[ext_resource path="res://malvado_caminando0009.tex" type="Texture" id=11] -[ext_resource path="res://sangre.png" type="Texture" id=12] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk1.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk10.png" type="Texture" id=3] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk2.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk3.png" type="Texture" id=5] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk4.png" type="Texture" id=6] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk5.png" type="Texture" id=7] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk6.png" type="Texture" id=8] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk7.png" type="Texture" id=9] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk8.png" type="Texture" id=10] +[ext_resource path="res://Sprites/Charasets/Enemy_1/enemy_walk9.png" type="Texture" id=11] +[ext_resource path="res://Sprites/Effects/sangre.png" type="Texture" id=12] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -63,8 +63,8 @@ offsets = FloatArray( 0, 1 ) colors = ColorArray( 0.773438, 0.773438, 0.773438, 1, 0.1875, 0.1875, 0.1875, 1 ) [node name="KinematicBody2D 2" type="KinematicBody2D" groups=[ -"enemy", "enemy_1", +"enemy", ]] transform/pos = Vector2( 64.3, -80 ) @@ -157,7 +157,7 @@ trigger = true transform/pos = Vector2( 3.8147e-06, 0 ) frames = SubResource( 8 ) animation = "walking" -frame = 7 +frame = 2 playing = true [node name="hit_ray_particle" type="Particles2D" parent="."] diff --git a/engine.cfg b/engine.cfg index 6776f0c..e0b793f 100644 --- a/engine.cfg +++ b/engine.cfg @@ -1,13 +1,18 @@ [application] -name="CowRevenge" +name="Cow's Revenge" main_scene="res://menu.tscn" -icon="res://icon.png" +icon="res://Sprites/GUI/Buttons/btn_shoot.png" [autoload] global="*res://global.gd" +[debug] + +force_fps=60 +print_fps=true + [display] use_2d_pixel_snap=false @@ -20,6 +25,10 @@ stretch_mode="viewport" fullscreen=false orientation="landscape" +[display.Android] + +driver="GLES2" + [image_loader] filter=false diff --git a/explosion.png b/explosion.png deleted file mode 100644 index b43b7e0..0000000 Binary files a/explosion.png and /dev/null differ diff --git a/express.zip b/express.zip deleted file mode 100644 index 48d0dda..0000000 Binary files a/express.zip and /dev/null differ diff --git a/fondo.png.flags b/fondo.png.flags deleted file mode 100644 index 8b08f35..0000000 --- a/fondo.png.flags +++ /dev/null @@ -1,3 +0,0 @@ -filter=false -gen_mipmaps=false -repeat=true diff --git a/fondo.tex b/fondo.tex deleted file mode 100644 index d5c3e20..0000000 Binary files a/fondo.tex and /dev/null differ diff --git a/fondo_0.png b/fondo_0.png deleted file mode 100755 index 771dac5..0000000 Binary files a/fondo_0.png and /dev/null differ diff --git a/fondo_0.tex b/fondo_0.tex deleted file mode 100644 index 084721f..0000000 Binary files a/fondo_0.tex and /dev/null differ diff --git a/fondo_1.png b/fondo_1.png deleted file mode 100755 index 10c60a7..0000000 Binary files a/fondo_1.png and /dev/null differ diff --git a/fondo_1.tex b/fondo_1.tex deleted file mode 100644 index 33a0590..0000000 Binary files a/fondo_1.tex and /dev/null differ diff --git a/fondo_2.png b/fondo_2.png deleted file mode 100755 index 27bfc1d..0000000 Binary files a/fondo_2.png and /dev/null differ diff --git a/fondo_2.tex b/fondo_2.tex deleted file mode 100644 index e72c6e4..0000000 Binary files a/fondo_2.tex and /dev/null differ diff --git a/fondo_3.png~ b/fondo_3.png~ deleted file mode 100644 index cee62e1..0000000 Binary files a/fondo_3.png~ and /dev/null differ diff --git a/fondo_3.tex b/fondo_3.tex deleted file mode 100644 index f08b6aa..0000000 Binary files a/fondo_3.tex and /dev/null differ diff --git a/fondo_4.tex b/fondo_4.tex deleted file mode 100644 index e238229..0000000 Binary files a/fondo_4.tex and /dev/null differ diff --git a/game_over.gd b/game_over.gd index 5f106ee..55e1ad7 100644 --- a/game_over.gd +++ b/game_over.gd @@ -14,6 +14,5 @@ func _on_reset_pressed(): get_tree().change_scene(global.level) -func _on_main_menu_pressed(): - global.release_all() +func _on_main_menu_pressed(): get_tree().change_scene("res://menu.tscn") diff --git a/global.gd b/global.gd index 3129152..434c52e 100644 --- a/global.gd +++ b/global.gd @@ -1,21 +1,9 @@ extends Node -# class member variables go here, for example: -# var a = 2 -# var b = "textvar" - var level func release_all(): - Input.action_release("ui_up") - Input.action_release("ui_right") - Input.action_release("ui_left") - Input.action_release("ui_up") - Input.action_release("ui_down") - Input.action_release("ui_jump") - Input.action_release("ui_shoot") + pass func _ready(): - # Called every time the node is added to the scene. - # Initialization here pass \ No newline at end of file diff --git a/icon.png b/icon.png deleted file mode 100644 index c019ef6..0000000 Binary files a/icon.png and /dev/null differ diff --git a/icon.png.flags b/icon.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/icon.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/leche.png.flags b/leche.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/leche.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/malvado.png b/malvado.png deleted file mode 100644 index 70a77fb..0000000 Binary files a/malvado.png and /dev/null differ diff --git a/malvado.png.flags b/malvado.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/malvado.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/malvado.tex b/malvado.tex deleted file mode 100644 index 96be139..0000000 Binary files a/malvado.tex and /dev/null differ diff --git a/malvado2.png.flags b/malvado2.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/malvado2.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/malvado2.png~ b/malvado2.png~ deleted file mode 100644 index d03930f..0000000 Binary files a/malvado2.png~ and /dev/null differ diff --git a/malvado_caminando0000.tex b/malvado_caminando0000.tex deleted file mode 100644 index 349674e..0000000 Binary files a/malvado_caminando0000.tex and /dev/null differ diff --git a/malvado_caminando0001.tex b/malvado_caminando0001.tex deleted file mode 100644 index b938a79..0000000 Binary files a/malvado_caminando0001.tex and /dev/null differ diff --git a/malvado_caminando0002.tex b/malvado_caminando0002.tex deleted file mode 100644 index 7f68cd9..0000000 Binary files a/malvado_caminando0002.tex and /dev/null differ diff --git a/malvado_caminando0003.tex b/malvado_caminando0003.tex deleted file mode 100644 index 287c8ef..0000000 Binary files a/malvado_caminando0003.tex and /dev/null differ diff --git a/malvado_caminando0004.tex b/malvado_caminando0004.tex deleted file mode 100644 index 539ab8d..0000000 Binary files a/malvado_caminando0004.tex and /dev/null differ diff --git a/malvado_caminando0005.tex b/malvado_caminando0005.tex deleted file mode 100644 index c4a5127..0000000 Binary files a/malvado_caminando0005.tex and /dev/null differ diff --git a/malvado_caminando0006.tex b/malvado_caminando0006.tex deleted file mode 100644 index 4c20666..0000000 Binary files a/malvado_caminando0006.tex and /dev/null differ diff --git a/malvado_caminando0007.tex b/malvado_caminando0007.tex deleted file mode 100644 index 5532012..0000000 Binary files a/malvado_caminando0007.tex and /dev/null differ diff --git a/malvado_caminando0008.tex b/malvado_caminando0008.tex deleted file mode 100644 index 67b692f..0000000 Binary files a/malvado_caminando0008.tex and /dev/null differ diff --git a/malvado_caminando0009.tex b/malvado_caminando0009.tex deleted file mode 100644 index bca04ea..0000000 Binary files a/malvado_caminando0009.tex and /dev/null differ diff --git a/manzana.tex b/manzana.tex deleted file mode 100644 index 9efde8e..0000000 Binary files a/manzana.tex and /dev/null differ diff --git a/milk_botte_hud.gd b/milk_botte_hud.gd index 52e1bae..db3ee6b 100644 --- a/milk_botte_hud.gd +++ b/milk_botte_hud.gd @@ -8,6 +8,8 @@ export(Texture) var sprite1 export(Texture) var sprite2 export(Texture) var sprite3 +onready var sprites = [sprite1, sprite2, sprite3] + func on_set_max_milk (maxm): max_value = maxm each_bottle_value = (float(maxm) / get_children().size()) @@ -27,14 +29,6 @@ func on_update_milk_bar(value): get_children()[bottle_int].set_value(bottle_float * 100) func on_set_bottle_sprite(number): - var sprite - if (number == 1): - sprite = sprite1 - elif (number == 2): - sprite = sprite2 - else: - sprite = sprite3 - for progress_bar in get_children(): - progress_bar.set_over_texture(sprite) + progress_bar.set_over_texture(sprites[number]) diff --git a/milk_ray/middle/milk_ray_middle0000.tex b/milk_ray/middle/milk_ray_middle0000.tex deleted file mode 100644 index fb241a7..0000000 Binary files a/milk_ray/middle/milk_ray_middle0000.tex and /dev/null differ diff --git a/milk_ray/temazo.ogg b/milk_ray/temazo.ogg deleted file mode 100644 index 47e594b..0000000 Binary files a/milk_ray/temazo.ogg and /dev/null differ diff --git a/player.gd b/player.gd index 7d82d3f..41abe89 100644 --- a/player.gd +++ b/player.gd @@ -112,11 +112,6 @@ func show_damage (): func can_jump_more (): return jump_time > 0 -func horizontal_movement_amount (): - if (walk_speed < MAX_WALK_SPEED): - walk_speed += WALK_SPEED_INCREMENT - return walk_speed - func _fixed_process(delta): if (jumping): jump_time -= altitude @@ -133,7 +128,6 @@ func _fixed_process(delta): velocity.y = - JUMP_SPEED + (MAX_JUMP_TIME - jump_time) * 20 jumping = true - # Movimiento horizontal if (!right and !left): sprite.set_animation("Idle") @@ -154,32 +148,25 @@ func _fixed_process(delta): motion.x = -0.15 motion = move(motion) - - # Control de colisiones + # Control de colisiones if (is_colliding()): - var normal = get_collision_normal() - if (normal.y < -0.35): # Está en el suelo jumping = false can_jump = true - motion.y = 0 if (normal.y > -0.9): motion.x += motion.x * (-normal.y) - motion = normal.slide(motion) - #velocity = normal.slide(velocity) + motion = normal.slide(motion) velocity.y = 0 else: # Está chocándose contra techo o apred can_jump = false motion = normal.slide(motion) jump_time = 0 - #final_velocity = normal.slide(final_velocity) move(motion) - else: can_jump = false diff --git a/player.tscn b/player.tscn index 1e0cd89..6cf27d1 100644 --- a/player.tscn +++ b/player.tscn @@ -3,26 +3,26 @@ [ext_resource path="res://player.gd" type="Script" id=1] [ext_resource path="res://shooter.gd" type="Script" id=2] [ext_resource path="res://ray_milk.tscn" type="PackedScene" id=3] -[ext_resource path="res://vaca_walk/vakacaminar0005.png" type="Texture" id=4] -[ext_resource path="res://vaca_walk/vakacaminar0006.png" type="Texture" id=5] -[ext_resource path="res://vaca_walk/vakacaminar0007.png" type="Texture" id=6] -[ext_resource path="res://vaca_walk/vakacaminar0008.png" type="Texture" id=7] -[ext_resource path="res://vaca_walk/vakacaminar0009.png" type="Texture" id=8] -[ext_resource path="res://vaca_walk/vakacaminar0010.png" type="Texture" id=9] -[ext_resource path="res://vaca_walk/vakacaminar0011.png" type="Texture" id=10] -[ext_resource path="res://vaca_walk/vakacaminar0012.png" type="Texture" id=11] -[ext_resource path="res://vaca_walk/vakacaminar0013.png" type="Texture" id=12] -[ext_resource path="res://vaca_walk/vakacaminar0014.png" type="Texture" id=13] -[ext_resource path="res://vaca_walk/vakacaminar0015.png" type="Texture" id=14] -[ext_resource path="res://vaca_walk/vakacaminar0016.png" type="Texture" id=15] -[ext_resource path="res://vaca_walk/vakacaminar0017.png" type="Texture" id=16] -[ext_resource path="res://vaca_walk/vakacaminar0018.png" type="Texture" id=17] -[ext_resource path="res://vaca_walk/vakacaminar0019.png" type="Texture" id=18] -[ext_resource path="res://vaca_walk/vakacaminar0020.png" type="Texture" id=19] -[ext_resource path="res://vaca_idle_1.tex" type="Texture" id=20] -[ext_resource path="res://vaca_idle_2.tex" type="Texture" id=21] -[ext_resource path="res://vaca_idle_3.tex" type="Texture" id=22] -[ext_resource path="res://vaca_idle_4.tex" type="Texture" id=23] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk1.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk2.png" type="Texture" id=5] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk3.png" type="Texture" id=6] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk4.png" type="Texture" id=7] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk5.png" type="Texture" id=8] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk6.png" type="Texture" id=9] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk7.png" type="Texture" id=10] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk8.png" type="Texture" id=11] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk9.png" type="Texture" id=12] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk10.png" type="Texture" id=13] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk11.png" type="Texture" id=14] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk12.png" type="Texture" id=15] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk13.png" type="Texture" id=16] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk14.png" type="Texture" id=17] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk15.png" type="Texture" id=18] +[ext_resource path="res://Sprites/Charasets/Player/walk/player_walk16.png" type="Texture" id=19] +[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle1.png" type="Texture" id=20] +[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle2.png" type="Texture" id=21] +[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle3.png" type="Texture" id=22] +[ext_resource path="res://Sprites/Charasets/Player/idle/player_idle4.png" type="Texture" id=23] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -42,7 +42,7 @@ animations = [ { "name": "walk", "speed": 27.0 }, { -"frames": [ ExtResource( 12 ) ], +"frames": [ ExtResource( 17 ) ], "loop": true, "name": "jump", "speed": 5.0 @@ -109,8 +109,7 @@ _update_shape_index = 1 [node name="sprite" type="AnimatedSprite" parent="."] frames = SubResource( 3 ) -animation = "Idle" -frame = 4 +animation = "jump" playing = true [node name="Camera2D" type="Camera2D" parent="sprite"] diff --git a/ray_milk.tscn b/ray_milk.tscn index 623e989..f7d4c77 100644 --- a/ray_milk.tscn +++ b/ray_milk.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://rayo_leche.gd" type="Script" id=1] [ext_resource path="res://Splash.tscn" type="PackedScene" id=2] [ext_resource path="res://ray_milk_end.tres.gd" type="Script" id=3] -[ext_resource path="res://milk_ray/middle/milk_ray_middle0000.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Effects/milk_ray.png" type="Texture" id=4] [sub_resource type="RectangleShape2D" id=1] diff --git a/ray_milk_end.tres.gd b/ray_milk_end.tres.gd index f44e665..9d37f04 100644 --- a/ray_milk_end.tres.gd +++ b/ray_milk_end.tres.gd @@ -1,12 +1,8 @@ extends Area2D -# class member variables go here, for example: -# var a = 2 -# var b = "textvar" - var body_hitted = null -func _fixed_process(delta): +func _fixed_process(delta): body_hitted.decrease_life(0.10) var t = Timer.new() t.set_wait_time(0.01) diff --git a/suelo.kra b/suelo.kra deleted file mode 100644 index 17be10d..0000000 Binary files a/suelo.kra and /dev/null differ diff --git a/suelo.png.flags b/suelo.png.flags deleted file mode 100644 index efb2b8c..0000000 --- a/suelo.png.flags +++ /dev/null @@ -1 +0,0 @@ -filter=false diff --git a/temazo_old.ogg b/temazo_old.ogg deleted file mode 100644 index 57ccb42..0000000 Binary files a/temazo_old.ogg and /dev/null differ diff --git a/tile full.png.flags b/tile full.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/tile full.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/tile full.png~ b/tile full.png~ deleted file mode 100644 index 9816259..0000000 Binary files a/tile full.png~ and /dev/null differ diff --git a/tile full.tex b/tile full.tex deleted file mode 100644 index 108b469..0000000 Binary files a/tile full.tex and /dev/null differ diff --git a/tile.png.flags b/tile.png.flags deleted file mode 100644 index 95647b2..0000000 --- a/tile.png.flags +++ /dev/null @@ -1,4 +0,0 @@ -filter=false -gen_mipmaps=false -repeat=true -mirroredrepeat=true diff --git a/tiles.tscn b/tiles.tscn index 89a6e33..24c7ee6 100644 --- a/tiles.tscn +++ b/tiles.tscn @@ -1,109 +1,109 @@ [gd_scene load_steps=28 format=1] -[ext_resource path="res://tile full.tex" type="Texture" id=1] -[ext_resource path="res://arbol.png" type="Texture" id=2] -[ext_resource path="res://cochinada.png" type="Texture" id=3] -[ext_resource path="res://cochinada_right.png" type="Texture" id=4] -[ext_resource path="res://cochinada_left.png" type="Texture" id=5] -[ext_resource path="res://cochinada_single.png" type="Texture" id=6] -[ext_resource path="res://cochinada_alone.png" type="Texture" id=7] +[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=1] +[ext_resource path="res://Sprites/Tilesets/tree.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Tilesets/dirt_tiling.png" type="Texture" id=3] +[ext_resource path="res://Sprites/Tilesets/dirt_left.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Tilesets/dirt_right.png" type="Texture" id=5] +[ext_resource path="res://Sprites/Tilesets/dirt_single.png" type="Texture" id=6] +[ext_resource path="res://Sprites/Tilesets/dirt_alone.png" type="Texture" id=7] -[sub_resource type="ConvexPolygonShape2D" id=21] +[sub_resource type="ConvexPolygonShape2D" id=24] 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 ) -[sub_resource type="ConvexPolygonShape2D" id=22] +[sub_resource type="ConvexPolygonShape2D" id=25] custom_solver_bias = 0.0 points = Vector2Array( -32, -28, 32, -28, 32, 32, -32, 32 ) -[sub_resource type="ConvexPolygonShape2D" id=23] +[sub_resource type="ConvexPolygonShape2D" id=26] 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 ) -[sub_resource type="ConvexPolygonShape2D" id=4] +[sub_resource type="ConvexPolygonShape2D" id=27] custom_solver_bias = 0.0 points = Vector2Array( 32, -32, 32, 32, -28, 32, -27.4817, -32.0967 ) -[sub_resource type="ConvexPolygonShape2D" id=5] +[sub_resource type="ConvexPolygonShape2D" id=21] custom_solver_bias = 0.0 points = Vector2Array( 32, -32, 32, 32, -32, 32, -32, -32 ) -[sub_resource type="ConvexPolygonShape2D" id=6] +[sub_resource type="ConvexPolygonShape2D" id=22] custom_solver_bias = 0.0 points = Vector2Array( 27, -32, 27, 32, -32, 32, -32, -32 ) -[sub_resource type="ConvexPolygonShape2D" id=7] +[sub_resource type="ConvexPolygonShape2D" id=23] custom_solver_bias = 0.0 points = Vector2Array( 32.0174, -32.3287, 32.2493, 27.9823, -9.96833, 27.1704, -21.5666, 24.9667, -24.4662, 22.763, -27, 17, -26.9018, -31.7488 ) -[sub_resource type="ConvexPolygonShape2D" id=8] +[sub_resource type="ConvexPolygonShape2D" id=4] custom_solver_bias = 0.0 points = Vector2Array( 32, -32, 32, 28, -32, 28, -32, -32 ) -[sub_resource type="ConvexPolygonShape2D" id=9] +[sub_resource type="ConvexPolygonShape2D" id=5] custom_solver_bias = 0.0 points = Vector2Array( 27, -32, 27, 15, 25, 21, 21.115, 25.3147, 11.2565, 26.8224, -32, 28, -32, -32 ) -[sub_resource type="ConvexPolygonShape2D" id=10] +[sub_resource type="ConvexPolygonShape2D" id=6] custom_solver_bias = 0.0 points = Vector2Array( 32, -32, 32, 32, -32, 32, -31.8891, -27.3414, -29, -30 ) -[sub_resource type="ConvexPolygonShape2D" id=11] +[sub_resource type="ConvexPolygonShape2D" id=7] custom_solver_bias = 0.0 points = Vector2Array( -27, -32, 32, -32, -29, -30 ) -[sub_resource type="ConvexPolygonShape2D" id=12] +[sub_resource type="ConvexPolygonShape2D" id=8] custom_solver_bias = 0.0 points = Vector2Array( -31, -32, 33, -32, 33, 32, -27, 32, -29, 30, -31, 28 ) -[sub_resource type="ConvexPolygonShape2D" id=13] +[sub_resource type="ConvexPolygonShape2D" id=9] custom_solver_bias = 0.0 points = Vector2Array( -32, -32, 32, -32, 32, 28, 30, 30, 28, 32, -32, 32 ) -[sub_resource type="ConvexPolygonShape2D" id=14] +[sub_resource type="ConvexPolygonShape2D" id=10] custom_solver_bias = 0.0 points = Vector2Array( -32, -32, 28, -32, 32, -28, 32.0174, 32.0416, -32, 32 ) -[sub_resource type="ConvexPolygonShape2D" id=15] +[sub_resource type="ConvexPolygonShape2D" id=11] custom_solver_bias = 0.0 points = Vector2Array( -13, -27, 13, -27, 20.1871, -23.398, 26, -16, 26, 18, 22, 24, 12, 27, -11.8241, 27.0544, -22.7264, 24.6188, -27, 19, -26.9018, -15.1633, -21.7986, -22.5862, -18, -25 ) -[sub_resource type="ConvexPolygonShape2D" id=16] +[sub_resource type="ConvexPolygonShape2D" id=12] custom_solver_bias = 0.0 points = Vector2Array( -27, 32, 32, -28, 32.0174, 31.9257 ) -[sub_resource type="ConvexPolygonShape2D" id=17] +[sub_resource type="ConvexPolygonShape2D" id=13] custom_solver_bias = 0.0 points = Vector2Array( -32, -28, -29, -25, 28, 32, -32, 32 ) -[sub_resource type="ConvexPolygonShape2D" id=18] +[sub_resource type="ConvexPolygonShape2D" id=14] custom_solver_bias = 0.0 points = Vector2Array( -32, -32, 27, -32, -32, 28 ) -[sub_resource type="ConvexPolygonShape2D" id=19] +[sub_resource type="ConvexPolygonShape2D" id=15] custom_solver_bias = 0.0 points = Vector2Array( 32, -32, 32, 28, -28, -32 ) -[sub_resource type="ConvexPolygonShape2D" id=20] +[sub_resource type="ConvexPolygonShape2D" id=16] custom_solver_bias = 0.0 points = Vector2Array( 16, 16, 22, 22, 22, 26, 18, 32, -20, 32, -23, 27, -23, 23, -18, 16 ) @@ -112,17 +112,18 @@ points = Vector2Array( 16, 16, 22, 22, 22, 26, 18, 32, -20, 32, -23, 27, -23, 23 transform/pos = Vector2( 32, 32 ) -[node name="Arriba_Izquierda" type="Sprite" parent="."] +[node name="Arriba_Izquierda1" type="Sprite" parent="."] +editor/display_folded = true transform/pos = Vector2( -64, 0 ) texture = ExtResource( 1 ) region = true region_rect = Rect2( 0, 0, 64, 64 ) -[node name="StaticBody2D" type="StaticBody2D" parent="Arriba_Izquierda"] +[node name="StaticBody2D" type="StaticBody2D" parent="Arriba_Izquierda1"] input/pickable = false -shapes/0/shape = SubResource( 21 ) +shapes/0/shape = SubResource( 24 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) shapes/0/trigger = false collision/layers = 2 @@ -132,7 +133,7 @@ constant_angular_velocity = 0.0 friction = 0.0 bounce = 0.0 -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Arriba_Izquierda/StaticBody2D"] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Arriba_Izquierda1/StaticBody2D"] build_mode = 0 polygon = 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 ) @@ -141,6 +142,7 @@ trigger = false [node name="Arriba" type="Sprite" parent="."] +editor/display_folded = true texture = ExtResource( 1 ) region = true region_rect = Rect2( 64, 0, 64, 64 ) @@ -149,7 +151,7 @@ region_rect = Rect2( 64, 0, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 22 ) +shapes/0/shape = SubResource( 25 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -169,6 +171,7 @@ trigger = false [node name="Arriba_Derecha" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -179,7 +182,7 @@ region_rect = Rect2( 128, 0, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 23 ) +shapes/0/shape = SubResource( 26 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -199,6 +202,7 @@ trigger = false [node name="Izquierda" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -209,7 +213,7 @@ region_rect = Rect2( 0, 64, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 4 ) +shapes/0/shape = SubResource( 27 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -229,6 +233,7 @@ trigger = false [node name="Centro" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -239,7 +244,7 @@ region_rect = Rect2( 64, 64, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 5 ) +shapes/0/shape = SubResource( 21 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -259,6 +264,7 @@ trigger = false [node name="Derecha" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -269,7 +275,7 @@ region_rect = Rect2( 128, 64, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 6 ) +shapes/0/shape = SubResource( 22 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -289,6 +295,7 @@ trigger = false [node name="Abajo_Izquierda" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -299,7 +306,7 @@ region_rect = Rect2( 0, 128, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 7 ) +shapes/0/shape = SubResource( 23 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -319,6 +326,7 @@ trigger = false [node name="Abajo" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -329,7 +337,7 @@ region_rect = Rect2( 64, 128, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 8 ) +shapes/0/shape = SubResource( 4 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -349,6 +357,7 @@ trigger = false [node name="Abajo_Derecha" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -359,7 +368,7 @@ region_rect = Rect2( 128, 128, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 9 ) +shapes/0/shape = SubResource( 5 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -379,6 +388,7 @@ trigger = false [node name="Inner_Derecha_Abajo" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -390,10 +400,10 @@ region_rect = Rect2( 256, 256, 64, 64 ) visibility/visible = false transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 10 ) +shapes/0/shape = SubResource( 6 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false -shapes/1/shape = SubResource( 11 ) +shapes/1/shape = SubResource( 7 ) shapes/1/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/1/trigger = false collision/layers = 2 @@ -414,6 +424,7 @@ trigger = false [node name="Inner_Derecha_Arriba" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -425,7 +436,7 @@ region_rect = Rect2( 256, 192, 64, 64 ) visibility/visible = false transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 12 ) +shapes/0/shape = SubResource( 8 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.914745, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -446,6 +457,7 @@ trigger = false [node name="Inner_Izquierda_Arriba" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -456,7 +468,7 @@ region_rect = Rect2( 192, 192, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 13 ) +shapes/0/shape = SubResource( 9 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -476,6 +488,7 @@ trigger = false [node name="Inner_Izquierda_Abajo" type="Sprite" parent="."] +editor/display_folded = true transform/pos = Vector2( -128, -64 ) texture = ExtResource( 1 ) region = true @@ -485,7 +498,7 @@ region_rect = Rect2( 192, 256, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 14 ) +shapes/0/shape = SubResource( 10 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -505,6 +518,7 @@ trigger = false [node name="Unico" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -515,7 +529,7 @@ region_rect = Rect2( 192, 64, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 15 ) +shapes/0/shape = SubResource( 11 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -535,6 +549,7 @@ trigger = false [node name="Rampa1" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -545,7 +560,7 @@ region_rect = Rect2( 0, 192, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 16 ) +shapes/0/shape = SubResource( 12 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -565,6 +580,7 @@ trigger = false [node name="Rampa2" type="Sprite" parent="."] +editor/display_folded = true transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) region = true @@ -574,7 +590,7 @@ region_rect = Rect2( 64, 192, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 17 ) +shapes/0/shape = SubResource( 13 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -594,6 +610,7 @@ trigger = false [node name="Rampa3" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -604,7 +621,7 @@ region_rect = Rect2( 64, 256, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 18 ) +shapes/0/shape = SubResource( 14 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -624,6 +641,7 @@ trigger = false [node name="Rampa4" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) texture = ExtResource( 1 ) @@ -634,7 +652,7 @@ region_rect = Rect2( 0, 256, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 19 ) +shapes/0/shape = SubResource( 15 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -654,6 +672,8 @@ trigger = false [node name="Tronco" type="Sprite" parent="."] +editor/display_folded = true +visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 texture = ExtResource( 2 ) @@ -663,7 +683,7 @@ region_rect = Rect2( 0, 256, 64, 64 ) transform/pos = Vector2( -0.0852547, -0.0852585 ) input/pickable = false -shapes/0/shape = SubResource( 20 ) +shapes/0/shape = SubResource( 16 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0.0852547, 0.0852585 ) shapes/0/trigger = false collision/layers = 2 @@ -707,7 +727,6 @@ region_rect = Rect2( 0, 256, 64, 64 ) [node name="Cochinada_single" type="Sprite" parent="."] -visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 texture = ExtResource( 6 ) @@ -715,6 +734,7 @@ region_rect = Rect2( 0, 256, 64, 64 ) [node name="Cochinada_alone" type="Sprite" parent="."] +visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 texture = ExtResource( 7 ) diff --git a/tileset.xml b/tileset.xml index 48c7b69..c469056 100644 --- a/tileset.xml +++ b/tileset.xml @@ -1,373 +1,355 @@ - - - - - - - - - - 0 - -32, -32, 32, -32, 32, 32, -32, 32, -32, -32 - - - - 0 - 32, -32, 32, 32, -32, 32 - - - - 0 - 32, -32, 32, 28, -32, 28, -32, -32 - - - - 0 - 27, -32, 27, 15, 25, 21, 21.115, 25.3147, 11.2565, 26.8224, -32, 28, -32, -32 - - - - 0 - 32, -32, 32, 32, -32, 32, -31.8891, -27.3414, -29, -30 - - - - 0 - -27, -32, 32, -32, -29, -30 - - - - 0 - -31, -32, 33, -32, 33, 32, -27, 32, -29, 30, -31, 28 - - - - 0 - -32, -32, 32, -32, 32, 28, 30, 30, 28, 32, -32, 32 - - - - 0 - -32, -32, 28, -32, 32, -28, 32.0174, 32.0416, -32, 32 - - - - 0 - -13, -27, 13, -27, 20.1871, -23.398, 26, -16, 26, 18, 22, 24, 12, 27, -11.8241, 27.0544, -22.7264, 24.6188, -27, 19, -26.9018, -15.1633, -21.7986, -22.5862, -18, -25 - - - - 0 - -27, 32, 32, -28, 32.0174, 31.9257 - - - - 0 - -32, -28, -29, -25, 28, 32, -32, 32 - - - - 0 - -32, -32, 27, -32, -32, 28 - - - - 0 - -32, -32, 32, 32, -32, 32 - - - - 0 - 32, -32, 32, 28, -28, -32 - - - - 0 - 16, 16, 22, 22, 22, 26, 18, 32, -20, 32, -23, 27, -23, 23, -18, 16 - - - + + + + + + + + + 0 -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 - + 0 -32, -28, 32, -28, 32, 32, -32, 32 - + + 0 + -31, -32, 33, -32, 33, 32, -27, 32, -29, 30, -31, 28 + + + + 0 + -32, -32, 32, -32, 32, 28, 30, 30, 28, 32, -32, 32 + + + + 0 + -32, -32, 28, -32, 32, -28, 32.0174, 32.0416, -32, 32 + + + + 0 + -13, -27, 13, -27, 20.1871, -23.398, 26, -16, 26, 18, 22, 24, 12, 27, -11.8241, 27.0544, -22.7264, 24.6188, -27, 19, -26.9018, -15.1633, -21.7986, -22.5862, -18, -25 + + + + 0 + -27, 32, 32, -28, 32.0174, 31.9257 + + + + 0 + -32, -28, -29, -25, 28, 32, -32, 32 + + + + 0 + -32, -32, 27, -32, -32, 28 + + + + 0 + 32, -32, 32, 28, -28, -32 + + + + 0 + 16, 16, 22, 22, 22, 26, 18, 32, -20, 32, -23, 27, -23, 23, -18, 16 + + + 0 -32, -28, 13.8965, -27.135, 19.9498, -24.2363, 24.2127, -19.4618, 25.4063, -15.7105, 26, 32, -32, 32 - + 0 32, -32, 32, 32, -28, 32, -27.4817, -32.0967 - + 0 32, -32, 32, 32, -32, 32, -32, -32 - + 0 27, -32, 27, 32, -32, 32, -32, -32 - + 0 32.0174, -32.3287, 32.2493, 27.9823, -9.96833, 27.1704, -21.5666, 24.9667, -24.4662, 22.763, -27, 17, -26.9018, -31.7488 + + + 0 + 32, -32, 32, 28, -32, 28, -32, -32 + + + + 0 + 27, -32, 27, 15, 25, 21, 21.115, 25.3147, 11.2565, 26.8224, -32, 28, -32, -32 + + + + 0 + 32, -32, 32, 32, -32, 32, -31.8891, -27.3414, -29, -30 + + + + 0 + -27, -32, 32, -32, -29, -30 + - "Suelo" + "Arriba_Izquierda1" 0, 0 1, 1, 1, 1 - 0, 0, 320, 320 - 160, 160 - 160, 160 - 160, 160 + 0, 0, 64, 64 + 32, 32 + 32, 32 + 32, 32 - + - "Rampa_LR" + "Arriba" 0, 0 1, 1, 1, 1 - 320, 256, 64, 64 + 64, 0, 64, 64 32, 32 32, 32 32, 32 - + - "Rampa_RL" + "Arriba_Derecha" 0, 0 1, 1, 1, 1 - 512, 256, 64, 64 + 128, 0, 64, 64 32, 32 32, 32 32, 32 - + - "Arriba_Izquierda" + "Izquierda" 0, 0 1, 1, 1, 1 - 0, 0, 64, 64 + 0, 64, 64, 64 32, 32 32, 32 32, 32 - + - "Arriba" + "Centro" 0, 0 1, 1, 1, 1 - 64, 0, 64, 64 + 64, 64, 64, 64 32, 32 32, 32 32, 32 - + - "Arriba_Derecha" + "Derecha" 0, 0 1, 1, 1, 1 - 128, 0, 64, 64 + 128, 64, 64, 64 32, 32 32, 32 32, 32 - + - "Izquierda" + "Abajo_Izquierda" 0, 0 1, 1, 1, 1 - 0, 64, 64, 64 + 0, 128, 64, 64 32, 32 32, 32 32, 32 - + - "Centro" + "Abajo" 0, 0 1, 1, 1, 1 - 64, 64, 64, 64 + 64, 128, 64, 64 32, 32 32, 32 32, 32 - + - "Derecha" + "Abajo_Derecha" 0, 0 1, 1, 1, 1 - 128, 64, 64, 64 + 128, 128, 64, 64 32, 32 32, 32 32, 32 - + - "Abajo_Izquierda" + "Inner_Derecha_Abajo" 0, 0 1, 1, 1, 1 - 0, 128, 64, 64 + 256, 256, 64, 64 32, 32 32, 32 32, 32 - + + - "Abajo" + "Inner_Derecha_Arriba" 0, 0 1, 1, 1, 1 - 64, 128, 64, 64 + 256, 192, 64, 64 32, 32 32, 32 32, 32 - "Abajo_Derecha" + "Inner_Izquierda_Arriba" 0, 0 1, 1, 1, 1 - 128, 128, 64, 64 + 192, 192, 64, 64 32, 32 32, 32 32, 32 - "Inner_Derecha_Abajo" + "Inner_Izquierda_Abajo" 0, 0 1, 1, 1, 1 - 256, 256, 64, 64 + 192, 256, 64, 64 32, 32 32, 32 32, 32 - + - - "Inner_Derecha_Arriba" + "Unico" 0, 0 1, 1, 1, 1 - 256, 192, 64, 64 + 192, 64, 64, 64 32, 32 32, 32 32, 32 - + - "Inner_Izquierda_Arriba" + "Rampa1" 0, 0 1, 1, 1, 1 - 192, 192, 64, 64 + 0, 192, 64, 64 32, 32 32, 32 32, 32 - + - "Inner_Izquierda_Abajo" + "Rampa2" 0, 0 1, 1, 1, 1 - 192, 256, 64, 64 + 64, 192, 64, 64 32, 32 32, 32 32, 32 - + - "Unico" + "Rampa3" 0, 0 1, 1, 1, 1 - 192, 64, 64, 64 + 64, 256, 64, 64 32, 32 32, 32 32, 32 - + - "Rampa1" + "Rampa4" 0, 0 1, 1, 1, 1 - 0, 192, 64, 64 + 0, 256, 64, 64 32, 32 32, 32 32, 32 - + - "Rampa2" - + "Tronco" + 0, 0 1, 1, 1, 1 - 64, 192, 64, 64 + 0, 0, 64, 64 32, 32 32, 32 32, 32 - + - "Rampa3" - + "Cochinada" + 0, 0 1, 1, 1, 1 - 64, 256, 64, 64 + 0, 0, 64, 64 32, 32 32, 32 - 32, 32 - - + 0, 0 + - "Rampa4" - + "Cochinada_left" + 0, 0 1, 1, 1, 1 - 0, 256, 64, 64 + 0, 0, 64, 64 32, 32 32, 32 - 32, 32 - - + 0, 0 + - "Tronco" - + "Cochinada_right" + 0, 0 1, 1, 1, 1 0, 0, 64, 64 32, 32 32, 32 - 32, 32 - - + 0, 0 + - "Cochinada" - + "Cochinada_single" + 0, 0 1, 1, 1, 1 0, 0, 64, 64 @@ -376,8 +358,8 @@ 0, 0 - "Cochinada_left" - + "Cochinada_alone" + 0, 0 1, 1, 1, 1 0, 0, 64, 64 @@ -386,46 +368,6 @@ 0, 0 - "Cochinada_right" - - 0, 0 - 1, 1, 1, 1 - 0, 0, 64, 64 - 32, 32 - 32, 32 - 0, 0 - - - "Cochinada_single" - - 0, 0 - 1, 1, 1, 1 - 0, 0, 64, 64 - 32, 32 - 32, 32 - 0, 0 - - - "Cochinada_reverse" - - 0, 0 - 1, 1, 1, 1 - 0, 0, 64, 64 - 32, 32 - 32, 32 - 0, 0 - - - "Cochinada_alone" - - 0, 0 - 1, 1, 1, 1 - 0, 0, 64, 64 - 32, 32 - 32, 32 - 0, 0 - - \ No newline at end of file diff --git a/top.tscn b/top.tscn index 56c5fe6..2ba177f 100644 --- a/top.tscn +++ b/top.tscn @@ -3,13 +3,13 @@ [ext_resource path="res://tileset.xml" type="TileSet" id=1] [ext_resource path="res://enemy_1.tscn" type="PackedScene" id=2] [ext_resource path="res://player.tscn" type="PackedScene" id=3] -[ext_resource path="res://fondo_0.tex" type="Texture" id=4] -[ext_resource path="res://fondo_1.tex" type="Texture" id=5] -[ext_resource path="res://fondo_2.tex" type="Texture" id=6] -[ext_resource path="res://fondo_3.png" type="Texture" id=7] +[ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Background/night_outside_c.png" type="Texture" id=5] +[ext_resource path="res://Sprites/Background/night_outside_b.png" type="Texture" id=6] +[ext_resource path="res://Sprites/Background/night_outside_a.png" type="Texture" id=7] [ext_resource path="res://apple.tscn" type="PackedScene" id=8] [ext_resource path="res://DeathLine.gd" type="Script" id=9] -[ext_resource path="res://loop_1.ogg" type="AudioStream" id=10] +[ext_resource path="res://Music/main_music_loop.ogg" type="AudioStream" id=10] [sub_resource type="LineShape2D" id=1] @@ -38,7 +38,7 @@ collision/bounce = 0.0 collision/layers = 1 collision/mask = 1 occluder/light_mask = 1 -tile_data = IntArray( -1769505, 27, -1703948, 27, -1638433, 27, -1507361, 27, -1507291, 23, -1507290, 22, -1507289, 24, -1441771, 23, -1441770, 22, -1441769, 24, -1245202, 25, -1245193, 25, -1245192, 23, -1245191, 24, -1245188, 23, -1245187, 24, -917536, 23, -917535, 22, -917534, 22, -917533, 24, -786431, 27, -720879, 27, -524292, 22, -458781, 27, -524284, 23, -524283, 26, -524282, 26, -524281, 22, -524280, 24, -458737, 23, -458736, 22, -458735, 22, -458734, 24, -393177, 23, -393176, 24, -196631, 23, -196630, 24 ) +tile_data = IntArray( -1769505, 27, -1703948, 27, -1638433, 27, -1507361, 27, -1507291, 23, -1507290, 22, -1507289, 24, -1441771, 23, -1441770, 22, -1441769, 24, -1245202, 25, -1245193, 25, -1245192, 23, -1245191, 24, -1245188, 23, -1245187, 24, -917536, 23, -917535, 22, -917534, 22, -917533, 24, -786431, 27, -720879, 27, -524292, 22, -458781, 27, -524284, 22, -524283, 26, -524282, 26, -524281, 22, -524280, 24, -458737, 23, -458736, 22, -458735, 22, -458734, 24, -393177, 23, -393176, 24, -196631, 23, -196630, 24 ) [node name="tile_0" type="TileMap" parent="." groups=[ "map", @@ -60,7 +60,7 @@ collision/bounce = 0.0 collision/layers = 2 collision/mask = 15 occluder/light_mask = 1 -tile_data = IntArray( -2359279, 17, -2359278, 18, -2293744, 17, -2293743, 12, -2293742, 19, -2228209, 17, -2228208, 12, -2228207, 19, -2228204, 16, -2162674, 17, -2162673, 12, -2162672, 19, -2162667, 16, -2031641, 16, -2031640, 16, -2031639, 16, -2031638, 16, -2031637, 16, -2031636, 16, -2097139, 17, -2097138, 12, -2097137, 19, -1966100, 16, -2031611, 16, -2031610, 21, -2031605, 16, -2031603, 20, -2031602, 19, -1900563, 16, -1966074, 16, -1966073, 16, -1966072, 16, -1966071, 16, -1966070, 16, -1835027, 16, -1835026, 16, -1835025, 16, -1900542, 21, -1900540, 16, -1769505, 16, -1769503, 3, -1769502, 4, -1769501, 4, -1769500, 5, -1769497, 3, -1769496, 4, -1769495, 4, -1769494, 5, -1835007, 3, -1835006, 5, -1835004, 16, -1703967, 6, -1703966, 7, -1703965, 14, -1703964, 11, -1703961, 9, -1703960, 13, -1703959, 7, -1703958, 8, -1703950, 16, -1703949, 16, -1703948, 16, -1703947, 16, -1703946, 16, -1703941, 21, -1769471, 9, -1769470, 11, -1638433, 16, -1638431, 6, -1638430, 14, -1638429, 19, -1638424, 20, -1638423, 13, -1638422, 8, -1638420, 16, -1638406, 17, -1638405, 4, -1638404, 4, -1638403, 4, -1638402, 18, -1703913, 16, -1703911, 16, -1703909, 16, -1703907, 16, -1703893, 3, -1703892, 4, -1703891, 4, -1703890, 4, -1703889, 18, -1572895, 9, -1572894, 19, -1572887, 20, -1572886, 11, -1572871, 17, -1572870, 12, -1572869, 14, -1572868, 10, -1572867, 10, -1572866, 11, -1638369, 16, -1638367, 3, -1638366, 4, -1638365, 4, -1638364, 5, -1638358, 17, -1638357, 12, -1638356, 14, -1638355, 10, -1638354, 10, -1638353, 19, -1507361, 16, -1507356, 17, -1507355, 4, -1507354, 4, -1507353, 18, -1507336, 17, -1507335, 12, -1507334, 14, -1507333, 19, -1572831, 9, -1572830, 10, -1572829, 13, -1572828, 8, -1572823, 17, -1572822, 12, -1572821, 14, -1572820, 19, -1572815, 16, -1441820, 20, -1441819, 13, -1441818, 14, -1441817, 19, -1441809, 16, -1441801, 17, -1441800, 12, -1441799, 14, -1441798, 19, -1507325, 16, -1507312, 16, -1507293, 6, -1507292, 15, -1507291, 4, -1507290, 4, -1507289, 4, -1507288, 4, -1507287, 12, -1507286, 14, -1507285, 19, -1376283, 9, -1376282, 11, -1376265, 20, -1376264, 10, -1376263, 19, -1441788, 16, -1441787, 16, -1441786, 16, -1441785, 16, -1441784, 16, -1441783, 16, -1441782, 16, -1441781, 16, -1441780, 16, -1441779, 16, -1441778, 16, -1441777, 16, -1441773, 16, -1441771, 3, -1441770, 4, -1441769, 4, -1441768, 5, -1441766, 16, -1441765, 16, -1441757, 9, -1441756, 10, -1441755, 10, -1441754, 10, -1441753, 10, -1441752, 10, -1441751, 10, -1441750, 19, -1441745, 16, -1310740, 16, -1310735, 16, -1376255, 16, -1376239, 16, -1376235, 20, -1376234, 13, -1376233, 14, -1376232, 19, -1245206, 3, -1245205, 4, -1245204, 4, -1245203, 4, -1245202, 4, -1245201, 4, -1245200, 4, -1245199, 4, -1245198, 4, -1245197, 4, -1245196, 4, -1245195, 4, -1245194, 4, -1245193, 4, -1245192, 4, -1245191, 4, -1245190, 4, -1245189, 4, -1245188, 4, -1245187, 4, -1245186, 4, -1245185, 4, -1310720, 4, -1310719, 5, -1310698, 6, -1310697, 8, -1310691, 16, -1310690, 16, -1310671, 16, -1179677, 16, -1179676, 16, -1179675, 16, -1179674, 16, -1179673, 16, -1179670, 9, -1179669, 10, -1179668, 10, -1179667, 10, -1179666, 10, -1179665, 10, -1179664, 10, -1179663, 10, -1179662, 10, -1179661, 13, -1179660, 7, -1179659, 7, -1179658, 7, -1179657, 7, -1179656, 7, -1179655, 7, -1179654, 7, -1179653, 7, -1179652, 7, -1179651, 7, -1179650, 14, -1179649, 10, -1245184, 10, -1245183, 11, -1245179, 3, -1245178, 5, -1245168, 16, -1245162, 9, -1245161, 11, -1114125, 9, -1114124, 10, -1114123, 10, -1114122, 10, -1114121, 10, -1114120, 10, -1114119, 10, -1114118, 10, -1114117, 10, -1114116, 10, -1114115, 10, -1114114, 11, -1179643, 6, -1179642, 8, -1179615, 16, -1179601, 16, -1048608, 16, -1114107, 6, -1114106, 8, -1114098, 3, -1114097, 4, -1114096, 18, -983073, 16, -983063, 3, -983062, 4, -983061, 4, -983060, 4, -983059, 18, -1048571, 20, -1048570, 19, -1048562, 6, -1048561, 7, -1048560, 15, -1048559, 18, -1048527, 16, -917537, 3, -917536, 4, -917535, 4, -917534, 4, -917533, 4, -917532, 4, -917531, 18, -917527, 20, -917526, 10, -917525, 10, -917524, 10, -917523, 11, -917516, 16, -917512, 21, -983028, 16, -983026, 20, -983025, 10, -983024, 10, -983023, 11, -983022, 16, -983018, 16, -983014, 16, -983010, 16, -983009, 16, -983008, 16, -983007, 16, -983006, 16, -983001, 16, -852006, 3, -852005, 18, -852001, 9, -852000, 10, -851999, 10, -851998, 10, -851997, 10, -851996, 13, -851995, 15, -851994, 18, -851985, 16, -851983, 16, -851977, 3, -851976, 4, -851975, 4, -851974, 5, -917465, 16, -917461, 3, -917460, 18, -917457, 16, -786470, 20, -786469, 15, -786468, 18, -786460, 20, -786459, 13, -786458, 15, -786457, 18, -786441, 9, -786440, 10, -786439, 10, -786438, 11, -851958, 16, -851946, 16, -851931, 17, -851930, 5, -851926, 3, -851925, 14, -851924, 11, -851919, 16, -720933, 20, -720932, 15, -720931, 18, -720923, 20, -720922, 13, -720921, 15, -720920, 18, -786431, 16, -786428, 16, -786411, 17, -786410, 4, -786409, 4, -786408, 4, -786407, 4, -786406, 4, -786405, 4, -786404, 4, -786403, 18, -786402, 16, -786396, 17, -786395, 12, -786394, 8, -786390, 9, -786389, 19, -655396, 20, -655395, 19, -655386, 20, -655385, 13, -655384, 15, -655383, 4, -655382, 4, -655381, 4, -655380, 4, -655379, 18, -720888, 16, -720881, 16, -720880, 16, -720879, 16, -720875, 9, -720874, 10, -720873, 10, -720872, 10, -720871, 10, -720870, 10, -720869, 10, -720868, 10, -720867, 19, -720861, 17, -720860, 12, -720859, 14, -720858, 11, -720853, 17, -720852, 18, -720849, 16, -589858, 16, -589849, 9, -589848, 10, -589847, 10, -589846, 10, -589845, 10, -589844, 13, -589843, 15, -589842, 4, -589841, 18, -589837, 16, -589829, 16, -589826, 17, -589825, 18, -655342, 16, -655332, 16, -655326, 17, -655325, 12, -655324, 12, -655323, 11, -655318, 17, -655317, 12, -655316, 19, -524320, 16, -524308, 6, -524307, 7, -524306, 13, -524305, 15, -524304, 4, -524303, 4, -524302, 4, -524301, 4, -524300, 4, -524299, 4, -524298, 4, -524297, 4, -524296, 5, -524293, 3, -524292, 4, -524291, 4, -524290, 12, -524289, 15, -589824, 4, -589823, 4, -589822, 18, -589816, 21, -589791, 17, -589790, 12, -589789, 14, -589788, 11, -589782, 20, -589781, 19, -589775, 16, -458781, 16, -458773, 17, -458772, 12, -458771, 10, -458770, 10, -458769, 10, -458768, 10, -458767, 10, -458766, 10, -458765, 10, -458764, 10, -458763, 10, -458762, 10, -458761, 10, -458760, 11, -458757, 9, -458756, 10, -458755, 10, -458754, 10, -458753, 10, -524288, 10, -524287, 13, -524286, 15, -524285, 4, -524284, 4, -524283, 4, -524282, 4, -524281, 4, -524280, 4, -524279, 4, -524278, 4, -524277, 4, -524276, 18, -524269, 16, -524262, 21, -524256, 17, -524255, 12, -524254, 14, -524253, 11, -393238, 17, -393237, 12, -393236, 19, -393222, 16, -458751, 9, -458750, 10, -458749, 10, -458748, 10, -458747, 10, -458746, 10, -458745, 10, -458744, 10, -458743, 10, -458742, 10, -458741, 10, -458740, 15, -458739, 4, -458738, 4, -458737, 4, -458736, 4, -458735, 4, -458734, 4, -458733, 4, -458732, 4, -458731, 4, -458730, 4, -458729, 4, -458728, 4, -458727, 4, -458726, 4, -458725, 4, -458724, 4, -458723, 4, -458722, 4, -458721, 4, -458720, 12, -458719, 10, -458718, 11, -458716, 16, -458704, 16, -327706, 16, -327703, 16, -327702, 20, -327701, 19, -393204, 9, -393203, 10, -393202, 10, -393201, 10, -393200, 10, -393199, 10, -393198, 10, -393197, 10, -393196, 10, -393195, 10, -393194, 10, -393193, 10, -393192, 10, -393191, 10, -393190, 10, -393189, 10, -393188, 10, -393187, 10, -393186, 10, -393185, 10, -393184, 19, -393179, 3, -393178, 4, -393177, 4, -393176, 4, -393175, 4, -393174, 4, -393173, 4, -393172, 4, -393171, 4, -393170, 4, -393169, 5, -262151, 16, -262148, 21, -327643, 20, -327642, 10, -327641, 10, -327640, 10, -327639, 10, -327638, 10, -327637, 10, -327636, 10, -327635, 10, -327634, 10, -327633, 19, -196633, 3, -196632, 4, -196631, 4, -196630, 4, -196629, 4, -196628, 4, -196627, 4, -196626, 4, -196625, 4, -196624, 4, -196623, 4, -196622, 5, -196618, 3, -196617, 4, -196616, 4, -196615, 4, -196614, 4, -196613, 4, -196612, 4, -196611, 4, -196610, 4, -196609, 4, -262144, 4, -262143, 4, -262142, 5, -131097, 9, -131096, 10, -131095, 10, -131094, 10, -131093, 10, -131092, 10, -131091, 10, -131090, 10, -131089, 10, -131088, 10, -131087, 10, -131086, 11, -131082, 9, -131081, 10, -131080, 10, -131079, 10, -131078, 10, -131077, 10, -131076, 10, -131075, 10, -131074, 10, -131073, 10, -196608, 10, -196607, 10, -196606, 11 ) +tile_data = IntArray( -2359279, 14, -2359278, 15, -2293744, 14, -2293743, 11, -2293742, 16, -2228209, 14, -2228208, 11, -2228207, 16, -2228204, 13, -2162674, 14, -2162673, 11, -2162672, 16, -2162667, 13, -2031641, 13, -2031640, 13, -2031639, 13, -2031638, 13, -2031637, 13, -2031636, 13, -2097139, 14, -2097138, 11, -2097137, 16, -1966100, 13, -2031611, 13, -2031610, 13, -2031605, 13, -2031603, 17, -2031602, 16, -1900563, 13, -1966074, 13, -1966073, 13, -1966072, 13, -1966071, 13, -1966070, 13, -1835027, 13, -1835026, 13, -1835025, 13, -1900542, 13, -1900540, 13, -1769505, 13, -1769503, 0, -1769502, 1, -1769501, 1, -1769500, 2, -1769497, 0, -1769496, 1, -1769495, 1, -1769494, 2, -1835007, 0, -1835006, 2, -1835004, 13, -1703967, 3, -1703966, 9, -1703965, 11, -1703964, 16, -1703961, 17, -1703960, 10, -1703959, 4, -1703958, 5, -1703950, 13, -1703949, 13, -1703948, 13, -1703947, 13, -1703946, 13, -1703941, 18, -1769471, 6, -1769470, 8, -1638433, 13, -1638431, 3, -1638430, 11, -1638429, 16, -1638424, 17, -1638423, 10, -1638422, 5, -1638420, 13, -1638406, 17, -1638405, 4, -1638404, 4, -1638403, 4, -1638402, 18, -1703913, 13, -1703911, 13, -1703909, 13, -1703907, 13, -1703893, 3, -1703892, 4, -1703891, 4, -1703890, 4, -1703889, 18, -1572895, 6, -1572894, 16, -1572887, 17, -1572886, 8, -1572871, 17, -1572870, 12, -1572869, 14, -1572868, 10, -1572867, 10, -1572866, 11, -1638369, 13, -1638367, 3, -1638366, 4, -1638365, 4, -1638364, 5, -1638358, 17, -1638357, 12, -1638356, 14, -1638355, 10, -1638354, 10, -1638353, 19, -1507361, 13, -1507356, 14, -1507355, 1, -1507354, 1, -1507353, 15, -1507336, 17, -1507335, 12, -1507334, 14, -1507333, 19, -1572831, 9, -1572830, 10, -1572829, 13, -1572828, 8, -1572823, 17, -1572822, 12, -1572821, 14, -1572820, 19, -1572815, 13, -1441820, 17, -1441819, 10, -1441818, 11, -1441817, 16, -1441809, 13, -1441801, 17, -1441800, 12, -1441799, 14, -1441798, 19, -1507325, 13, -1507312, 13, -1507293, 6, -1507292, 15, -1507291, 4, -1507290, 4, -1507289, 4, -1507288, 4, -1507287, 12, -1507286, 14, -1507285, 19, -1376283, 17, -1376282, 16, -1376265, 20, -1376264, 10, -1376263, 19, -1441788, 13, -1441787, 13, -1441786, 13, -1441785, 13, -1441784, 13, -1441783, 13, -1441782, 13, -1441781, 13, -1441780, 13, -1441779, 13, -1441778, 13, -1441777, 13, -1441773, 13, -1441771, 3, -1441770, 4, -1441769, 4, -1441768, 5, -1441766, 13, -1441765, 13, -1441757, 9, -1441756, 10, -1441755, 10, -1441754, 10, -1441753, 10, -1441752, 10, -1441751, 10, -1441750, 19, -1441745, 13, -1310740, 13, -1310735, 13, -1376255, 16, -1376235, 20, -1376234, 13, -1376233, 14, -1376232, 19, -1245206, 3, -1245205, 4, -1245204, 4, -1245203, 4, -1245202, 4, -1245201, 4, -1245200, 4, -1245199, 4, -1245198, 4, -1245197, 4, -1245196, 4, -1245195, 4, -1245194, 4, -1245193, 4, -1245192, 4, -1245191, 4, -1245190, 4, -1245189, 4, -1245188, 4, -1245187, 4, -1245186, 4, -1245185, 4, -1310720, 4, -1310719, 5, -1310702, 13, -1310698, 6, -1310697, 8, -1310691, 13, -1310690, 13, -1310671, 13, -1179677, 13, -1179676, 13, -1179675, 13, -1179674, 13, -1179673, 13, -1179670, 9, -1179669, 10, -1179668, 10, -1179667, 10, -1179666, 10, -1179665, 10, -1179664, 10, -1179663, 10, -1179662, 10, -1179661, 13, -1179660, 7, -1179659, 7, -1179658, 7, -1179657, 7, -1179656, 7, -1179655, 7, -1179654, 7, -1179653, 7, -1179652, 7, -1179651, 7, -1179650, 14, -1179649, 10, -1245184, 10, -1245183, 11, -1245179, 3, -1245178, 5, -1245168, 13, -1245162, 9, -1245161, 11, -1114125, 9, -1114124, 10, -1114123, 10, -1114122, 10, -1114121, 10, -1114120, 10, -1114119, 10, -1114118, 10, -1114117, 10, -1114116, 10, -1114115, 10, -1114114, 11, -1179643, 6, -1179642, 8, -1179615, 13, -1179601, 13, -1048608, 13, -1114107, 6, -1114106, 8, -1114098, 3, -1114097, 4, -1114096, 18, -983073, 13, -983063, 3, -983062, 4, -983061, 4, -983060, 4, -983059, 18, -1048571, 20, -1048570, 19, -1048562, 6, -1048561, 7, -1048560, 15, -1048559, 18, -1048527, 13, -917537, 0, -917536, 1, -917535, 1, -917534, 4, -917533, 1, -917532, 1, -917531, 15, -917527, 20, -917526, 10, -917525, 10, -917524, 10, -917523, 11, -917516, 16, -917512, 21, -983028, 13, -983026, 20, -983025, 10, -983024, 10, -983023, 11, -983022, 16, -983018, 13, -983014, 13, -983010, 13, -983009, 13, -983008, 13, -983007, 13, -983006, 13, -983001, 13, -852006, 3, -852005, 15, -852001, 6, -852000, 7, -851999, 7, -851998, 7, -851997, 7, -851996, 10, -851995, 12, -851994, 15, -851985, 16, -851984, 16, -851983, 16, -851977, 3, -851976, 4, -851975, 4, -851974, 5, -917465, 13, -917457, 13, -786470, 6, -786469, 12, -786468, 15, -786460, 17, -786459, 10, -786458, 12, -786457, 15, -786441, 9, -786440, 10, -786439, 10, -786438, 11, -851958, 13, -851946, 13, -851931, 14, -851930, 2, -851919, 13, -720933, 6, -720932, 12, -720931, 15, -720923, 17, -720922, 10, -720921, 12, -720920, 15, -786431, 13, -786428, 13, -786411, 0, -786410, 1, -786409, 1, -786408, 1, -786407, 1, -786406, 1, -786405, 1, -786404, 2, -786396, 14, -786395, 9, -786394, 5, -655396, 6, -655395, 16, -655386, 17, -655385, 10, -655384, 12, -655383, 1, -655382, 1, -655381, 1, -655380, 1, -655379, 15, -720888, 13, -720881, 13, -720880, 13, -720879, 13, -720875, 6, -720874, 7, -720873, 7, -720872, 7, -720871, 7, -720870, 7, -720869, 7, -720868, 7, -720861, 14, -720860, 9, -720859, 11, -720858, 8, -720849, 13, -589859, 13, -589858, 13, -589849, 17, -589848, 7, -589847, 7, -589846, 7, -589845, 7, -589844, 10, -589843, 12, -589842, 15, -589841, 18, -589837, 16, -589829, 13, -589826, 14, -589825, 15, -655342, 13, -655326, 14, -655325, 9, -655324, 12, -655323, 8, -524320, 13, -524308, 3, -524307, 4, -524306, 12, -524305, 1, -524304, 1, -524303, 1, -524302, 1, -524301, 1, -524300, 1, -524299, 1, -524298, 1, -524297, 1, -524296, 2, -524293, 0, -524292, 1, -524291, 1, -524290, 9, -524289, 12, -589824, 1, -589823, 1, -589822, 15, -589816, 18, -589791, 14, -589790, 9, -589789, 11, -589788, 8, -589775, 13, -458781, 13, -458773, 14, -458772, 9, -458771, 7, -458770, 7, -458769, 7, -458768, 7, -458767, 7, -458766, 7, -458765, 7, -458764, 7, -458763, 7, -458762, 7, -458761, 7, -458760, 8, -458757, 6, -458756, 7, -458755, 7, -458754, 7, -458753, 7, -524288, 7, -524287, 10, -524286, 12, -524285, 1, -524284, 1, -524283, 1, -524282, 1, -524281, 1, -524280, 1, -524279, 1, -524278, 1, -524277, 1, -524276, 15, -524269, 13, -524262, 18, -524256, 14, -524255, 9, -524254, 11, -524253, 8, -393238, 14, -393237, 12, -393236, 16, -393222, 13, -458751, 6, -458750, 7, -458749, 7, -458748, 7, -458747, 7, -458746, 7, -458745, 7, -458744, 7, -458743, 7, -458742, 7, -458741, 10, -458740, 12, -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, 9, -458719, 10, -458718, 8, -458716, 13, -458704, 13, -327706, 13, -327703, 13, -327702, 17, -327701, 16, -393205, 6, -393204, 7, -393203, 7, -393202, 7, -393201, 7, -393200, 7, -393199, 7, -393198, 7, -393197, 7, -393196, 7, -393195, 7, -393194, 7, -393193, 7, -393192, 7, -393191, 7, -393190, 7, -393189, 7, -393188, 7, -393187, 7, -393186, 7, -393185, 7, -393184, 7, -393183, 8, -393179, 0, -393178, 1, -393177, 1, -393176, 1, -393175, 1, -393174, 1, -393173, 1, -393172, 1, -393171, 1, -393170, 1, -393169, 2, -262151, 13, -327643, 17, -327642, 7, -327641, 7, -327640, 7, -327639, 7, -327638, 7, -327637, 7, -327636, 7, -327635, 7, -327634, 7, -327633, 16, -196633, 0, -196632, 1, -196631, 1, -196630, 1, -196629, 1, -196628, 1, -196627, 1, -196626, 1, -196625, 1, -196624, 1, -196623, 1, -196622, 2, -196618, 0, -196617, 1, -196616, 1, -196615, 1, -196614, 1, -196613, 1, -196612, 1, -196611, 1, -196610, 1, -196609, 1, -262144, 1, -262143, 1, -262142, 2, -131097, 6, -131096, 7, -131095, 7, -131094, 7, -131093, 7, -131092, 7, -131091, 7, -131090, 7, -131089, 7, -131088, 7, -131087, 7, -131086, 8, -131082, 6, -131081, 7, -131080, 7, -131079, 7, -131078, 7, -131077, 7, -131076, 7, -131075, 7, -131074, 7, -131073, 7, -196608, 7, -196607, 7, -196606, 8 ) __meta__ = { "_edit_group_": true, "_edit_lock_": true @@ -175,7 +175,6 @@ transform/pos = Vector2( 2496, -1120 ) JUMP_SPEED = 600 MAX_JUMP_TIME = 25 max_milk = 100 -life = 3 invulneravility_time = 10 [node name="ParallaxBackground" type="ParallaxBackground" parent="."] @@ -191,16 +190,15 @@ scroll/limit_begin = Vector2( 1, 0 ) scroll/limit_end = Vector2( 1, 0 ) scroll/ignore_camera_zoom = true -[node name="ParallaxLayer4" type="ParallaxLayer" parent="ParallaxBackground"] +[node name="ParallaxLayerd" type="ParallaxLayer" parent="ParallaxBackground"] -editor/display_folded = true transform/pos = Vector2( -736, -352 ) z/z = -4 motion/scale = Vector2( 0.2, 0 ) motion/offset = Vector2( 1, 2000 ) motion/mirroring = Vector2( 0, 0 ) -[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer4"] +[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayerd"] transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) @@ -209,16 +207,15 @@ centered = false region = true region_rect = Rect2( 0, 0, 1024, 128 ) -[node name="ParallaxLayer5" type="ParallaxLayer" parent="ParallaxBackground"] +[node name="ParallaxLayerc" type="ParallaxLayer" parent="ParallaxBackground"] -editor/display_folded = true transform/pos = Vector2( -736, -352 ) z/z = -3 motion/scale = Vector2( 0.35, 0 ) motion/offset = Vector2( 1, 2000 ) motion/mirroring = Vector2( 0, 0 ) -[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer5"] +[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayerc"] transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) @@ -227,16 +224,15 @@ centered = false region = true region_rect = Rect2( 0, 0, 1200, 128 ) -[node name="ParallaxLayer6" type="ParallaxLayer" parent="ParallaxBackground"] +[node name="ParallaxLayerb" type="ParallaxLayer" parent="ParallaxBackground"] -editor/display_folded = true transform/pos = Vector2( -736, -352 ) z/z = -2 motion/scale = Vector2( 0.65, 0 ) motion/offset = Vector2( 1, 2000 ) motion/mirroring = Vector2( 0, 0 ) -[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer6"] +[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayerb"] transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) @@ -245,16 +241,15 @@ centered = false region = true region_rect = Rect2( 0, 0, 2048, 128 ) -[node name="ParallaxLayer7" type="ParallaxLayer" parent="ParallaxBackground"] +[node name="ParallaxLayera" type="ParallaxLayer" parent="ParallaxBackground"] -editor/display_folded = true transform/pos = Vector2( -736, -352 ) z/z = -1 motion/scale = Vector2( 0.9, 0 ) motion/offset = Vector2( 1, 2000 ) motion/mirroring = Vector2( 0, 0 ) -[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayer7"] +[node name="Sprite" type="Sprite" parent="ParallaxBackground/ParallaxLayera"] transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) diff --git a/vaca.2kra b/vaca.2kra deleted file mode 100644 index a00207f..0000000 Binary files a/vaca.2kra and /dev/null differ diff --git a/vaca.tex b/vaca.tex deleted file mode 100644 index 4fd582d..0000000 Binary files a/vaca.tex and /dev/null differ diff --git a/vaca2.png.flags b/vaca2.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/vaca2.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/vaca2.png~ b/vaca2.png~ deleted file mode 100644 index c2f498e..0000000 Binary files a/vaca2.png~ and /dev/null differ diff --git a/vaca3.png.flags b/vaca3.png.flags deleted file mode 100644 index 226e8a3..0000000 --- a/vaca3.png.flags +++ /dev/null @@ -1,2 +0,0 @@ -filter=false -gen_mipmaps=false diff --git a/vaca3.png~ b/vaca3.png~ deleted file mode 100644 index 6eafcf3..0000000 Binary files a/vaca3.png~ and /dev/null differ diff --git a/vaca_idle_1.png~ b/vaca_idle_1.png~ deleted file mode 100644 index fef464e..0000000 Binary files a/vaca_idle_1.png~ and /dev/null differ diff --git a/vaca_idle_1.tex b/vaca_idle_1.tex deleted file mode 100644 index e0b58fe..0000000 Binary files a/vaca_idle_1.tex and /dev/null differ diff --git a/vaca_idle_2.png.flags b/vaca_idle_2.png.flags deleted file mode 100644 index efb2b8c..0000000 --- a/vaca_idle_2.png.flags +++ /dev/null @@ -1 +0,0 @@ -filter=false diff --git a/vaca_idle_2.png~ b/vaca_idle_2.png~ deleted file mode 100644 index 95d6e21..0000000 Binary files a/vaca_idle_2.png~ and /dev/null differ diff --git a/vaca_idle_2.tex b/vaca_idle_2.tex deleted file mode 100644 index 328aa0c..0000000 Binary files a/vaca_idle_2.tex and /dev/null differ diff --git a/vaca_idle_3.png.flags b/vaca_idle_3.png.flags deleted file mode 100644 index efb2b8c..0000000 --- a/vaca_idle_3.png.flags +++ /dev/null @@ -1 +0,0 @@ -filter=false diff --git a/vaca_idle_3.png~ b/vaca_idle_3.png~ deleted file mode 100644 index 0c17c36..0000000 Binary files a/vaca_idle_3.png~ and /dev/null differ diff --git a/vaca_idle_3.tex b/vaca_idle_3.tex deleted file mode 100644 index ae7ee58..0000000 Binary files a/vaca_idle_3.tex and /dev/null differ diff --git a/vaca_idle_4.png~ b/vaca_idle_4.png~ deleted file mode 100644 index 0f97ab8..0000000 Binary files a/vaca_idle_4.png~ and /dev/null differ diff --git a/vaca_idle_4.tex b/vaca_idle_4.tex deleted file mode 100644 index 623478b..0000000 Binary files a/vaca_idle_4.tex and /dev/null differ diff --git a/vaca_walk/.directory b/vaca_walk/.directory deleted file mode 100644 index a560fb1..0000000 --- a/vaca_walk/.directory +++ /dev/null @@ -1,7 +0,0 @@ -[Dolphin] -PreviewsShown=true -Timestamp=2017,7,27,20,34,13 -Version=4 - -[Settings] -HiddenFilesShown=true diff --git a/vaca_walk/vakacaminar0000.png b/vaca_walk/vakacaminar0000.png deleted file mode 100644 index cdd86f3..0000000 Binary files a/vaca_walk/vakacaminar0000.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0001.png b/vaca_walk/vakacaminar0001.png deleted file mode 100644 index cdd86f3..0000000 Binary files a/vaca_walk/vakacaminar0001.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0002.png b/vaca_walk/vakacaminar0002.png deleted file mode 100644 index cdd86f3..0000000 Binary files a/vaca_walk/vakacaminar0002.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0003.png b/vaca_walk/vakacaminar0003.png deleted file mode 100644 index cdd86f3..0000000 Binary files a/vaca_walk/vakacaminar0003.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0004.png b/vaca_walk/vakacaminar0004.png deleted file mode 100644 index cdd86f3..0000000 Binary files a/vaca_walk/vakacaminar0004.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0005.png b/vaca_walk/vakacaminar0005.png deleted file mode 100644 index 1f1dca3..0000000 Binary files a/vaca_walk/vakacaminar0005.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0006.png b/vaca_walk/vakacaminar0006.png deleted file mode 100644 index 1f1dca3..0000000 Binary files a/vaca_walk/vakacaminar0006.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0007.png b/vaca_walk/vakacaminar0007.png deleted file mode 100644 index 1f1dca3..0000000 Binary files a/vaca_walk/vakacaminar0007.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0008.png b/vaca_walk/vakacaminar0008.png deleted file mode 100644 index 5be3603..0000000 Binary files a/vaca_walk/vakacaminar0008.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0009.png b/vaca_walk/vakacaminar0009.png deleted file mode 100644 index 5be3603..0000000 Binary files a/vaca_walk/vakacaminar0009.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0010.png b/vaca_walk/vakacaminar0010.png deleted file mode 100644 index 5be3603..0000000 Binary files a/vaca_walk/vakacaminar0010.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0011.png b/vaca_walk/vakacaminar0011.png deleted file mode 100644 index 268a32b..0000000 Binary files a/vaca_walk/vakacaminar0011.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0012.png b/vaca_walk/vakacaminar0012.png deleted file mode 100644 index 268a32b..0000000 Binary files a/vaca_walk/vakacaminar0012.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0013.png b/vaca_walk/vakacaminar0013.png deleted file mode 100644 index 268a32b..0000000 Binary files a/vaca_walk/vakacaminar0013.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0014.png b/vaca_walk/vakacaminar0014.png deleted file mode 100644 index 55a32fb..0000000 Binary files a/vaca_walk/vakacaminar0014.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0015.png b/vaca_walk/vakacaminar0015.png deleted file mode 100644 index 55a32fb..0000000 Binary files a/vaca_walk/vakacaminar0015.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0016.png b/vaca_walk/vakacaminar0016.png deleted file mode 100644 index 55a32fb..0000000 Binary files a/vaca_walk/vakacaminar0016.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0017.png b/vaca_walk/vakacaminar0017.png deleted file mode 100644 index 8a7b205..0000000 Binary files a/vaca_walk/vakacaminar0017.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0018.png b/vaca_walk/vakacaminar0018.png deleted file mode 100644 index 8a7b205..0000000 Binary files a/vaca_walk/vakacaminar0018.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0019.png b/vaca_walk/vakacaminar0019.png deleted file mode 100644 index 8a7b205..0000000 Binary files a/vaca_walk/vakacaminar0019.png and /dev/null differ diff --git a/vaca_walk/vakacaminar0020.png b/vaca_walk/vakacaminar0020.png deleted file mode 100644 index 16a867f..0000000 Binary files a/vaca_walk/vakacaminar0020.png and /dev/null differ diff --git a/árbol.png~ b/árbol.png~ deleted file mode 100644 index 1b192cb..0000000 Binary files a/árbol.png~ and /dev/null differ