Compare commits

...

2 Commits

Author SHA1 Message Date
dukegoobler cb4b147516 Finished cosmetic UI overhaul
New dialogic themes, choice buttons, and dialog tweaks for intro, credits, and controls boxes
2022-12-22 16:37:10 -07:00
dukegoobler a6f07dad9a New UI theme and menu tweaks
Added new button assets and reskinned the default UI theme. Pause menu has its own theme also.
2022-12-20 14:50:01 -07:00
47 changed files with 500 additions and 163 deletions

View File

@ -0,0 +1,3 @@
source_md5="e7ff8adad983ccaebd137d5a088e219f"
dest_md5="6dbb8b0b7e49465e444af4d54fd0dc08"

View File

@ -0,0 +1,3 @@
source_md5="31ab93069da1ac1e4973b02e491ad64e"
dest_md5="3cd5051ef4630a2f73d3ee321655d70b"

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="ba0985dcbd463264ca1cf17ce3944c3a"
dest_md5="6e0c635700173b07a640dabfcc871b9c"

View File

@ -0,0 +1,3 @@
source_md5="ba0985dcbd463264ca1cf17ce3944c3a"
dest_md5="6e0c635700173b07a640dabfcc871b9c"

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/Button01.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/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Button01.png"
dest_files=[ "res://.import/Button01.png-dddfdcb3808573045e2ed3a829fa36a6.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/Button03.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/Button03.png-671c9cb8368e44c810a563d955c96ff9.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Button03.png"
dest_files=[ "res://.import/Button03.png-671c9cb8368e44c810a563d955c96ff9.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/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/Button13.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/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Button13.png"
dest_files=[ "res://.import/Button13.png-bdd5ce03dfb4b19f3445e11943f8091a.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: else:
turn_screen_on() turn_screen_on()
func make_active(): func make_active():
if active: if active:
return return
@ -67,7 +66,6 @@ func toggle_active():
else: else:
make_active() make_active()
func put_away(): func put_away():
fsm.travel("WalkieTalkieLeave") fsm.travel("WalkieTalkieLeave")
if $DestroyTimer.is_stopped(): if $DestroyTimer.is_stopped():
@ -78,12 +76,11 @@ func _process(_delta):
toggle_active() toggle_active()
if not active or not fsm.is_playing(): if not active or not fsm.is_playing():
return return
if player.is_ground_sprinting(): if player.is_ground_walking():
fsm.travel("WalkieTalkieWalking") fsm.travel("WalkieTalkieWalking")
else: else:
fsm.travel("WalkieTalkieIdle") fsm.travel("WalkieTalkieIdle")
func _on_ScreenFlicker_timeout(): func _on_ScreenFlicker_timeout():
if active: if active:
toggle_screen() toggle_screen()

View File

@ -102,7 +102,7 @@ states/WalkieTalkieLeave/position = Vector2( 123, -28 )
states/WalkieTalkieWalking/node = SubResource( 27 ) states/WalkieTalkieWalking/node = SubResource( 27 )
states/WalkieTalkieWalking/position = Vector2( 681, 113 ) 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 ) ] 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] [sub_resource type="AnimationNodeStateMachinePlayback" id=19]
@ -205,7 +205,7 @@ surfaces/0 = {
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="Animations" type="Spatial" parent="."] [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"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Animations"]
root_node = NodePath("../..") root_node = NodePath("../..")
@ -262,21 +262,23 @@ mesh = SubResource( 23 )
[node name="StaticBuzz" type="AudioStreamPlayer" parent="."] [node name="StaticBuzz" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 7 ) stream = ExtResource( 7 )
volume_db = 8.211 volume_db = 2.0
[node name="StaticFizz" type="AudioStreamPlayer" parent="."] [node name="StaticFizz" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 8 ) stream = ExtResource( 8 )
volume_db = 4.789 volume_db = 1.25
[node name="Talk" type="AudioStreamPlayer" parent="."] [node name="Talk" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 9 ) stream = ExtResource( 9 )
volume_db = 3.421 volume_db = -4.0
[node name="Whale1" type="AudioStreamPlayer" parent="."] [node name="Whale1" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 6 ) stream = ExtResource( 6 )
volume_db = -2.0
[node name="Whale2" type="AudioStreamPlayer" parent="."] [node name="Whale2" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 10 ) stream = ExtResource( 10 )
volume_db = -2.0
[node name="Click" type="AudioStreamPlayer" parent="."] [node name="Click" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 11 ) stream = ExtResource( 11 )

