diff --git a/dist/bosskeeper.exe b/dist/bosskeeper.exe deleted file mode 100644 index d2763c6..0000000 Binary files a/dist/bosskeeper.exe and /dev/null differ diff --git a/dist/bosskeeper.pck b/dist/bosskeeper.pck deleted file mode 100644 index 196678b..0000000 Binary files a/dist/bosskeeper.pck and /dev/null differ diff --git a/src/Boss/SlimeBoss/SlimeBossStateMachine.gd b/src/Boss/SlimeBoss/SlimeBossStateMachine.gd index f514567..9cb5de6 100644 --- a/src/Boss/SlimeBoss/SlimeBossStateMachine.gd +++ b/src/Boss/SlimeBoss/SlimeBossStateMachine.gd @@ -16,7 +16,6 @@ enum PHASES {PHASE_ONE, PHASE_TWO, PHASE_THREE} export(PHASES) var _phase = PHASES.PHASE_ONE export(String, FILE, "*.tscn,*.scn") var lose_screen = "" -export(String, FILE, "*.tscn,*.scn") var win_screen = "" func _ready(): print("Hey.") diff --git a/src/Menus/Credits/Credits.tscn b/src/Menus/Credits/Credits.tscn index fd4842f..73a7ed9 100644 --- a/src/Menus/Credits/Credits.tscn +++ b/src/Menus/Credits/Credits.tscn @@ -16,7 +16,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 20 ), "transitions": PoolRealArray( 1, 1 ), "update": 0, -"values": [ 200.0, -630 ] +"values": [ 200.0, -720 ] } [node name="Credits" type="Node2D"] @@ -37,7 +37,12 @@ margin_top = 200.0 margin_right = 40.0 margin_bottom = 14.0 custom_fonts/font = ExtResource( 1 ) -text = "---- Team ---- +text = "Boss Keeper +A Time Wasted Production + +Game made for LD 46 + +---- Team ---- DerAnonymos https://www.youtube.com/c/DerAnonymosLP https://twitch.tv/deranonymos diff --git a/src/Menus/DragNDrop/DragSink.tscn b/src/Menus/DragNDrop/DragSink.tscn index 0e0a1df..ed32252 100644 --- a/src/Menus/DragNDrop/DragSink.tscn +++ b/src/Menus/DragNDrop/DragSink.tscn @@ -5,7 +5,8 @@ [node name="DragSink" type="Container"] anchor_right = 1.0 anchor_bottom = 0.789 -margin_bottom = -0.0200043 +margin_right = -3.0 +margin_bottom = 0.970001 script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false diff --git a/src/Menus/LoseScreen/LoseScreen.gd b/src/Menus/LoseScreen/LoseScreen.gd index 189748f..f5947eb 100644 --- a/src/Menus/LoseScreen/LoseScreen.gd +++ b/src/Menus/LoseScreen/LoseScreen.gd @@ -5,6 +5,8 @@ export(String, FILE, "*.tscn,*.scn") var title_screen = "" func _on_Restart_pressed(): get_tree().change_scene(restart_scene) + SoundControler.pub_stop_effects() func _on_TitleScreen_pressed(): get_tree().change_scene(title_screen) + SoundControler.pub_stop_effects() diff --git a/src/Menus/LoseScreen/LoseScreen.tscn b/src/Menus/LoseScreen/LoseScreen.tscn index 39a38b7..623fefc 100644 --- a/src/Menus/LoseScreen/LoseScreen.tscn +++ b/src/Menus/LoseScreen/LoseScreen.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] -[ext_resource path="res://Fonts/Harmonic/Harmonic24.tres" type="DynamicFont" id=1] [ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=2] [ext_resource path="res://Menus/LoseScreen/LoseScreen.gd" type="Script" id=3] @@ -72,48 +71,48 @@ __meta__ = { } [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/CenterContainer"] -margin_left = 124.0 -margin_top = 98.0 -margin_right = 356.0 -margin_bottom = 172.0 +margin_left = 172.0 +margin_top = 104.0 +margin_right = 308.0 +margin_bottom = 166.0 custom_constants/separation = 10 alignment = 1 [node name="Label" type="Label" parent="CanvasLayer/CenterContainer/VBoxContainer"] -margin_right = 232.0 +margin_right = 136.0 margin_bottom = 12.0 custom_fonts/font = ExtResource( 2 ) text = "Your friend, the slime, died." align = 1 -percent_visible = 0.0 [node name="Label2" type="Label" parent="CanvasLayer/CenterContainer/VBoxContainer"] margin_top = 22.0 -margin_right = 232.0 +margin_right = 136.0 margin_bottom = 34.0 custom_fonts/font = ExtResource( 2 ) text = "And everything is worse now." align = 1 valign = 1 -percent_visible = 0.0 [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/CenterContainer/VBoxContainer"] margin_top = 44.0 -margin_right = 232.0 -margin_bottom = 74.0 +margin_right = 136.0 +margin_bottom = 62.0 [node name="Restart" type="Button" parent="CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer"] -margin_right = 90.0 -margin_bottom = 30.0 -custom_fonts/font = ExtResource( 1 ) +margin_right = 48.0 +margin_bottom = 18.0 +custom_fonts/font = ExtResource( 2 ) +custom_colors/font_color = Color( 0.121569, 0.45098, 0.780392, 1 ) text = "Restart" flat = true [node name="TitleScreen" type="Button" parent="CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer"] -margin_left = 94.0 -margin_right = 232.0 -margin_bottom = 30.0 -custom_fonts/font = ExtResource( 1 ) +margin_left = 52.0 +margin_right = 124.0 +margin_bottom = 18.0 +custom_fonts/font = ExtResource( 2 ) +custom_colors/font_color = Color( 0.682353, 0.141176, 0.333333, 1 ) text = "Title screen" flat = true diff --git a/src/Menus/WinScreen/WinScreen.gd b/src/Menus/WinScreen/WinScreen.gd index 189748f..fa95813 100644 --- a/src/Menus/WinScreen/WinScreen.gd +++ b/src/Menus/WinScreen/WinScreen.gd @@ -3,8 +3,11 @@ extends Node2D export(String, FILE, "*.tscn,*.scn") var restart_scene = "" export(String, FILE, "*.tscn,*.scn") var title_screen = "" + func _on_Restart_pressed(): get_tree().change_scene(restart_scene) + SoundControler.pub_stop_effects() func _on_TitleScreen_pressed(): get_tree().change_scene(title_screen) + SoundControler.pub_stop_effects() diff --git a/src/Menus/WinScreen/WinScreen.tscn b/src/Menus/WinScreen/WinScreen.tscn index be9121d..35e9c95 100644 --- a/src/Menus/WinScreen/WinScreen.tscn +++ b/src/Menus/WinScreen/WinScreen.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] -[ext_resource path="res://Fonts/Harmonic/Harmonic24.tres" type="DynamicFont" id=1] [ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=2] [ext_resource path="res://Menus/WinScreen/WinScreen.gd" type="Script" id=3] @@ -57,7 +56,7 @@ tracks/3/keys = { "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] } -[node name="LoseScreen" type="Node2D"] +[node name="WinScreen" type="Node2D"] script = ExtResource( 3 ) restart_scene = "res://World.tscn" title_screen = "res://Menus/TitleScreen/TitleScreen.tscn" @@ -73,9 +72,9 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/CenterContainer"] margin_left = 68.0 -margin_top = 98.0 +margin_top = 104.0 margin_right = 412.0 -margin_bottom = 172.0 +margin_bottom = 166.0 custom_constants/separation = 10 alignment = 1 @@ -101,24 +100,26 @@ percent_visible = 0.0 [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/CenterContainer/VBoxContainer"] margin_top = 44.0 margin_right = 344.0 -margin_bottom = 74.0 +margin_bottom = 62.0 alignment = 1 [node name="Restart" type="Button" parent="CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer"] modulate = Color( 1, 1, 1, 0 ) -margin_left = 56.0 -margin_right = 146.0 -margin_bottom = 30.0 -custom_fonts/font = ExtResource( 1 ) +margin_left = 110.0 +margin_right = 158.0 +margin_bottom = 18.0 +custom_fonts/font = ExtResource( 2 ) +custom_colors/font_color = Color( 0.121569, 0.45098, 0.780392, 1 ) text = "Restart" flat = true [node name="TitleScreen" type="Button" parent="CanvasLayer/CenterContainer/VBoxContainer/HBoxContainer"] modulate = Color( 1, 1, 1, 0 ) -margin_left = 150.0 -margin_right = 288.0 -margin_bottom = 30.0 -custom_fonts/font = ExtResource( 1 ) +margin_left = 162.0 +margin_right = 234.0 +margin_bottom = 18.0 +custom_fonts/font = ExtResource( 2 ) +custom_colors/font_color = Color( 0.682353, 0.141176, 0.333333, 1 ) text = "Title screen" flat = true diff --git a/src/World.gd b/src/World.gd index c0c63c7..79addb1 100644 --- a/src/World.gd +++ b/src/World.gd @@ -47,6 +47,6 @@ func spawn_new_hero(x:float,y:float): func _on_Win_pressed(): if passed_final_Round: - # TODO CHANGE SCENE TO WINSCREEN - pass + Engine.time_scale = 1 + get_tree().change_scene("res://Menus/WinScreen/WinScreen.tscn") pass # Replace with function body. diff --git a/src/World.tscn b/src/World.tscn index a45fc83..513c188 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -336,6 +336,12 @@ margin_top = 0.463304 margin_right = 0.0 margin_bottom = 0.463318 +[node name="DragSink" parent="CanvasLayer/DragNDropUI" index="0"] +margin_left = 15.0 +margin_top = 7.0 +margin_right = -15.96 +margin_bottom = -49.9 + [node name="SelectUpgradeUI" parent="CanvasLayer" instance=ExtResource( 4 )] visible = false