Updated Hub World to have portals to levels and disabled the level select menu

This commit is contained in:
VoidTwo
2021-12-09 17:31:24 -06:00
parent 2147d38874
commit 037752c118
18 changed files with 389 additions and 15 deletions

View File

@@ -1,11 +1,28 @@
extends CanvasLayer
export var hub_world_path: String = 'res://Levels/Hub World.tscn'
export var disable_back_to_hub: bool = false
func _ready() -> void:
if disable_back_to_hub:
$'Menu/Menu Options/Back To Hub'.visible = false
return
func _on_resume_button_pressed() -> void:
resume()
return
func _on_back_to_hub_button_pressed():
if get_tree().change_scene(hub_world_path) != OK:
print('ERROR: Pause Screen failed to change scene to Hub World.')
resume()
queue_free()
return
func _on_quit_button_pressed() -> void:
get_tree().quit()
return
@@ -16,6 +33,11 @@ func _on_resume_button_mouse_entered() -> void:
return
func _on_back_to_hub_button_mouse_entered() -> void:
$'Menu Button Hover'.play(0.0)
return
func _on_quit_button_mouse_entered() -> void:
$'Menu Button Hover'.play(0.0)
return

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://Sprites/Assets/Black_Background.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Menus/Menu Buttons/Quit_Button_Normal.png" type="Texture" id=2]
@@ -7,6 +7,8 @@
[ext_resource path="res://Sprites/Menus/Menu Buttons/Quit_Button_Hover.png" type="Texture" id=5]
[ext_resource path="res://GUI/Pause Screen.gd" type="Script" id=6]
[ext_resource path="res://Sounds/Menu_Button_Hover.wav" type="AudioStream" id=7]
[ext_resource path="res://Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Normal.png" type="Texture" id=8]
[ext_resource path="res://Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Hover.png" type="Texture" id=9]
[node name="Pause Screen" type="CanvasLayer"]
pause_mode = 2
@@ -34,10 +36,10 @@ __meta__ = {
}
[node name="Menu Options" type="VBoxContainer" parent="Menu"]
margin_left = 49.0
margin_top = 63.0
margin_right = 111.0
margin_bottom = 97.0
margin_left = 33.0
margin_top = 53.0
margin_right = 126.0
margin_bottom = 106.0
[node name="Resume" type="CenterContainer" parent="Menu/Menu Options"]
margin_right = 62.0
@@ -49,6 +51,17 @@ margin_bottom = 15.0
texture_normal = ExtResource( 3 )
texture_hover = ExtResource( 4 )
[node name="Back To Hub" type="CenterContainer" parent="Menu/Menu Options"]
margin_right = 40.0
margin_bottom = 40.0
[node name="Back To Hub Button" type="TextureButton" parent="Menu/Menu Options/Back To Hub"]
margin_top = 12.0
margin_right = 93.0
margin_bottom = 27.0
texture_normal = ExtResource( 8 )
texture_hover = ExtResource( 9 )
[node name="Quit" type="CenterContainer" parent="Menu/Menu Options"]
margin_top = 19.0
margin_right = 62.0
@@ -67,5 +80,7 @@ volume_db = -16.0
[connection signal="mouse_entered" from="Menu/Menu Options/Resume/Resume Button" to="." method="_on_resume_button_mouse_entered"]
[connection signal="pressed" from="Menu/Menu Options/Resume/Resume Button" to="." method="_on_resume_button_pressed"]
[connection signal="mouse_entered" from="Menu/Menu Options/Back To Hub/Back To Hub Button" to="." method="_on_back_to_hub_button_mouse_entered"]
[connection signal="pressed" from="Menu/Menu Options/Back To Hub/Back To Hub Button" to="." method="_on_back_to_hub_button_pressed"]
[connection signal="mouse_entered" from="Menu/Menu Options/Quit/Quit Button" to="." method="_on_quit_button_mouse_entered"]
[connection signal="pressed" from="Menu/Menu Options/Quit/Quit Button" to="." method="_on_quit_button_pressed"]

View File

