feat: level, logic, and visual updates

This commit is contained in:
Sara Gerretsen 2026-06-10 23:06:23 +02:00
parent cb921b2c2d
commit 4e5216538f
44 changed files with 2326 additions and 69 deletions

BIN
assets/broken_warning.ase Normal file

Binary file not shown.

View file

@ -16493,8 +16493,8 @@ _subresources={
"materials": {
"Base": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/character/player/player_body.tres",
"use_external/path": "uid://4jw7ckdluil6"
"use_external/fallback_path": "res://assets/character/player/skin_shader.tres",
"use_external/path": "uid://dmfij86pa2ce4"
},
"Boots": {
"use_external/enabled": true,

View file

@ -4,23 +4,24 @@
[node name="PlayerModel" unique_id=1710695753 instance=ExtResource("1_1oybq")]
[node name="HumanArmature" parent="." index="0" unique_id=1751290725]
[node name="HumanArmature" parent="." index="0" unique_id=421743004]
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0)
[node name="BlankCharacterMesh" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1497073029) index="0" unique_id=513141126]
[node name="BlankCharacterMesh" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1304677512) index="0" unique_id=2112206549]
layers = 3
instance_shader_parameters/health = 0.78800003743
[node name="BootL" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1304677512) index="1" unique_id=1405068253]
layers = 3
[node name="BootL" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1497073029) index="1" unique_id=343538324]
[node name="BootR" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1304677512) index="2" unique_id=999143729]
layers = 3
[node name="BootR" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1497073029) index="2" unique_id=1338096799]
[node name="Eyes" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1304677512) index="3" unique_id=1828498705]
layers = 3
[node name="Eyes" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1497073029) index="3" unique_id=602091173]
[node name="Jacket" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1304677512) index="4" unique_id=35022302]
layers = 3
[node name="Jacket" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1497073029) index="4" unique_id=2011987394]
layers = 3
[node name="Mouth" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1497073029) index="5" unique_id=1092763051]
[node name="Mouth" parent="HumanArmature/Skeleton3D" parent_id_path=PackedInt32Array(1304677512) index="5" unique_id=367342885]
layers = 3

View file

