Skip to content

Commit

Permalink
better title screen
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielElisenberg committed Apr 15, 2024
1 parent 59444ec commit 3fbd589
Show file tree
Hide file tree
Showing 12 changed files with 129 additions and 28 deletions.
2 changes: 1 addition & 1 deletion scenes/arena.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[ext_resource type="AudioStream" uid="uid://r2x0xl547ogc" path="res://sounds/sfx/round_one.mp3" id="13_x5p41"]
[ext_resource type="AudioStream" uid="uid://dfux6ifjmwjxp" path="res://sounds/sfx/round_two.mp3" id="14_2xykl"]
[ext_resource type="AudioStream" uid="uid://cj2thne38xtrf" path="res://sounds/sfx/final_round.mp3" id="15_p2c5a"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="16_t2jnb"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="16_t2jnb"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_mq1db"]
size = Vector2(39.5, 872.5)
Expand Down
2 changes: 1 addition & 1 deletion scenes/arena_ceo.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[ext_resource type="AudioStream" uid="uid://r2x0xl547ogc" path="res://sounds/sfx/round_one.mp3" id="13_rw1l0"]
[ext_resource type="AudioStream" uid="uid://dfux6ifjmwjxp" path="res://sounds/sfx/round_two.mp3" id="14_l4h36"]
[ext_resource type="AudioStream" uid="uid://cj2thne38xtrf" path="res://sounds/sfx/final_round.mp3" id="15_qm0yf"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="16_lv3og"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="16_lv3og"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_mq1db"]
size = Vector2(39.5, 872.5)
Expand Down
2 changes: 1 addition & 1 deletion scenes/arena_devon.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="Script" path="res://scripts/arena.gd" id="1_msr1w"]
[ext_resource type="Texture2D" uid="uid://slnivve5revd" path="res://sprites/backgrounds/fight_bg.png" id="2_8160l"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="2_nhcav"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="2_nhcav"]
[ext_resource type="PackedScene" uid="uid://dpgss5cyimvpn" path="res://scenes/player_character.tscn" id="3_uyqvy"]
[ext_resource type="PackedScene" uid="uid://r5peab67hacc" path="res://scenes/health_bar.tscn" id="4_a4rr8"]
[ext_resource type="FontFile" uid="uid://cldenxc5p1221" path="res://fonts/Pixelify_Sans/static/PixelifySans-Medium.ttf" id="5_pqqgj"]
Expand Down
8 changes: 4 additions & 4 deletions scenes/courtroom_ceo.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[ext_resource type="Script" path="res://scripts/courtroom_ceo.gd" id="1_ajp4y"]
[ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="2_xr87f"]
[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="3_ekk7o"]
[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="4_s1u30"]
[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="5_saxum"]
[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="3_ekk7o"]
[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="4_s1u30"]
[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="5_saxum"]
[ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_6tynu"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="7_sq88j"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="7_sq88j"]

[node name="courtroom_ceo" type="Node2D"]
position = Vector2(750, 2.08165e-12)
Expand Down
8 changes: 4 additions & 4 deletions scenes/courtroom_devin.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="1_j6pui"]
[ext_resource type="Script" path="res://scripts/courtroom_devin.gd" id="1_j78rv"]
[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="2_53ydx"]
[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="3_x87h7"]
[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="4_noygb"]
[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="2_53ydx"]
[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="3_x87h7"]
[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="4_noygb"]
[ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_0krxw"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="6_qcd74"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="6_qcd74"]

[node name="courtroom_devin" type="Node2D"]
position = Vector2(750, 2.08165e-12)
Expand Down
8 changes: 4 additions & 4 deletions scenes/courtroom_satan.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[ext_resource type="Texture2D" uid="uid://ba6fhck0lsywo" path="res://sprites/backgrounds/courtroom.png" id="1_c22x3"]
[ext_resource type="Script" path="res://scenes/courtroom_satan.gd" id="1_sme03"]
[ext_resource type="PackedScene" path="res://scenes/warlock.tscn" id="2_1kldv"]
[ext_resource type="PackedScene" path="res://scenes/summoning_ring.tscn" id="3_l4cpl"]
[ext_resource type="PackedScene" path="res://scenes/text_box.tscn" id="5_r4gwd"]
[ext_resource type="PackedScene" uid="uid://cnbl6ra6bh6mc" path="res://scenes/warlock.tscn" id="2_1kldv"]
[ext_resource type="PackedScene" uid="uid://okqnfgow3d3a" path="res://scenes/summoning_ring.tscn" id="3_l4cpl"]
[ext_resource type="PackedScene" uid="uid://byshmomdcx3dv" path="res://scenes/text_box.tscn" id="5_r4gwd"]
[ext_resource type="AudioStream" uid="uid://bgnd3ptkli7ew" path="res://sounds/a_courtroom_somewhere.mp3" id="6_cjq4g"]
[ext_resource type="PackedScene" path="res://scenes/versus.tscn" id="7_nda3f"]
[ext_resource type="PackedScene" uid="uid://tijbokynigwu" path="res://scenes/versus.tscn" id="7_nda3f"]

[node name="CourtroomSatan" type="Node2D"]
position = Vector2(750, 2.08165e-12)
Expand Down
36 changes: 25 additions & 11 deletions scenes/title_menu.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[gd_scene load_steps=8 format=3 uid="uid://g5h206tqgk8g"]
[gd_scene load_steps=11 format=3 uid="uid://g5h206tqgk8g"]

[ext_resource type="Script" path="res://scripts/title_menu.gd" id="1_0xdjc"]
[ext_resource type="Texture2D" uid="uid://dv0bfhia56pla" path="res://sprites/backgrounds/titlebg.png" id="2_l1jlx"]
[ext_resource type="FontFile" uid="uid://bh4o4pc5pwotn" path="res://fonts/Pixelify_Sans/static/PixelifySans-Bold.ttf" id="3_44sft"]
[ext_resource type="FontFile" uid="uid://cldmt3smtivah" path="res://fonts/Pixelify_Sans/static/PixelifySans-Regular.ttf" id="3_oa7op"]
[ext_resource type="Texture2D" uid="uid://dxmplasi56eus" path="res://sprites/fighters/judgesheet.png" id="4_cfmhn"]
[ext_resource type="AudioStream" uid="uid://cbd607hngait1" path="res://sounds/trial_by_combat.mp3" id="5_u148c"]
[ext_resource type="Texture2D" uid="uid://n3eo26wmtk1j" path="res://sprites/UI/selector.png" id="7_fp87m"]
[ext_resource type="PackedScene" uid="uid://pw50xwse55ov" path="res://scenes/control_screen.tscn" id="8_kebmd"]

[sub_resource type="AtlasTexture" id="AtlasTexture_jwopw"]
atlas = ExtResource("4_cfmhn")
Expand All @@ -24,22 +27,26 @@ animations = [{
[node name="TitleMenu" type="Node2D"]
script = ExtResource("1_0xdjc")

[node name="bg" type="Sprite2D" parent="."]
texture = ExtResource("2_l1jlx")
centered = false

[node name="PlayLabel" type="Label" parent="."]
offset_left = 3.0
offset_top = 715.0
offset_right = 1929.0
offset_bottom = 819.0
offset_left = 1.0
offset_top = 776.0
offset_right = 1927.0
offset_bottom = 880.0
theme_override_fonts/font = ExtResource("3_oa7op")
theme_override_font_sizes/font_size = 80
text = "Play"
horizontal_alignment = 1
vertical_alignment = 1

[node name="ControlLabel" type="Label" parent="."]
offset_left = 1.0
offset_top = 870.0
offset_right = 1927.0
offset_bottom = 974.0
offset_left = -1.0
offset_top = 912.0
offset_right = 1925.0
offset_bottom = 1016.0
theme_override_fonts/font = ExtResource("3_oa7op")
theme_override_font_sizes/font_size = 80
text = "Controls"
Expand All @@ -58,10 +65,17 @@ horizontal_alignment = 1
vertical_alignment = 1

[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(947, 461)
scale = Vector2(8, 8)
position = Vector2(962, 520)
scale = Vector2(10, 10)
sprite_frames = SubResource("SpriteFrames_jdgst")

[node name="BattleMusic" type="AudioStreamPlayer" parent="."]
stream = ExtResource("5_u148c")
autoplay = true

[node name="Selector" type="Sprite2D" parent="."]
position = Vector2(964, 833)
texture = ExtResource("7_fp87m")

[node name="ControlScreen" parent="." instance=ExtResource("8_kebmd")]
visible = false
23 changes: 21 additions & 2 deletions scripts/title_menu.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
extends Node2D

@onready var selector = $Selector
@onready var control_screen = $ControlScreen
const controls_position = Vector2(964, 967)
const play_position = Vector2(964, 833)
var choice = "play"

func _process(delta):
if Input.is_action_just_pressed("ui_accept"):
get_tree().change_scene_to_file("res://scenes/intro.tscn")
if control_screen.visible:
if Input.is_action_just_pressed("ui_accept"):
control_screen.visible = false
else:
if Input.is_action_just_pressed("down"):
choice = "controls"
selector.position = controls_position
if Input.is_action_just_pressed("jump"):
choice = "play"
selector.position = play_position
if Input.is_action_just_pressed("ui_accept"):
if choice == "play":
get_tree().change_scene_to_file("res://scenes/intro.tscn")
else:
control_screen.visible = true

Binary file added sprites/UI/selector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions sprites/UI/selector.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://n3eo26wmtk1j"
path="res://.godot/imported/selector.png-f4b1e84d04e5787b8936fc348cf379e5.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://sprites/UI/selector.png"
dest_files=["res://.godot/imported/selector.png-f4b1e84d04e5787b8936fc348cf379e5.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
Binary file added sprites/backgrounds/titlebg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions sprites/backgrounds/titlebg.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dv0bfhia56pla"
path="res://.godot/imported/titlebg.png-2e7cb5a78b8db5140655fef0e836e477.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://sprites/backgrounds/titlebg.png"
dest_files=["res://.godot/imported/titlebg.png-2e7cb5a78b8db5140655fef0e836e477.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

0 comments on commit 3fbd589

Please sign in to comment.