From dfe51650bdddfa39848e1d952349e428530cc94c Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 26 Feb 2018 18:20:29 +0000 Subject: [PATCH] Fix minor bugs --- Scenes/Events/ray_milk.tscn | 2 +- Scenes/Maps/map_3.tscn | 4 ++-- Scenes/Menu/buy_milk.gd | 2 +- Scenes/Menu/global.gd | 28 +++++++++++++++++----------- Scenes/Menu/in_game_menu.tscn | 2 +- Scenes/Menu/ufo_store.gd | 11 +++++++++-- engine.cfg | 3 ++- player_spawner.gd | 2 +- 8 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Scenes/Events/ray_milk.tscn b/Scenes/Events/ray_milk.tscn index c6c397f..9c0cfed 100644 --- a/Scenes/Events/ray_milk.tscn +++ b/Scenes/Events/ray_milk.tscn @@ -41,7 +41,7 @@ gravity_vec = Vector2( 0, 1 ) gravity = 98.0 linear_damp = 0.1 angular_damp = 1.0 -monitoring = false +priority = 100.0 monitorable = false script/script = ExtResource( 3 ) diff --git a/Scenes/Maps/map_3.tscn b/Scenes/Maps/map_3.tscn index d68739e..a176686 100644 --- a/Scenes/Maps/map_3.tscn +++ b/Scenes/Maps/map_3.tscn @@ -136,7 +136,7 @@ collision/bounce = 0.0 collision/layers = 2 collision/mask = 15 occluder/light_mask = 1 -tile_data = IntArray( -1310716, 32, -1245179, 13, -1179646, 32, -1179634, 32, -1114110, 31, -1114108, 31, -1114107, 13, -1114106, 13, -1114105, 13, -1114104, 13, -1114103, 13, -1114101, 13, -1114100, 13, -1114099, 13, -1114098, 31, -1048574, 30, -1048572, 31, -1048562, 31, -1048558, 0, -1048557, 1, -1048556, 2, -983038, 13, -983036, 31, -983032, 27, -983026, 31, -983024, 14, -983023, 15, -983022, 17, -983021, 7, -983020, 16, -983019, 14, -983018, 1, -983017, 15, -917502, 13, -917500, 31, -917496, 13, -917490, 31, -917488, 17, -917487, 8, -917483, 6, -917482, 7, -917481, 8, -851964, 31, -851962, 32, -851958, 32, -851954, 31, -851944, 0, -851943, 2, -851940, 14, -851939, 15, -786430, 32, -786428, 31, -786426, 31, -786422, 31, -786418, 31, -786417, 0, -786416, 2, -786408, 3, -786407, 5, -786405, 14, -786404, 9, -786403, 16, -720894, 31, -720892, 31, -720890, 31, -720886, 31, -720885, 32, -720882, 31, -720881, 3, -720880, 12, -720879, 1, -720878, 1, -720877, 1, -720876, 1, -720875, 1, -720874, 1, -720873, 1, -720872, 9, -720871, 5, -720869, 17, -720868, 16, -720865, 13, -655358, 30, -655356, 31, -655354, 30, -655350, 31, -655349, 31, -655346, 31, -655345, 3, -655344, 11, -655343, 7, -655342, 7, -655341, 7, -655340, 7, -655339, 7, -655338, 7, -655337, 7, -655336, 7, -655335, 8, -524289, 0, -589824, 15, -589822, 13, -589820, 31, -589818, 13, -589814, 31, -589813, 31, -589810, 31, -589809, 6, -589808, 16, -589794, 13, -458753, 3, -524288, 5, -524284, 30, -524280, 14, -524279, 15, -524278, 30, -524277, 30, -524274, 30, -524273, 0, -524272, 15, -393217, 3, -458752, 5, -458750, 0, -458749, 1, -458748, 2, -458746, 0, -458745, 1, -458744, 9, -458743, 12, -458742, 1, -458741, 2, -458739, 0, -458738, 2, -458737, 3, -458736, 12, -458735, 1, -458734, 1, -458733, 2, -458730, 0, -458729, 1, -458728, 1, -458727, 1, -458726, 2, -458723, 14, -458722, 15, -327681, 3, -393216, 5, -393214, 3, -393213, 4, -393212, 5, -393210, 17, -393209, 7, -393208, 7, -393207, 7, -393206, 7, -393205, 8, -393203, 17, -393202, 16, -393201, 6, -393200, 7, -393199, 7, -393198, 7, -393197, 16, -393196, 27, -393194, 17, -393193, 7, -393192, 7, -393191, 7, -393190, 8, -393188, 14, -393187, 9, -393186, 16, -262145, 3, -327680, 5, -327678, 17, -327677, 7, -327676, 16, -327661, 14, -327660, 1, -327659, 1, -327658, 15, -327652, 3, -327651, 5, -196609, 17, -262144, 12, -262143, 15, -262137, 18, -262128, 13, -262125, 17, -262124, 4, -262123, 11, -262122, 16, -262118, 20, -262116, 6, -262115, 8, -196608, 17, -196607, 12, -196606, 1, -196605, 1, -196604, 1, -196603, 1, -196602, 1, -196601, 1, -196600, 1, -196599, 1, -196598, 1, -196597, 1, -196596, 1, -196595, 1, -196594, 1, -196593, 1, -196592, 1, -196591, 1, -196590, 15, -196588, 17, -196587, 16, -196585, 14, -196584, 1, -196583, 1, -196582, 1, -196581, 2, -131071, 17, -131070, 7, -131069, 7, -131068, 7, -131067, 7, -131066, 7, -131065, 7, -131064, 7, -131063, 7, -131062, 7, -131061, 7, -131060, 7, -131059, 7, -131058, 7, -131057, 7, -131056, 7, -131055, 10, -131054, 12, -131053, 15, -131050, 14, -131049, 9, -131048, 11, -131047, 7, -131046, 7, -131045, 8, -65519, 3, -65518, 4, -65517, 12, -65516, 1, -65515, 1, -65514, 9, -65513, 4, -65512, 5, 17, 6, 18, 7, 19, 7, 20, 7, 21, 7, 22, 7, 23, 7, 24, 8 ) +tile_data = IntArray( -1310716, 32, -1245179, 13, -1179646, 32, -1179634, 32, -1114110, 31, -1114108, 31, -1114107, 13, -1114106, 13, -1114105, 13, -1114104, 13, -1114103, 13, -1114101, 13, -1114100, 13, -1114099, 13, -1114098, 31, -1048574, 30, -1048572, 31, -1048562, 31, -1048558, 0, -1048557, 1, -1048556, 2, -983038, 13, -983036, 31, -983032, 27, -983026, 31, -983024, 14, -983023, 15, -983022, 17, -983021, 7, -983020, 16, -983019, 14, -983018, 1, -983017, 15, -917502, 13, -917500, 31, -917496, 13, -917490, 31, -917488, 17, -917487, 8, -917483, 6, -917482, 7, -917481, 8, -851964, 31, -851962, 32, -851958, 32, -851954, 31, -851944, 0, -851943, 2, -851940, 14, -851939, 15, -786430, 32, -786428, 31, -786426, 31, -786422, 31, -786418, 31, -786417, 0, -786416, 2, -786408, 3, -786407, 5, -786405, 14, -786404, 9, -786403, 16, -655361, 13, -720894, 31, -720892, 31, -720890, 31, -720886, 31, -720885, 32, -720882, 31, -720881, 3, -720880, 12, -720879, 1, -720878, 1, -720877, 1, -720876, 1, -720875, 1, -720874, 1, -720873, 1, -720872, 9, -720871, 5, -720869, 17, -720868, 16, -720865, 13, -655358, 30, -655356, 31, -655354, 30, -655350, 31, -655349, 31, -655346, 31, -655345, 3, -655344, 11, -655343, 7, -655342, 7, -655341, 7, -655340, 7, -655339, 7, -655338, 7, -655337, 7, -655336, 7, -655335, 8, -524290, 13, -524289, 0, -589824, 15, -589822, 13, -589820, 31, -589818, 13, -589814, 31, -589813, 31, -589810, 31, -589809, 6, -589808, 16, -589794, 13, -458753, 3, -524288, 5, -524284, 30, -524280, 14, -524279, 15, -524278, 30, -524277, 30, -524274, 30, -524273, 0, -524272, 15, -393217, 3, -458752, 5, -458750, 0, -458749, 1, -458748, 2, -458746, 0, -458745, 1, -458744, 9, -458743, 12, -458742, 1, -458741, 2, -458739, 0, -458738, 2, -458737, 3, -458736, 12, -458735, 1, -458734, 1, -458733, 2, -458730, 0, -458729, 1, -458728, 1, -458727, 1, -458726, 2, -458723, 14, -458722, 15, -327681, 3, -393216, 5, -393214, 3, -393213, 4, -393212, 5, -393210, 17, -393209, 7, -393208, 7, -393207, 7, -393206, 7, -393205, 8, -393203, 17, -393202, 16, -393201, 6, -393200, 7, -393199, 7, -393198, 7, -393197, 16, -393196, 27, -393194, 17, -393193, 7, -393192, 7, -393191, 7, -393190, 8, -393188, 14, -393187, 9, -393186, 16, -262145, 3, -327680, 5, -327678, 17, -327677, 7, -327676, 16, -327661, 14, -327660, 1, -327659, 1, -327658, 15, -327652, 3, -327651, 5, -196609, 17, -262144, 12, -262143, 15, -262137, 18, -262128, 13, -262125, 17, -262124, 4, -262123, 11, -262122, 16, -262118, 20, -262116, 6, -262115, 8, -196608, 17, -196607, 12, -196606, 1, -196605, 1, -196604, 1, -196603, 1, -196602, 1, -196601, 1, -196600, 1, -196599, 1, -196598, 1, -196597, 1, -196596, 1, -196595, 1, -196594, 1, -196593, 1, -196592, 1, -196591, 1, -196590, 15, -196588, 17, -196587, 16, -196585, 14, -196584, 1, -196583, 1, -196582, 1, -196581, 2, -131071, 17, -131070, 7, -131069, 7, -131068, 7, -131067, 7, -131066, 7, -131065, 7, -131064, 7, -131063, 7, -131062, 7, -131061, 7, -131060, 7, -131059, 7, -131058, 7, -131057, 7, -131056, 7, -131055, 10, -131054, 12, -131053, 15, -131050, 14, -131049, 9, -131048, 11, -131047, 7, -131046, 7, -131045, 8, -65519, 3, -65518, 4, -65517, 12, -65516, 1, -65515, 1, -65514, 9, -65513, 4, -65512, 5, 17, 6, 18, 7, 19, 7, 20, 7, 21, 7, 22, 7, 23, 7, 24, 8 ) [node name="ParallaxBackground" type="ParallaxBackground" parent="."] @@ -279,7 +279,7 @@ amount = 20 [node name="Heart" parent="hearts" instance=ExtResource( 8 )] -transform/pos = Vector2( 1250, -1230 ) +transform/pos = Vector2( 1211.19, -1230 ) [node name="Heart1" parent="hearts" instance=ExtResource( 8 )] diff --git a/Scenes/Menu/buy_milk.gd b/Scenes/Menu/buy_milk.gd index 4b96e98..835f82a 100644 --- a/Scenes/Menu/buy_milk.gd +++ b/Scenes/Menu/buy_milk.gd @@ -5,7 +5,7 @@ var price = 0 func _ready(): update_price() -func update_price(): +func update_price(): price = global.base_price_milk * max(global.increment_price_milk * global.milk_buyed, 1) get_node("Milk_Label").set_text(str(price)) if (price < global.saved_cowbells): diff --git a/Scenes/Menu/global.gd b/Scenes/Menu/global.gd index 08819f5..a4e1b5a 100644 --- a/Scenes/Menu/global.gd +++ b/Scenes/Menu/global.gd @@ -11,6 +11,8 @@ var increment_price_milk = 2 var hearts_buyed = 0 var milk_buyed = 0 +var can_show_in_game_menu = true + var level = 0 var unlocked_levels = 1 var onscreen_controls = true @@ -21,21 +23,25 @@ var max_milk = 100 var max_life = 3 var saved_cowbells = 0 -func buy_milk(price): - milk_buyed += 1 +func buy(price): saved_cowbells -= price - max_milk += 33 - milk_level = max_milk - get_tree().get_nodes_in_group("level_selector")[0].reset_hud() + cowbells = saved_cowbells save_game() -func buy_heart(price): - hearts_buyed += 1 - saved_cowbells -= price - max_life += 1 - life = max_life +func buy_milk(price): + milk_buyed += 1 + max_milk += 33 + milk_level = max_milk + buy(price) get_tree().get_nodes_in_group("level_selector")[0].reset_hud() - save_game() + +func buy_heart(price): + hearts_buyed += 1 + max_life += 1 + life = max_life + buy(price) + get_tree().get_nodes_in_group("level_selector")[0].reset_hud() + func release_all(): pass diff --git a/Scenes/Menu/in_game_menu.tscn b/Scenes/Menu/in_game_menu.tscn index e9796be..1cdd330 100644 --- a/Scenes/Menu/in_game_menu.tscn +++ b/Scenes/Menu/in_game_menu.tscn @@ -24,7 +24,7 @@ func hide(): func _input(ev): - if (ev.is_action_pressed(\"ui_cancel\")): + if (ev.is_action_pressed(\"ui_menu\") and global.can_show_in_game_menu): if (is_hidden()): show() else: diff --git a/Scenes/Menu/ufo_store.gd b/Scenes/Menu/ufo_store.gd index 8e1a1f4..dbd541c 100644 --- a/Scenes/Menu/ufo_store.gd +++ b/Scenes/Menu/ufo_store.gd @@ -1,19 +1,26 @@ extends Control func show(): + global.can_show_in_game_menu = false get_node("Panel").set_hidden(false) get_node("Panel/VButtonArray/Liftoff").update_button() get_node("AnimationPlayer").play("slide_down") get_node("Panel/VButtonArray/Milk_button").update_price() get_node("Panel/VButtonArray/Heart_button").update_price() get_node("Panel/VButtonArray/Return").grab_focus() + set_process_input(true) -func hide(): +func hide(): + global.can_show_in_game_menu = true get_node("AnimationPlayer").play_backwards("slide_down") get_node("Panel/VButtonArray/Return").grab_focus() get_node("Panel/VButtonArray/Return").release_focus() + set_process_input(false) func _on_Button1_pressed(): get_tree().get_nodes_in_group("player_spawner")[0].deploy() hide() - + +func _input(ev): + if (ev.is_action_pressed("ui_cancel")): + _on_Button1_pressed() diff --git a/engine.cfg b/engine.cfg index f35f0b8..7654789 100644 --- a/engine.cfg +++ b/engine.cfg @@ -38,9 +38,10 @@ gen_mipmaps=false [input] -ui_cancel=[key(Escape), jbutton(0, 11)] +ui_cancel=[key(Escape), jbutton(0, 2), jbutton(0, 3)] ui_left=[key(Left), jbutton(0, 14)] ui_right=[key(Right), jbutton(0, 15)] +ui_menu=[key(Escape), jbutton(0, 11)] ui_jump=[key(A), key(Space), jbutton(0, 0)] ui_shoot=[key(S), jbutton(0, 1)] ui_change_weapon=[key(R), jbutton(0, 6), jbutton(0, 5)] diff --git a/player_spawner.gd b/player_spawner.gd index 832cbb3..0dc19f5 100644 --- a/player_spawner.gd +++ b/player_spawner.gd @@ -51,7 +51,7 @@ func _input(ev): abduct() func _on_Area2D_body_enter( body ): - if (body.is_in_group("player")): + if (body.is_in_group("player")): set_process_input(true) func _on_Area2D_body_exit(body):