diff --git a/Level1.tscn b/Level1.tscn index 69f31a6..8e5c37c 100644 --- a/Level1.tscn +++ b/Level1.tscn @@ -5,10 +5,13 @@ [ext_resource path="res://Player.tscn" type="PackedScene" id=3] [ext_resource path="res://Mothership.tscn" type="PackedScene" id=4] -[node name="Level1" type="Node" index="0"] +[node name="Level1" type="Node"] script = ExtResource( 1 ) FirstBad = ExtResource( 2 ) +BlobBad = null +LaserBad = null +RectangleBoss = null [node name="Player" parent="." index="0" instance=ExtResource( 3 )] diff --git a/Main.gd b/Main.gd index d50bc10..93b58fe 100644 --- a/Main.gd +++ b/Main.gd @@ -124,7 +124,7 @@ var sendblob = 1 var bad_health_multi = 1 var total_bads_spawned = 0 func BaddieTimer(): - if total_bads_spawned == 75: + if total_bads_spawned == 15: # 75 default if get_tree().is_network_server(): rpc("bossMode") else: diff --git a/Main.tscn b/Main.tscn index 14f6aa3..62801ff 100644 --- a/Main.tscn +++ b/Main.tscn @@ -28,7 +28,7 @@ animations = [ { "speed": 5.0 } ] -[node name="Main" type="Node" index="0"] +[node name="Main" type="Node"] script = ExtResource( 1 ) _sections_unfolded = [ "Pause" ] @@ -105,7 +105,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 785.0 -margin_top = 125.0 +margin_top = 269.0 margin_right = 1022.0 margin_bottom = 599.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -188,10 +188,10 @@ _sections_unfolded = [ "Visibility" ] [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="update_display" from="Player" to="." method="_on_Player_update_display"] [connection signal="timeout" from="BaddieTimer" to="." method="BaddieTimer"] diff --git a/MainMenu.gd b/MainMenu.gd index d684ea0..0d572c9 100644 --- a/MainMenu.gd +++ b/MainMenu.gd @@ -31,7 +31,7 @@ var now_quitting = false var rectangle_opacity = 0 func _ready(): - #$Music.play() + $Music.play() pass func _process(delta): diff --git a/Player.gd b/Player.gd index 3e89b7e..d7b3e88 100644 --- a/Player.gd +++ b/Player.gd @@ -59,7 +59,7 @@ const BULLET_DELAY_TIER4_COST = 400 const BULLET_DELAY_TIER5_COST = 1000 # double laser cost -const DOUBLE_LASER_COST = 20 +const DOUBLE_LASER_COST = 2000 # the 5 tiers of ship speed const SHIP_SPEED_TIER1 = 150 @@ -78,7 +78,7 @@ const SHIP_SPEED_TIER5_COST = 800 const STARTING_POSITION = Vector2(100, 250) # the amount of money the player starts with -const STARTING_MONEY = 100 +const STARTING_MONEY = 10000 ################################# @@ -244,7 +244,7 @@ func upgradeShipSpeed(): prints(ship_speed) func doubleLaserUpgrade(): - if money >= DOUBLE_LASER_COST: + if money >= DOUBLE_LASER_COST && double_laser == false: money -= DOUBLE_LASER_COST double_laser = true rpc("double_laser_upgrade", get_tree().get_network_unique_id()) diff --git a/TODO b/TODO index d307733..a1cbc03 100644 --- a/TODO +++ b/TODO @@ -2,4 +2,6 @@ * A way of increasing difficulty without it suddenly becoming impossible * Mothership art * A story mode? +* The main menu stars could do something silly and fun, like change colors, + maybe taking the menu colors with them. * etc., etc.