sjkillen/meat_madness_redux
sjkillen
/
meat_madness_redux
1
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

chapter select + new end screen

This commit is contained in:
dukegoobler 2023-01-02 22:13:52 -07:00
parent bd9afc4a3e
commit ffe2c7f19f
11 changed files with 136 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
godot/assets/meat_bore/level.tscn
View File

@ -12,12 +12,12 @@
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_2.png" type="Texture" id=10]
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_4.png" type="Texture" id=11]
[sub_resource type="PanoramaSky" id=2]
[sub_resource type="PanoramaSky" id=4]
panorama = ExtResource( 6 )
[sub_resource type="Environment" id=3]
background_mode = 2
background_sky = SubResource( 2 )
background_sky = SubResource( 4 )
ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 )
ambient_light_energy = 1.5
ambient_light_sky_contribution = 0.0

3
godot/dialogic/folder_structure.json
View File

@ -43,7 +43,8 @@
"files": [
"default-theme.cfg",
"theme-1671745159.cfg",
"theme-1671748561.cfg"
"theme-1671748561.cfg",
"theme-1672721557.cfg"
],
"folders": {

2
godot/dialogic/settings.cfg
View File

@ -26,4 +26,4 @@ canvas_layer=50.0
[QuickTimelineTest]
timeline_file="timeline-1672719153.json"
timeline_file="timeline-1667668097.json"

2
godot/dialogic/themes/theme-1671748561.cfg
View File

@ -29,3 +29,5 @@ hover=[ true, Color( 0.698039, 0.698039, 0.698039, 1 ), false, Color( 0, 0, 0, 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 ) ]
layout=0
fixed=false

25
godot/dialogic/themes/theme-1672721557.cfg Normal file
View File

@ -0,0 +1,25 @@
[settings]
name="Chapter Select Theme"
[buttons]
normal=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button01.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://assets/Button01.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://assets/Button01.png", false, Color( 1, 1, 1, 1 ) ]
pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button01.png", false, Color( 1, 1, 1, 1 ) ]
disabled=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button01.png", false, Color( 1, 1, 1, 1 ) ]
padding=Vector2( 10, 10 )
gap=10.0
[background]
use_image=false
[name]
is_hidden=true
[text]
font="res://assets/gratvityfont.tres"

8
godot/dialogic/timelines/timeline-1667668097.json
View File

@ -71,8 +71,8 @@
"set_value": "true"
},
{
"change_scene": "res://assets/meat_creek/side_tunnel_1.tscn",
"event_id": "dialogic_041"
"change_timeline": "timeline-1672719153.json",
"event_id": "dialogic_020"
},
{
"event_id": "dialogic_022",
@ -88,8 +88,8 @@
"value": "true"
},
{
"change_scene": "res://assets/meat_creek/side_tunnel_1.tscn",
"event_id": "dialogic_041"
"change_timeline": "timeline-1672719153.json",
"event_id": "dialogic_020"
},
{
"event_id": "dialogic_022",

27
godot/dialogic/timelines/timeline-1672719153.json
View File

@ -2,7 +2,7 @@
"events": [
{
"event_id": "dialogic_024",
"set_theme": "theme-1671748561.cfg"
"set_theme": "theme-1672721557.cfg"
},
{
"character": "",
@ -11,21 +11,40 @@
],
"portrait": "",
"question": "Chapter Select"
"question": ""
},
{
"choice": "Chapter 1",
"choice": "Chapter 1- Black Boxes",
"condition": "",
"definition": "",
"event_id": "dialogic_011",
"value": ""
},
{
"choice": "Chapter 2",
"change_scene": "res://assets/meat_creek/side_tunnel_1.tscn",
"event_id": "dialogic_041"
},
{
"event_id": "dialogic_022",
"transition_duration": 1
},
{
"choice": "Chapter 2- The Descent",
"condition": "",
"definition": "",
"event_id": "dialogic_011",
"value": ""
},
{
"change_scene": "res://assets/meat_bore/level.tscn",
"event_id": "dialogic_041"
},
{
"event_id": "dialogic_022",
"transition_duration": 1
},
{
"event_id": "dialogic_013"
}
],
"metadata": {

2
godot/screens/PauseScreen.gd
View File

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

2
godot/screens/TitleScreen_Planet.tscn
View File

@ -9,7 +9,7 @@
[ext_resource path="res://assets/audio/button_press.ogg" type="AudioStream" id=7]
[ext_resource path="res://assets/ui_theme.tres" type="Theme" id=8]
[node name="test_titlescreen_planet" type="Spatial"]
[node name="titlescreen_planet" type="Spatial"]
[node name="Camera" type="Camera" parent="."]
transform = Transform( -0.262413, -0.132575, 0.955805, -0.0204041, 0.991058, 0.131863, -0.96474, 0.0151002, -0.262772, 4.34589, 1.41359, 1.05785 )

5
godot/tests/test_endscreen_planet/EndMenu.gd
View File

@ -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():
@ -20,5 +20,6 @@ func _on_Controls_pressed():
add_child(dialog)
func _on_QuitButton_pressed():
get_tree().quit()
get_tree().change_scene("res://screens/TitleScreen_Planet.tscn")

97
godot/tests/test_endscreen_planet/EndScreen_Planet.tscn
View File

@ -1,29 +1,76 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=15 format=2]
[ext_resource path="res://assets/title_font.tres" type="DynamicFont" id=1]
[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=2]
[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/models/meat_planet.tscn" type="PackedScene" id=4]
[ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=4]
[ext_resource path="res://tests/test_endscreen_planet/EndMenu.gd" type="Script" id=5]
[ext_resource path="res://assets/audio/menu_music.ogg" type="AudioStream" id=6]
[ext_resource path="res://assets/audio/button_press.ogg" type="AudioStream" id=7]
[ext_resource path="res://assets/ui_theme.tres" type="Theme" id=8]
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_1.png" type="Texture" id=9]
[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=10]
[ext_resource path="res://assets/Starbox3.png" type="Texture" id=11]
[node name="EndScreen_Planet" type="Spatial"]
[sub_resource type="Animation" id=4]
resource_name = "camera descend"
length = 60.0
loop = true
tracks/0/type = "transform"
tracks/0/path = NodePath(".")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = PoolRealArray( 0.3, 1, 0, 50, 0, 0.0945714, 0.700754, 0.700754, -0.0945714, 1, 1, 1, 29.4, 1, 0, -50, 0, -0.707107, 6.18172e-08, 6.18172e-08, 0.707107, 1, 1, 1, 59.2, 1, 0, 50, 0, 0.0945714, 0.700754, 0.700754, -0.0945714, 1, 1, 1 )
[sub_resource type="PanoramaSky" id=2]
panorama = ExtResource( 11 )
[sub_resource type="Environment" id=3]
background_mode = 2
background_sky = SubResource( 2 )
ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 )
ambient_light_sky_contribution = 0.0
fog_enabled = true
fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 )
fog_sun_color = Color( 0.639216, 0.541176, 0.345098, 1 )
fog_depth_begin = 0.0
fog_depth_end = 73.5
fog_depth_curve = 0.933033
fog_transmit_enabled = true
fog_transmit_curve = 1.03526
auto_exposure_min_luma = 0.58
auto_exposure_max_luma = 4.5
auto_exposure_speed = 0.63
ssao_enabled = true
ssao_radius2 = 2.0
ssao_bias = 0.05
dof_blur_far_distance = 5.0
dof_blur_near_enabled = true
dof_blur_near_distance = 1.33
dof_blur_near_amount = 0.66
dof_blur_near_quality = 2
glow_enabled = true
glow_bloom = 1.0
[node name="endscreen_planet" type="Spatial"]
[node name="Camera" type="Camera" parent="."]
transform = Transform( -0.262413, -0.132575, 0.955805, -0.0204041, 0.991058, 0.131863, -0.96474, 0.0151002, -0.262772, 4.34589, 1.41359, 1.05785 )
transform = Transform( -0.964225, 0.265085, -2.98023e-08, -2.98023e-08, 0, 1, 0.265085, 0.964225, 0, 0, 50, 0 )
[node name="meat_planet" parent="." instance=ExtResource( 4 )]
transform = Transform( -0.0182938, 0.353447, -0.54052, 0.529643, -0.301205, -0.214884, -0.369546, -0.44919, -0.281219, 0.0736001, 0.18823, -0.0757823 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Camera"]
autoplay = "camera descend"
playback_speed = 0.75
"anims/camera descend" = SubResource( 4 )
[node name="DirectionalLight" type="DirectionalLight" parent="."]
transform = Transform( 0.791944, 0.610549, 0.00734885, -0.405596, 0.517027, 0.753774, 0.456416, -0.599928, 0.657093, 3.25392, 5.38699, -0.264825 )
light_color = Color( 0.317647, 0.0156863, 0.0156863, 1 )
light_energy = 1.5
shadow_enabled = true
[node name="meat_tunnel_top" parent="." instance=ExtResource( 3 )]
[node name="WorldEnvironment" parent="." instance=ExtResource( 3 )]
[node name="meat_module_1" parent="." instance=ExtResource( 4 )]
texture = ExtResource( 9 )
[node name="LessFogWorldEnvironment" parent="." instance=ExtResource( 10 )]
environment = SubResource( 3 )
[node name="EndMenu" type="Control" parent="."]
anchor_left = 0.5
@ -59,10 +106,10 @@ anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -504.0
margin_top = -52.0
margin_right = -204.0
margin_bottom = 298.0
margin_left = -150.0
margin_top = -175.0
margin_right = 150.0
margin_bottom = 175.0
theme = ExtResource( 8 )
custom_constants/separation = 10
@ -70,28 +117,28 @@ custom_constants/separation = 10
margin_right = 300.0
margin_bottom = 80.0
size_flags_vertical = 3
text = "Play"
text = "Play Again"
[node name="Credits" type="Button" parent="EndMenu/ButtonContainer"]
[node name="QuitButton" type="Button" parent="EndMenu/ButtonContainer"]
margin_top = 90.0
margin_right = 300.0
margin_bottom = 170.0
size_flags_vertical = 3
text = "Credits"
text = "Main Menu"
[node name="Controls" type="Button" parent="EndMenu/ButtonContainer"]
[node name="Credits" type="Button" parent="EndMenu/ButtonContainer"]
margin_top = 180.0
margin_right = 300.0
margin_bottom = 260.0
size_flags_vertical = 3
text = "Controls"
text = "Credits"
[node name="QuitButton" type="Button" parent="EndMenu/ButtonContainer"]
[node name="Controls" type="Button" parent="EndMenu/ButtonContainer"]
margin_top = 270.0
margin_right = 300.0
margin_bottom = 350.0
size_flags_vertical = 3
text = "Quit"
text = "Controls"
[node name="BlackoutScreen" type="CanvasLayer" parent="EndMenu"]
layer = 2
@ -113,6 +160,6 @@ stream = ExtResource( 7 )
[node name="grainy_shader" parent="EndMenu" instance=ExtResource( 2 )]
[connection signal="pressed" from="EndMenu/ButtonContainer/PlayButton" to="EndMenu" method="_on_PlayButton_pressed"]
[connection signal="pressed" from="EndMenu/ButtonContainer/QuitButton" to="EndMenu" method="_on_QuitButton_pressed"]
[connection signal="pressed" from="EndMenu/ButtonContainer/Credits" to="EndMenu" method="_on_Credits_pressed"]
[connection signal="pressed" from="EndMenu/ButtonContainer/Controls" to="EndMenu" method="_on_Controls_pressed"]
[connection signal="pressed" from="EndMenu/ButtonContainer/QuitButton" to="EndMenu" method="_on_QuitButton_pressed"]