@ -1,7 +1,5 @@
[gd_resource type="StandardMaterial3D" format=3 uid="uid://c0khp3qs2pfx5"]
[ext_resource type="Texture2D" uid="uid://2mxufux2e17f" path="res://assets/character/player/player_boots.png" id="1_8b5ri"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_v7if1"]
render_priority = 1
transparency = 1
@ -18,7 +16,7 @@ metadata/_stencil_owned = true
next_pass = SubResource("StandardMaterial3D_v7if1")
diffuse_mode = 3
specular_mode = 1
albedo_texture = ExtResource("1_8b5ri")
albedo_color = Color(0.05833335, 0, 0.1, 1)
metallic_specular = 0.0
roughness = 0.0
stencil_mode = 1

View file

@ -0,0 +1,27 @@
[gd_resource type="ShaderMaterial" format=3 uid="uid://dmfij86pa2ce4"]
[ext_resource type="Shader" uid="uid://briad1jwmkdw2" path="res://assets/character/shaders/player_skin.gdshader" id="1_6rrkd"]
[ext_resource type="Texture2D" uid="uid://da0k02xs2oecj" path="res://assets/character/player/player_skin_portfolio_ver.png" id="2_thik8"]
[ext_resource type="Texture2D" uid="uid://ddaso2y8ooove" path="res://assets/materials/kaleidoscope_mosaic_albedo.png" id="3_i1ahx"]
[ext_resource type="Texture2D" uid="uid://dwskfat6ut10d" path="res://assets/materials/kaleidoscope_mosaic_normal.png" id="4_thik8"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_thik8"]
noise_type = 0
frequency = 0.0103
fractal_octaves = 3
fractal_lacunarity = 2.4
fractal_gain = -0.432
fractal_weighted_strength = 0.36
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_i1ahx"]
noise = SubResource("FastNoiseLite_thik8")
invert = true
[resource]
render_priority = 0
shader = ExtResource("1_6rrkd")
shader_parameter/alpha_texture = SubResource("NoiseTexture2D_i1ahx")
shader_parameter/top_layer_albedo = ExtResource("2_thik8")
shader_parameter/under_layer_albedo = ExtResource("3_i1ahx")
shader_parameter/under_layer_normal = ExtResource("4_thik8")
shader_parameter/under_layer_scale = 10.046

View file

@ -0,0 +1,33 @@
shader_type spatial;
render_mode diffuse_toon, specular_disabled;
uniform sampler2D alpha_texture : hint_default_white, filter_linear;
instance uniform float health : hint_range(0.0, 1.0) = 1.0;
group_uniforms TopLayer;
uniform sampler2D top_layer_albedo : source_color, hint_default_black, filter_linear_mipmap_anisotropic;
group_uniforms UnderLayer;
uniform sampler2D under_layer_albedo : source_color, hint_default_white;
uniform sampler2D under_layer_normal : hint_normal;
uniform float under_layer_scale = 1.0;
void fragment() {
vec2 under_uv = UV * under_layer_scale;
vec4 top_layer_sample = texture(top_layer_albedo, UV);
vec4 under_layer_sample = texture(under_layer_albedo, under_uv);
float alpha = clamp(step(0.0, health - texture(alpha_texture, UV).r) * top_layer_sample.a, 0.0, 1.0);
ALBEDO = mix(under_layer_sample.rgb, top_layer_sample.rgb, alpha);
if (alpha < 0.5) {
NORMAL_MAP = texture(under_layer_normal, under_uv).rgb;
}
ROUGHNESS = 0.0;
SPECULAR = 0.0;
METALLIC = 0.0;
}
//void light() {
// // Called for every pixel for every light affecting the material.
// // Uncomment to replace the default light processing function with this one.
//}

View file

@ -0,0 +1 @@
uid://briad1jwmkdw2

BIN
project/assets/environment/floors/balcony.blend (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,76 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://ct8gtkg1lqduc"
path="res://.godot/imported/balcony.blend-fe81eb104740f96ce4be03cde9db88b7.scn"
[deps]
source_file="res://assets/environment/floors/balcony.blend"
dest_files=["res://.godot/imported/balcony.blend-fe81eb104740f96ce4be03cde9db88b7.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={
"materials": {
"Tiles": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/sidewalk_tiles.tres",
"use_external/path": "res://assets/materials/sidewalk_tiles.tres"
},
"Wall": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/stylised_bricks_outlined.tres",
"use_external/path": "uid://01juefcm2qw6"
}
}
}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/vertex_colors=1
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2
gltf/texture_map_mode=1

Binary file not shown.

BIN
project/assets/environment/floors/balcony_corner.blend (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,76 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://ddbwc8xft3vrh"
path="res://.godot/imported/balcony_corner.blend-c4836cbfaf4c523b89073997404a5a9c.scn"
[deps]
source_file="res://assets/environment/floors/balcony_corner.blend"
dest_files=["res://.godot/imported/balcony_corner.blend-c4836cbfaf4c523b89073997404a5a9c.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={
"materials": {
"Tiles": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/sidewalk_tiles.tres",
"use_external/path": "res://assets/materials/sidewalk_tiles.tres"
},
"Wall": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/stylised_bricks_outlined.tres",
"use_external/path": "uid://01juefcm2qw6"
}
}
}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/vertex_colors=1
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2
gltf/texture_map_mode=1

BIN
project/assets/environment/floors/stairs.blend (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,76 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dhqju2b7ua1ck"
path="res://.godot/imported/stairs.blend-4bd2549d994e3ec25c2d878dfde4b194.scn"
[deps]
source_file="res://assets/environment/floors/stairs.blend"
dest_files=["res://.godot/imported/stairs.blend-4bd2549d994e3ec25c2d878dfde4b194.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={
"materials": {
"Bricks": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/stylised_bricks.tres",
"use_external/path": "uid://oeoikc7gtrxg"
},
"Stairs": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/stylized_stone_block_outlined.tres",
"use_external/path": "uid://ck7r28aomg7hu"
}
}
}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/vertex_colors=1
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2
gltf/texture_map_mode=1

