From d5714756685ebdb4a8b3e1b03f923c98b1cd245f Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Wed, 4 Jan 2023 20:03:05 -0700 Subject: [PATCH] alexis tweak plus some end dialog --- .../styles/ResourceMenuPanelBackground.tres | 2 +- .../meat_bore/meat_module/level_alexis.tscn | 20 +++++++- .../meat_bore/meat_module/level_jackie.tscn | 2 +- .../assets/models/PlanetMaterial.material.tmp | Bin 0 -> 848 bytes .../timelines/timeline-1667673517.json | 4 +- .../timelines/timeline-1672623960.json | 45 ++++++++++-------- godot/screens/EndScreen_Planet.gd | 16 +++++++ godot/screens/EndScreen_Planet.tscn | 4 +- 8 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 godot/assets/models/PlanetMaterial.material.tmp create mode 100644 godot/screens/EndScreen_Planet.gd 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/meat_bore/meat_module/level_alexis.tscn b/godot/assets/meat_bore/meat_module/level_alexis.tscn index 3ba7185..e6e7443 100644 --- a/godot/assets/meat_bore/meat_module/level_alexis.tscn +++ b/godot/assets/meat_bore/meat_module/level_alexis.tscn @@ -38,6 +38,9 @@ transform = Transform( 0.998181, 0, 0.060282, 0, 1, 0, -0.060282, 0, 0.998181, 4 [node name="bridge" parent="." instance=ExtResource( 2 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.35255, -237.925, -7.85863 ) +[node name="bridge2" parent="." instance=ExtResource( 2 )] +transform = Transform( 1, 0, 0, 0, 0.993678, 0.112267, 0, -0.112267, 0.993678, -4.35255, -298.997, -7.85863 ) + [node name="dialogue_platform" parent="." instance=ExtResource( 6 )] transform = Transform( -0.00622234, 0.26132, -0.965232, 0.984724, -0.166367, -0.0513891, -0.174012, -0.950807, -0.256293, -9.27767, -292.621, 24.8008 ) @@ -48,4 +51,19 @@ transform = Transform( -0.929686, 0, 0.368352, 0, 1, 0, -0.368352, 0, -0.929686, transform = Transform( -0.0983844, 2.98061, 5.76833, 4.72262, 0.154299, -0.0388896, 0.00299956, 5.2907, -0.579473, -1.70829, 3.38397, 5.07203 ) [node name="creek_platform" parent="." instance=ExtResource( 9 )] -transform = Transform( 3.74529, 0, 0.111503, 0, 1, 0, 0.865761, 0, 2.4009, -5.52073, -297.308, 18.7745 ) +transform = Transform( 3.48191, 0, -0.392344, 0, 1, 0, 1.62881, 0, 2.37125, -5.52073, -294.493, 18.7745 ) + +[node name="creek_platform2" parent="." instance=ExtResource( 9 )] +transform = Transform( 3.42535, 0, 1.6289, 0, 1, 0, -1.74463, 0, 1.76732, 10.0399, -266.67, 18.297 ) + +[node name="creek_platform4" parent="." instance=ExtResource( 9 )] +transform = Transform( 3.46356, 0, -0.418723, 0, 1, 0, 1.66748, 0, 2.36673, -13.6817, -250.367, 16.622 ) + +[node name="creek_platform5" parent="." instance=ExtResource( 9 )] +transform = Transform( 3.42535, 0, 1.6289, 0, 1, 0, -1.74463, 0, 1.76732, 10.0399, -334.916, 18.297 ) + +[node name="creek_platform6" parent="." instance=ExtResource( 9 )] +transform = Transform( 3.46356, 0, -0.418723, 0, 1, 0, 1.66748, 0, 2.36673, -13.6817, -318.613, 16.622 ) + +[node name="creek_platform3" parent="." instance=ExtResource( 9 )] +transform = Transform( 2.95813, 0, -0.978084, 0, 1, 0, 2.45483, 0, 2.19547, -14.5492, -278.404, 15.0742 ) diff --git a/godot/assets/meat_bore/meat_module/level_jackie.tscn b/godot/assets/meat_bore/meat_module/level_jackie.tscn index 3a4ae22..bc6c090 100644 --- a/godot/assets/meat_bore/meat_module/level_jackie.tscn +++ b/godot/assets/meat_bore/meat_module/level_jackie.tscn @@ -37,7 +37,7 @@ shadow_enabled = true transform = Transform( 0.293757, 0, 0.95588, 0, 2.76592, 0, -0.95588, 0, 0.293757, -33.8926, -520.389, -8.76617 ) [node name="dialogue_platform2" parent="." instance=ExtResource( 4 )] -transform = Transform( 0.957214, 0.289383, 0, -0.705992, 2.33526, 0, 0, 0, 1, -30.1093, -522.019, -8.76617 ) +transform = Transform( 0.47125, -0.463241, 0.918156, 0.0126881, 2.80226, 0, -1.09203, 1.07347, 0.396219, -32.0499, -521.224, -8.76617 ) [node name="SinkBlock" parent="." instance=ExtResource( 5 )] transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 30, -0.004, -469.575, 0.012 ) diff --git a/godot/assets/models/PlanetMaterial.material.tmp b/godot/assets/models/PlanetMaterial.material.tmp new file mode 100644 index 0000000000000000000000000000000000000000..448480c4a824f8fd9d7b5d76cfa04aea9f9e7b6d GIT binary patch literal 848 zcmV-W1F!s2Q$s@n000005C8z52LJ##0{{RhwJ-f(p9Xaq05+#_Hc)Mn4lpw_Gcz+Y zv!p_;n^x0e=j}o<0d1qhe0eq(bc6 zUgNxF%F=%cZxlPM=PX;O6YjEva35aS3zKmUp)$v*I3zLQqGk&*HQ~%;nKj6QjhI44 zk3*p)n~U$Q)0W#v>9PuzNJhPqH3x6TMwD)-0+V%(T54lCRh3b}5?mVFW}K@*A4_|v z$;q`)3(;c9oDN1fF3RL#tGL!t652?qdX3Ki1IK;(zr~j^XJT}ernm75+eyVyFEMI} zBslgMqnZq*RaOwL)XJ@bp!%c>wNL{dKtzCW*dX!vxP}OZ4-+5o|AGYy0e%VsC!CHD z5mrKb(Ebkf4MNhA_U zTa89;8iwi-^5iwDPPYy2Vt2C-GY==z3j=_ssBy6}%E*j}NYW(B7*GNsrO0dt65ta> z$^t1hGi{~)e*=ri28HgyFIG~yV-}{Z-Vn>jghS+Px{f!k6Jw54kX3}tYLMKsI#@gF zVpX#x#|nez{?L=e&Ku(rZ^B%sjzjX`!#?al3Ei(tBM@8UN)&dQUwOdEt*q=voxQd< z>kS$dGw_13J-g~Z{USgU17dH9i98eJzFhe^$Zb=B7GK(t7?GOZioc4P=>VRCHgoDD z$>+wt+fhPdaJOpU=I0Z53&(&~GvTgdgZQm%J(A=PiRMKmH+Os|jmqvu(N5d~g2}_; a0XM4@Rpv^Rb@DH%D!l17g19hJQ$s_!Rf$*t literal 0 HcmV?d00001 diff --git a/godot/dialogic/timelines/timeline-1667673517.json b/godot/dialogic/timelines/timeline-1667673517.json index e04e9d3..c87cea1 100644 --- a/godot/dialogic/timelines/timeline-1667673517.json +++ b/godot/dialogic/timelines/timeline-1667673517.json @@ -108,13 +108,13 @@ "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "You and Brimley are evacuated from the site and paid handsomely for your services on the condition that you remain silent on what you have witnessed" + "text": "You and Brimley are evacuated from the site and paid handsomely for your services" }, { "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "On Earth, the crew’s families are happily reunited with their loved ones without the traumatic memory of their fate deep beneath surface of Ceres" + "text": "On Earth, the crew’s families are happily reunited with their loved ones unaware of their fate deep beneath surface of Ceres" }, { "character": "", diff --git a/godot/dialogic/timelines/timeline-1672623960.json b/godot/dialogic/timelines/timeline-1672623960.json index ed94f0d..95818c2 100644 --- a/godot/dialogic/timelines/timeline-1672623960.json +++ b/godot/dialogic/timelines/timeline-1672623960.json @@ -79,6 +79,10 @@ "portrait": "", "text": "Hmm. Come back when you're ready then Stuart" }, + { + "event_id": "dialogic_022", + "transition_duration": 1 + }, { "event_id": "dialogic_013" }, @@ -115,6 +119,10 @@ "portrait": "", "text": "Come back when you’ve gathered enough data" }, + { + "event_id": "dialogic_022", + "transition_duration": 1 + }, { "event_id": "dialogic_013" }, @@ -259,6 +267,14 @@ { "event_id": "dialogic_013" }, + { + "definition": "1672699872-250", + "event_id": "dialogic_014", + "operation": "=", + "random_upper_limit": 100, + "set_random": false, + "set_value": "true" + }, { "character": "character-1667667572.json", "event_id": "dialogic_001", @@ -295,18 +311,6 @@ "portrait": "", "text": "Come back when you’ve found five data fragments. That should be enough to paint a clear picture of their final movements" }, - { - "event_id": "dialogic_015", - "id": "anchor-1634488067", - "index": 0, - "name": "glider/float" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Oh and one last thing..." - }, { "character": "character-1667667572.json", "event_id": "dialogic_001", @@ -326,7 +330,7 @@ ], "portrait": "", - "question": "Its your paycheck. You want the boost?" + "question": "It's your paycheck. You want the boost?" }, { "choice": "Yes", @@ -349,6 +353,10 @@ "set_random": false, "set_value": "true" }, + { + "event_id": "dialogic_022", + "transition_duration": 1 + }, { "choice": "No", "condition": "", @@ -370,16 +378,15 @@ "set_random": false, "set_value": "false" }, + { + "event_id": "dialogic_022", + "transition_duration": 1 + }, { "event_id": "dialogic_013" }, { - "definition": "1672699872-250", - "event_id": "dialogic_014", - "operation": "=", - "random_upper_limit": 100, - "set_random": false, - "set_value": "true" + "event_id": "dialogic_013" } ], "metadata": { diff --git a/godot/screens/EndScreen_Planet.gd b/godot/screens/EndScreen_Planet.gd new file mode 100644 index 0000000..9846006 --- /dev/null +++ b/godot/screens/EndScreen_Planet.gd @@ -0,0 +1,16 @@ +extends Spatial + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + pass + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/godot/screens/EndScreen_Planet.tscn b/godot/screens/EndScreen_Planet.tscn index 3324b11..e906ae8 100644 --- a/godot/screens/EndScreen_Planet.tscn +++ b/godot/screens/EndScreen_Planet.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 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] @@ -11,6 +11,7 @@ [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] +[ext_resource path="res://screens/EndScreen_Planet.gd" type="Script" id=12] [sub_resource type="Animation" id=4] resource_name = "camera descend" @@ -55,6 +56,7 @@ glow_enabled = true glow_bloom = 1.0 [node name="endscreen_planet" type="Spatial"] +script = ExtResource( 12 ) [node name="void" type="OmniLight" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -128.2, 0 )