View File

@ -1,6 +0,0 @@
[gd_resource type="Theme" load_steps=2 format=2]
[ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=1]
[resource]
default_font = ExtResource( 1 )

View File

@ -1,6 +1,38 @@
[gd_resource type="Theme" load_steps=2 format=2] [gd_resource type="Theme" load_steps=8 format=2]
[ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=1] [ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=1]
[ext_resource path="res://assets/Button01.png" type="Texture" id=2]
[ext_resource path="res://assets/Button03.png" type="Texture" id=3]
[sub_resource type="StyleBoxTexture" id=1]
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 152, 40 )
modulate_color = Color( 0.41954, 0.740249, 0.761719, 1 )
[sub_resource type="StyleBoxTexture" id=2]
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 152, 40 )
modulate_color = Color( 0.6, 0.6, 0.6, 1 )
[sub_resource type="StyleBoxTexture" id=3]
texture = ExtResource( 2 )
region_rect = Rect2( 0, 0, 152, 40 )
[sub_resource type="StyleBoxTexture" id=4]
texture = ExtResource( 3 )
region_rect = Rect2( 0, 0, 152, 40 )
modulate_color = Color( 0, 0, 0, 1 )
[resource] [resource]
default_font = ExtResource( 1 ) default_font = ExtResource( 1 )
Button/colors/font_color = Color( 0.88, 0.88, 0.88, 1 )
Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
Button/colors/font_color_focus = Color( 0.94, 0.94, 0.94, 1 )
Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 )
Button/colors/font_color_pressed = Color( 1, 1, 1, 1 )
Button/constants/hseparation = 2
Button/styles/disabled = null
Button/styles/focus = SubResource( 1 )
Button/styles/hover = SubResource( 2 )
Button/styles/normal = SubResource( 3 )
Button/styles/pressed = SubResource( 4 )

View File

@ -0,0 +1,37 @@
[gd_resource type="Theme" load_steps=7 format=2]
[ext_resource path="res://assets/Button13.png" type="Texture" id=1]
[ext_resource path="res://assets/gratvityfont.tres" type="DynamicFont" id=2]
[sub_resource type="StyleBoxTexture" id=4]
texture = ExtResource( 1 )
region_rect = Rect2( 0, 0, 105, 21 )
[sub_resource type="StyleBoxTexture" id=2]
texture = ExtResource( 1 )
region_rect = Rect2( 0, 0, 105, 21 )
modulate_color = Color( 0.439216, 0.223529, 0.223529, 1 )
[sub_resource type="StyleBoxTexture" id=1]
texture = ExtResource( 1 )
region_rect = Rect2( 0, 0, 105, 21 )
modulate_color = Color( 0.52549, 0.403922, 0.403922, 1 )
[sub_resource type="StyleBoxTexture" id=3]
texture = ExtResource( 1 )
region_rect = Rect2( 0, 0, 105, 21 )
modulate_color = Color( 0.266667, 0.266667, 0.266667, 1 )
[resource]
Button/colors/font_color = Color( 0.88, 0.88, 0.88, 1 )
Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
Button/colors/font_color_focus = Color( 0.94, 0.94, 0.94, 1 )
Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 )
Button/colors/font_color_pressed = Color( 1, 1, 1, 1 )
Button/constants/hseparation = 2
Button/fonts/font = ExtResource( 2 )
Button/styles/disabled = null
Button/styles/focus = SubResource( 4 )
Button/styles/hover = SubResource( 2 )
Button/styles/normal = SubResource( 1 )
Button/styles/pressed = SubResource( 3 )

View File

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

View File

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

View File