Binary file not shown.

BIN
project/assets/environment/floors/tiled_floor.blend (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,81 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bsv14q4ksn8a2"
path="res://.godot/imported/tiled_floor.blend-3c5f4f87ecf2595e1f620ebf4ace4f48.scn"
[deps]
source_file="res://assets/environment/floors/tiled_floor.blend"
dest_files=["res://.godot/imported/tiled_floor.blend-3c5f4f87ecf2595e1f620ebf4ace4f48.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={
"materials": {
"Brick": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/stylised_bricks_outlined.tres",
"use_external/path": "uid://01juefcm2qw6"
},
"Tile": {
"use_external/enabled": true,
"use_external/fallback_path": "res://assets/materials/sidewalk_tiles.tres",
"use_external/path": "res://assets/materials/sidewalk_tiles.tres"
}
},
"nodes": {
"PATH:TiledFloor": {
"mesh_instance/layers": 5
}
}
}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/vertex_colors=1
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2
gltf/texture_map_mode=1

Binary file not shown.

BIN
project/assets/environment/props/warning/boring_warning.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dmhsbk3n1puqv"
path="res://.godot/imported/boring_warning.png-70b6c72e3a0d9539a72f8ea8faac0f4b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/environment/props/warning/boring_warning.png"
dest_files=["res://.godot/imported/boring_warning.png-70b6c72e3a0d9539a72f8ea8faac0f4b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
project/assets/environment/props/warning/broken_warning.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,41 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bkh2toqtkk3x6"
path.s3tc="res://.godot/imported/broken_warning.png-8c801c8800a07fae4726963d8fd482fa.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/environment/props/warning/broken_warning.png"
dest_files=["res://.godot/imported/broken_warning.png-8c801c8800a07fae4726963d8fd482fa.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
project/assets/environment/props/warning/warning.blend (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,63 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c8bcv3dfoxl72"
path="res://.godot/imported/warning.blend-e661b8dedbad8d51b9457a273c85455b.scn"
[deps]
source_file="res://assets/environment/props/warning/warning.blend"
dest_files=["res://.godot/imported/warning.blend-e661b8dedbad8d51b9457a273c85455b.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/vertex_colors=1
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2
gltf/texture_map_mode=1

BIN
project/assets/environment/props/warning/warning_torn.blend (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,63 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://s0r8hrc5iqkd"
path="res://.godot/imported/warning_torn.blend-22be0ab146da155222bc3d3f860145ea.scn"
[deps]
source_file="res://assets/environment/props/warning/warning_torn.blend"
dest_files=["res://.godot/imported/warning_torn.blend-22be0ab146da155222bc3d3f860145ea.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/vertex_colors=1
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2
gltf/texture_map_mode=1

View file

@ -51,6 +51,11 @@ _subresources={
"use_external/fallback_path": "res://assets/effects/non_growing_outline_material.tres",
"use_external/path": "uid://b0g4ra3c060x8"
}
},
"nodes": {
"PATH:Wall": {
"mesh_instance/layers": 5
}
}
}
blender/nodes/visible=0

Binary file not shown.

View file

@ -46,6 +46,11 @@ _subresources={
"use_external/fallback_path": "res://assets/materials/stylized_stone_block_outlined.tres",
"use_external/path": "uid://ck7r28aomg7hu"
}
},
"nodes": {
"PATH:BuildingSkirt": {
"mesh_instance/layers": 5
}
}
}
blender/nodes/visible=0

Binary file not shown.

View file

@ -56,6 +56,20 @@ _subresources={
"use_external/fallback_path": "res://assets/effects/non_growing_outline_material.tres",
"use_external/path": "uid://b0g4ra3c060x8"
}
},
"nodes": {
"PATH:Frame": {
"mesh_instance/layers": 5
},
"PATH:OutlinePlane": {
"mesh_instance/layers": 5
},
"PATH:Wall": {
"mesh_instance/layers": 5
},
"PATH:WindowPane": {
"mesh_instance/layers": 5
}
}
}
blender/nodes/visible=0

