diff --git a/Music/Milk machine.ogg b/Music/Milk machine.ogg new file mode 100644 index 0000000..2ff6c22 Binary files /dev/null and b/Music/Milk machine.ogg differ diff --git a/Music/dangerous-hills-loop.ogg b/Music/dangerous-hills-loop.ogg new file mode 100644 index 0000000..d158659 Binary files /dev/null and b/Music/dangerous-hills-loop.ogg differ diff --git a/Music/main_music.ogg b/Music/dangerous_hills.ogg similarity index 100% rename from Music/main_music.ogg rename to Music/dangerous_hills.ogg diff --git a/Music/milk-machine-loop.ogg b/Music/milk-machine-loop.ogg new file mode 100644 index 0000000..f26a476 Binary files /dev/null and b/Music/milk-machine-loop.ogg differ diff --git a/Scenes/Events/cowbell_collector.gd b/Scenes/Events/cowbell_collector.gd index 69b7e60..6be904e 100644 --- a/Scenes/Events/cowbell_collector.gd +++ b/Scenes/Events/cowbell_collector.gd @@ -16,8 +16,6 @@ func timer_timeout(): func play_sound(): pitch += pitch_increment - print ("sound ", pitch) - timer.start() return pitch diff --git a/Scenes/Events/player.gd b/Scenes/Events/player.gd index 893011c..e21bb6c 100644 --- a/Scenes/Events/player.gd +++ b/Scenes/Events/player.gd @@ -24,6 +24,7 @@ onready var sound = get_node("sound") onready var hud_milk = get_tree().get_nodes_in_group("milk_hud")[0] onready var hud_life = get_tree().get_nodes_in_group("life_hud")[0] +onready var hud_cowbell = get_tree().get_nodes_in_group("cowbell_hud")[0] onready var JUMP_SOUND = ResourceLoader.load("Sound/player_jump_sound.ogg") onready var cowbell_collector = get_node("cowbell_collector") @@ -57,6 +58,7 @@ export(int) var cowbells_collected = 0 func add_cowbells(var number): cowbells_collected += number + hud_cowbell.set_counter (cowbells_collected) return cowbell_collector.play_sound() func is_falling (): diff --git a/Scenes/Events/player.tscn b/Scenes/Events/player.tscn index 5638a24..750b5e1 100644 --- a/Scenes/Events/player.tscn +++ b/Scenes/Events/player.tscn @@ -8,12 +8,12 @@ [ext_resource path="res://Scenes/Events/cowbell_collector.gd" type="Script" id=6] [ext_resource path="res://Sound/player_jump_sound.ogg" type="AudioStream" id=7] -[sub_resource type="ConvexPolygonShape2D" id=4] +[sub_resource type="ConvexPolygonShape2D" id=1] custom_solver_bias = 0.0 points = Vector2Array( -13.2061, 7.63341, -13.1494, -10.328, 11.2943, -10.3627, 11.4077, 7.42536, 1.19923, 13.0773, -3.50803, 13.0773 ) -[sub_resource type="ConvexPolygonShape2D" id=5] +[sub_resource type="ConvexPolygonShape2D" id=2] custom_solver_bias = 0.0 points = Vector2Array( -2.43698, 6.86286, -10.0513, 0.602652, -10.0513, -10.186, 9.7198, -10, 9.7198, 0.41664, 1.64128, 6.92704 ) @@ -42,10 +42,10 @@ tracks/0/keys = { transform/scale = Vector2( 2, 2 ) z/relative = false input/pickable = true -shapes/0/shape = SubResource( 4 ) +shapes/0/shape = SubResource( 1 ) shapes/0/transform = Matrix32( 1.89755, 0, 0, 3.10364, 2.93931, -4.91934 ) shapes/0/trigger = false -shapes/1/shape = SubResource( 5 ) +shapes/1/shape = SubResource( 2 ) shapes/1/transform = Matrix32( 2.35192, 0, 0, 2.68801, 1.63985, 16.8801 ) shapes/1/trigger = true collision/layers = 1057 @@ -56,7 +56,7 @@ max_milk = 100 milk_level = 0 max_life = 5 MAX_JUMP_TIME = 20 -MAX_WALK_SPEED = 450 +MAX_WALK_SPEED = 500 invulneravility_time = 8 JUMP_SPEED = 620 altitude = 0.5 diff --git a/Scenes/Maps/map_1.tscn b/Scenes/Maps/map_1.tscn index 5941d47..d7b13e5 100644 --- a/Scenes/Maps/map_1.tscn +++ b/Scenes/Maps/map_1.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=13 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] -[ext_resource path="res://Scenes/Events/enemy_1.tscn" type="PackedScene" id=2] -[ext_resource path="res://player_spawner.gd" type="Script" id=3] -[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://player_spawner.gd" type="Script" id=2] +[ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=3] +[ext_resource path="res://Sprites/Background/night_outside_c.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Background/night_outside_b.png" type="Texture" id=5] +[ext_resource path="res://Sprites/Background/night_outside_a.png" type="Texture" id=6] +[ext_resource path="res://Scenes/Events/enemy_1.tscn" type="PackedScene" id=7] [ext_resource path="res://Scenes/Events/apple.tscn" type="PackedScene" id=8] [ext_resource path="res://Scenes/Events/heart.tscn" type="PackedScene" id=9] [ext_resource path="res://Scenes/Events/cowbell.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=11] -[ext_resource path="res://Music/main_music_loop.ogg" type="AudioStream" id=12] +[ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] [node name="Level" type="Node2D"] @@ -136,120 +136,20 @@ collision/bounce = 0.0 collision/layers = 2 collision/mask = 15 occluder/light_mask = 1 -tile_data = IntArray( -2359279, 14, -2359278, 15, -2293744, 14, -2293743, 9, -2293742, 16, -2293725, 14, -2293724, 15, -2228209, 14, -2228208, 9, -2228207, 16, -2228204, 13, -2228189, 17, -2228188, 16, -2162674, 14, -2162673, 9, -2162672, 16, -2162667, 13, -2162663, 0, -2162662, 1, -2162661, 1, -2162660, 1, -2162659, 1, -2162658, 1, -2162657, 1, -2162656, 1, -2162655, 2, -2162648, 14, -2162647, 15, -2162642, 14, -2162641, 15, -2031647, 31, -2031641, 13, -2031640, 13, -2031639, 13, -2031638, 13, -2031637, 13, -2031636, 13, -2097139, 14, -2097138, 9, -2097137, 16, -2097127, 6, -2097126, 7, -2097125, 7, -2097124, 7, -2097123, 7, -2097122, 7, -2097121, 7, -2097120, 7, -2097119, 8, -2097115, 14, -2097114, 15, -2097112, 17, -2097111, 16, -2097106, 17, -2097105, 16, -1966100, 13, -2031611, 13, -2031610, 13, -2031605, 13, -2031603, 17, -2031602, 16, -2031579, 17, -2031578, 16, -2031573, 14, -2031572, 15, -1900575, 31, -1900563, 13, -1966074, 13, -1966073, 13, -1966072, 13, -1966071, 13, -1966070, 13, -1966037, 17, -1966036, 16, -1966031, 14, -1966030, 15, -1835039, 29, -1835031, 18, -1835027, 13, -1835026, 13, -1835025, 13, -1900542, 13, -1900540, 13, -1900498, 14, -1900497, 15, -1900495, 17, -1900494, 16, -1769505, 13, -1769503, 0, -1769502, 1, -1769501, 1, -1769500, 2, -1769497, 0, -1769496, 1, -1769495, 1, -1769494, 2, -1835007, 0, -1835006, 2, -1835004, 13, -1834962, 17, -1834961, 16, -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, -1769422, 14, -1769421, 15, -1638433, 13, -1638431, 3, -1638430, 11, -1638429, 16, -1638424, 17, -1638423, 10, -1638422, 5, -1638420, 13, -1638406, 14, -1638405, 1, -1638404, 1, -1638403, 1, -1638402, 2, -1703913, 13, -1703911, 13, -1703909, 13, -1703907, 13, -1703886, 17, -1703885, 16, -1572895, 6, -1572894, 16, -1572887, 17, -1572886, 8, -1572882, 13, -1572871, 14, -1572870, 9, -1572869, 11, -1572868, 7, -1572867, 7, -1572866, 8, -1638369, 13, -1638367, 0, -1638366, 1, -1638365, 1, -1638364, 2, -1638358, 13, -1638357, 13, -1638356, 13, -1638355, 13, -1638354, 13, -1507361, 13, -1507356, 14, -1507355, 1, -1507354, 1, -1507353, 15, -1507336, 14, -1507335, 9, -1507334, 11, -1507333, 16, -1572831, 6, -1572830, 7, -1572829, 7, -1572828, 8, -1572823, 13, -1572815, 13, -1441820, 17, -1441819, 10, -1441818, 11, -1441817, 16, -1441809, 13, -1441801, 14, -1441800, 9, -1441799, 11, -1441798, 16, -1507325, 13, -1507312, 13, -1507306, 27, -1507293, 0, -1507292, 1, -1507291, 1, -1507290, 1, -1507289, 1, -1507288, 1, -1507287, 2, -1376283, 17, -1376282, 16, -1376265, 6, -1376264, 7, -1376263, 16, -1441788, 13, -1441787, 13, -1441785, 13, -1441784, 13, -1441783, 13, -1441782, 13, -1441781, 13, -1441780, 13, -1441779, 13, -1441778, 13, -1441777, 13, -1441773, 13, -1441771, 0, -1441770, 1, -1441769, 1, -1441768, 2, -1441766, 13, -1441765, 13, -1441757, 6, -1441756, 7, -1441755, 7, -1441754, 7, -1441753, 7, -1441752, 7, -1441751, 8, -1441745, 13, -1310740, 13, -1310735, 13, -1376255, 13, -1376235, 17, -1376234, 10, -1376233, 11, -1376232, 16, -1245206, 0, -1245205, 1, -1245204, 1, -1245203, 1, -1245202, 1, -1245201, 1, -1245200, 1, -1245199, 1, -1245198, 1, -1245197, 1, -1245196, 1, -1245195, 1, -1245194, 1, -1245193, 1, -1245192, 1, -1245191, 1, -1245190, 1, -1245189, 1, -1245188, 1, -1245187, 1, -1245186, 1, -1245185, 1, -1310720, 1, -1310719, 2, -1310702, 13, -1310698, 6, -1310697, 8, -1310691, 13, -1310690, 13, -1310671, 13, -1179677, 13, -1179676, 13, -1179675, 13, -1179674, 13, -1179673, 13, -1179670, 6, -1179669, 7, -1179668, 7, -1179667, 7, -1179666, 7, -1179665, 7, -1179664, 7, -1179663, 7, -1179662, 10, -1179661, 4, -1179660, 4, -1179659, 4, -1179658, 4, -1179657, 4, -1179656, 4, -1179655, 4, -1179654, 4, -1179653, 4, -1179652, 4, -1179651, 4, -1179650, 11, -1179649, 7, -1245184, 7, -1245183, 8, -1245179, 0, -1245178, 2, -1245168, 13, -1114126, 6, -1114125, 7, -1114124, 7, -1114123, 7, -1114122, 7, -1114121, 7, -1114120, 7, -1114119, 7, -1114118, 7, -1114117, 7, -1114116, 7, -1114115, 7, -1114114, 8, -1179643, 3, -1179642, 5, -1179615, 13, -1179601, 13, -1048608, 31, -1048598, 27, -1114107, 3, -1114106, 5, -1114098, 0, -1114097, 1, -1114096, 2, -983072, 30, -983063, 0, -983062, 1, -983061, 1, -983060, 1, -983059, 2, -1048571, 17, -1048570, 16, -1048562, 6, -1048561, 10, -1048560, 12, -1048559, 1, -1048558, 15, -1048554, 32, -1048527, 13, -917537, 0, -917536, 1, -917535, 1, -917534, 1, -917533, 1, -917532, 1, -917531, 15, -917527, 6, -917526, 7, -917525, 7, -917524, 7, -917523, 8, -917516, 13, -917513, 0, -917512, 1, -917511, 1, -917510, 1, -917509, 2, -983028, 13, -983025, 6, -983024, 7, -983023, 7, -983022, 16, -983020, 13, -983019, 36, -983018, 34, -983016, 32, -983010, 13, -983009, 13, -983008, 13, -983007, 13, -983006, 13, -983001, 13, -852006, 0, -852005, 15, -852001, 6, -852000, 7, -851999, 7, -851998, 7, -851997, 7, -851996, 10, -851995, 12, -851994, 15, -851985, 13, -851984, 13, -851983, 13, -851977, 3, -851976, 11, -851975, 7, -851974, 10, -851973, 5, -917482, 33, -917480, 31, -917478, 32, -917465, 13, -917457, 13, -786470, 6, -786469, 12, -786468, 15, -786460, 17, -786459, 10, -786458, 12, -786457, 15, -786441, 6, -786440, 16, -786438, 17, -786437, 8, -851958, 13, -851946, 30, -851944, 30, -851942, 30, -851940, 29, -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, 2, -786408, 0, -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, 8, -720872, 6, -720871, 7, -720870, 7, -720869, 7, -720868, 8, -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, 13, -589829, 27, -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, -524260, 27, -524258, 27, -524256, 14, -524255, 9, -524254, 11, -524253, 8, -393238, 14, -393237, 9, -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 ) +tile_data = IntArray( -2359279, 14, -2359278, 15, -2293744, 14, -2293743, 9, -2293742, 16, -2293725, 14, -2293724, 15, -2228209, 14, -2228208, 9, -2228207, 16, -2228204, 13, -2228189, 17, -2228188, 16, -2162674, 14, -2162673, 9, -2162672, 16, -2162667, 13, -2162663, 0, -2162662, 1, -2162661, 1, -2162660, 1, -2162659, 1, -2162658, 1, -2162657, 1, -2162656, 1, -2162655, 2, -2162648, 14, -2162647, 15, -2162642, 14, -2162641, 15, -2031647, 31, -2031641, 13, -2031640, 13, -2031639, 13, -2031638, 13, -2031637, 13, -2031636, 13, -2097139, 14, -2097138, 9, -2097137, 16, -2097127, 6, -2097126, 7, -2097125, 7, -2097124, 7, -2097123, 7, -2097122, 7, -2097121, 7, -2097120, 7, -2097119, 8, -2097115, 14, -2097114, 15, -2097112, 17, -2097111, 16, -2097106, 17, -2097105, 16, -1966100, 13, -2031611, 13, -2031610, 13, -2031605, 13, -2031603, 17, -2031602, 16, -2031579, 17, -2031578, 16, -2031573, 14, -2031572, 15, -1900575, 31, -1900563, 13, -1966074, 13, -1966073, 13, -1966072, 13, -1966071, 13, -1966070, 13, -1966037, 17, -1966036, 16, -1966031, 14, -1966030, 15, -1835039, 29, -1835031, 18, -1835027, 13, -1835026, 13, -1835025, 13, -1900542, 13, -1900540, 13, -1900498, 14, -1900497, 15, -1900495, 17, -1900494, 16, -1769505, 13, -1769503, 0, -1769502, 1, -1769501, 1, -1769500, 2, -1769497, 0, -1769496, 1, -1769495, 1, -1769494, 2, -1835007, 0, -1835006, 2, -1835004, 13, -1834962, 17, -1834961, 16, -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, -1769422, 14, -1769421, 15, -1638433, 13, -1638431, 3, -1638430, 11, -1638429, 16, -1638424, 17, -1638423, 10, -1638422, 5, -1638420, 13, -1638406, 14, -1638405, 1, -1638404, 1, -1638403, 1, -1638402, 2, -1703913, 13, -1703911, 13, -1703909, 13, -1703907, 13, -1703886, 17, -1703885, 16, -1572895, 6, -1572894, 16, -1572887, 17, -1572886, 8, -1572882, 13, -1572871, 14, -1572870, 9, -1572869, 11, -1572868, 7, -1572867, 7, -1572866, 8, -1638369, 13, -1638367, 0, -1638366, 1, -1638365, 1, -1638364, 2, -1638358, 13, -1638357, 13, -1638356, 13, -1638355, 13, -1638354, 13, -1507361, 13, -1507356, 14, -1507355, 1, -1507354, 1, -1507353, 15, -1507336, 14, -1507335, 9, -1507334, 11, -1507333, 16, -1572831, 6, -1572830, 7, -1572829, 7, -1572828, 8, -1572823, 13, -1572815, 13, -1441820, 17, -1441819, 10, -1441818, 11, -1441817, 16, -1441809, 13, -1441801, 14, -1441800, 9, -1441799, 11, -1441798, 16, -1507325, 13, -1507320, 29, -1507312, 13, -1507306, 27, -1507293, 0, -1507292, 1, -1507291, 1, -1507290, 1, -1507289, 1, -1507288, 1, -1507287, 2, -1376283, 17, -1376282, 16, -1376265, 6, -1376264, 7, -1376263, 16, -1441788, 13, -1441787, 13, -1441785, 13, -1441784, 13, -1441783, 13, -1441782, 13, -1441781, 13, -1441780, 13, -1441779, 13, -1441778, 13, -1441777, 13, -1441773, 13, -1441771, 0, -1441770, 1, -1441769, 1, -1441768, 2, -1441766, 13, -1441765, 13, -1441757, 6, -1441756, 7, -1441755, 7, -1441754, 7, -1441753, 7, -1441752, 7, -1441751, 8, -1441745, 13, -1310740, 13, -1310735, 13, -1376255, 13, -1376235, 17, -1376234, 10, -1376233, 11, -1376232, 16, -1245206, 0, -1245205, 1, -1245204, 1, -1245203, 1, -1245202, 1, -1245201, 1, -1245200, 1, -1245199, 1, -1245198, 1, -1245197, 1, -1245196, 1, -1245195, 1, -1245194, 1, -1245193, 1, -1245192, 1, -1245191, 1, -1245190, 1, -1245189, 1, -1245188, 1, -1245187, 1, -1245186, 1, -1245185, 1, -1310720, 1, -1310719, 2, -1310702, 13, -1310698, 6, -1310697, 8, -1310691, 13, -1310690, 13, -1310671, 13, -1179677, 13, -1179676, 13, -1179675, 13, -1179674, 13, -1179673, 13, -1179670, 6, -1179669, 7, -1179668, 7, -1179667, 7, -1179666, 7, -1179665, 7, -1179664, 7, -1179663, 7, -1179662, 10, -1179661, 4, -1179660, 4, -1179659, 4, -1179658, 4, -1179657, 4, -1179656, 4, -1179655, 4, -1179654, 4, -1179653, 4, -1179652, 4, -1179651, 4, -1179650, 11, -1179649, 7, -1245184, 7, -1245183, 8, -1245179, 0, -1245178, 2, -1245168, 13, -1114126, 6, -1114125, 7, -1114124, 7, -1114123, 7, -1114122, 7, -1114121, 7, -1114120, 7, -1114119, 7, -1114118, 7, -1114117, 7, -1114116, 7, -1114115, 7, -1114114, 8, -1179643, 3, -1179642, 5, -1179615, 13, -1179601, 13, -1048608, 31, -1048598, 27, -1114107, 3, -1114106, 5, -1114098, 0, -1114097, 1, -1114096, 2, -983072, 30, -983063, 0, -983062, 1, -983061, 1, -983060, 1, -983059, 2, -1048571, 17, -1048570, 16, -1048562, 6, -1048561, 10, -1048560, 12, -1048559, 1, -1048558, 15, -1048554, 32, -1048527, 13, -917537, 0, -917536, 1, -917535, 1, -917534, 1, -917533, 1, -917532, 1, -917531, 15, -917527, 6, -917526, 7, -917525, 7, -917524, 7, -917523, 8, -917516, 13, -917513, 0, -917512, 1, -917511, 1, -917510, 1, -917509, 2, -983028, 13, -983025, 6, -983024, 7, -983023, 7, -983022, 16, -983020, 13, -983019, 36, -983018, 34, -983016, 32, -983010, 13, -983009, 13, -983008, 13, -983007, 13, -983006, 13, -983001, 13, -852006, 0, -852005, 15, -852001, 6, -852000, 7, -851999, 7, -851998, 7, -851997, 7, -851996, 10, -851995, 12, -851994, 15, -851985, 13, -851984, 13, -851983, 13, -851977, 3, -851976, 11, -851975, 7, -851974, 10, -851973, 5, -917482, 33, -917480, 31, -917478, 32, -917465, 13, -917457, 13, -786470, 6, -786469, 12, -786468, 15, -786460, 17, -786459, 10, -786458, 12, -786457, 15, -786441, 6, -786440, 16, -786438, 17, -786437, 8, -851958, 13, -851946, 30, -851944, 30, -851942, 30, -851940, 29, -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, 2, -786408, 0, -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, 8, -720872, 6, -720871, 7, -720870, 7, -720869, 7, -720868, 8, -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, 13, -589829, 29, -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, -524260, 27, -524258, 27, -524256, 14, -524255, 9, -524254, 11, -524253, 8, -393238, 14, -393237, 9, -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, -196620, 13, -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 } -[node name="enemies" type="Node2D" parent="."] - -editor/display_folded = true -transform/pos = Vector2( 2496, -1120 ) -transform/scale = Vector2( 2, 2 ) - -[node name="Enemy3" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -2240, -64 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy25" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 928, -128 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy30" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 352, 64 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy31" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 512, 64 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy32" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 1056, -256 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy23" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -2592, -192 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy15" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -2576, -768 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy16" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -3072, -448 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy4" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -1792, -64 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy7" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -1408, -1152 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy8" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -2400, -1472 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy9" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -608, -1408 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy17" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -800, -896 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy18" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -320, -896 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy5" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( -1952, -768 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy6" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 160, 64 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy10" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 1440, 128 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy11" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 1184, -944 ) -transform/scale = Vector2( 1, 1 ) - -[node name="Enemy12" parent="enemies" instance=ExtResource( 2 )] - -transform/pos = Vector2( 928, -448 ) -transform/scale = Vector2( 1, 1 ) - [node name="player_spawner" type="Node2D" parent="."] transform/pos = Vector2( -1600, -1344 ) -script/script = ExtResource( 3 ) +script/script = ExtResource( 2 ) [node name="ParallaxBackground" type="ParallaxBackground" parent="."] +editor/display_folded = true layer = -1 offset = Vector2( 0, 0 ) rotation = 0.0 @@ -274,7 +174,7 @@ motion/mirroring = Vector2( 0, 0 ) transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) -texture = ExtResource( 4 ) +texture = ExtResource( 3 ) centered = false region = true region_rect = Rect2( 0, 0, 1024, 128 ) @@ -292,7 +192,7 @@ motion/mirroring = Vector2( 0, 0 ) transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) -texture = ExtResource( 5 ) +texture = ExtResource( 4 ) centered = false region = true region_rect = Rect2( 0, 0, 1200, 128 ) @@ -310,7 +210,7 @@ motion/mirroring = Vector2( 0, 0 ) transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) -texture = ExtResource( 6 ) +texture = ExtResource( 5 ) centered = false region = true region_rect = Rect2( 0, 0, 2048, 128 ) @@ -327,11 +227,111 @@ motion/mirroring = Vector2( 0, 0 ) transform/pos = Vector2( -3712, -2048 ) transform/scale = Vector2( 6, 6 ) -texture = ExtResource( 7 ) +texture = ExtResource( 6 ) centered = false region = true region_rect = Rect2( -1000, 0, 2048, 128 ) +[node name="enemies" type="Node2D" parent="."] + +transform/pos = Vector2( 2496, -1120 ) +transform/scale = Vector2( 2, 2 ) + +[node name="Enemy3" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -2240, -64 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy25" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 928, -128 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy30" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 352, 64 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy31" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 512, 64 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy32" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 1056, -256 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy23" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -2592, -192 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy15" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -2576, -768 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy16" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -3072, -448 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy4" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -1792, -64 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy7" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -1408, -1152 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy8" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -2400, -1472 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy9" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -608, -1408 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy17" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -597, -895 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy18" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -320, -896 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy5" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( -1952, -768 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy6" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 160, 64 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy10" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 1440, 128 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy11" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 1184, -944 ) +transform/scale = Vector2( 1, 1 ) + +[node name="Enemy12" parent="enemies" instance=ExtResource( 7 )] + +transform/pos = Vector2( 928, -448 ) +transform/scale = Vector2( 1, 1 ) + [node name="apples" type="Node2D" parent="."] editor/display_folded = true diff --git a/Scenes/Menu/HUD.tscn b/Scenes/Menu/HUD.tscn index ef59553..efea63e 100644 --- a/Scenes/Menu/HUD.tscn +++ b/Scenes/Menu/HUD.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=1] +[gd_scene load_steps=16 format=1] [ext_resource path="res://Scenes/Maps/map_1.tscn" type="PackedScene" id=1] [ext_resource path="res://Scenes/Menu/life_hud.gd" type="Script" id=2] @@ -11,6 +11,8 @@ [ext_resource path="res://Sprites/GUI/HUD/milbar_outter_2.png" type="Texture" id=9] [ext_resource path="res://Sprites/GUI/HUD/milkbar_outter_3.png" type="Texture" id=10] [ext_resource path="res://Sprites/GUI/HUD/milkbar_outter_1.png" type="Texture" id=11] +[ext_resource path="res://Scenes/Menu/cowbells_hud.gd" type="Script" id=12] +[ext_resource path="res://Sprites/Charasets/cowbell.png" type="Texture" id=13] [sub_resource type="Environment" id=1] @@ -77,6 +79,7 @@ margin/bottom = 768.0 [node name="Viewport" type="Viewport" parent="Control"] +editor/display_folded = true rect = Rect2( 0, 0, 1280, 768 ) own_world = false world = SubResource( 2 ) @@ -262,6 +265,35 @@ sprite1 = ExtResource( 9 ) sprite2 = ExtResource( 10 ) sprite3 = ExtResource( 11 ) +[node name="Cowbells" type="Node2D" parent="Control" groups=[ +"cowbell_hud", +]] + +script/script = ExtResource( 12 ) + +[node name="LineEdit" type="LineEdit" parent="Control/Cowbells"] + +focus/ignore_mouse = false +focus/stop_mouse = false +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 630.0 +margin/top = 9.0 +margin/right = 715.0 +margin/bottom = 81.0 +placeholder/text = "1" +placeholder/alpha = 1.0 +editable = false +focus_mode = 2 +caret/caret_blink = false +caret/caret_blink_speed = 0.65 + +[node name="Sprite" type="Sprite" parent="Control/Cowbells"] + +transform/pos = Vector2( 586, 45 ) +transform/scale = Vector2( 3, 3 ) +texture = ExtResource( 13 ) + [connection signal="pressed" from="Control/Buttons/Bttn_U" to="Control/Buttons" method="_on_Bttn_U_pressed"] [connection signal="released" from="Control/Buttons/Bttn_U" to="Control/Buttons" method="_on_Bttn_U_released"] diff --git a/Scenes/Menu/cowbells_hud.gd b/Scenes/Menu/cowbells_hud.gd new file mode 100644 index 0000000..e482374 --- /dev/null +++ b/Scenes/Menu/cowbells_hud.gd @@ -0,0 +1,10 @@ +extends Node2D + +# class member variables go here, for example: +# var a = 2 +# var b = "textvar" + +onready var label = get_node("LineEdit") + +func set_counter (var quantity): + label.set_text(String(quantity)) \ No newline at end of file