diff --git a/godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.md5 b/godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.md5 new file mode 100644 index 0000000..361b188 --- /dev/null +++ b/godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.md5 @@ -0,0 +1,3 @@ +source_md5="5a328d0e134030b30e6236d255743fb9" +dest_md5="0942527d12800b34331ad85647630e88" + diff --git a/godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample b/godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample new file mode 100644 index 0000000..5b48b4b Binary files /dev/null and b/godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample differ diff --git a/godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.md5 b/godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.md5 new file mode 100644 index 0000000..e4f3b23 --- /dev/null +++ b/godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.md5 @@ -0,0 +1,3 @@ +source_md5="718ea6c3f6a955acd994df7eb4c2c07d" +dest_md5="5f30eed77e07a34869d29b2ddae18a48" + diff --git a/godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample b/godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample new file mode 100644 index 0000000..e1e2c30 Binary files /dev/null and b/godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample differ diff --git a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres index 41c5bcc..acd96c5 100644 --- a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres +++ b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres @@ -5,7 +5,7 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0.2, 0.23, 0.31, 1 ) +bg_color = Color( 0.03, 0.21, 0.26, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/godot/assets/audio/sparkle.wav b/godot/assets/audio/sparkle.wav new file mode 100644 index 0000000..4f30b75 Binary files /dev/null and b/godot/assets/audio/sparkle.wav differ diff --git a/godot/assets/audio/sparkle.wav.import b/godot/assets/audio/sparkle.wav.import new file mode 100644 index 0000000..863e34b --- /dev/null +++ b/godot/assets/audio/sparkle.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample" + +[deps] + +source_file="res://assets/audio/sparkle.wav" +dest_files=[ "res://.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/audio/synthsparkle.wav b/godot/assets/audio/synthsparkle.wav new file mode 100644 index 0000000..ab00707 Binary files /dev/null and b/godot/assets/audio/synthsparkle.wav differ diff --git a/godot/assets/audio/synthsparkle.wav.import b/godot/assets/audio/synthsparkle.wav.import new file mode 100644 index 0000000..69fc9c3 --- /dev/null +++ b/godot/assets/audio/synthsparkle.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample" + +[deps] + +source_file="res://assets/audio/synthsparkle.wav" +dest_files=[ "res://.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/godot/assets/meat_bore/meat_heaven.gd b/godot/assets/meat_bore/meat_heaven.gd index 977d431..3631775 100644 --- a/godot/assets/meat_bore/meat_heaven.gd +++ b/godot/assets/meat_bore/meat_heaven.gd @@ -1,5 +1,4 @@ extends Spatial func _ready(): - var dialog = Dialogic.start("controls") - add_child(dialog) + pass diff --git a/godot/assets/models/Material_003.material.tmp b/godot/assets/models/Material_003.material.tmp new file mode 100644 index 0000000..4a23758 Binary files /dev/null and b/godot/assets/models/Material_003.material.tmp differ diff --git a/godot/assets/models/PlanetMaterial.material.tmp b/godot/assets/models/PlanetMaterial.material.tmp new file mode 100644 index 0000000..448480c Binary files /dev/null and b/godot/assets/models/PlanetMaterial.material.tmp differ diff --git a/godot/dialogic/characters/character-1672875775.json b/godot/dialogic/characters/character-1672875775.json new file mode 100644 index 0000000..32d3b7f --- /dev/null +++ b/godot/dialogic/characters/character-1672875775.json @@ -0,0 +1,21 @@ +{ + "color": "#ffffffff", + "description": "", + "display_name": "The Squirrel", + "display_name_bool": true, + "id": "character-1672875775.json", + "mirror_portraits": false, + "name": "The Squirrel", + "nickname": "", + "nickname_bool": false, + "offset_x": 0, + "offset_y": 0, + "portraits": [ + { + "name": "Default", + "path": "" + } + ], + "scale": 100, + "theme": "" +} diff --git a/godot/dialogic/folder_structure.json b/godot/dialogic/folder_structure.json index f890a61..555aa16 100644 --- a/godot/dialogic/folder_structure.json +++ b/godot/dialogic/folder_structure.json @@ -13,7 +13,8 @@ "character-1667667711.json", "character-1667767751.json", "character-1672267793.json", - "character-1672728520.json" + "character-1672728520.json", + "character-1672875775.json" ], "folders": { @@ -50,7 +51,8 @@ "theme-1671745159.cfg", "theme-1671748561.cfg", "theme-1672721557.cfg", - "theme-1672728448.cfg" + "theme-1672728448.cfg", + "theme-1672875796.cfg" ], "folders": { @@ -82,7 +84,8 @@ "timeline-1672725696.json", "timeline-1672727997.json", "timeline-1672812380.json", - "timeline-1672859304.json" + "timeline-1672859304.json", + "timeline-1672875631.json" ], "folders": { diff --git a/godot/dialogic/settings.cfg b/godot/dialogic/settings.cfg index ddf37d5..bc35734 100644 --- a/godot/dialogic/settings.cfg +++ b/godot/dialogic/settings.cfg @@ -7,7 +7,7 @@ updatenumber=3 default_action_key="dialogic_default_action" clicking_dialog_action=false autofocus_choices=true -delay_after_options="0.5" +delay_after_options="1" enable_default_shortcut=false [editor] @@ -26,4 +26,4 @@ canvas_layer=50.0 [QuickTimelineTest] -timeline_file="timeline-1667671061.json" +timeline_file="timeline-1672859304.json" diff --git a/godot/dialogic/themes/theme-1672875796.cfg b/godot/dialogic/themes/theme-1672875796.cfg new file mode 100644 index 0000000..a9710d7 --- /dev/null +++ b/godot/dialogic/themes/theme-1672875796.cfg @@ -0,0 +1,54 @@ +[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 ) ] +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 ) ] + +[settings] + +name="Heaven Theme" + +[background] + +color="#fff700ff" +use_color=false +use_image=true +image="res://assets/Button03.png" +modulation_color="#ffff94ee" +modulation=true + +[name] + +font="res://assets/dialogic_name_font.tres" +position=1 +modulation=false +background_visible=false +image_visible=false +auto_color=false +modulation_color="#ffffffff" + +[text] + +font="res://assets/dialogic_name_font.tres" +text_margin_top=30.0 +text_margin_left=30.0 +text_margin_right=-30.0 +text_margin_bottom=-30.0 +color="#ffff00e3" +shadow=true +shadow_color="#9effffff" + +[audio] + +typing={ +"allow_interrupt": true, +"audio_bus": "Master", +"enable": true, +"path": "res://assets/audio/sparkle.wav", +"pitch": 1.0, +"pitch_rand_range": 0.0, +"volume": 0.0, +"volume_rand_range": 0.0 +} diff --git a/godot/dialogic/timelines/timeline-1672859304.json b/godot/dialogic/timelines/timeline-1672859304.json index cafd991..837e291 100644 --- a/godot/dialogic/timelines/timeline-1672859304.json +++ b/godot/dialogic/timelines/timeline-1672859304.json @@ -1,10 +1,34 @@ { "events": [ + { + "event_id": "dialogic_024", + "set_theme": "theme-1672875796.cfg" + }, { "character": "", "event_id": "dialogic_001", "portrait": "", + "text": "Squeak" + }, + { + "audio": "play", + "audio_bus": "Master", + "event_id": "dialogic_030", + "event_name": "AudioEvent", + "file": "res://assets/audio/synthsparkle.wav", + "volume": 0 + }, + { + "character": "character-1672875775.json", + "event_id": "dialogic_001", + "portrait": "", "text": "Password: GHYF12FGXNMQ" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "Squeak squeak" } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672875631.json b/godot/dialogic/timelines/timeline-1672875631.json new file mode 100644 index 0000000..7f0e108 --- /dev/null +++ b/godot/dialogic/timelines/timeline-1672875631.json @@ -0,0 +1,36 @@ +{ + "events": [ + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, + { + "event_id": "dialogic_024", + "set_theme": "theme-1672875796.cfg" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "Where am I?" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "I love it here" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "I wonder what's at the top?" + } + ], + "metadata": { + "dialogic-version": "1.4.5", + "file": "timeline-1672875631.json", + "name": "heaven" + } +} diff --git a/godot/project.godot b/godot/project.godot index 44b88cf..4c2a139 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -94,8 +94,6 @@ _global_script_class_icons={ config/name="meat_madness_redux" run/main_scene="res://screens/TitleScreen_Planet.tscn" -boot_splash/show_image=false -boot_splash/bg_color=Color( 0, 0, 0, 1 ) config/icon="res://meat_madness_icon.png" [autoload] diff --git a/godot/screens/TitleMenu.gd b/godot/screens/TitleMenu.gd index ef0a2c6..e897677 100644 --- a/godot/screens/TitleMenu.gd +++ b/godot/screens/TitleMenu.gd @@ -16,7 +16,11 @@ func _on_Credits_pressed(): add_child(dialog) func _on_Controls_pressed(): - var _err = get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn") + var dialog = Dialogic.start("controls") + add_child(dialog) func _on_QuitButton_pressed(): get_tree().quit() + +func _on_heavenButton_pressed(): + var _err = get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn") diff --git a/godot/screens/TitleScreen_Planet.tscn b/godot/screens/TitleScreen_Planet.tscn index e482ba0..f5c1a21 100644 --- a/godot/screens/TitleScreen_Planet.tscn +++ b/godot/screens/TitleScreen_Planet.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://assets/title_font.tres" type="DynamicFont" id=1] [ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=2] @@ -44,6 +44,8 @@ glow_bloom = 1.0 glow_blend_mode = 0 glow_high_quality = true +[sub_resource type="StyleBoxEmpty" id=3] + [node name="titlescreen_planet" type="Spatial"] [node name="Camera" type="Camera" parent="."] @@ -150,7 +152,19 @@ stream = ExtResource( 7 ) [node name="grainy_shader" parent="TitleMenu" instance=ExtResource( 3 )] +[node name="heavenButton" type="Button" parent="TitleMenu"] +margin_left = -164.0 +margin_top = -176.0 +margin_right = -92.0 +margin_bottom = -112.0 +custom_styles/normal = SubResource( 3 ) +shortcut_in_tooltip = false +action_mode = 0 +text = " " +flat = true + [connection signal="pressed" from="TitleMenu/ButtonContainer/PlayButton" to="TitleMenu" method="_on_PlayButton_pressed"] [connection signal="pressed" from="TitleMenu/ButtonContainer/Credits" to="TitleMenu" method="_on_Credits_pressed"] [connection signal="pressed" from="TitleMenu/ButtonContainer/Controls" to="TitleMenu" method="_on_Controls_pressed"] [connection signal="pressed" from="TitleMenu/ButtonContainer/QuitButton" to="TitleMenu" method="_on_QuitButton_pressed"] +[connection signal="pressed" from="TitleMenu/heavenButton" to="TitleMenu" method="_on_heavenButton_pressed"]