File diff suppressed because it is too large Load diff

View file

@ -9,7 +9,7 @@
size = Vector2(28.577915, 21.667503)
[sub_resource type="QuadOccluder3D" id="QuadOccluder3D_64s6k"]
size = Vector2(81.173065, 80.59202)
size = Vector2(51.9532, 54.080856)
[node name="Core" type="Node3D" unique_id=1034984951]

View file

@ -8,6 +8,8 @@
[ext_resource type="Material" uid="uid://b886atyq5fn6" path="res://assets/environment/triplanar_materials/stone.tres" id="5_1o7vw"]
[ext_resource type="PackedScene" uid="uid://b6vnp6u3i5u47" path="res://objects/effects/kaleidoscope_omni_projector.tscn" id="5_s6lbc"]
[ext_resource type="PackedScene" uid="uid://bl7tlfjeo0bq4" path="res://assets/environment/props/metro/escalator.blend" id="6_b5kel"]
[ext_resource type="PackedScene" uid="uid://c8bcv3dfoxl72" path="res://assets/environment/props/warning/warning.blend" id="9_tj0ty"]
[ext_resource type="PackedScene" uid="uid://s0r8hrc5iqkd" path="res://assets/environment/props/warning/warning_torn.blend" id="10_lqnq6"]
[node name="Station" type="Node3D" unique_id=1757986756]
@ -35,7 +37,7 @@ size = Vector3(7.518593, 6.115967, 0.7234955)
material = ExtResource("2_mo284")
[node name="CSGBox3D12" type="CSGBox3D" parent="CSGCombiner3D" unique_id=786318085]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.654902, 8.854908, -32.83026)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.6549063, 8.850288, -32.82947)
size = Vector3(4.469452, 10.649109, 9.418884)
material = ExtResource("2_mo284")
@ -372,44 +374,36 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.95
[node name="OmniLight3D" parent="." unique_id=388804586 instance=ExtResource("5_s6lbc")]
transform = Transform3D(-0.45079836, 0.81186604, 0.37101808, -0.5955859, 0.03602412, -0.80248356, -0.6648747, -0.58273137, 0.46729633, -2.6842768, 1.9526056, -15.171796)
light_energy = 2.086
light_cull_mask = 4294967292
omni_range = 2.641
[node name="OmniLight3D2" parent="." unique_id=779918029 instance=ExtResource("5_s6lbc")]
transform = Transform3D(0.7092167, -0.47455093, -0.521357, 0.70499057, 0.4773957, 0.5244823, 0, -0.73952335, 0.6731309, -2.6499035, 4.3830457, -17.490736)
light_energy = 2.086
light_cull_mask = 4294967292
omni_range = 2.2924402
[node name="OmniLight3D3" parent="." unique_id=118388089 instance=ExtResource("5_s6lbc")]
transform = Transform3D(0.29277182, -0.7737612, 0.56176364, -0.058540225, 0.5719, 0.81823194, -0.95438874, -0.272441, 0.122140035, -2.0092142, 6.301402, -35.711594)
light_energy = 2.086
light_cull_mask = 4294967292
shadow_caster_mask = 4294967292
omni_range = 1.3487188
[node name="OmniLight3D4" parent="." unique_id=1629760581 instance=ExtResource("5_s6lbc")]
transform = Transform3D(0.8244043, 0.06913145, 0.56176364, -0.56600136, 0.10069281, 0.81823194, 0, -0.99251294, 0.12214007, 15.127914, 8.425544, -25.203468)
light_energy = 2.086
light_cull_mask = 4294967292
omni_range = 2.641
[node name="OmniLight3D7" parent="." unique_id=1764956841 instance=ExtResource("5_s6lbc")]
transform = Transform3D(0.09317468, -0.6645957, 0.7413711, -0.3887, -0.709803, -0.5874454, 0.91664106, -0.23343591, -0.32446402, 13.479575, 8.425544, -28.246061)
light_energy = 2.086
light_cull_mask = 4294967292
omni_range = 2.641
[node name="OmniLight3D5" parent="." unique_id=1528397531 instance=ExtResource("5_s6lbc")]
transform = Transform3D(0.8244043, 0.06913145, 0.56176364, -0.56600136, 0.10069281, 0.81823194, 0, -0.99251294, 0.12214007, 15.839307, 10.652011, -22.217182)
light_energy = 2.086
light_cull_mask = 4294967292
omni_range = 2.641
[node name="OmniLight3D6" parent="." unique_id=264628514 instance=ExtResource("5_s6lbc")]
transform = Transform3D(0.80324996, 0.56932276, -0.1751034, 0.42614233, -0.34388492, 0.8367472, 0.41616386, -0.7467361, -0.51883805, -1.9250414, 7.7852325, -34.249424)
light_energy = 2.086
light_cull_mask = 4294967292
omni_range = 1.4774958
[node name="escalator" parent="." unique_id=186009496 instance=ExtResource("6_b5kel")]
@ -417,3 +411,39 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.423309, 0.49251378, -19.08
[node name="escalator2" parent="." unique_id=1247266253 instance=ExtResource("6_b5kel")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.5266166, 0.49251378, -19.083635)
[node name="warning" parent="." unique_id=1353607911 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.287293, 4.1318064, -33.680058)
[node name="warning_torn" parent="." unique_id=666956895 instance=ExtResource("10_lqnq6")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.0133524, 4.1318064, -33.568348)
[node name="warning2" parent="." unique_id=702476219 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.7385325, 0.050688982, -13.832207)
[node name="warning4" parent="." unique_id=527026916 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 0.54231983, 0.8401721, 0, -0.8401721, 0.54231983, -6.7793665, 1.6091713, -13.807217)
[node name="warning5" parent="." unique_id=1588971296 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 0.54231983, 0.8401721, 0, -0.8401721, 0.54231983, -8.480635, 1.6091713, -13.807217)
[node name="warning6" parent="." unique_id=1236376355 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 0.54231983, 0.8401721, 0, -0.8401721, 0.54231983, -6.7793665, 2.4632995, -15.130448)
[node name="warning7" parent="." unique_id=1809414444 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 0.54231983, 0.8401721, 0, -0.8401721, 0.54231983, -8.480635, 2.4632995, -15.130448)
[node name="warning8" parent="." unique_id=1002449845 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 0.54231983, 0.8401721, 0, -0.8401721, 0.54231983, -6.7793665, 3.5915012, -16.87828)
[node name="warning9" parent="." unique_id=395040806 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 0.54231983, 0.8401721, 0, -0.8401721, 0.54231983, -8.480635, 3.5915012, -16.87828)
[node name="warning3" parent="." unique_id=533711758 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.557756, 0.050688982, -13.832207)
[node name="warning10" parent="." unique_id=1302083615 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.7305536, 3.2163343, -18.800953)
[node name="warning11" parent="." unique_id=1625370944 instance=ExtResource("9_tj0ty")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.557756, 3.2163343, -18.800953)

