Compare commits

...

2 Commits

Author SHA1 Message Date
Spencer Killen 2c2d7507bb
Merge remote-tracking branch 'origin/master' into spencer 2023-01-04 19:09:55 -07:00
Spencer Killen 28e4cf2129
intro scene 2023-01-04 19:00:50 -07:00
39 changed files with 140 additions and 51 deletions

BIN
Data.pck Normal file

Binary file not shown.

View File

@ -0,0 +1,3 @@
source_md5="b0989b0b32639e93e7bb9de031cc630c"
dest_md5="c7494eb2c4518e849d04bd411a623706"

View File

@ -5,7 +5,7 @@ content_margin_left = 10.0
content_margin_right = 10.0 content_margin_right = 10.0
content_margin_top = 10.0 content_margin_top = 10.0
content_margin_bottom = 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_left = 1
border_width_top = 1 border_width_top = 1
border_width_right = 1 border_width_right = 1

BIN
godot/assets/audio/squirrel.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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

View File

@ -24,7 +24,7 @@ tracks/0/keys = {
"times": PoolRealArray( 0, 3 ), "times": PoolRealArray( 0, 3 ),
"transitions": PoolRealArray( 1, 1 ), "transitions": PoolRealArray( 1, 1 ),
"update": 0, "update": 0,
"values": [ -50.0, 0.0 ] "values": [ -50.0, 20.0 ]
} }
[node name="meat_module" instance=ExtResource( 1 )] [node name="meat_module" instance=ExtResource( 1 )]

View File

@ -27,4 +27,4 @@ canvas_layer=50.0
[QuickTimelineTest] [QuickTimelineTest]
timeline_file="timeline-1672875631.json" timeline_file="timeline-1672859304.json"

View File

@ -1,11 +1,5 @@
{ {
"events": [ "events": [
{
"condition": "!=",
"definition": "1667703692-648",
"event_id": "dialogic_012",
"value": "true"
},
{ {
"event_id": "dialogic_024", "event_id": "dialogic_024",
"set_theme": "theme-1671745159.cfg" "set_theme": "theme-1671745159.cfg"
@ -56,47 +50,20 @@
"event_id": "dialogic_024", "event_id": "dialogic_024",
"set_theme": "theme-1671748561.cfg" "set_theme": "theme-1671748561.cfg"
}, },
{
"block_input": true,
"event_id": "dialogic_050",
"wait_time": 0
},
{ {
"character": "", "character": "",
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "(Initializing...)" "text": "initializing..."
}, },
{ {
"definition": "1667703692-648", "change_scene": "res://assets/meat_creek/side_tunnel_1.tscn",
"event_id": "dialogic_014", "event_id": "dialogic_041"
"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"
} }
], ],
"metadata": { "metadata": {

View File

@ -13,6 +13,17 @@
"portrait": "", "portrait": "",
"question": "" "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", "choice": "Chapter 1- Black Boxes",
"condition": "", "condition": "",

View File

@ -18,6 +18,14 @@
"file": "res://assets/audio/synthsparkle.wav", "file": "res://assets/audio/synthsparkle.wav",
"volume": 0 "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", "character": "character-1672875775.json",
"event_id": "dialogic_001", "event_id": "dialogic_001",

View File

@ -34,12 +34,6 @@
"event_id": "dialogic_001", "event_id": "dialogic_001",
"portrait": "", "portrait": "",
"text": "I never want to leave..." "text": "I never want to leave..."
},
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "I wonder what's at the top?"
} }
], ],
"metadata": { "metadata": {

View File

@ -94,6 +94,8 @@ _global_script_class_icons={
config/name="meat_madness_redux" config/name="meat_madness_redux"
run/main_scene="res://screens/TitleScreen_Planet.tscn" 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" config/icon="res://meat_madness_icon.png"
[autoload] [autoload]

4
godot/screens/Intro.gd Normal file
View File

@ -0,0 +1,4 @@
extends Control
func _ready():
add_child(Dialogic.start("intro"))

16
godot/screens/Intro.tscn Normal file
View File

@ -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 )]

View File

@ -8,7 +8,7 @@ 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") var dialog = Dialogic.start("chapterselect")
add_child(dialog) add_child(dialog)
func _on_Credits_pressed(): func _on_Credits_pressed():

BIN
store_assets/Screenshot from 2023-01-04 18-23-40.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-34-28.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-52-15.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-52-43.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-53-14.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-54-00.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-54-30.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-55-39.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-56-09.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-57-07.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/Screenshot from 2023-01-04 18-57-31.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
store_assets/screenshot.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/1.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/10.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/2.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/3.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/4.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/5.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/6.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/7.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/8.jpg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
super_secret/9.jpg (Stored with Git LFS) Normal file

Binary file not shown.