@@ -2,5 +2,16 @@ extends Node2D
func _ready() -> void:
$YSort/Player.load_hud($HUD)
return
$YSort/Player.load_hud($HUD)
for level_portal in $'YSort/Level Portals'.get_children():
if level_portal.connect('enter_level', self, 'enter_level') != OK:
print('ERROR: Level Portal "enter_level" signal already connected.')
return
func enter_level(level: String) -> void:
if get_tree().change_scene(level) != OK:
print('ERROR: Hub World failed to change scene to Level.')
queue_free()
return

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,11 @@
extends Area2D
signal enter_level(level)
export var level_path: String = 'res://Levels/LEVEL.tscn'
func _on_level_portal_body_entered(body: Node) -> void:
if body.is_in_group('player'):
emit_signal('enter_level', level_path)
return

View File

@@ -0,0 +1,28 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Sprites/Levels/Interactables/Level_Portal.png" type="Texture" id=1]
[ext_resource path="res://Levels/Interactables/Level Portal.gd" type="Script" id=2]
[sub_resource type="CapsuleShape2D" id=1]
radius = 8.0
height = 18.0
[node name="Level Portal" type="Area2D"]
light_mask = 0
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
offset = Vector2( 0, -8 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
visible = false
light_mask = 0
position = Vector2( 0, -8 )
shape = SubResource( 1 )
[connection signal="body_entered" from="." to="." method="_on_level_portal_body_entered"]

13
Main.gd
View File

@@ -3,7 +3,7 @@ extends Node
export var splash_screen_path: String
export var main_menu_path: String
export var level_select_menu_path: String
export var world_path: String
export var hub_world_path: String
func _ready() -> void:
@@ -40,10 +40,13 @@ func play_main_menu() -> Node:
func main_menu_option(option: String) -> void:
if option == 'new game':
var level_select_menu: Node = play_level_select_menu()
yield(level_select_menu, 'complete')
free_connected_node(level_select_menu, 'level_select_menu_option')
level_select_menu = null
if get_tree().change_scene(hub_world_path) != OK:
print('ERROR: Main failed to change scene to Hub World.')
queue_free()
#var level_select_menu: Node = play_level_select_menu()
#yield(level_select_menu, 'complete')
#free_connected_node(level_select_menu, 'level_select_menu_option')
#level_select_menu = null
return

View File

@@ -8,7 +8,7 @@ script = ExtResource( 1 )
splash_screen_path = "res://GUI/Splash Screen.tscn"
main_menu_path = "res://GUI/Main Menu.tscn"
level_select_menu_path = "res://GUI/Level Select Menu.tscn"
world_path = "res://Levels/Hub World.tscn"
hub_world_path = "res://Levels/Hub World.tscn"
[node name="Background" type="Sprite" parent="."]
texture = ExtResource( 3 )

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Black_Tile.png-468b234ed74eefbb74c33d4d44fd3553.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Assets/Black_Tile.png"
dest_files=[ "res://.import/Black_Tile.png-468b234ed74eefbb74c33d4d44fd3553.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=0
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Level_Portal.png-032cf024355e4d24a270165e6487b474.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Interactables/Level_Portal.png"
dest_files=[ "res://.import/Level_Portal.png-032cf024355e4d24a270165e6487b474.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=0
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Hub_World_Grass_Atlas.png-35f62295b86dd25eba082844cf2760f1.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Tilesets/Hub_World_Grass_Atlas.png"
dest_files=[ "res://.import/Hub_World_Grass_Atlas.png-35f62295b86dd25eba082844cf2760f1.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=0
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Back_To_Hub_Button_Hover.png-7168f4a8f8f34c936a30024ee0a830de.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Hover.png"
dest_files=[ "res://.import/Back_To_Hub_Button_Hover.png-7168f4a8f8f34c936a30024ee0a830de.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=0
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Back_To_Hub_Button_Normal.png-f0f1f9eb9ea13789e27688857590fc22.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Menus/Menu Buttons/Back_To_Hub_Button_Normal.png"
dest_files=[ "res://.import/Back_To_Hub_Button_Normal.png-f0f1f9eb9ea13789e27688857590fc22.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=2
flags/repeat=0
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=0
process/fix_alpha_border=false
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0