View file

@ -35,38 +35,38 @@ height = 109.2168
[node name="WorldEnvironment" parent="." unique_id=1373429783 instance=ExtResource("1_pmfem")]
[node name="Station" parent="." unique_id=1977494771 instance=ExtResource("1_2mgkc")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.627396, -8.061678, 11.177508)
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=103904385]
transform = Transform3D(0.7631885, -0.5412827, -0.35292548, 4.7748173e-08, -0.5461754, 0.8376708, -0.646176, -0.6393007, -0.41683477, 0, 0, 0)
light_color = Color(0.16742355, 0.19254684, 0.26175305, 1)
shadow_enabled = true
[node name="Player" parent="." unique_id=591139793 instance=ExtResource("4_w32yo")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 35.853123, 4.0041876, 41.944412)
[node name="Core" parent="." unique_id=1034984951 instance=ExtResource("2_tsgde")]
[node name="Player" parent="." unique_id=591139793 instance=ExtResource("4_w32yo")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -48.388027, -6.5538864, 10.20134)
[node name="Station" parent="." unique_id=1977494771 instance=ExtResource("1_2mgkc")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.627396, -8.061678, 11.177508)
[node name="Appartments" parent="." unique_id=2084435541 instance=ExtResource("9_687qm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.893333, -0.017716527, 8.963372)
[node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=2045560215]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 65.850815, 0)
transform = Transform3D(1, 0, 0, 0, -1, 8.742278e-08, 0, -8.742278e-08, -1, 0, 34.67711, -2.725292e-06)
material_override = SubResource("StandardMaterial3D_wqmfy")
mesh = SubResource("CylinderMesh_i8ckm")
[node name="MeshInstance3D4" type="MeshInstance3D" parent="." unique_id=766384880]
transform = Transform3D(1.98, 0, 0, 0, 1.98, 0, 0, 0, 1.98, 0, 137.97618, -231)
transform = Transform3D(1.98, 0, 0, 0, -1.98, 1.7309709e-07, 0, -1.7309709e-07, -1.98, 0, 76.25224, -231)
material_override = SubResource("StandardMaterial3D_wqmfy")
mesh = SubResource("CylinderMesh_i8ckm")
[node name="MeshInstance3D3" type="MeshInstance3D" parent="." unique_id=1531313918]
transform = Transform3D(1.98, 0, 0, 0, 1.98, 0, 0, 0, 1.98, 266, 137.97618, 0)
transform = Transform3D(1.98, 0, 0, 0, -1.98, 1.7309709e-07, 0, -1.7309709e-07, -1.98, 266, 76.25224, -5.396078e-06)
material_override = SubResource("StandardMaterial3D_wqmfy")
mesh = SubResource("CylinderMesh_i8ckm")
[node name="MeshInstance3D2" type="MeshInstance3D" parent="." unique_id=97923765]
transform = Transform3D(1.98, 0, 0, 0, 1.98, 0, 0, 0, 1.98, 0, 137.97618, 263)
transform = Transform3D(1.98, 0, 0, 0, -1.98, 1.7309709e-07, 0, -1.7309709e-07, -1.98, 0, 76.25224, 263)
material_override = SubResource("StandardMaterial3D_wqmfy")
mesh = SubResource("CylinderMesh_i8ckm")
[node name="Appartments" parent="." unique_id=2084435541 instance=ExtResource("9_687qm")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.893333, -0.017716527, 8.963372)

View file

@ -17,9 +17,9 @@ func _process(_delta : float):
light_energy = 0.039
light_projector = ExtResource("1_61ws2")
light_specular = 16.0
light_cull_mask = 4294967293
light_cull_mask = 4294967292
shadow_enabled = true
shadow_caster_mask = 4294967293
shadow_caster_mask = 4294967292
omni_range = 10.644
omni_attenuation = 0.745
omni_shadow_mode = 0

View file

@ -0,0 +1,36 @@
[gd_scene format=3 uid="uid://l7ay3axvibpt"]
[ext_resource type="PackedScene" uid="uid://dxy17jkuvdy6f" path="res://objects/environment_modules/appartment_fascade.tscn" id="1_gve1p"]
[ext_resource type="PackedScene" uid="uid://ct8gtkg1lqduc" path="res://assets/environment/floors/balcony.blend" id="2_ynjk5"]
[node name="AppartmentBuildingStory" type="Node3D" unique_id=1175206052]
[node name="AppartmentFascade2" parent="." unique_id=232585684 instance=ExtResource("1_gve1p")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.07438529, 0.0057001114, -3.970789)
[node name="AppartmentFascade3" parent="." unique_id=880149485 instance=ExtResource("1_gve1p")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 0.074384816, 0.0057001114, 4.0292115)
[node name="balcony" parent="." unique_id=1125370929 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, -6)
[node name="balcony2" parent="." unique_id=952805673 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, -4)
[node name="balcony3" parent="." unique_id=21889292 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, -2)
[node name="balcony4" parent="." unique_id=893918248 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, 0)
[node name="balcony5" parent="." unique_id=1024482106 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, 2)
[node name="balcony6" parent="." unique_id=355118253 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, 4)
[node name="balcony7" parent="." unique_id=227932299 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, 6)
[node name="balcony8" parent="." unique_id=1755884673 instance=ExtResource("2_ynjk5")]
transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.496911e-07, 0, 8)

