diff --git a/Data.pck b/Data.pck new file mode 100644 index 0000000..63bdb20 Binary files /dev/null and b/Data.pck differ diff --git a/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 new file mode 100644 index 0000000..ea42599 --- /dev/null +++ b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5 @@ -0,0 +1,3 @@ +source_md5="b0989b0b32639e93e7bb9de031cc630c" +dest_md5="c7494eb2c4518e849d04bd411a623706" + diff --git a/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr new file mode 100644 index 0000000..8fa7749 Binary files /dev/null and b/godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr differ diff --git a/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres b/godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres index acd96c5..41c5bcc 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.03, 0.21, 0.26, 1 ) +bg_color = Color( 0.2, 0.23, 0.31, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/godot/assets/audio/squirrel.ogg b/godot/assets/audio/squirrel.ogg new file mode 100644 index 0000000..d3380c7 --- /dev/null +++ b/godot/assets/audio/squirrel.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d83b5d71ac6e6babb2ff6333af500ab750311dc9beb2d4098ab8e865a7f02ed +size 17115 diff --git a/godot/assets/audio/squirrel.ogg.import b/godot/assets/audio/squirrel.ogg.import new file mode 100644 index 0000000..5b9e7cb --- /dev/null +++ b/godot/assets/audio/squirrel.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr" + +[deps] + +source_file="res://assets/audio/squirrel.ogg" +dest_files=[ "res://.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/godot/assets/meat_bore/meat_module/meat_module.tscn b/godot/assets/meat_bore/meat_module/meat_module.tscn index 69c0f95..ed113b8 100644 --- a/godot/assets/meat_bore/meat_module/meat_module.tscn +++ b/godot/assets/meat_bore/meat_module/meat_module.tscn @@ -24,7 +24,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 3 ), "transitions": PoolRealArray( 1, 1 ), "update": 0, -"values": [ -50.0, 0.0 ] +"values": [ -50.0, 20.0 ] } [node name="meat_module" instance=ExtResource( 1 )] diff --git a/godot/assets/models/PlanetMaterial.material.tmp b/godot/assets/models/PlanetMaterial.material.tmp deleted file mode 100644 index 448480c..0000000 Binary files a/godot/assets/models/PlanetMaterial.material.tmp and /dev/null differ diff --git a/godot/dialogic/settings.cfg b/godot/dialogic/settings.cfg index 4b70683..bc35734 100644 --- a/godot/dialogic/settings.cfg +++ b/godot/dialogic/settings.cfg @@ -26,4 +26,4 @@ canvas_layer=50.0 [QuickTimelineTest] -timeline_file="timeline-1672875631.json" +timeline_file="timeline-1672859304.json" diff --git a/godot/dialogic/timelines/timeline-1667668097.json b/godot/dialogic/timelines/timeline-1667668097.json index 069db88..58472b4 100644 --- a/godot/dialogic/timelines/timeline-1667668097.json +++ b/godot/dialogic/timelines/timeline-1667668097.json @@ -1,11 +1,5 @@ { "events": [ - { - "condition": "!=", - "definition": "1667703692-648", - "event_id": "dialogic_012", - "value": "true" - }, { "event_id": "dialogic_024", "set_theme": "theme-1671745159.cfg" @@ -56,47 +50,20 @@ "event_id": "dialogic_024", "set_theme": "theme-1671748561.cfg" }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, { "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "(Initializing...)" + "text": "initializing..." }, { - "definition": "1667703692-648", - "event_id": "dialogic_014", - "operation": "=", - "random_upper_limit": 100, - "set_random": false, - "set_value": "true" - }, - { - "change_timeline": "timeline-1672719153.json", - "event_id": "dialogic_020" - }, - { - "event_id": "dialogic_022", - "transition_duration": 1 - }, - { - "event_id": "dialogic_013" - }, - { - "condition": "", - "definition": "1667703692-648", - "event_id": "dialogic_012", - "value": "true" - }, - { - "change_timeline": "timeline-1672719153.json", - "event_id": "dialogic_020" - }, - { - "event_id": "dialogic_022", - "transition_duration": 1 - }, - { - "event_id": "dialogic_013" + "change_scene": "res://assets/meat_creek/side_tunnel_1.tscn", + "event_id": "dialogic_041" } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672719153.json b/godot/dialogic/timelines/timeline-1672719153.json index e9de623..58f7f04 100644 --- a/godot/dialogic/timelines/timeline-1672719153.json +++ b/godot/dialogic/timelines/timeline-1672719153.json @@ -13,6 +13,17 @@ "portrait": "", "question": "" }, + { + "choice": "Chapter 0- Intro", + "condition": "", + "definition": "", + "event_id": "dialogic_011", + "value": "" + }, + { + "change_scene": "res://screens/Intro.tscn", + "event_id": "dialogic_041" + }, { "choice": "Chapter 1- Black Boxes", "condition": "", diff --git a/godot/dialogic/timelines/timeline-1672859304.json b/godot/dialogic/timelines/timeline-1672859304.json index 837e291..e572e1c 100644 --- a/godot/dialogic/timelines/timeline-1672859304.json +++ b/godot/dialogic/timelines/timeline-1672859304.json @@ -18,6 +18,14 @@ "file": "res://assets/audio/synthsparkle.wav", "volume": 0 }, + { + "audio": "play", + "audio_bus": "Master", + "event_id": "dialogic_030", + "event_name": "AudioEvent", + "file": "res://assets/audio/squirrel.ogg", + "volume": 0 + }, { "character": "character-1672875775.json", "event_id": "dialogic_001", diff --git a/godot/dialogic/timelines/timeline-1672875631.json b/godot/dialogic/timelines/timeline-1672875631.json index 9227424..5dab605 100644 --- a/godot/dialogic/timelines/timeline-1672875631.json +++ b/godot/dialogic/timelines/timeline-1672875631.json @@ -34,12 +34,6 @@ "event_id": "dialogic_001", "portrait": "", "text": "This must be... [wave amp=50 freq=2][color=red]Meat Heaven[/color][/wave]" - }, - { - "character": "", - "event_id": "dialogic_001", - "portrait": "", - "text": "I wonder what's at the top?" } ], "metadata": { diff --git a/godot/project.godot b/godot/project.godot index 4c2a139..44b88cf 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -94,6 +94,8 @@ _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/Intro.gd b/godot/screens/Intro.gd new file mode 100644 index 0000000..17d1d9b --- /dev/null +++ b/godot/screens/Intro.gd @@ -0,0 +1,4 @@ +extends Control + +func _ready(): + add_child(Dialogic.start("intro")) diff --git a/godot/screens/Intro.tscn b/godot/screens/Intro.tscn new file mode 100644 index 0000000..4cc9cec --- /dev/null +++ b/godot/screens/Intro.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://screens/Intro.gd" type="Script" id=1] +[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=2] + +[node name="Intro" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 1 ) + +[node name="ColorRect" type="ColorRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0, 0, 0, 1 ) + +[node name="shader" parent="." instance=ExtResource( 2 )] diff --git a/godot/screens/TitleMenu.gd b/godot/screens/TitleMenu.gd index e897677..8380c5c 100644 --- a/godot/screens/TitleMenu.gd +++ b/godot/screens/TitleMenu.gd @@ -8,7 +8,7 @@ func _on_PlayButton_pressed(): $BlackoutSound.play() $ButtonContainer.visible = false $BlackoutScreen.visible = true - var dialog = Dialogic.start("intro") + var dialog = Dialogic.start("chapterselect") add_child(dialog) func _on_Credits_pressed(): diff --git a/store_assets/Screenshot from 2023-01-04 18-23-40.png b/store_assets/Screenshot from 2023-01-04 18-23-40.png new file mode 100644 index 0000000..3a8e6a0 --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-23-40.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ed02be78424b96045850b1652d7a5a29389a68133e9516d68cbd597100f75a6 +size 1315062 diff --git a/store_assets/Screenshot from 2023-01-04 18-34-28.png b/store_assets/Screenshot from 2023-01-04 18-34-28.png new file mode 100644 index 0000000..80d9970 --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-34-28.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94c7a4669184d41e9d2926947268c968e73f89f31fd0460dd44354a07784379f +size 2461900 diff --git a/store_assets/Screenshot from 2023-01-04 18-52-15.png b/store_assets/Screenshot from 2023-01-04 18-52-15.png new file mode 100644 index 0000000..26bd4ce --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-52-15.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:135aecf634fbec8a2aacf592c1661f4123720c34574972fddc44c6daaf3e5b36 +size 2037674 diff --git a/store_assets/Screenshot from 2023-01-04 18-52-43.png b/store_assets/Screenshot from 2023-01-04 18-52-43.png new file mode 100644 index 0000000..7a4b92d --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-52-43.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb4337c87146fd89d9c7a967647c7f795454e8586e435a458147ca5cef5098d7 +size 3838538 diff --git a/store_assets/Screenshot from 2023-01-04 18-53-14.png b/store_assets/Screenshot from 2023-01-04 18-53-14.png new file mode 100644 index 0000000..590cd86 --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-53-14.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7808a9e8b510dd35ba39803e741cc08e8934244e870a90aaacda0b8625e91f33 +size 3847141 diff --git a/store_assets/Screenshot from 2023-01-04 18-54-00.png b/store_assets/Screenshot from 2023-01-04 18-54-00.png new file mode 100644 index 0000000..89dca7a --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-54-00.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c3819b9ce404fe946d34c701178840d5f82e68974b873f64c3667014eefd0fb +size 2970761 diff --git a/store_assets/Screenshot from 2023-01-04 18-54-30.png b/store_assets/Screenshot from 2023-01-04 18-54-30.png new file mode 100644 index 0000000..3e476e7 --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-54-30.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0684a54e202cfe230dcb76ce7be5ee3b0634f3903cdb22d7b438c85ef7bf7ccd +size 3867639 diff --git a/store_assets/Screenshot from 2023-01-04 18-55-39.png b/store_assets/Screenshot from 2023-01-04 18-55-39.png new file mode 100644 index 0000000..cccabb4 --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-55-39.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f246b9e97817c3243b0bef40b37e5a120fe1ef2e3aec53ec61984cddf0dbdd25 +size 3785923 diff --git a/store_assets/Screenshot from 2023-01-04 18-56-09.png b/store_assets/Screenshot from 2023-01-04 18-56-09.png new file mode 100644 index 0000000..fc2e45f --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-56-09.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51fd0406390a0ae872e5ebfd86e7df8f4a73ae45f3c1a9a5a740c213680f7124 +size 3108665 diff --git a/store_assets/Screenshot from 2023-01-04 18-57-07.png b/store_assets/Screenshot from 2023-01-04 18-57-07.png new file mode 100644 index 0000000..5acc8ea --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-57-07.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2990d07bbc9772b9d48e0c013ebde8050b84c27d526ea749e589921151e3732d +size 4422337 diff --git a/store_assets/Screenshot from 2023-01-04 18-57-31.png b/store_assets/Screenshot from 2023-01-04 18-57-31.png new file mode 100644 index 0000000..688a3af --- /dev/null +++ b/store_assets/Screenshot from 2023-01-04 18-57-31.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a39041041853aa81c306742163486cb471261c627514bea2878a98026395b2a +size 4019542 diff --git a/store_assets/screenshot.png b/store_assets/screenshot.png new file mode 100644 index 0000000..72faba8 --- /dev/null +++ b/store_assets/screenshot.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76e5ddbf2ef52e66c6322d20205871335f1a1bca56feeebd5e36ff5f46351e5a +size 1504251 diff --git a/super_secret/1.jpg b/super_secret/1.jpg new file mode 100644 index 0000000..5b6c7c8 --- /dev/null +++ b/super_secret/1.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f1c7ec15dcc2327465ac75c8e7cde52f92ae6c124c5c801aaf1db54eb648b97 +size 710136 diff --git a/super_secret/10.jpg b/super_secret/10.jpg new file mode 100644 index 0000000..e36aac0 --- /dev/null +++ b/super_secret/10.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb44abfb63ea9a11baf3562a686a6023c8a2a2a2a361ddfd05fb9bb639c612a5 +size 3092477 diff --git a/super_secret/2.jpg b/super_secret/2.jpg new file mode 100644 index 0000000..5a835c3 --- /dev/null +++ b/super_secret/2.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e88279bf3c32e816cf04516105ed0cdd362630eb5200cf0d6f95aa3db0ee8919 +size 3104581 diff --git a/super_secret/3.jpg b/super_secret/3.jpg new file mode 100644 index 0000000..6eed249 --- /dev/null +++ b/super_secret/3.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25536c4dc26251b55950960ac4b260a00a5b5e24c8a31e2b792d98f7da2a2726 +size 302916 diff --git a/super_secret/4.jpg b/super_secret/4.jpg new file mode 100644 index 0000000..73297ff --- /dev/null +++ b/super_secret/4.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d38349c1f4eb0d5cb9976e326a9f5ad7591022aeb0017603722fa0c04bc860 +size 1440866 diff --git a/super_secret/5.jpg b/super_secret/5.jpg new file mode 100644 index 0000000..5a49670 --- /dev/null +++ b/super_secret/5.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31c5bd478a5a5014160c27ba0fca71165f3bcb079b9dbc904f45d2f7d6ae33bb +size 3231707 diff --git a/super_secret/6.jpg b/super_secret/6.jpg new file mode 100644 index 0000000..e2b8f0a --- /dev/null +++ b/super_secret/6.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f0e441abd12f7d70db2e049e0f62220ba9722a4d84dc82bad35843ab654098c +size 2745679 diff --git a/super_secret/7.jpg b/super_secret/7.jpg new file mode 100644 index 0000000..c56f36c --- /dev/null +++ b/super_secret/7.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4db4425b5955aa3edbd8fd532a9ce099ad03bd528ceea3b692c29ddb606d7452 +size 638258 diff --git a/super_secret/8.jpg b/super_secret/8.jpg new file mode 100644 index 0000000..710e682 --- /dev/null +++ b/super_secret/8.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4299b4bf937e136c294b765cfacb3b6d4f155dc6ba1a15550d86001ff94ac96 +size 866549 diff --git a/super_secret/9.jpg b/super_secret/9.jpg new file mode 100644 index 0000000..3864054 --- /dev/null +++ b/super_secret/9.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4623005b74f8b1e52f9a8970449e2fda8f08605a4a6751f83e79470d781a7d80 +size 3532485