From b562a8ce6c9e2be93dd375edc638f3e2e7e06162 Mon Sep 17 00:00:00 2001 From: dariasteam Date: Sat, 3 Mar 2018 12:49:29 +0000 Subject: [PATCH] Fix minor problems with trees --- Scenes/Maps/map_4.tscn | 4 +-- Scenes/Maps/tileset.tscn | 67 +++++++++++++++++++------------------ Scenes/Maps/tileset.xml | 72 ++++++++++++++++++++-------------------- Scenes/Menu/HUD.tscn | 21 ++++++------ 4 files changed, 82 insertions(+), 82 deletions(-) diff --git a/Scenes/Maps/map_4.tscn b/Scenes/Maps/map_4.tscn index a91bfdb..3026183 100644 --- a/Scenes/Maps/map_4.tscn +++ b/Scenes/Maps/map_4.tscn @@ -95,7 +95,7 @@ collision/bounce = 0.0 collision/layers = 2 collision/mask = 15 occluder/light_mask = 1 -tile_data = IntArray( -2162701, 28, -1966086, 26, -1638429, 21, -1638402, 28, -1441809, 28, -1441798, 19, -1441796, 28, -1376270, 28, -1245205, 28, -1114128, 21, -1114112, 28 ) +tile_data = IntArray( -2162701, 28, -1966086, 26, -1703942, 28, -1638429, 21, -1638402, 28, -1441809, 28, -1441798, 19, -1441796, 28, -1376270, 28, -1245205, 28, -1114128, 21, -1114112, 28 ) [node name="base" type="TileMap" parent="."] @@ -115,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, -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, 13, -1572874, 17, -1572873, 7, -1572872, 16, -1572868, 32, -1572867, 17, -1572866, 16, -1638400, 31, -1507351, 31, -1507349, 31, -1507345, 29, -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 ) +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, 20, -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, 13, -1572874, 17, -1572873, 7, -1572872, 16, -1572868, 32, -1572867, 17, -1572866, 16, -1638400, 31, -1507351, 31, -1507349, 31, -1507345, 29, -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="."] diff --git a/Scenes/Maps/tileset.tscn b/Scenes/Maps/tileset.tscn index 5554839..d1a161e 100644 --- a/Scenes/Maps/tileset.tscn +++ b/Scenes/Maps/tileset.tscn @@ -117,35 +117,35 @@ points = Vector2Array( 17, 24, 27, 30, -21, 30, -11, 24 ) custom_solver_bias = 0.0 points = Vector2Array( 14, 13, 17, 24, -11, 24, -8, 13 ) -[sub_resource type="ConvexPolygonShape2D" id=24] +[sub_resource type="ConvexPolygonShape2D" id=40] custom_solver_bias = 0.0 -points = Vector2Array( 16, 23, 27, 30, -21, 30, -10, 23 ) +points = Vector2Array( 27, 30, -21, 30, -9, 23, 16, 23 ) -[sub_resource type="ConvexPolygonShape2D" id=25] +[sub_resource type="ConvexPolygonShape2D" id=41] custom_solver_bias = 0.0 -points = Vector2Array( 16, 23, -10, 23, -9, -31, 16, -31 ) +points = Vector2Array( -9, -31, 16, -31, 16, 23, -9, 23 ) -[sub_resource type="ConvexPolygonShape2D" id=26] +[sub_resource type="ConvexPolygonShape2D" id=38] custom_solver_bias = 0.0 -points = Vector2Array( 16, 23, 27, 30, -21, 30, -10, 23 ) +points = Vector2Array( 27, 30, -21, 30, -9, 23, 16, 23 ) -[sub_resource type="ConvexPolygonShape2D" id=27] +[sub_resource type="ConvexPolygonShape2D" id=39] custom_solver_bias = 0.0 -points = Vector2Array( 16, 23, -10, 23, -9, -34, 16, -34 ) +points = Vector2Array( -9, -34, 16, -34, 16, 23, -9, 23 ) -[sub_resource type="ConvexPolygonShape2D" id=28] +[sub_resource type="RectangleShape2D" id=28] custom_solver_bias = 0.0 -points = Vector2Array( 16, -34, 16, 30, -9, 30, -9, -34 ) +extents = Vector2( 12.0968, 32 ) -[sub_resource type="ConvexPolygonShape2D" id=29] +[sub_resource type="RectangleShape2D" id=42] custom_solver_bias = 0.0 -points = Vector2Array( 16, -31, 16, 30, -9, 30, -9, -31 ) +extents = Vector2( 12.0968, 30 ) [sub_resource type="RectangleShape2D" id=30] @@ -902,7 +902,6 @@ region_rect = Rect2( 0, 256, 64, 64 ) [node name="Tocon2_up" type="Sprite" parent="."] editor/display_folded = true -visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 texture = ExtResource( 1 ) @@ -963,10 +962,10 @@ region_rect = Rect2( 0, 256, 64, 64 ) transform/pos = Vector2( -3, 0 ) input/pickable = false -shapes/0/shape = SubResource( 24 ) +shapes/0/shape = SubResource( 40 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 2 ) shapes/0/trigger = false -shapes/1/shape = SubResource( 25 ) +shapes/1/shape = SubResource( 41 ) shapes/1/transform = Matrix32( 1, 0, 0, 1, 0, 2 ) shapes/1/trigger = false collision/layers = 2 @@ -980,7 +979,7 @@ bounce = 0.0 transform/pos = Vector2( 0, 2 ) build_mode = 0 -polygon = Vector2Array( 16, -31, 16, 23, 27, 30, -21, 30, -10, 23, -9, -31 ) +polygon = Vector2Array( 16, -31, 16, 23, 27, 30, -21, 30, -9, 23, -9, -31 ) shape_range = Vector2( 0, 1 ) trigger = false @@ -1000,10 +999,10 @@ region_rect = Rect2( 0, 256, 64, 64 ) transform/pos = Vector2( -3, 0 ) input/pickable = false -shapes/0/shape = SubResource( 26 ) +shapes/0/shape = SubResource( 38 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 2 ) shapes/0/trigger = false -shapes/1/shape = SubResource( 27 ) +shapes/1/shape = SubResource( 39 ) shapes/1/transform = Matrix32( 1, 0, 0, 1, 0, 2 ) shapes/1/trigger = false collision/layers = 2 @@ -1017,7 +1016,7 @@ bounce = 0.0 transform/pos = Vector2( 0, 2 ) build_mode = 0 -polygon = Vector2Array( 16, -34, 16, 23, 27, 30, -21, 30, -10, 23, -9, -34 ) +polygon = Vector2Array( 16, -34, 16, 23, 27, 30, -21, 30, -9, 23, -9, -34 ) shape_range = Vector2( 0, 1 ) trigger = false @@ -1038,7 +1037,7 @@ region_rect = Rect2( 0, 256, 64, 64 ) transform/pos = Vector2( -3, 0 ) input/pickable = false shapes/0/shape = SubResource( 28 ) -shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 2 ) +shapes/0/transform = Matrix32( 1.03333, 0, 0, 1, 3.5, 0 ) shapes/0/trigger = false collision/layers = 2 collision/mask = 15 @@ -1047,17 +1046,16 @@ constant_angular_velocity = 0.0 friction = 0.0 bounce = 0.0 -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Tronco_largo_tiling/StaticBody2D1"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Tronco_largo_tiling/StaticBody2D1"] -transform/pos = Vector2( 0, 2 ) -build_mode = 0 -polygon = Vector2Array( 16, -34, 16, 30, -9, 30, -9, -34 ) -shape_range = Vector2( 0, 0 ) +transform/pos = Vector2( 3.5, 0 ) +transform/scale = Vector2( 1.03333, 1 ) +shape = SubResource( 28 ) trigger = false +_update_shape_index = 0 [node name="Tronco_largo_end" type="Sprite" parent="."] -editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 @@ -1071,8 +1069,8 @@ region_rect = Rect2( 0, 256, 64, 64 ) transform/pos = Vector2( -3, 0 ) input/pickable = false -shapes/0/shape = SubResource( 29 ) -shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 2 ) +shapes/0/shape = SubResource( 42 ) +shapes/0/transform = Matrix32( 1.03333, 0, 0, 1, 3.5, 2 ) shapes/0/trigger = false collision/layers = 2 collision/mask = 15 @@ -1081,16 +1079,18 @@ constant_angular_velocity = 0.0 friction = 0.0 bounce = 0.0 -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Tronco_largo_end/StaticBody2D1"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Tronco_largo_end/StaticBody2D1"] -transform/pos = Vector2( 0, 2 ) -build_mode = 0 -polygon = Vector2Array( 16, -31, 16, 30, -9, 30, -9, -31 ) -shape_range = Vector2( 0, 0 ) +transform/pos = Vector2( 3.5, 2 ) +transform/scale = Vector2( 1.03333, 1 ) +shape = SubResource( 42 ) trigger = false +_update_shape_index = 0 [node name="Tronco_rama_right" type="Sprite" parent="."] +editor/display_folded = true +visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 texture = ExtResource( 1 ) @@ -1125,6 +1125,7 @@ _update_shape_index = 0 [node name="Tronco_rama_left" type="Sprite" parent="."] +editor/display_folded = true visibility/visible = false transform/pos = Vector2( -64, -64 ) z/z = 2 diff --git a/Scenes/Maps/tileset.xml b/Scenes/Maps/tileset.xml index d31f321..27236d5 100644 --- a/Scenes/Maps/tileset.xml +++ b/Scenes/Maps/tileset.xml @@ -76,14 +76,14 @@ 14, 13, 17, 24, -11, 24, -8, 13 - + 0 - 16, 23, 27, 30, -21, 30, -10, 23 + 27, 30, -21, 30, -9, 23, 16, 23 - + 0 - 16, 23, -10, 23, -9, -31, 16, -31 + -9, -31, 16, -31, 16, 23, -9, 23 @@ -91,62 +91,62 @@ 32, -32, 32, 32, -28, 32, -27.4817, -32.0967 - + 0 - 16, 23, 27, 30, -21, 30, -10, 23 + 27, 30, -21, 30, -9, 23, 16, 23 - + 0 - 16, 23, -10, 23, -9, -34, 16, -34 + -9, -34, 16, -34, 16, 23, -9, 23 - + 0 - 16, -34, 16, 30, -9, 30, -9, -34 + 12.0968, 32 - + 0 - 16, -31, 16, 30, -9, 30, -9, -31 + 12.0968, 30 - + 0 32, 6 - + 0 2, 6 - + 0 -9, -18, -9, -34, 16, -34, 16, -18 - + 0 23, -12, 35, -12, 35, -1, 23, 4, -14, 6 - + 0 16, 19, 16, 30, -9, 30, -9, 18 - + 0 -24, -1, -29, -1, -29, -12, -17, -12 - + 0 -14, 6, -24, -1, -17, -12, -9, -18, 16, -18, 23, -12 - + 0 23, 4, 16, 19, -9, 18, -14, 6 @@ -567,8 +567,8 @@ 29, 32 29, 32 - - + + 0, 0 0 @@ -581,8 +581,8 @@ 29, 32 29, 32 - - + + 0, 0 0 @@ -608,7 +608,7 @@ 29, 32 29, 32 - + 0, 0 0 @@ -621,7 +621,7 @@ 29, 32 29, 32 - + 0, 1 1 @@ -634,7 +634,7 @@ 29, 32 29, 32 - + 0, 1 1 @@ -647,7 +647,7 @@ 29, 32 29, 32 - + 0, 1 20 @@ -660,7 +660,7 @@ 29, 32 29, 32 - + 0, 1 20 @@ -673,7 +673,7 @@ 29, 32 29, 32 - + 0, 1 1 @@ -686,12 +686,12 @@ 29, 32 29, 32 - - - - - - + + + + + + 0, 1 1 diff --git a/Scenes/Menu/HUD.tscn b/Scenes/Menu/HUD.tscn index 232fb3c..39ba0de 100644 --- a/Scenes/Menu/HUD.tscn +++ b/Scenes/Menu/HUD.tscn @@ -28,7 +28,7 @@ [ext_resource path="res://Scenes/Menu/ufo_store.tscn" type="PackedScene" id=26] [ext_resource path="res://Scenes/Effects/scan_lines.tscn" type="PackedScene" id=27] -[sub_resource type="Environment" id=1] +[sub_resource type="Environment" id=2] ambient_light/enabled = false ambient_light/color = Color( 0, 0, 0, 1 ) @@ -72,15 +72,15 @@ bcs/contrast = 1.0 bcs/saturation = 1.0 srgb/enabled = false -[sub_resource type="World" id=2] +[sub_resource type="World" id=3] -environment = SubResource( 1 ) +environment = SubResource( 2 ) -[sub_resource type="CanvasItemMaterial" id=3] +[sub_resource type="CanvasItemMaterial" id=4] shader/shading_mode = 0 -[sub_resource type="GDScript" id=4] +[sub_resource type="GDScript" id=5] script/source = "extends Button @@ -89,7 +89,7 @@ func _on_Back_pressed(): get_node(\"in_game_menu\").show() " -[sub_resource type="GDScript" id=5] +[sub_resource type="GDScript" id=1] script/source = "extends TextureFrame @@ -124,7 +124,7 @@ levels = [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 rect = Rect2( 0, 0, 1280, 768 ) own_world = false -world = SubResource( 2 ) +world = SubResource( 3 ) transparent_bg = false render_target/enabled = false render_target/v_flip = false @@ -368,7 +368,7 @@ autostart = false [node name="Sprite" type="Sprite" parent="Control/Cowbells"] -material/material = SubResource( 3 ) +material/material = SubResource( 4 ) transform/pos = Vector2( 586, 45 ) transform/scale = Vector2( 3, 3 ) texture = ExtResource( 21 ) @@ -393,7 +393,7 @@ margin/top = 34.0 margin/right = 97.0 margin/bottom = 89.0 text = "<" -script/script = SubResource( 4 ) +script/script = SubResource( 5 ) [node name="in_game_menu" parent="Control/Back" instance=ExtResource( 25 )] @@ -407,8 +407,7 @@ margin/bottom = 686.0 [node name="ScanLine" parent="." instance=ExtResource( 27 )] -visibility/visible = false -script/script = SubResource( 5 ) +script/script = SubResource( 1 ) [connection signal="pressed" from="Control/Buttons/Bttn_U" to="Control/Buttons" method="_on_Bttn_U_pressed"]