diff --git a/BG.tscn b/BG.tscn index e599596..87f48ca 100644 --- a/BG.tscn +++ b/BG.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://art/bg.png" type="Texture" id=3] [ext_resource path="res://art/backgrounds/orange.png" type="Texture" id=4] -[node name="BG" type="Node2D"] +[node name="BG" type="Node2D" index="0"] z_index = -1 script = ExtResource( 1 ) @@ -38,6 +38,7 @@ _sections_unfolded = [ "Anchor", "Focus", "Grow Direction", "Hint", "Margin", "M visible = false position = Vector2( 1250, 154.764 ) +scale = Vector2( 0.3, 0.3 ) z_index = 1 texture = ExtResource( 2 ) _sections_unfolded = [ "Transform", "Z Index" ] diff --git a/Main.gd b/Main.gd index 43aeca7..8662c24 100644 --- a/Main.gd +++ b/Main.gd @@ -79,9 +79,9 @@ func rounds(round_number): 2: roundOfEnemies(.6,DEFAULT_SPAWN_SPEED*.75,4,1,0,0) #if get_tree().is_network_server() == true: - # rpc("bossMode", 1) + # rpc("bossMode", 0) #else: - # bossMode(1) + # bossMode(0) rpc("set_wave_name", "Wave 2: Any colour you like") 3: roundOfEnemies(.6,DEFAULT_SPAWN_SPEED*.75,8,2,0,0) @@ -403,7 +403,7 @@ sync func bossMode(boss_type): bad = RectangleBoss.instance() elif boss_type == 1: bad = BlackHole.instance() - $Music.volume_db = -20 + $Music.volume_db = -40 add_child(bad) # Flash screen when signalled diff --git a/Main.tscn b/Main.tscn index 16cd1bf..9fb7890 100644 --- a/Main.tscn +++ b/Main.tscn @@ -258,10 +258,10 @@ bus = "Master" [connection signal="other_shooting_upgrade" from="Player" to="." method="other_shooting_upgrade"] -[connection signal="restart_game" from="Player" to="." method="_on_Player_restart_game"] - [connection signal="restart_game" from="Player" to="Mothership" method="_on_Player_restart_game"] +[connection signal="restart_game" from="Player" to="." method="_on_Player_restart_game"] + [connection signal="start_next_round" from="Player" to="." method="startNextRound"] [connection signal="update_display" from="Player" to="." method="updatePoints"] diff --git a/MainMenu.tscn b/MainMenu.tscn index 15751e1..717c291 100644 --- a/MainMenu.tscn +++ b/MainMenu.tscn @@ -33,7 +33,7 @@ animations = [ { "speed": 5.0 } ] -[node name="Node" type="Node" index="0"] +[node name="Node" type="Node"] pause_mode = 2 script = ExtResource( 1 ) diff --git a/Menus/Settings.tscn b/Menus/Settings.tscn index a7349c8..ac21183 100644 --- a/Menus/Settings.tscn +++ b/Menus/Settings.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://Menus/libera.png" type="Texture" id=3] [ext_resource path="res://Menus/opens_externally.png" type="Texture" id=4] -[node name="Menu" instance=ExtResource( 1 )] +[node name="Menu" index="0" instance=ExtResource( 1 )] [node name="PatreonLink" type="Button" parent="." index="2"] diff --git a/Player.tscn b/Player.tscn index 975c8ae..5e970bf 100644 --- a/Player.tscn +++ b/Player.tscn @@ -20,7 +20,7 @@ custom_solver_bias = 0.0 radius = 25.7545 height = 40.4125 -[node name="Player" type="Area2D"] +[node name="Player" type="Area2D" index="0"] input_pickable = true gravity_point = true diff --git a/RectangleBoss.tscn b/RectangleBoss.tscn index fa1d01e..6e1a029 100644 --- a/RectangleBoss.tscn +++ b/RectangleBoss.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=2] +[gd_scene load_steps=28 format=2] [ext_resource path="res://RectangleBoss.gd" type="Script" id=1] [ext_resource path="res://Laser.tscn" type="PackedScene" id=2] @@ -22,6 +22,7 @@ [ext_resource path="res://art/bad/rectangle/rectangle_outside_cracked12.png" type="Texture" id=20] [ext_resource path="res://art/bad/rectangle/rectangle_outside_cracked13.png" type="Texture" id=21] [ext_resource path="res://art/bad/rectangle/rectangle_outside_cracked14.png" type="Texture" id=22] +[ext_resource path="res://boss_long_minor_key.ogg" type="AudioStream" id=23] [sub_resource type="SpriteFrames" id=1] @@ -119,6 +120,14 @@ shape = SubResource( 4 ) position = Vector2( 3427.85, 1866.16 ) shape = SubResource( 4 ) +[node name="BossMusic" type="AudioStreamPlayer" parent="." index="5"] + +stream = ExtResource( 23 ) +volume_db = 4.0 +autoplay = true +mix_target = 0 +bus = "Master" + [connection signal="area_entered" from="Inside" to="." method="_on_Inside_area_entered"] [connection signal="body_entered" from="Inside" to="." method="_on_Inside_body_entered"] diff --git a/Turret.gd b/Turret.gd index ffb8387..0af3d34 100644 --- a/Turret.gd +++ b/Turret.gd @@ -54,12 +54,12 @@ func _process(delta): func entityEnteredRange(bad_id, bad, bad_shape, self_shape): #print(bad.get_name()) - if ("Bad" in bad.get_name() || "Black" in bad.get_name() || "Boss" in bad.get_name()):# && current_bad == null: + if ("Bad" in bad.get_name() || "Black" in bad.get_name() || "Boss" in bad.get_name()) || "Prison" in bad.get_name():# && current_bad == null: current_bad = bad current_bad_id = bad_id current_bad_shape = bad_shape enemy_count += 1 - print(enemy_count) + #print(enemy_count) func _on_FlashTimer_timeout(): $Beam.default_color.a = 0 diff --git a/boss_long_minor_key.ogg b/boss_long_minor_key.ogg new file mode 100644 index 0000000..eb02b42 Binary files /dev/null and b/boss_long_minor_key.ogg differ diff --git a/export_presets.cfg b/export_presets.cfg index e046023..26bb2d3 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -210,7 +210,7 @@ user_permissions/19=false [preset.1] -name="Linux/X11" +name="Linux" platform="Linux/X11" runnable=true custom_features="" @@ -230,7 +230,7 @@ custom_template/debug="" [preset.2] -name="Windows Desktop" +name="Windows" platform="Windows Desktop" runnable=true custom_features="" @@ -344,7 +344,7 @@ custom_template/debug="" [preset.5] -name="Mac OSX" +name="OSX" platform="Mac OSX" runnable=true custom_features="" diff --git a/project.godot b/project.godot index bbcba5e..dea7042 100644 --- a/project.godot +++ b/project.godot @@ -17,7 +17,6 @@ config/icon="res://icon.png" [display] -window/handheld/emulate_touchscreen=true window/stretch/mode="2d" [input] @@ -25,6 +24,22 @@ window/stretch/mode="2d" ui_select=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":69,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null) ] +ui_left=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) + ] +ui_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) + ] +ui_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) + ] +ui_down=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) + ] ui_reset=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":82,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) ]