From f4dbc0249bf1cf40001c6c522dadc9a7bace4875 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Sat, 20 Jan 2024 03:38:12 -0700 Subject: [PATCH] test rooms --- backgounds/disclaimer.gd | 4 +- backgounds/result.gd | 2 +- backgounds/wip.gd | 2 +- global.gd | 15 ++- levels/Testrooms/testboss.tscn | 20 ++++ levels/Testrooms/testspawn.tscn | 10 ++ levels/{ => ui}/credits.gd | 2 +- levels/{ => ui}/credits.tscn | 4 +- levels/{ => ui}/debug.gd | 6 +- levels/{ => ui}/debug.tscn | 2 +- levels/ui/gameplay.gd | 50 ++++++++++ levels/ui/gameplay.tscn | 6 ++ levels/{ => ui}/musictest.gd | 2 +- levels/{ => ui}/musictest.tscn | 2 +- levels/{ => ui}/roll.gd | 0 levels/{ => ui}/scene.gd | 8 +- levels/{ => ui}/scene.tscn | 9 +- levels/{ => ui}/sfxtest.gd | 2 +- levels/{ => ui}/sfxtest.tscn | 2 +- levels/{ => ui}/soundtest.gd | 6 +- levels/{ => ui}/soundtest.tscn | 2 +- levels/{ => ui}/talk.tscn | 22 +++-- levels/ui/testrooms.gd | 56 ++++++++++++ levels/ui/testrooms.tscn | 91 +++++++++++++++++++ levels/{ => ui}/tmenu.gd | 2 +- levels/{ => ui}/tmenu.tscn | 2 +- sprites/common/midori/midori.tscn | 3 +- sprites/common/placeholder/face.png.import | 6 +- .../common/placeholder/fullbody.png.import | 34 +++++++ sprites/common/placeholder/player.png.import | 6 +- title.gd | 2 +- 31 files changed, 338 insertions(+), 42 deletions(-) create mode 100644 levels/Testrooms/testboss.tscn create mode 100644 levels/Testrooms/testspawn.tscn rename levels/{ => ui}/credits.gd (96%) rename levels/{ => ui}/credits.tscn (98%) rename levels/{ => ui}/debug.gd (87%) rename levels/{ => ui}/debug.tscn (97%) create mode 100644 levels/ui/gameplay.gd create mode 100644 levels/ui/gameplay.tscn rename levels/{ => ui}/musictest.gd (98%) rename levels/{ => ui}/musictest.tscn (99%) rename levels/{ => ui}/roll.gd (100%) rename levels/{ => ui}/scene.gd (87%) rename levels/{ => ui}/scene.tscn (88%) rename levels/{ => ui}/sfxtest.gd (95%) rename levels/{ => ui}/sfxtest.tscn (98%) rename levels/{ => ui}/soundtest.gd (77%) rename levels/{ => ui}/soundtest.tscn (96%) rename levels/{ => ui}/talk.tscn (55%) create mode 100644 levels/ui/testrooms.gd create mode 100644 levels/ui/testrooms.tscn rename levels/{ => ui}/tmenu.gd (95%) rename levels/{ => ui}/tmenu.tscn (97%) create mode 100644 sprites/common/placeholder/fullbody.png.import diff --git a/backgounds/disclaimer.gd b/backgounds/disclaimer.gd index e3728a9..654be36 100644 --- a/backgounds/disclaimer.gd +++ b/backgounds/disclaimer.gd @@ -27,9 +27,9 @@ func _title(): # This is like autoloading the scene, only # it happens after already loading the main scene. if Global.debug: - get_tree().change_scene_to_file("res://levels/scene.tscn") + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") else: - get_tree().change_scene_to_file("res://levels/credits.tscn") + get_tree().change_scene_to_file("res://levels/ui/credits.tscn") #get_tree().root.add_child(title) #get_tree().root.remove_child(boot) #boot.queue_free() diff --git a/backgounds/result.gd b/backgounds/result.gd index 1f5668d..d76cec8 100644 --- a/backgounds/result.gd +++ b/backgounds/result.gd @@ -27,7 +27,7 @@ func _title(): # This is like autoloading the scene, only # it happens after already loading the main scene. if Global.debug: - get_tree().change_scene_to_file("res://levels/scene.tscn") + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") else: get_tree().change_scene_to_file("res://backgounds/wip.tscn") #get_tree().root.add_child(title) diff --git a/backgounds/wip.gd b/backgounds/wip.gd index ef61110..380ec76 100644 --- a/backgounds/wip.gd +++ b/backgounds/wip.gd @@ -27,7 +27,7 @@ func _title(): # This is like autoloading the scene, only # it happens after already loading the main scene. if Global.debug: - get_tree().change_scene_to_file("res://levels/scene.tscn") + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") else: get_tree().change_scene_to_file("res://title.tscn") #get_tree().root.add_child(title) diff --git a/global.gd b/global.gd index ca12cc0..653341e 100644 --- a/global.gd +++ b/global.gd @@ -6,14 +6,23 @@ var origmpos var mousepos var timelimit = 15000 var wait +const places = [[[[null, null, null, null, false], [null, null, null, null, false]], [[null, null, null, null, false], ["res://levels/Testrooms/testboss.tscn", 640, 360, 11, false]], [[null, null, null, null ,false], ["res://levels/Testrooms/testspawn.tscn", 640, 360, 2 ,false]]]] +var cplace = [0,2,1] +var dplace = [null, null, null] +const pchars = ["res://sprites/common/midori/midori.tscn"] +const npchars = [] +var cpchar = 0 +var dcpchar = 0 +var cspawnarea = [null, null] +var owlocation = [[null, null], [null, null]] var hiscoresfile = "user://hiscores.save" var gamelevel var levelmax var firstrun -var musictracks = ["res://music/reloaded.wav", "res://music/Jellies.wav", "res://music/getabrain.wav", "res://music/oskars.wav", "res://music/extralife.wav", "res://music/layers.wav", "res://music/caramel.wav", "res://music/XsEdzesSs.wav", "res://music/shakeshark.wav", "res://music/zubmarine.wav", "res://music/crammin.wav", "res://music/func.wav", "res://music/kaveh.wav", "res://music/rock.wav", "res://music/milkyway.wav", "res://music/sweetener.wav", "res://music/tooold.wav", "res://music/portello.wav", "res://music/songbirds.wav", "res://music/Gotanda.wav", "res://music/unreeeal.wav"] -var sfxtracks = [] +const musictracks = ["res://music/reloaded.wav", "res://music/Jellies.wav", "res://music/getabrain.wav", "res://music/oskars.wav", "res://music/extralife.wav", "res://music/layers.wav", "res://music/caramel.wav", "res://music/XsEdzesSs.wav", "res://music/shakeshark.wav", "res://music/zubmarine.wav", "res://music/crammin.wav", "res://music/func.wav", "res://music/kaveh.wav", "res://music/rock.wav", "res://music/milkyway.wav", "res://music/sweetener.wav", "res://music/tooold.wav", "res://music/portello.wav", "res://music/songbirds.wav", "res://music/Gotanda.wav", "res://music/unreeeal.wav"] +const sfxtracks = [] var debug = false -var release = "R0.0.0-dev" +const release = "R0.0.0-dev" var sk = false var xm = 0 var ym = 0 diff --git a/levels/Testrooms/testboss.tscn b/levels/Testrooms/testboss.tscn new file mode 100644 index 0000000..58f655d --- /dev/null +++ b/levels/Testrooms/testboss.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=2 format=3 uid="uid://cma7ddp0r4rm"] + +[ext_resource type="Texture2D" uid="uid://dursxelwwxe8u" path="res://sprites/common/placeholder/player.png" id="1_hxdyl"] + +[node name="Testboss" type="Node2D"] + +[node name="TextureRect" type="TextureRect" parent="."] +offset_left = 583.0 +offset_top = 4.0 +offset_right = 711.0 +offset_bottom = 260.0 +texture = ExtResource("1_hxdyl") + +[node name="Label" type="Label" parent="."] +offset_left = 327.0 +offset_top = 354.0 +offset_right = 957.0 +offset_bottom = 409.0 +theme_override_font_sizes/font_size = 40 +text = "Boss spawns at EBU pattern area" diff --git a/levels/Testrooms/testspawn.tscn b/levels/Testrooms/testspawn.tscn new file mode 100644 index 0000000..bfb9912 --- /dev/null +++ b/levels/Testrooms/testspawn.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://b5cxd2rmstnpt"] + +[ext_resource type="Texture2D" uid="uid://kxvipok4tnuw" path="res://backgounds/wip.jpg" id="1_yw0he"] + +[node name="Testspawn" type="Node2D"] + +[node name="WIP" type="TextureRect" parent="."] +offset_right = 40.0 +offset_bottom = 40.0 +texture = ExtResource("1_yw0he") diff --git a/levels/credits.gd b/levels/ui/credits.gd similarity index 96% rename from levels/credits.gd rename to levels/ui/credits.gd index 23298b6..e130f1c 100644 --- a/levels/credits.gd +++ b/levels/ui/credits.gd @@ -45,7 +45,7 @@ func _complete(): # This is like autoloading the scene, only # it happens after already loading the main scene. if Global.debug: - get_tree().change_scene_to_file("res://levels/scene.tscn") + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") else: get_tree().change_scene_to_file("res://backgounds/result.tscn") #get_tree().root.add_child(title) diff --git a/levels/credits.tscn b/levels/ui/credits.tscn similarity index 98% rename from levels/credits.tscn rename to levels/ui/credits.tscn index fbbfb64..05af50b 100644 --- a/levels/credits.tscn +++ b/levels/ui/credits.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://g8ajwoud48us"] -[ext_resource type="Script" path="res://levels/credits.gd" id="1_y6orl"] +[ext_resource type="Script" path="res://levels/ui/credits.gd" id="1_y6orl"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_0cref"] [ext_resource type="Script" path="res://nebula.gd" id="3_ffw0g"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="5_yvope"] -[ext_resource type="Script" path="res://levels/roll.gd" id="6_3q8sp"] +[ext_resource type="Script" path="res://levels/ui/roll.gd" id="6_3q8sp"] [node name="credits" type="Node2D"] script = ExtResource("1_y6orl") diff --git a/levels/debug.gd b/levels/ui/debug.gd similarity index 87% rename from levels/debug.gd rename to levels/ui/debug.gd index 7466324..61321db 100644 --- a/levels/debug.gd +++ b/levels/ui/debug.gd @@ -41,13 +41,13 @@ func _input(event): func _on_scene_selector_pressed(): - get_tree().change_scene_to_file("res://levels/scene.tscn") + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") func _on_sound_test_pressed(): - get_tree().change_scene_to_file("res://levels/soundtest.tscn") + get_tree().change_scene_to_file("res://levels/ui/soundtest.tscn") func _on_back_pressed(): Global.debug = false - get_tree().change_scene_to_file("res://levels/tmenu.tscn") + get_tree().change_scene_to_file("res://levels/ui/tmenu.tscn") diff --git a/levels/debug.tscn b/levels/ui/debug.tscn similarity index 97% rename from levels/debug.tscn rename to levels/ui/debug.tscn index 73d2aaf..96c3e93 100644 --- a/levels/debug.tscn +++ b/levels/ui/debug.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://brrta1s63r2q2"] -[ext_resource type="Script" path="res://levels/debug.gd" id="1_gm5qw"] +[ext_resource type="Script" path="res://levels/ui/debug.gd" id="1_gm5qw"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_l51wy"] [ext_resource type="Script" path="res://nebula.gd" id="3_0jyxj"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_ogmre"] diff --git a/levels/ui/gameplay.gd b/levels/ui/gameplay.gd new file mode 100644 index 0000000..1432cbc --- /dev/null +++ b/levels/ui/gameplay.gd @@ -0,0 +1,50 @@ +extends Node2D +var level +var player +var music +var bgsound := AudioStreamPlayer.new() +var musictrack +var isboss + +# Called when the node enters the scene tree for the first time. +func _ready(): + add_child(bgsound) + if Global.debug: + level = load(Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][0]).instantiate() + player = load(Global.pchars[Global.dcpchar]).instantiate() + musictrack = Global.musictracks[Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][3]] + isboss = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][4] + else: + level = load(Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][0]).instantiate() + player = load(Global.pchars[Global.cpchar]).instantiate() + musictrack = Global.musictracks[Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][3]] + isboss = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][4] + if Global.cspawnarea[0] != null && Global.cspawnarea[0] != null: + player.position.x = Global.cspawnarea[0] + player.position.y = Global.cspawnarea[1] + elif Global.debug: + player.position.x = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][1] + player.position.y = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][2] + else: + player.position.x = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][1] + player.position.y = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][2] + music = load(musictrack) + get_tree().root.add_child.call_deferred(level) + get_tree().root.add_child.call_deferred(player) + bgsound.stream = music + if !isboss: + bgsound.play(0) + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + +func _input(event): + if Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_BACK): + get_tree().root.remove_child(player) + get_tree().root.remove_child(level) + if Global.debug: + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") + else: + get_tree().change_scene_to_file("res://title.tscn") diff --git a/levels/ui/gameplay.tscn b/levels/ui/gameplay.tscn new file mode 100644 index 0000000..e132eae --- /dev/null +++ b/levels/ui/gameplay.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3 uid="uid://o4fdhf0tco2h"] + +[ext_resource type="Script" path="res://levels/ui/gameplay.gd" id="1_swekd"] + +[node name="Gameplay" type="Node2D"] +script = ExtResource("1_swekd") diff --git a/levels/musictest.gd b/levels/ui/musictest.gd similarity index 98% rename from levels/musictest.gd rename to levels/ui/musictest.gd index 49e0495..145da66 100644 --- a/levels/musictest.gd +++ b/levels/ui/musictest.gd @@ -48,7 +48,7 @@ func _input(event): func _on_back_pressed(): - get_tree().change_scene_to_file("res://levels/soundtest.tscn") + get_tree().change_scene_to_file("res://levels/ui/soundtest.tscn") func _on_title_screen_pressed(): diff --git a/levels/musictest.tscn b/levels/ui/musictest.tscn similarity index 99% rename from levels/musictest.tscn rename to levels/ui/musictest.tscn index 018c7e7..4fbe2e5 100644 --- a/levels/musictest.tscn +++ b/levels/ui/musictest.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://v2cnmd1atfw1"] -[ext_resource type="Script" path="res://levels/musictest.gd" id="1_mulrj"] +[ext_resource type="Script" path="res://levels/ui/musictest.gd" id="1_mulrj"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_hc5pw"] [ext_resource type="Script" path="res://nebula.gd" id="3_4oqoj"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_a1ux8"] diff --git a/levels/roll.gd b/levels/ui/roll.gd similarity index 100% rename from levels/roll.gd rename to levels/ui/roll.gd diff --git a/levels/scene.gd b/levels/ui/scene.gd similarity index 87% rename from levels/scene.gd rename to levels/ui/scene.gd index 724d55f..42f5653 100644 --- a/levels/scene.gd +++ b/levels/ui/scene.gd @@ -43,10 +43,10 @@ func _input(event): func _on_back_pressed(): - get_tree().change_scene_to_file("res://levels/debug.tscn") + get_tree().change_scene_to_file("res://levels/ui/debug.tscn") func _on_credits_pressed(): - get_tree().change_scene_to_file("res://levels/credits.tscn") + get_tree().change_scene_to_file("res://levels/ui/credits.tscn") func _on_wip_pressed(): @@ -59,3 +59,7 @@ func _on_results_pressed(): func _on_disclaimer_pressed(): get_tree().change_scene_to_file("res://backgounds/disclaimer.tscn") + + +func _on_testrooms_pressed(): + get_tree().change_scene_to_file("res://levels/ui/testrooms.tscn") diff --git a/levels/scene.tscn b/levels/ui/scene.tscn similarity index 88% rename from levels/scene.tscn rename to levels/ui/scene.tscn index 2fe977e..4d53ad1 100644 --- a/levels/scene.tscn +++ b/levels/ui/scene.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://duyxejhnys1l4"] -[ext_resource type="Script" path="res://levels/scene.gd" id="1_hxcrn"] +[ext_resource type="Script" path="res://levels/ui/scene.gd" id="1_hxcrn"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_nvftm"] [ext_resource type="Script" path="res://nebula.gd" id="3_6sds4"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_2y7h7"] @@ -57,6 +57,12 @@ theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") text = "Disclaimer" +[node name="Testrooms" type="Button" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") +text = "Test Rooms" + [node name="Results" type="Button" parent="VBoxContainer"] layout_mode = 2 theme_override_font_sizes/font_size = 32 @@ -86,6 +92,7 @@ layout_mode = 1 [connection signal="finished" from="nebula" to="nebula" method="_on_finished"] [connection signal="pressed" from="VBoxContainer/Disclaimer" to="." method="_on_disclaimer_pressed"] +[connection signal="pressed" from="VBoxContainer/Testrooms" to="." method="_on_testrooms_pressed"] [connection signal="pressed" from="VBoxContainer/Results" to="." method="_on_results_pressed"] [connection signal="pressed" from="VBoxContainer/Credits" to="." method="_on_credits_pressed"] [connection signal="pressed" from="VBoxContainer/WIP" to="." method="_on_wip_pressed"] diff --git a/levels/sfxtest.gd b/levels/ui/sfxtest.gd similarity index 95% rename from levels/sfxtest.gd rename to levels/ui/sfxtest.gd index a493e04..bc98cdd 100644 --- a/levels/sfxtest.gd +++ b/levels/ui/sfxtest.gd @@ -48,5 +48,5 @@ func _input(event): func _on_back_pressed(): - get_tree().change_scene_to_file("res://levels/soundtest.tscn") + get_tree().change_scene_to_file("res://levels/ui/soundtest.tscn") diff --git a/levels/sfxtest.tscn b/levels/ui/sfxtest.tscn similarity index 98% rename from levels/sfxtest.tscn rename to levels/ui/sfxtest.tscn index ca5c7a7..ac6fad3 100644 --- a/levels/sfxtest.tscn +++ b/levels/ui/sfxtest.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://cv2a37xetkkse"] -[ext_resource type="Script" path="res://levels/sfxtest.gd" id="1_l1lbb"] +[ext_resource type="Script" path="res://levels/ui/sfxtest.gd" id="1_l1lbb"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_c55jp"] [ext_resource type="Script" path="res://nebula.gd" id="3_yeu3h"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_xxv3m"] diff --git a/levels/soundtest.gd b/levels/ui/soundtest.gd similarity index 77% rename from levels/soundtest.gd rename to levels/ui/soundtest.gd index 95f7fc9..62b2d76 100644 --- a/levels/soundtest.gd +++ b/levels/ui/soundtest.gd @@ -28,13 +28,13 @@ func _input(event): func _on_back_pressed(): - get_tree().change_scene_to_file("res://levels/debug.tscn") + get_tree().change_scene_to_file("res://levels/ui/tmenu.tscn") func _on_music_pressed(): - get_tree().change_scene_to_file("res://levels/musictest.tscn") + get_tree().change_scene_to_file("res://levels/ui/musictest.tscn") func _on_sfx_pressed(): - get_tree().change_scene_to_file("res://levels/sfxtest.tscn") + get_tree().change_scene_to_file("res://levels/ui/sfxtest.tscn") diff --git a/levels/soundtest.tscn b/levels/ui/soundtest.tscn similarity index 96% rename from levels/soundtest.tscn rename to levels/ui/soundtest.tscn index 42bd999..b10d3bf 100644 --- a/levels/soundtest.tscn +++ b/levels/ui/soundtest.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://chg6qe1fijkh3"] -[ext_resource type="Script" path="res://levels/soundtest.gd" id="1_3bg6p"] +[ext_resource type="Script" path="res://levels/ui/soundtest.gd" id="1_3bg6p"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_abtft"] [ext_resource type="Script" path="res://nebula.gd" id="3_c33nl"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_2a53a"] diff --git a/levels/talk.tscn b/levels/ui/talk.tscn similarity index 55% rename from levels/talk.tscn rename to levels/ui/talk.tscn index 7467ce3..65a4f99 100644 --- a/levels/talk.tscn +++ b/levels/ui/talk.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=2 format=3 uid="uid://cd8hd11usuhbu"] -[ext_resource type="Texture2D" uid="uid://bb4sw2rhdbjbf" path="res://sprites/placeholder/face.png" id="1_3sqvt"] +[ext_resource type="Texture2D" uid="uid://bb4sw2rhdbjbf" path="res://sprites/common/placeholder/face.png" id="1_4l8il"] [node name="Talk" type="Node2D"] -[node name="TextureRect" type="TextureRect" parent="."] +[node name="Playerface" type="TextureRect" parent="."] offset_left = 511.0 offset_top = 35.0 offset_right = 767.0 offset_bottom = 291.0 -texture = ExtResource("1_3sqvt") +texture = ExtResource("1_4l8il") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="Textbox" type="ColorRect" parent="."] offset_left = 41.0 offset_top = 319.0 offset_right = 1243.0 @@ -22,8 +22,18 @@ color = Color(0.254902, 0.254902, 0.254902, 1) offset_left = 41.0 offset_top = 319.0 offset_right = 1243.0 -offset_bottom = 681.0 +offset_bottom = 412.0 theme_override_font_sizes/font_size = 68 -text = "Your text goes here" +text = "Character name goes here" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="Dialog" type="Label" parent="."] +offset_left = 41.0 +offset_top = 414.0 +offset_right = 1243.0 +offset_bottom = 681.0 +theme_override_font_sizes/font_size = 68 +text = "Your dialog goes here" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/levels/ui/testrooms.gd b/levels/ui/testrooms.gd new file mode 100644 index 0000000..1477d16 --- /dev/null +++ b/levels/ui/testrooms.gd @@ -0,0 +1,56 @@ +extends Control +func _ready(): + Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN) + $"VBoxContainer/Testspawn".grab_focus() + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + +func _level(): + # This is like autoloading the scene, only + # it happens after already loading the main scene. + get_tree().change_scene_to_file("res://backgounds/disclaimer.tscn") + #Global.live = 1 + #Global.gamelevel = randi() % 3 + #if Global.gamelevel == 0: + # get_tree().change_scene_to_file("res://backgounds/galaxy.tscn") + #elif Global.gamelevel == 1: + # get_tree().change_scene_to_file("res://backgounds/wormhole.tscn") + #else: + # get_tree().change_scene_to_file("res://backgounds/abstract.tscn") + #get_tree().root.add_child(title) + #get_tree().root.remove_child(boot) + #boot.queue_free() + +func _input(event): + # Mouse in viewport coordinates. + if Input.is_action_just_pressed("ui_cancel"): + _on_back_pressed() + #print("Mouse Click/Unclick at: ", event.position) +# if highlighted == 1: +# _on_debug_pressed() +# if highlighted == 2: +# _on_exit_pressed() +# else: +# _on_start_pressed() +# elif Input.is_action_pressed("ui_up"): +# focus_next + + + + + + +func _on_back_pressed(): + get_tree().change_scene_to_file("res://levels/ui/scene.tscn") + + +func _on_testspawn_pressed(): + Global.dplace = [0, 2, 1] + get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn") + + +func _on_testboss_pressed(): + Global.dplace = [0, 1, 1] + get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn") diff --git a/levels/ui/testrooms.tscn b/levels/ui/testrooms.tscn new file mode 100644 index 0000000..1115fa4 --- /dev/null +++ b/levels/ui/testrooms.tscn @@ -0,0 +1,91 @@ +[gd_scene load_steps=7 format=3 uid="uid://b0pgk6d871bor"] + +[ext_resource type="Script" path="res://levels/ui/testrooms.gd" id="1_p5nnr"] +[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_wyg0k"] +[ext_resource type="Script" path="res://nebula.gd" id="3_co5y6"] +[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_jvl8w"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6u0xs"] +bg_color = Color(0, 0.8, 0, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_r2qrn"] +bg_color = Color(0, 0.8, 0, 1) + +[node name="Testrooms" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_p5nnr") + +[node name="nebula" type="VideoStreamPlayer" parent="."] +layout_mode = 0 +offset_right = 640.0 +offset_bottom = 368.0 +scale = Vector2(2, 1.96) +stream = ExtResource("2_wyg0k") +autoplay = true +script = ExtResource("3_co5y6") + +[node name="Game name" type="Label" parent="."] +layout_mode = 0 +offset_left = 496.0 +offset_top = 3.0 +offset_right = 790.0 +offset_bottom = 73.0 +theme_override_font_sizes/font_size = 40 +text = "Test Rooms" + +[node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = -129.5 +offset_top = -362.0 +offset_right = 129.5 +grow_horizontal = 2 +grow_vertical = 0 + +[node name="Testspawn" type="Button" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") +text = "Test Spawn" + +[node name="Testboss" type="Button" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") +text = "Test Boss +" + +[node name="Credits" type="Button" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") +text = "Unused" + +[node name="WIP" type="Button" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") +text = "Unused" + +[node name="Back" type="Button" parent="VBoxContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 32 +theme_override_styles/focus = SubResource("StyleBoxFlat_r2qrn") +text = "Back" + +[node name="Bottomhud" parent="." instance=ExtResource("4_jvl8w")] +layout_mode = 1 + +[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] +[connection signal="pressed" from="VBoxContainer/Testspawn" to="." method="_on_testspawn_pressed"] +[connection signal="pressed" from="VBoxContainer/Testboss" to="." method="_on_testboss_pressed"] +[connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/tmenu.gd b/levels/ui/tmenu.gd similarity index 95% rename from levels/tmenu.gd rename to levels/ui/tmenu.gd index 16fadbe..9763072 100644 --- a/levels/tmenu.gd +++ b/levels/ui/tmenu.gd @@ -43,7 +43,7 @@ func _on_start_pressed(): func _on_debug_pressed(): - get_tree().change_scene_to_file("res://levels/debug.tscn") + get_tree().change_scene_to_file("res://levels/ui/debug.tscn") func _on_exit_pressed(): diff --git a/levels/tmenu.tscn b/levels/ui/tmenu.tscn similarity index 97% rename from levels/tmenu.tscn rename to levels/ui/tmenu.tscn index 29180a2..a7fc913 100644 --- a/levels/tmenu.tscn +++ b/levels/ui/tmenu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://s8ttuboef06k"] [ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="1_33b4o"] -[ext_resource type="Script" path="res://levels/tmenu.gd" id="1_w3aym"] +[ext_resource type="Script" path="res://levels/ui/tmenu.gd" id="1_w3aym"] [ext_resource type="Script" path="res://nebula.gd" id="2_x35ws"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_0qcfw"] diff --git a/sprites/common/midori/midori.tscn b/sprites/common/midori/midori.tscn index ac104eb..f7e5a59 100644 --- a/sprites/common/midori/midori.tscn +++ b/sprites/common/midori/midori.tscn @@ -17,7 +17,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 1, -"values": [2] +"values": [0] } [sub_resource type="Animation" id="Animation_cajcr"] @@ -99,7 +99,6 @@ _data = { texture = ExtResource("1_oqq2w") hframes = 3 vframes = 2 -frame = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(0, 0.25) diff --git a/sprites/common/placeholder/face.png.import b/sprites/common/placeholder/face.png.import index 128a386..7a9318e 100644 --- a/sprites/common/placeholder/face.png.import +++ b/sprites/common/placeholder/face.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bb4sw2rhdbjbf" -path="res://.godot/imported/face.png-5c2e95a83c1bd2f50674a584a2d88c4c.ctex" +path="res://.godot/imported/face.png-1c594c584b4f1920bcf388a9791a76e8.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/placeholder/face.png" -dest_files=["res://.godot/imported/face.png-5c2e95a83c1bd2f50674a584a2d88c4c.ctex"] +source_file="res://sprites/common/placeholder/face.png" +dest_files=["res://.godot/imported/face.png-1c594c584b4f1920bcf388a9791a76e8.ctex"] [params] diff --git a/sprites/common/placeholder/fullbody.png.import b/sprites/common/placeholder/fullbody.png.import new file mode 100644 index 0000000..bc8c56e --- /dev/null +++ b/sprites/common/placeholder/fullbody.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://jvonhohp1dj7" +path="res://.godot/imported/fullbody.png-439828a8054d750e5b39aa0dc76f4f4b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/common/placeholder/fullbody.png" +dest_files=["res://.godot/imported/fullbody.png-439828a8054d750e5b39aa0dc76f4f4b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/sprites/common/placeholder/player.png.import b/sprites/common/placeholder/player.png.import index 2562c53..0366839 100644 --- a/sprites/common/placeholder/player.png.import +++ b/sprites/common/placeholder/player.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dursxelwwxe8u" -path="res://.godot/imported/player.png-132d3a237e614f1ef29e140714a5341a.ctex" +path="res://.godot/imported/player.png-e7065df61843ebbfe12674e7da0fe6e4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/placeholder/player.png" -dest_files=["res://.godot/imported/player.png-132d3a237e614f1ef29e140714a5341a.ctex"] +source_file="res://sprites/common/placeholder/player.png" +dest_files=["res://.godot/imported/player.png-e7065df61843ebbfe12674e7da0fe6e4.ctex"] [params] diff --git a/title.gd b/title.gd index 3127ff2..f4fcdbf 100644 --- a/title.gd +++ b/title.gd @@ -28,7 +28,7 @@ func _input(event): # Mouse in viewport coordinates. if Input.is_action_just_pressed("ui_accept"): #print("Mouse Click/Unclick at: ", event.position) - get_tree().change_scene_to_file("res://levels/tmenu.tscn") + get_tree().change_scene_to_file("res://levels/ui/tmenu.tscn") #_level() elif Input.is_action_just_pressed("ui_cancel"): get_tree().quit()