View file

@ -0,0 +1,49 @@
[gd_scene format=3 uid="uid://dxy17jkuvdy6f"]
[ext_resource type="PackedScene" uid="uid://4418x3hwthdc" path="res://assets/environment/walls/city_wall_base.blend" id="1_rynhn"]
[ext_resource type="PackedScene" uid="uid://cig57auil40wk" path="res://assets/environment/walls/stone_doorway.blend" id="2_6ogv3"]
[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/environment/triplanar_materials/tiles.tres" id="3_6ogv3"]
[node name="AppartmentFascade" type="Node3D" unique_id=232585684]
[node name="city_wall_base4" parent="." unique_id=1678399604 instance=ExtResource("1_rynhn")]
transform = Transform3D(1.3113416e-07, 0, -1, 0, 1, 0, 1, 0, 1.3113416e-07, -1.0306016, 0, 1)
[node name="city_wall_base7" parent="." unique_id=1437551593 instance=ExtResource("1_rynhn")]
transform = Transform3D(-2.1855693e-07, 0, 1, 0, 1, 0, -1, 0, -2.1855693e-07, 0.9693984, 0, 1)
[node name="city_wall_base5" parent="." unique_id=2050555648 instance=ExtResource("1_rynhn")]
transform = Transform3D(1, 0, 1.7484555e-07, 0, 1, 0, -1.7484555e-07, 0, 1, -2.0306015, 0, 0)
[node name="city_wall_base9" parent="." unique_id=87486851 instance=ExtResource("1_rynhn")]
transform = Transform3D(1, 0, 1.7484555e-07, 0, 1, 0, -1.7484555e-07, 0, 1, -1.6480703, 0, 1)
[node name="city_wall_base10" parent="." unique_id=1186763366 instance=ExtResource("1_rynhn")]
transform = Transform3D(1, 0, 1.7484555e-07, 0, 1, 0, -1.7484555e-07, 0, 1, 1.648831, 0, 1)
[node name="city_wall_base6" parent="." unique_id=1468779465 instance=ExtResource("1_rynhn")]
transform = Transform3D(1, 0, 1.7484555e-07, 0, 1, 0, -1.7484555e-07, 0, 1, 1.9693984, 0, 0)
[node name="city_wall_base8" parent="." unique_id=216926320 instance=ExtResource("1_rynhn")]
transform = Transform3D(1, 0, 1.7484555e-07, 0, 1, 0, -1.7484555e-07, 0, 1, 3.9693985, 0, 0)
[node name="stone_doorway" parent="." unique_id=1547361218 instance=ExtResource("2_6ogv3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.007880747, 0, 1)
[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=571841778]
[node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D" unique_id=696613224]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.072718024, -0.26384306, 0.83848715)
autosmooth = true
smoothing_angle = 180.0
use_collision = true
size = Vector3(2.2884903, 0.5180664, 1.6430054)
material = ExtResource("3_6ogv3")
[node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D" unique_id=650181547]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.9735867, -0.08702421, 0.8335433)
autosmooth = true
smoothing_angle = 180.0
use_collision = true
size = Vector3(7.865247, 0.16442871, 1.6331177)
material = ExtResource("3_6ogv3")

View file

@ -526,12 +526,12 @@ min_run_time = 0.05
script = SubResource("GDScript_nmc1l")
wall_drag = 15.0
max_y_velocity = 4.0
jump_normal_force = 2.5
jump_normal_force = 4.0
jump_vertical_force = 6.0
[node name="Fall" type="PlayerAction" parent="PlayerBehaviourTree/BehaviourRepeater/ActionSelector" unique_id=570179125]
script = SubResource("GDScript_ykyjo")
drag = 0.003
drag = 0.015
[node name="Jump" type="PlayerAction" parent="PlayerBehaviourTree/BehaviourRepeater/ActionSelector" unique_id=553747039]
script = SubResource("GDScript_eqqp1")