Finished cosmetic UI overhaul

New dialogic themes, choice buttons, and dialog tweaks for intro, credits, and controls boxes
This commit is contained in:
dukegoobler 2022-12-22 16:37:10 -07:00
parent a6f07dad9a
commit cb4b147516
28 changed files with 230 additions and 81 deletions

View File

@ -0,0 +1,3 @@
source_md5="99b3de5274bfd3d6dbe6d7ff090966bd"
dest_md5="72ac343ab250b0506aadf7f714d75b17"

View File

@ -0,0 +1,3 @@
source_md5="99b3de5274bfd3d6dbe6d7ff090966bd"
dest_md5="72ac343ab250b0506aadf7f714d75b17"

View File

@ -0,0 +1,3 @@
source_md5="f634757ebda914197d910894a0da9825"
dest_md5="305d7df790836b650a78fda46bd49478"

View File

@ -0,0 +1,3 @@
source_md5="f634757ebda914197d910894a0da9825"
dest_md5="305d7df790836b650a78fda46bd49478"

BIN
godot/assets/Button07.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Button07.png-da9155c8dadcc88116c727c2b13f047a.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Button07.png"
dest_files=[ "res://.import/Button07.png-da9155c8dadcc88116c727c2b13f047a.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
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=true
svg/scale=1.0

BIN
godot/assets/MainPanel01.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/MainPanel01.png-28a55d9136e73eb1659916b99f9937ba.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/MainPanel01.png"
dest_files=[ "res://.import/MainPanel01.png-28a55d9136e73eb1659916b99f9937ba.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
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=true
svg/scale=1.0

View File

@ -31,7 +31,6 @@ func toggle_screen():
else:
turn_screen_on()
func make_active():
if active:
return
@ -67,7 +66,6 @@ func toggle_active():
else:
make_active()
func put_away():
fsm.travel("WalkieTalkieLeave")
if $DestroyTimer.is_stopped():
@ -78,12 +76,11 @@ func _process(_delta):
toggle_active()
if not active or not fsm.is_playing():
return
if player.is_ground_sprinting():
if player.is_ground_walking():
fsm.travel("WalkieTalkieWalking")
else:
fsm.travel("WalkieTalkieIdle")
func _on_ScreenFlicker_timeout():
if active:
toggle_screen()

View File

@ -102,7 +102,7 @@ states/WalkieTalkieLeave/position = Vector2( 123, -28 )
states/WalkieTalkieWalking/node = SubResource( 27 )
states/WalkieTalkieWalking/position = Vector2( 681, 113 )
transitions = [ "WalkieTalkieEnter", "WalkieTalkieIdle", SubResource( 28 ), "WalkieTalkieIdle", "WalkieTalkieWalking", SubResource( 29 ), "WalkieTalkieWalking", "WalkieTalkieIdle", SubResource( 30 ), "WalkieTalkieIdle", "WalkieTalkieLeave", SubResource( 32 ), "WalkieTalkieWalking", "WalkieTalkieLeave", SubResource( 33 ), "WalkieTalkieLeave", "WalkieTalkieEnter", SubResource( 34 ), "WalkieTalkieEnter", "WalkieTalkieLeave", SubResource( 35 ) ]
graph_offset = Vector2( -167, -115 )
graph_offset = Vector2( -167, -100.936 )
[sub_resource type="AnimationNodeStateMachinePlayback" id=19]
@ -205,7 +205,7 @@ surfaces/0 = {
script = ExtResource( 5 )
[node name="Animations" type="Spatial" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -7.3322e-05, 0 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Animations"]
root_node = NodePath("../..")
@ -262,21 +262,23 @@ mesh = SubResource( 23 )
[node name="StaticBuzz" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 7 )
volume_db = 8.211
volume_db = 2.0
[node name="StaticFizz" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 8 )
volume_db = 4.789
volume_db = 1.25
[node name="Talk" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 9 )
volume_db = 3.421
volume_db = -4.0
[node name="Whale1" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 6 )
volume_db = -2.0
[node name="Whale2" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 10 )
volume_db = -2.0
[node name="Click" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 11 )

View File

@ -38,7 +38,9 @@
},
"Themes": {
"files": [
"default-theme.cfg"
"default-theme.cfg",
"theme-1671745159.cfg",
"theme-1671748561.cfg"
],
"folders": {

View File

@ -7,6 +7,8 @@ updatenumber=3
default_action_key="dialogic_default_action"
clicking_dialog_action=false
autofocus_choices=true
delay_after_options="0.5"
enable_default_shortcut=false
[editor]
@ -15,6 +17,8 @@ character_preview_mode=1
[dialog]
stop_mouse=false
new_lines=false
text_event_audio_enable=false
[theme]

View File

@ -12,11 +12,15 @@ shadow_offset=Vector2( 7, 2 )
[buttons]
normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
hover=[ true, Color( 0.698039, 0.698039, 0.698039, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
focus=[ true, Color( 0.698039, 0.698039, 0.698039, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
normal=[ true, Color( 0.521569, 0.521569, 0.521569, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", false, Color( 1, 1, 1, 1 ) ]
hover=[ true, Color( 0.717647, 0.717647, 0.717647, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
focus=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
disabled=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ]
layout=1
fixed=true
fixed_size=Vector2( 200, 80 )
offset=Vector2( 0, -50 )
[name]

View File

@ -0,0 +1,56 @@
[settings]
name="Tech Theme"
[background]
image="res://assets/MainPanel01.png"
full_width=false
modulation=false
[box]
size=Vector2( 1080, 600 )
anchor=5
portraits_behind_dialog_box=false
[text]
font="res://assets/gratvityfont.tres"
text_margin_left=50.0
text_margin_top=60.0
text_margin_right=-50.0
text_margin_bottom=-60.0
shadow=false
speed=2.0
[name]
font="res://assets/title_font.tres"
position=1
auto_color=false
shadow_visible=true
[audio]
typing={
"allow_interrupt": true,
"audio_bus": "Master",
"enable": true,
"path": "res://assets/audio/typing.ogg",
"pitch": 1.0,
"pitch_rand_range": 0.0,
"volume": 0.0,
"volume_rand_range": 0.0
}
[next_indicator]
animation="Up and down"
[buttons]
normal=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", false, Color( 1, 1, 1, 1 ) ]
layout=1
fixed=true
fixed_size=Vector2( 200, 80 )

View File

@ -0,0 +1,23 @@
[settings]
name="Initializing Theme"
[text]
alignment=4
speed=0.0
font="res://assets/gratvityfont.tres"
shadow=false
[background]
image="res://assets/Button01.png"
[box]
anchor=5
size=Vector2( 455, 84 )
[name]
is_hidden=true

View File

@ -1,5 +1,9 @@
{
"events": [
{
"event_id": "dialogic_024",
"set_theme": "default-theme.cfg"
},
{
"condition": "!=",
"definition": "1667755202-648",

View File

@ -7,64 +7,36 @@
"value": "true"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "The year is 2104."
"event_id": "dialogic_024",
"set_theme": "theme-1671745159.cfg"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "The Earth has depleted its resources. "
"text": "The year is 2104 [pause=1]\n\nThe Earth has depleted its resources [pause=1] \n\nUncontaminated food and water are scarce due to the ongoing effects of the nuclear winter, famines, and climate catastrophes of the past century [pause=1]\n\n\n"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "And a mysterious planet-sized creature has appeared on the edge of our solar system. "
"text": "A mysterious planet-sized creature has appeared on the edge of our solar system [pause=1]\n\nTo feed the starving Earth, IngestiCorp sends mining expeditions to harvest the meat planets flesh [pause=1]\n\nUnknown to the public, many expeditions end in disaster"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "To feed the starving Earth, IngestiCorp mining expeditions have been sent by IngestiCorp to harvest the meat planets flesh. "
"text": "To protect its image, IngestiCorp hires \"Recovery Specialists\" to retrieve neural scans and DNA samples from miners who meet gruesome ends on the meat planet [pause=1]\n\nIn labs on Earth, missing miners are cloned and returned to their families as though nothing had gone wrong"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Unknown to the public, most expeditions end in disaster."
"text": "You are John Stuart. Age: 27. Condition: Stable [pause=1]\n\nYou are a Recovery Specialist hired by IngestiCorp to recover samples from the crew of Deep Space Vehicle (DSV) Provender [pause=1]\n\nWhether you find them dead or alive— or worse..."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "To protect its image, IngestiCorp hires \"Recovery Specialists\" "
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Recovery Specialists retrieve neural scans and DNA samples from miners who meet gruesome ends on the meat planet. "
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "In labs on Earth, missing miners are cloned and returned to their families as though nothing had gone wrong."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "You are John Stuart. Age: 27. Condition: Stable."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "You are a Recovery Specialist hired by IngestiCorp to recover samples from the crew of the DSV-Provender, whether you find them dead or alive—- or worse."
"event_id": "dialogic_024",
"set_theme": "theme-1671748561.cfg"
},
{
"character": "",

View File

@ -1,28 +1,14 @@
{
"events": [
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Created by Spencer, Noah, and Kairo for Gamesden Done Quicker 2022."
"event_id": "dialogic_024",
"set_theme": "theme-1671745159.cfg"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "User interface elements courtesy of John Watson, Wenrexa, and Sunfire Interactive."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Overlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Sounds courtesy of Dryoma and VOiD1 Gaming."
"text": "[speed=0]Created by Spencer, Noah, and Kairo for Gamesden Done Quicker 2022\n\nUser interface elements courtesy of John Watson, Wenrexa, and Sunfire Interactive\n\nOverlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com\n\nSounds courtesy of Dryoma and VOiD1 Gaming"
},
{
"event_id": "dialogic_022",

View File

@ -1,22 +1,14 @@
{
"events": [
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "WASD/Mouse or Joysticks to move and look around"
"event_id": "dialogic_024",
"set_theme": "theme-1671745159.cfg"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Space or R to jump. Hold shift or L to run. Jump while falling to double jump and break your fall"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "F or Y to toggle flashlight. Use D-pad to select between dialog options"
"text": "[speed=0]Use WASD/Mouse or Joysticks to move and look around\n\nUse Space or R1 to jump or double jump and hold Shift or L1 to run\n\nPress F or Y to toggle your flashlight and C or X to toggle your walkie talkie\n\nUse the Arrow Keys or D-pad to select between dialog options and press Enter or A to select"
}
],
"metadata": {

View File

@ -215,6 +215,12 @@ toggle_walkie_talkie={
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null)
]
}
interact={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":69,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
]
}
[mono]

View File

@ -45,10 +45,18 @@ focus_neighbour_top = NodePath("../RetryButton")
focus_neighbour_bottom = NodePath("../QuitButton")
text = "Main Menu"
[node name="QuitButton" type="Button" parent="Menu"]
[node name="CreditsButton" type="Button" parent="Menu"]
margin_top = 80.0
margin_right = 208.0
margin_bottom = 116.0
focus_neighbour_top = NodePath("../RetryButton")
focus_neighbour_bottom = NodePath("../QuitButton")
text = "Credits"
[node name="QuitButton" type="Button" parent="Menu"]
margin_top = 120.0
margin_right = 208.0
margin_bottom = 156.0
focus_neighbour_top = NodePath("../MenuButton")
focus_neighbour_bottom = NodePath("../PlayButton")
text = "Quit"
@ -92,5 +100,6 @@ align = 1
[connection signal="pressed" from="Menu/RetryButton" to="." method="_on_RetryButton_pressed"]
[connection signal="pressed" from="Menu/MenuButton" to="." method="_on_MenuButton_pressed"]
[connection signal="pressed" from="Menu/CreditsButton" to="." method="_on_CreditsButton_pressed"]
[connection signal="pressed" from="Menu/QuitButton" to="." method="_on_QuitButton_pressed"]
[connection signal="timeout" from="BlackoutTimer" to="." method="_on_BlackoutTimer_timeout"]

View File

@ -29,7 +29,6 @@ func _on_ResumeButton_pressed():
func _on_MainMenuButton_pressed():
get_tree().paused = false
var _a = get_tree().change_scene("res://screens/TitleScreen.tscn")
func _on_ControlsButton_pressed():
var dialog = Dialogic.start("controls")

View File

@ -10,6 +10,11 @@ func _on_RetryButton_pressed():
func _on_MenuButton_pressed():
var _err = get_tree().change_scene("res://screens/TitleScreen.tscn")
func _on_CreditsButton_pressed():
var dialog = Dialogic.start("credits")
dialog.connect("tree_exited", self, "_on_dialogue_done")
add_child(dialog)
func _on_QuitButton_pressed():
get_tree().quit()

View File

@ -8,16 +8,16 @@ func _on_PlayButton_pressed():
$BlackoutSound.play()
$ButtonContainer.visible = false
$BlackoutScreen.visible = true
var dialog = Dialogic.start("intro")
add_child(dialog)
func _on_Credits_pressed():
var dialog = Dialogic.start("credits")
add_child(dialog)
dialog.connect("tree_exiting", self, "controls_done")
func _on_Controls_pressed():
var dialog = Dialogic.start("controls")
add_child(dialog)
dialog.connect("tree_exiting", self, "controls_done")
func _on_QuitButton_pressed():
get_tree().quit()