Compare commits

..

4 Commits

Author SHA1 Message Date
Spencer Killen 3431100b5f
barriers 2023-01-04 00:27:01 -07:00
Spencer Killen b92bfd33a3
Merge branch 'spencer' 2023-01-03 23:49:59 -07:00
Spencer Killen d49a7ddaca
Merge branch 'spencer' 2023-01-03 23:20:44 -07:00
dukegoobler 31b4543fbb dialog fixes 2023-01-03 23:20:15 -07:00
33 changed files with 1295 additions and 22 deletions

BIN
blends/large_meat_tunnel.blend (Stored with Git LFS)

Binary file not shown.

View File

@ -0,0 +1,3 @@
source_md5="ba2b4fe80ac63027ebeb29a17173cab0"
dest_md5="39a59b84944cb36f98658ca1a713e36a"

View File

@ -0,0 +1,3 @@
source_md5="2fc9b0fb03d32a81f0f05fa6e4e88917"
dest_md5="1100d1e9cf38ee19a81fa58b862694fa"

View File

@ -0,0 +1,3 @@
source_md5="cceeb5729d9d2aee46d8cc8fe6b07999"
dest_md5="b65f50f6ec9ac579c6bced3620bdcdd6"

View File

@ -0,0 +1,3 @@
source_md5="141e852e7ef93f7e4b0705fd13102825"
dest_md5="061d0b13daef58871da9cdf492597a22"

BIN
godot/Material_005.material (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,16 @@
extends StaticBody
# 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():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=2]
[gd_scene load_steps=16 format=2]
[ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=2]
@ -13,6 +13,7 @@
[ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=11]
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=12]
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=13]
[ext_resource path="res://assets/meat_bore/obelisk_ring.tscn" type="PackedScene" id=14]
[sub_resource type="Environment" id=3]
background_mode = 2
@ -46,7 +47,7 @@ glow_bloom = 1.0
[node name="meat_tunnel_top" parent="." instance=ExtResource( 1 )]
[node name="Player" parent="." instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 21.3374, 30.1915 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.51511, 88.4606 )
[node name="shader" parent="." instance=ExtResource( 5 )]
@ -129,4 +130,7 @@ transform = Transform( -0.452271, 0.189509, 0.236865, -0.0433815, 0.487985, -0.3
[node name="MeatSinkParameters" parent="." instance=ExtResource( 6 )]
[node name="Heart_2" parent="." instance=ExtResource( 11 )]
transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0.00217056, 31.5978, 83.3354 )
transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0.00217056, 31.5978, 170.072 )
[node name="obelisk_ring" parent="." instance=ExtResource( 14 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.746, 0 )

View File

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

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
godot/assets/starbox_with_neptune.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

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

View File

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

View File

@ -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 foods 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 foods unpredictable side effects and high costs leave it undesirable or unaffordable to most [pause=1]\n\nAnd so, humanity still starves"
},
{
"character": "",

View File

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

View File

@ -55,6 +55,9 @@
"random_upper_limit": 100,
"set_random": false,
"set_value": "1"
},
{
"event_id": "dialogic_013"
}
],
"metadata": {

View File

@ -67,6 +67,9 @@
"random_upper_limit": 100,
"set_random": false,
"set_value": "1"
},
{
"event_id": "dialogic_013"
}
],
"metadata": {

View File

@ -61,6 +61,9 @@
"random_upper_limit": 100,
"set_random": false,
"set_value": "1"
},
{
"event_id": "dialogic_013"
}
],
"metadata": {

View File

@ -55,6 +55,9 @@
"random_upper_limit": 100,
"set_random": false,
"set_value": "1"
},
{
"event_id": "dialogic_013"
}
],
"metadata": {

View File

@ -79,6 +79,9 @@
"random_upper_limit": 100,
"set_random": false,
"set_value": "1"
},
{
"event_id": "dialogic_013"
}
],
"metadata": {

BIN
godot/obelisk_ring.glb (Stored with Git LFS) Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

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

View File

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

BIN
godot/tests/side_tunnel/MeatBEAM.material (Stored with Git LFS)

Binary file not shown.