From 3fc696591c25b76470c890128a4a39c670b10fb6 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Wed, 4 Jan 2023 10:23:03 -0700 Subject: [PATCH] Add chapter 3 --- .../timelines/timeline-1672719153.json | 11 +++++++++ godot/jackie_skip.tscn | 23 +++++++++++++++++++ godot/screens/TitleMenu.gd | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 godot/jackie_skip.tscn diff --git a/godot/dialogic/timelines/timeline-1672719153.json b/godot/dialogic/timelines/timeline-1672719153.json index 42a9464..e9de623 100644 --- a/godot/dialogic/timelines/timeline-1672719153.json +++ b/godot/dialogic/timelines/timeline-1672719153.json @@ -43,6 +43,17 @@ "event_id": "dialogic_022", "transition_duration": 1 }, + { + "choice": "Chapter 3- The End", + "condition": "", + "definition": "", + "event_id": "dialogic_011", + "value": "" + }, + { + "change_scene": "res://jackie_skip.tscn", + "event_id": "dialogic_041" + }, { "event_id": "dialogic_013" } diff --git a/godot/jackie_skip.tscn b/godot/jackie_skip.tscn new file mode 100644 index 0000000..631b5d2 --- /dev/null +++ b/godot/jackie_skip.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/meat_bore/meat_module/level_jackie.tscn" type="PackedScene" id=2] +[ext_resource path="res://player/player.tscn" type="PackedScene" id=3] +[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=4] +[ext_resource path="res://effects/MeatSinkParameters.tscn" type="PackedScene" id=5] +[ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=6] + +[node name="jackie_skip" type="Spatial"] + +[node name="level_jackie" parent="." instance=ExtResource( 2 )] + +[node name="WorldEnvironment" parent="." instance=ExtResource( 4 )] + +[node name="shader" parent="." instance=ExtResource( 1 )] + +[node name="Player" parent="." instance=ExtResource( 3 )] +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2.05098, -464.864, -2.97118 ) + +[node name="MeatSinkParameters" parent="." instance=ExtResource( 5 )] + +[node name="level_wally" parent="." instance=ExtResource( 6 )] diff --git a/godot/screens/TitleMenu.gd b/godot/screens/TitleMenu.gd index 99b8e27..ef0a2c6 100644 --- a/godot/screens/TitleMenu.gd +++ b/godot/screens/TitleMenu.gd @@ -16,7 +16,7 @@ func _on_Credits_pressed(): add_child(dialog) func _on_Controls_pressed(): - get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn") + var _err = get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn") func _on_QuitButton_pressed(): get_tree().quit()