diff --git a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 index 478aa0f..a146b62 100644 --- a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 +++ b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5 @@ -1,3 +1,3 @@ -source_md5="b55252b193b820230f43f7e9c800ec75" -dest_md5="d35a34792cc21a09cd2504f4154b6cb2" +source_md5="c532c3a2f96107461a44deb84d39efb9" +dest_md5="c3617d1811bc857d73165e335ad3abcf" diff --git a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn index 786bc40..0f44f84 100644 Binary files a/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn and b/godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.scn differ diff --git a/godot/.import/meat_beams.glb-79affb5359b73c71ccd66f0111c5b6d2.md5 b/godot/.import/meat_beams.glb-79affb5359b73c71ccd66f0111c5b6d2.md5 new file mode 100644 index 0000000..246f2ca --- /dev/null +++ b/godot/.import/meat_beams.glb-79affb5359b73c71ccd66f0111c5b6d2.md5 @@ -0,0 +1,3 @@ +source_md5="ba2b4fe80ac63027ebeb29a17173cab0" +dest_md5="39a59b84944cb36f98658ca1a713e36a" + diff --git a/godot/.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.md5 b/godot/.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.md5 new file mode 100644 index 0000000..81b82be --- /dev/null +++ b/godot/.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.md5 @@ -0,0 +1,3 @@ +source_md5="141e852e7ef93f7e4b0705fd13102825" +dest_md5="061d0b13daef58871da9cdf492597a22" + diff --git a/godot/.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.stex b/godot/.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.stex new file mode 100644 index 0000000..f5f446f Binary files /dev/null and b/godot/.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.stex differ diff --git a/godot/assets/meat_bore/MeatBridge.material.tmp b/godot/assets/meat_bore/MeatBridge.material.tmp new file mode 100644 index 0000000..462eb44 Binary files /dev/null and b/godot/assets/meat_bore/MeatBridge.material.tmp differ diff --git a/godot/assets/meat_bore/MeatMaterialUntextured.material.tmp b/godot/assets/meat_bore/MeatMaterialUntextured.material.tmp new file mode 100644 index 0000000..dc487c7 Binary files /dev/null and b/godot/assets/meat_bore/MeatMaterialUntextured.material.tmp differ diff --git a/godot/assets/meat_bore/meat_module/level_clark.tscn b/godot/assets/meat_bore/meat_module/level_clark.tscn index d18168f..34ee1ea 100644 --- a/godot/assets/meat_bore/meat_module/level_clark.tscn +++ b/godot/assets/meat_bore/meat_module/level_clark.tscn @@ -1,10 +1,28 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_2.png" type="Texture" id=2] +[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=3] +[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5] +[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=6] [node name="level_clark" type="Spatial"] [node name="meat_module_2" parent="." instance=ExtResource( 1 )] transform = Transform( 0.742409, 0, 0.669947, 0, 1, 0, -0.669947, 0, 0.742409, 0, -114.811, 0 ) texture = ExtResource( 2 ) + +[node name="meatcircle" parent="." instance=ExtResource( 3 )] +transform = Transform( -0.0599631, -2.54901, 3.84308, 4.72262, 0.154299, -0.0388896, -0.0780571, 5.51163, 4.34052, 16.0579, -173.995, -14.3824 ) + +[node name="meat_tentacle" parent="." instance=ExtResource( 5 )] +transform = Transform( 0.954245, -1.25165, -0.857684, 0.517972, 0.776757, -0.962792, 1.22131, 0.397085, 0.752197, 13.3326, -179.475, -15.9297 ) + +[node name="meat_tentacle_small" parent="." instance=ExtResource( 6 )] +transform = Transform( -1.10438, -1.18577, 0.64199, -0.0212327, 0.725049, 1.30265, -1.3033, 0.923921, -0.535492, 13.3026, -168.245, -17.206 ) + +[node name="meat_tentacle_small2" parent="." instance=ExtResource( 6 )] +transform = Transform( -0.410648, -0.838634, -1.1852, -1.57091, -0.314374, 0.602531, -0.531315, 1.40827, -0.792496, 19.1304, -168.245, -10.6874 ) + +[node name="meat_tentacle_small3" parent="." instance=ExtResource( 6 )] +transform = Transform( -0.410648, -0.838634, -1.1852, -1.57091, -0.314374, 0.602531, -0.531315, 1.40827, -0.792496, 14.5021, -168.053, -16.188 ) diff --git a/godot/assets/models/PlanetMaterial.material.tmp b/godot/assets/models/PlanetMaterial.material.tmp index e477bd4..448480c 100644 Binary files a/godot/assets/models/PlanetMaterial.material.tmp and b/godot/assets/models/PlanetMaterial.material.tmp differ diff --git a/godot/assets/models/heart/Heart_Material.material.tmp b/godot/assets/models/heart/Heart_Material.material.tmp new file mode 100644 index 0000000..3af104e Binary files /dev/null and b/godot/assets/models/heart/Heart_Material.material.tmp differ diff --git a/godot/assets/starbox_with_neptune.png b/godot/assets/starbox_with_neptune.png new file mode 100644 index 0000000..cd76689 --- /dev/null +++ b/godot/assets/starbox_with_neptune.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8f40445f958888ef48a28a60b44fea17dfff51d9beec6a3b54e1e49ebdcb88e +size 98567 diff --git a/godot/assets/starbox_with_neptune.png.import b/godot/assets/starbox_with_neptune.png.import new file mode 100644 index 0000000..cb0c74b --- /dev/null +++ b/godot/assets/starbox_with_neptune.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/starbox_with_neptune.png" +dest_files=[ "res://.import/starbox_with_neptune.png-bc3fcfdf977d14aaa22b84201ad33fa5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/godot/dialogic/timelines/timeline-1667667789.json b/godot/dialogic/timelines/timeline-1667667789.json index f8f0d52..89ec284 100644 --- a/godot/dialogic/timelines/timeline-1667667789.json +++ b/godot/dialogic/timelines/timeline-1667667789.json @@ -119,7 +119,13 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me to recover samples" + "text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago" + }, + { + "character": "character-1667667572.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "You need to head down into the mining pit behind me to recover samples" }, { "character": "character-1667667572.json", @@ -143,13 +149,13 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": " Be careful climbing down. Recovery Specialists have augmented joints for heavy impact but they won't save you from a long fall." + "text": " Be careful climbing down. Recovery Specialists have augmented joints for heavy impact but they won't save you from a long fall" }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "If it gets dark, you can toggle your suit's flashlight by pressing (f). Can't collect a good sample if you're as blind a clone! Ha!" + "text": "If it gets dark, you can toggle your suit's flashlight by pressing (f). Can't collect a good sample if you're as blind a clone! Heh" }, { "character": "character-1667667572.json", diff --git a/godot/dialogic/timelines/timeline-1667668097.json b/godot/dialogic/timelines/timeline-1667668097.json index a9f5cc0..069db88 100644 --- a/godot/dialogic/timelines/timeline-1667668097.json +++ b/godot/dialogic/timelines/timeline-1667668097.json @@ -20,7 +20,7 @@ "character": "", "event_id": "dialogic_001", "portrait": "", - "text": "Agricultural conglomerate IngestiCorp has developed and patented the DNA of radiation and cold resistant crops and livestock, but cloned food’s unpredictable side effects and high costs leave it undesirable or unaffordable to most [pause=1]\n\nAnd so, humanity still starves" + "text": "Agricultural conglomerate IngestiCorp has developed and patented the DNA of radiation and cold resistant crops and livestock[pause=1]\n\n But cloned food’s unpredictable side effects and high costs leave it undesirable or unaffordable to most [pause=1]\n\nAnd so, humanity still starves" }, { "character": "", diff --git a/godot/dialogic/timelines/timeline-1667673517.json b/godot/dialogic/timelines/timeline-1667673517.json index 998141e..e04e9d3 100644 --- a/godot/dialogic/timelines/timeline-1667673517.json +++ b/godot/dialogic/timelines/timeline-1667673517.json @@ -6,6 +6,11 @@ "event_id": "dialogic_012", "value": "true" }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, { "character": "", "event_id": "dialogic_001", @@ -54,6 +59,11 @@ "portrait": "", "text": "Now all will become one with the meat..." }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, { "definition": "1667770005-207", "event_id": "dialogic_014", @@ -83,6 +93,11 @@ "event_id": "dialogic_012", "value": "true" }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, { "character": "", "event_id": "dialogic_001", @@ -107,6 +122,11 @@ "portrait": "", "text": "Only you will remember what happened to the DSV-Provender..." }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, { "definition": "1667711785-428", "event_id": "dialogic_014", @@ -142,6 +162,11 @@ "event_id": "dialogic_024", "set_theme": "default-theme.cfg" }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 0 + }, { "audio": "play", "audio_bus": "Master", @@ -196,6 +221,11 @@ "portrait": "", "text": "(SHUTTING DOWN. PLEASE AWAIT RECOVERY)\n\n[pause=2]" }, + { + "block_input": true, + "event_id": "dialogic_050", + "wait_time": 2 + }, { "change_scene": "res://screens/EndScreen_Planet.tscn", "event_id": "dialogic_041" diff --git a/godot/dialogic/timelines/timeline-1672265563.json b/godot/dialogic/timelines/timeline-1672265563.json index a4971ed..d4a671c 100644 --- a/godot/dialogic/timelines/timeline-1672265563.json +++ b/godot/dialogic/timelines/timeline-1672265563.json @@ -55,6 +55,9 @@ "random_upper_limit": 100, "set_random": false, "set_value": "1" + }, + { + "event_id": "dialogic_013" } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672267820.json b/godot/dialogic/timelines/timeline-1672267820.json index a8b3651..f93abff 100644 --- a/godot/dialogic/timelines/timeline-1672267820.json +++ b/godot/dialogic/timelines/timeline-1672267820.json @@ -67,6 +67,9 @@ "random_upper_limit": 100, "set_random": false, "set_value": "1" + }, + { + "event_id": "dialogic_013" } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672267850.json b/godot/dialogic/timelines/timeline-1672267850.json index 32518ea..074c77c 100644 --- a/godot/dialogic/timelines/timeline-1672267850.json +++ b/godot/dialogic/timelines/timeline-1672267850.json @@ -61,6 +61,9 @@ "random_upper_limit": 100, "set_random": false, "set_value": "1" + }, + { + "event_id": "dialogic_013" } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672267872.json b/godot/dialogic/timelines/timeline-1672267872.json index beceeba..c4236ba 100644 --- a/godot/dialogic/timelines/timeline-1672267872.json +++ b/godot/dialogic/timelines/timeline-1672267872.json @@ -55,6 +55,9 @@ "random_upper_limit": 100, "set_random": false, "set_value": "1" + }, + { + "event_id": "dialogic_013" } ], "metadata": { diff --git a/godot/dialogic/timelines/timeline-1672267892.json b/godot/dialogic/timelines/timeline-1672267892.json index a489131..ad39f9a 100644 --- a/godot/dialogic/timelines/timeline-1672267892.json +++ b/godot/dialogic/timelines/timeline-1672267892.json @@ -79,6 +79,9 @@ "random_upper_limit": 100, "set_random": false, "set_value": "1" + }, + { + "event_id": "dialogic_013" } ], "metadata": { diff --git a/godot/screens/HeartEnding.gd b/godot/screens/HeartEnding.gd index 595a0e6..7561a60 100644 --- a/godot/screens/HeartEnding.gd +++ b/godot/screens/HeartEnding.gd @@ -13,4 +13,5 @@ func _ready(): add_child(dialog) # Called every frame. 'delta' is the elapsed time since the previous frame. #func _process(delta): +# if Dialogic.get_variable("") # pass diff --git a/godot/screens/TitleScreen_Planet.tscn b/godot/screens/TitleScreen_Planet.tscn index edab334..e482ba0 100644 --- a/godot/screens/TitleScreen_Planet.tscn +++ b/godot/screens/TitleScreen_Planet.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://assets/title_font.tres" type="DynamicFont" id=1] [ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=2] @@ -8,23 +8,59 @@ [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/starbox_with_neptune.png" type="Texture" id=9] + +[sub_resource type="PanoramaSky" id=1] +panorama = ExtResource( 9 ) + +[sub_resource type="Environment" id=2] +background_mode = 2 +background_sky = SubResource( 1 ) +background_sky_custom_fov = 95.0 +ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 ) +ambient_light_energy = 2.22 +fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 ) +fog_sun_color = Color( 0.639216, 0.541176, 0.345098, 1 ) +fog_depth_begin = 1.0 +fog_depth_end = 5.0 +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_intensity = 1.0 +glow_strength = 0.76 +glow_bloom = 1.0 +glow_blend_mode = 0 +glow_high_quality = true [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 ) +transform = Transform( -0.560929, 0.224596, 0.796816, -0.0917815, 0.939691, -0.329479, -0.822761, -0.257947, -0.506486, 4.51661, 0.621379, -0.0384483 ) current = true [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 ) +transform = Transform( -0.0230506, 0.00644278, -0.645638, 0.408317, -0.500316, -0.0195707, -0.500167, -0.408734, 0.0137787, -0.0971218, 0.676688, 1.02051 ) [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 ) +transform = Transform( 0.913139, 0.192329, 0.359427, -0.406418, 0.498, 0.766042, -0.0316625, -0.84558, 0.532909, 3.25392, 5.38699, 5.82346 ) light_color = Color( 0.317647, 0.0156863, 0.0156863, 1 ) -light_energy = 1.5 +light_energy = 2.0 shadow_enabled = true [node name="WorldEnvironment" parent="." instance=ExtResource( 2 )] +environment = SubResource( 2 ) [node name="TitleMenu" type="Control" parent="."] anchor_left = 0.5 @@ -99,6 +135,7 @@ layer = 2 visible = false [node name="ColorRect" type="ColorRect" parent="TitleMenu/BlackoutScreen"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 color = Color( 0, 0, 0, 1 ) diff --git a/godot/tests/side_tunnel/MeatBEAM.material b/godot/tests/side_tunnel/MeatBEAM.material deleted file mode 100644 index 617c317..0000000 --- a/godot/tests/side_tunnel/MeatBEAM.material +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbfaa23dc0d333def117c3eb9dfe444582cafc990c49042f270d4b195f86978d -size 4196283