@ -12,11 +12,15 @@ shadow_offset=Vector2( 7, 2 )
[buttons] [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 ) ] 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.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 ) ] 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( 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( 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 ) ] 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 ) ] 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] [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": [ "events": [
{
"event_id": "dialogic_024",
"set_theme": "default-theme.cfg"
},
{ {
"condition": "!=", "condition": "!=",
"definition": "1667755202-648", "definition": "1667755202-648",

View File

@ -7,64 +7,36 @@
"value": "true" "value": "true"
}, },
{ {
"character": "", "event_id": "dialogic_024",
"event_id": "dialogic_001", "set_theme": "theme-1671745159.cfg"
"portrait": "",
"text": "The year is 2104."
}, },
{ {
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "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": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "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": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "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": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "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_024",
"event_id": "dialogic_001", "set_theme": "theme-1671748561.cfg"
"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."
}, },
{ {
"character": "", "character": "",
@ -81,7 +53,7 @@
"set_value": "true" "set_value": "true"
}, },
{ {
"change_scene": "res://test_with_all.tscn", "change_scene": "res://tests/test_player_locomotion.tscn",
"event_id": "dialogic_041" "event_id": "dialogic_041"
}, },
{ {
@ -98,7 +70,7 @@
"value": "true" "value": "true"
}, },
{ {
"change_scene": "res://test_with_all.tscn", "change_scene": "res://tests/test_player_locomotion.tscn",
"event_id": "dialogic_041" "event_id": "dialogic_041"
}, },
{ {

View File

@ -1,46 +1,14 @@
{ {
"events": [ "events": [
{ {
"character": "", "event_id": "dialogic_024",
"event_id": "dialogic_001", "set_theme": "theme-1671745159.cfg"
"portrait": "",
"text": "Created by Spencer, Noah, and Kairo for Gamesden Done Quicker 2022."
}, },
{ {
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "Gravity Pixel Font courtesy of John Watson and Sunfire Interactive." "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"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Background images courtesy of Bacteri."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Sounds courtesy of Dryoma and VOiD1 Gaming."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Overlays courtesy of ZimaJeKKT."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "All photos of people from thispersondoesnotexist.com."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Stock photos from www.hippopx.com."
}, },
{ {
"event_id": "dialogic_022", "event_id": "dialogic_022",

View File

@ -1,22 +1,14 @@
{ {
"events": [ "events": [
{ {
"character": "", "event_id": "dialogic_024",
"event_id": "dialogic_001", "set_theme": "theme-1671745159.cfg"
"portrait": "",
"text": "WASD/Mouse or Joysticks to move and look around"
}, },
{ {
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "Space or R to jump. Hold shift or L to run. Jump while falling to double jump and break your fall" "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"
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "F or Y to toggle flashlight. Use D-pad to select between dialog options"
} }
], ],
"metadata": { "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) , 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] [mono]

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=8 format=2]
[ext_resource path="res://assets/audio/human-impact-on-ground-6982.mp3" type="AudioStream" id=1] [ext_resource path="res://assets/audio/human-impact-on-ground-6982.mp3" type="AudioStream" id=1]
[ext_resource path="res://assets/Background_space.png" type="Texture" id=2] [ext_resource path="res://assets/Background_space.png" type="Texture" id=2]
@ -6,6 +6,7 @@
[ext_resource path="res://screens/death.gd" type="Script" id=4] [ext_resource path="res://screens/death.gd" type="Script" id=4]
[ext_resource path="res://assets/ui_theme.tres" type="Theme" id=5] [ext_resource path="res://assets/ui_theme.tres" type="Theme" id=5]
[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=6] [ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=6]
[ext_resource path="res://assets/title_font.tres" type="DynamicFont" id=7]
[node name="EndScreen" type="Control"] [node name="EndScreen" type="Control"]
anchor_right = 1.0 anchor_right = 1.0
@ -21,32 +22,41 @@ stretch_mode = 1
[node name="Menu" type="VBoxContainer" parent="."] [node name="Menu" type="VBoxContainer" parent="."]
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 1.0 anchor_top = 0.5
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 1.0 anchor_bottom = 0.5
margin_left = -133.0 margin_left = -104.0
margin_top = -253.0 margin_top = 46.0
margin_right = 134.0 margin_right = 104.0
margin_bottom = -53.0 margin_bottom = 244.0
theme = ExtResource( 5 )
[node name="RetryButton" type="Button" parent="Menu"] [node name="RetryButton" type="Button" parent="Menu"]
margin_right = 267.0 margin_right = 208.0
margin_bottom = 42.0 margin_bottom = 36.0
focus_neighbour_bottom = NodePath("../MenuButton") focus_neighbour_bottom = NodePath("../MenuButton")
text = "Retry" text = "Retry"
[node name="MenuButton" type="Button" parent="Menu"] [node name="MenuButton" type="Button" parent="Menu"]
margin_top = 46.0 margin_top = 40.0
margin_right = 267.0 margin_right = 208.0
margin_bottom = 88.0 margin_bottom = 76.0
focus_neighbour_top = NodePath("../RetryButton") focus_neighbour_top = NodePath("../RetryButton")
focus_neighbour_bottom = NodePath("../QuitButton") focus_neighbour_bottom = NodePath("../QuitButton")
text = "Main Menu" text = "Main 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"] [node name="QuitButton" type="Button" parent="Menu"]
margin_top = 92.0 margin_top = 120.0
margin_right = 267.0 margin_right = 208.0
margin_bottom = 134.0 margin_bottom = 156.0
focus_neighbour_top = NodePath("../MenuButton") focus_neighbour_top = NodePath("../MenuButton")
focus_neighbour_bottom = NodePath("../PlayButton") focus_neighbour_bottom = NodePath("../PlayButton")
text = "Quit" text = "Quit"
@ -72,7 +82,24 @@ stream = ExtResource( 3 )
[node name="shader" parent="." instance=ExtResource( 6 )] [node name="shader" parent="." instance=ExtResource( 6 )]
[node name="Title" type="Label" parent="."]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -342.0
margin_top = -135.0
margin_right = 342.0
margin_bottom = -71.0
custom_colors/font_color = Color( 1, 1, 1, 1 )
custom_colors/font_outline_modulate = Color( 0, 0, 0, 1 )
custom_constants/shadow_offset_x = 10
custom_fonts/font = ExtResource( 7 )
text = "MEAT MADNESS"
align = 1
[connection signal="pressed" from="Menu/RetryButton" to="." method="_on_RetryButton_pressed"] [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/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="pressed" from="Menu/QuitButton" to="." method="_on_QuitButton_pressed"]
[connection signal="timeout" from="BlackoutTimer" to="." method="_on_BlackoutTimer_timeout"] [connection signal="timeout" from="BlackoutTimer" to="." method="_on_BlackoutTimer_timeout"]

View File

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

View File

@ -1,13 +1,15 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://assets/blackbackground.png" type="Texture" id=1] [ext_resource path="res://assets/blackbackground.png" type="Texture" id=1]
[ext_resource path="res://assets/ui_theme.tres" type="Theme" id=2] [ext_resource path="res://assets/ui_theme.tres" type="Theme" id=2]
[ext_resource path="res://screens/PauseScreen.gd" type="Script" id=3] [ext_resource path="res://screens/PauseScreen.gd" type="Script" id=3]
[ext_resource path="res://assets/ui_theme_PauseScreen.tres" type="Theme" id=4]
[node name="PauseScreen" type="Control"] [node name="PauseScreen" type="Control"]
pause_mode = 2 pause_mode = 2
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
theme = ExtResource( 4 )
script = ExtResource( 3 ) script = ExtResource( 3 )
[node name="pauseBackground" type="TextureRect" parent="."] [node name="pauseBackground" type="TextureRect" parent="."]
@ -19,52 +21,47 @@ stretch_mode = 1
[node name="CenterContainer" type="CenterContainer" parent="."] [node name="CenterContainer" type="CenterContainer" parent="."]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
theme = ExtResource( 2 )
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
margin_left = 312.0 margin_left = 408.0
margin_top = 146.0 margin_top = 193.0
margin_right = 712.0 margin_right = 616.0
margin_bottom = 454.0 margin_bottom = 407.0
theme = ExtResource( 2 ) theme = ExtResource( 4 )
custom_constants/separation = 10 custom_constants/separation = 10
[node name="Label" type="Label" parent="CenterContainer/VBoxContainer"]
margin_right = 400.0
margin_bottom = 36.0
text = "Paused"
align = 1
[node name="Spacer" type="Control" parent="CenterContainer/VBoxContainer"] [node name="Spacer" type="Control" parent="CenterContainer/VBoxContainer"]
margin_top = 46.0 margin_right = 208.0
margin_right = 400.0 margin_bottom = 30.0
margin_bottom = 76.0
rect_min_size = Vector2( 1, 30 ) rect_min_size = Vector2( 1, 30 )
[node name="ResumeButton" type="Button" parent="CenterContainer/VBoxContainer"] [node name="ResumeButton" type="Button" parent="CenterContainer/VBoxContainer"]
margin_top = 86.0 margin_top = 40.0
margin_right = 400.0 margin_right = 208.0
margin_bottom = 136.0 margin_bottom = 76.0
rect_min_size = Vector2( 400, 50 ) rect_min_size = Vector2( 208, 36 )
text = "Resume" text = "Resume"
[node name="MainMenuButton" type="Button" parent="CenterContainer/VBoxContainer"] [node name="MainMenuButton" type="Button" parent="CenterContainer/VBoxContainer"]
margin_top = 146.0 margin_top = 86.0
margin_right = 400.0 margin_right = 208.0
margin_bottom = 196.0 margin_bottom = 122.0
rect_min_size = Vector2( 400, 50 ) rect_min_size = Vector2( 208, 36 )
text = "Main Menu" text = "Main Menu"
[node name="ControlsButton" type="Button" parent="CenterContainer/VBoxContainer"] [node name="ControlsButton" type="Button" parent="CenterContainer/VBoxContainer"]
margin_top = 206.0 margin_top = 132.0
margin_right = 400.0 margin_right = 208.0
margin_bottom = 248.0 margin_bottom = 168.0
rect_min_size = Vector2( 208, 36 )
text = "Controls" text = "Controls"
[node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer"] [node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer"]
margin_top = 258.0 margin_top = 178.0
margin_right = 400.0 margin_right = 208.0
margin_bottom = 308.0 margin_bottom = 214.0
rect_min_size = Vector2( 400, 50 ) rect_min_size = Vector2( 208, 36 )
text = "Quit" text = "Quit"
[connection signal="pressed" from="CenterContainer/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"] [connection signal="pressed" from="CenterContainer/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"]

View File

@ -49,25 +49,25 @@ custom_constants/separation = 10
[node name="PlayButton" type="Button" parent="ButtonContainer"] [node name="PlayButton" type="Button" parent="ButtonContainer"]
margin_right = 208.0 margin_right = 208.0
margin_bottom = 42.0 margin_bottom = 36.0
text = "Play" text = "Play"
[node name="Credits" type="Button" parent="ButtonContainer"] [node name="Credits" type="Button" parent="ButtonContainer"]
margin_top = 52.0 margin_top = 46.0
margin_right = 208.0 margin_right = 208.0
margin_bottom = 94.0 margin_bottom = 82.0
text = "Credits" text = "Credits"
[node name="Controls" type="Button" parent="ButtonContainer"] [node name="Controls" type="Button" parent="ButtonContainer"]
margin_top = 104.0 margin_top = 92.0
margin_right = 208.0 margin_right = 208.0
margin_bottom = 146.0 margin_bottom = 128.0
text = "Controls" text = "Controls"
[node name="QuitButton" type="Button" parent="ButtonContainer"] [node name="QuitButton" type="Button" parent="ButtonContainer"]
margin_top = 156.0 margin_top = 138.0
margin_right = 208.0 margin_right = 208.0
margin_bottom = 198.0 margin_bottom = 174.0
text = "Quit" text = "Quit"
[node name="BlackoutScreen" type="CanvasLayer" parent="."] [node name="BlackoutScreen" type="CanvasLayer" parent="."]

View File

@ -9,7 +9,12 @@ func _on_RetryButton_pressed():
pass # Replace with function body. pass # Replace with function body.
func _on_MenuButton_pressed(): func _on_MenuButton_pressed():
var _err = get_tree().change_scene("res://screens/title.tscn") 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(): func _on_QuitButton_pressed():
get_tree().quit() get_tree().quit()

View File

@ -8,14 +8,16 @@ func _on_PlayButton_pressed():
$BlackoutSound.play() $BlackoutSound.play()
$ButtonContainer.visible = false $ButtonContainer.visible = false
$BlackoutScreen.visible = true $BlackoutScreen.visible = true
var dialog = Dialogic.start("intro")
add_child(dialog)
func _on_Credits_pressed(): func _on_Credits_pressed():
pass # Replace with function body. var dialog = Dialogic.start("credits")
add_child(dialog)
func _on_Controls_pressed(): func _on_Controls_pressed():
pass # Replace with function body. var dialog = Dialogic.start("controls")
add_child(dialog)
func _on_QuitButton_pressed(): func _on_QuitButton_pressed():
get_tree().quit() get_tree().quit()