diff --git a/models/Materials/orb_inner.tres b/models/Materials/orb_inner.tres index 7ae3efe..426882d 100644 --- a/models/Materials/orb_inner.tres +++ b/models/Materials/orb_inner.tres @@ -6,9 +6,9 @@ [resource] render_priority = 0 shader = ExtResource("1_r8t2t") +shader_parameter/Albedo_Map = ExtResource("2_83rgw") shader_parameter/Albedo_Tone = Color(0.505645, 0.698715, 1, 1) shader_parameter/Metallic = 0.194 shader_parameter/Roughness = 0.403 shader_parameter/Emission = Color(0.151504, 0.398018, 0.646932, 1) shader_parameter/Fresnel_Power = 0.1 -shader_parameter/Albedo_Map = ExtResource("2_83rgw") diff --git a/models/Materials/orb_inner_shader.tres b/models/Materials/orb_inner_shader.tres index 923a836..aab211e 100644 --- a/models/Materials/orb_inner_shader.tres +++ b/models/Materials/orb_inner_shader.tres @@ -67,10 +67,10 @@ render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_s uniform sampler2D tex_vtx_17; uniform sampler2D Albedo_Map : hint_default_black; uniform vec4 Albedo_Tone : source_color; -uniform float Metallic : hint_range(0, 1); -uniform float Roughness : hint_range(0, 1); +uniform float Metallic : hint_range(0.0, 1.0); +uniform float Roughness : hint_range(0.0, 1.0); uniform vec4 Emission : source_color; -uniform float Fresnel_Power : hint_range(-10, 100) = 100; +uniform float Fresnel_Power : hint_range(-10.0, 100.0) = 100.0; diff --git a/models/power_plant.glb b/models/power_plant.glb index 7fb833c..a9b8cce 100644 Binary files a/models/power_plant.glb and b/models/power_plant.glb differ diff --git a/models/power_plant.glb.import b/models/power_plant.glb.import index 09c9374..c72ca7c 100644 --- a/models/power_plant.glb.import +++ b/models/power_plant.glb.import @@ -32,6 +32,13 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/path": "uid://b8yum5qqa1c75" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/models/pavement-fountain_colormap.png b/models/power_plant_colormap.png similarity index 100% rename from models/pavement-fountain_colormap.png rename to models/power_plant_colormap.png diff --git a/models/pavement-fountain_colormap.png.import b/models/power_plant_colormap.png.import similarity index 55% rename from models/pavement-fountain_colormap.png.import rename to models/power_plant_colormap.png.import index 67c0684..eec7ea7 100644 --- a/models/pavement-fountain_colormap.png.import +++ b/models/power_plant_colormap.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://oo7o4pp68xgr" -path.s3tc="res://.godot/imported/pavement-fountain_colormap.png-d827cc6b1a4dc607aa80cf851d86b35e.s3tc.ctex" -path.etc2="res://.godot/imported/pavement-fountain_colormap.png-d827cc6b1a4dc607aa80cf851d86b35e.etc2.ctex" +uid="uid://ckqy5ay5m40cu" +path.s3tc="res://.godot/imported/power_plant_colormap.png-e3852f3ab950661f6fb34853a2c5c106.s3tc.ctex" +path.etc2="res://.godot/imported/power_plant_colormap.png-e3852f3ab950661f6fb34853a2c5c106.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://models/pavement-fountain_colormap.png" -dest_files=["res://.godot/imported/pavement-fountain_colormap.png-d827cc6b1a4dc607aa80cf851d86b35e.s3tc.ctex", "res://.godot/imported/pavement-fountain_colormap.png-d827cc6b1a4dc607aa80cf851d86b35e.etc2.ctex"] +source_file="res://models/power_plant_colormap.png" +dest_files=["res://.godot/imported/power_plant_colormap.png-e3852f3ab950661f6fb34853a2c5c106.s3tc.ctex", "res://.godot/imported/power_plant_colormap.png-e3852f3ab950661f6fb34853a2c5c106.etc2.ctex"] [params] diff --git a/models/road-intersection_colormap.png b/models/road-intersection_colormap.png deleted file mode 100644 index 4acee4c..0000000 Binary files a/models/road-intersection_colormap.png and /dev/null differ diff --git a/models/road-intersection_colormap.png.import b/models/road-intersection_colormap.png.import deleted file mode 100644 index ae90372..0000000 --- a/models/road-intersection_colormap.png.import +++ /dev/null @@ -1,39 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://rmdd8v6vmym5" -path.s3tc="res://.godot/imported/road-intersection_colormap.png-c61e4b104cdf6bfa6866d3f91af681fd.s3tc.ctex" -path.etc2="res://.godot/imported/road-intersection_colormap.png-c61e4b104cdf6bfa6866d3f91af681fd.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} -generator_parameters={ -"md5": "007d2d2af08d0a09042bcd8910fe8d8f" -} - -[deps] - -source_file="res://models/road-intersection_colormap.png" -dest_files=["res://.godot/imported/road-intersection_colormap.png-c61e4b104cdf6bfa6866d3f91af681fd.s3tc.ctex", "res://.godot/imported/road-intersection_colormap.png-c61e4b104cdf6bfa6866d3f91af681fd.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 diff --git a/models/road-split_colormap.png b/models/road-split_colormap.png deleted file mode 100644 index 4acee4c..0000000 Binary files a/models/road-split_colormap.png and /dev/null differ diff --git a/models/road-split_colormap.png.import b/models/road-split_colormap.png.import deleted file mode 100644 index 056ecd0..0000000 --- a/models/road-split_colormap.png.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dcamohwwb5prk" -path="res://.godot/imported/road-split_colormap.png-d20fd957a58f362b47c3e36589efd30c.ctex" -metadata={ -"vram_texture": false -} -generator_parameters={ -"md5": "007d2d2af08d0a09042bcd8910fe8d8f" -} - -[deps] - -source_file="res://models/road-split_colormap.png" -dest_files=["res://.godot/imported/road-split_colormap.png-d20fd957a58f362b47c3e36589efd30c.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 diff --git a/models/road-straight-lightposts_colormap.png b/models/road-straight-lightposts_colormap.png deleted file mode 100644 index 4acee4c..0000000 Binary files a/models/road-straight-lightposts_colormap.png and /dev/null differ diff --git a/models/road-straight-lightposts_colormap.png.import b/models/road-straight-lightposts_colormap.png.import deleted file mode 100644 index 20b3f7e..0000000 --- a/models/road-straight-lightposts_colormap.png.import +++ /dev/null @@ -1,39 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cckpaetm6elpf" -path.s3tc="res://.godot/imported/road-straight-lightposts_colormap.png-c8d1253418f218a084df50c53c513432.s3tc.ctex" -path.etc2="res://.godot/imported/road-straight-lightposts_colormap.png-c8d1253418f218a084df50c53c513432.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} -generator_parameters={ -"md5": "007d2d2af08d0a09042bcd8910fe8d8f" -} - -[deps] - -source_file="res://models/road-straight-lightposts_colormap.png" -dest_files=["res://.godot/imported/road-straight-lightposts_colormap.png-c8d1253418f218a084df50c53c513432.s3tc.ctex", "res://.godot/imported/road-straight-lightposts_colormap.png-c8d1253418f218a084df50c53c513432.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 diff --git a/models/road-straight_colormap.png b/models/road-straight_colormap.png deleted file mode 100644 index 4acee4c..0000000 Binary files a/models/road-straight_colormap.png and /dev/null differ diff --git a/models/road-straight_colormap.png.import b/models/road-straight_colormap.png.import deleted file mode 100644 index 9d40ab7..0000000 --- a/models/road-straight_colormap.png.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ddl8lrcoeovpw" -path="res://.godot/imported/road-straight_colormap.png-b6a117d52548e61c263bb6e65713a481.ctex" -metadata={ -"vram_texture": false -} -generator_parameters={ -"md5": "007d2d2af08d0a09042bcd8910fe8d8f" -} - -[deps] - -source_file="res://models/road-straight_colormap.png" -dest_files=["res://.godot/imported/road-straight_colormap.png-b6a117d52548e61c263bb6e65713a481.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 diff --git a/models/store.glb b/models/store.glb index e654827..f03a7a4 100644 Binary files a/models/store.glb and b/models/store.glb differ diff --git a/models/store.glb.import b/models/store.glb.import index d4078db..6ae4ed2 100644 --- a/models/store.glb.import +++ b/models/store.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://h0vrvst3cumo" +uid="uid://rdfjckc8h1dp" path="res://.godot/imported/store.glb-eb219227761a994cd73630b580ffec3c.scn" [deps] @@ -13,8 +13,8 @@ dest_files=["res://.godot/imported/store.glb-eb219227761a994cd73630b580ffec3c.sc [params] -nodes/root_type="Node3D" -nodes/root_name="Scene Root" +nodes/root_type="" +nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false @@ -32,6 +32,13 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} -gltf/naming_version=0 +_subresources={ +"materials": { +"colormap": { +"use_external/enabled": true, +"use_external/path": "uid://b8yum5qqa1c75" +} +} +} +gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/models/pavement_colormap.png b/models/store_colormap.png similarity index 100% rename from models/pavement_colormap.png rename to models/store_colormap.png diff --git a/models/pavement_colormap.png.import b/models/store_colormap.png.import similarity index 58% rename from models/pavement_colormap.png.import rename to models/store_colormap.png.import index cb0a579..70155ba 100644 --- a/models/pavement_colormap.png.import +++ b/models/store_colormap.png.import @@ -2,9 +2,9 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bxv7gyds50dps" -path.s3tc="res://.godot/imported/pavement_colormap.png-49f7e71226550d61a313322246614540.s3tc.ctex" -path.etc2="res://.godot/imported/pavement_colormap.png-49f7e71226550d61a313322246614540.etc2.ctex" +uid="uid://bmwvd0udrl3mt" +path.s3tc="res://.godot/imported/store_colormap.png-0c8242d7cffc0f8d4757c000844710b2.s3tc.ctex" +path.etc2="res://.godot/imported/store_colormap.png-0c8242d7cffc0f8d4757c000844710b2.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -15,8 +15,8 @@ generator_parameters={ [deps] -source_file="res://models/pavement_colormap.png" -dest_files=["res://.godot/imported/pavement_colormap.png-49f7e71226550d61a313322246614540.s3tc.ctex", "res://.godot/imported/pavement_colormap.png-49f7e71226550d61a313322246614540.etc2.ctex"] +source_file="res://models/store_colormap.png" +dest_files=["res://.godot/imported/store_colormap.png-0c8242d7cffc0f8d4757c000844710b2.s3tc.ctex", "res://.godot/imported/store_colormap.png-0c8242d7cffc0f8d4757c000844710b2.etc2.ctex"] [params] diff --git a/scenes/main-environment.tres b/scenes/main-environment.tres index 9794e52..3c63be9 100644 --- a/scenes/main-environment.tres +++ b/scenes/main-environment.tres @@ -11,12 +11,11 @@ sky_material = SubResource("ProceduralSkyMaterial_lg8b7") [resource] background_mode = 1 -background_color = Color(0.560784, 0.592157, 0.670588, 1) +background_color = Color(0.219333, 0.21, 0.35, 1) sky = SubResource("Sky_7bk1c") -ambient_light_source = 2 -ambient_light_color = Color(0.662745, 0.694118, 0.772549, 1) -ambient_light_energy = 0.75 -tonemap_mode = 2 +ambient_light_source = 3 +ambient_light_color = Color(0.36875, 0.741929, 0.801344, 1) +tonemap_mode = 3 ssao_enabled = true ssao_radius = 0.25 ssao_intensity = 0.5 @@ -25,7 +24,10 @@ ssao_horizon = 0.1 sdfgi_cascades = 1 sdfgi_max_distance = 25.6 sdfgi_energy = 0.5 +glow_enabled = true glow_levels/2 = 0.6 glow_levels/3 = 0.6 glow_levels/5 = 0.0 -glow_intensity = 2.0 +glow_strength = 2.0 +fog_light_energy = 0.54 +fog_density = 0.0035 diff --git a/scenes/main.tscn b/scenes/main.tscn index 143ec77..e4bf23b 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=72 format=3 uid="uid://vgwrcfy1qawf"] +[gd_scene load_steps=71 format=3 uid="uid://vgwrcfy1qawf"] [ext_resource type="Script" uid="uid://c37h6na3e4twn" path="res://scripts/builder.gd" id="1_jybm7"] [ext_resource type="Environment" uid="uid://jbptgqvstei3" path="res://scenes/main-environment.tres" id="1_yndf3"] @@ -37,7 +37,6 @@ [ext_resource type="Resource" uid="uid://bom5bu47dy5kp" path="res://mission/unit_1.02/market_research_2.tres" id="24_xud6a"] [ext_resource type="Resource" uid="uid://csrqvfwp63ygr" path="res://mission/unit_1.02/market_research_3.tres" id="25_6hx7u"] [ext_resource type="Resource" uid="uid://qwiwim2pg88f" path="res://mission/unit_1.02/market_research_4.tres" id="26_lvk23"] -[ext_resource type="PackedScene" uid="uid://cb2rylpbex3ep" path="res://models/building-arcology.glb" id="27_m8wco"] [ext_resource type="Resource" uid="uid://cfgw8dblm55c5" path="res://mission/unit_1.03_1.05/grid_growth_1.tres" id="27_s0e58"] [ext_resource type="Resource" uid="uid://ba3ndftq7dht7" path="res://mission/unit_1.03_1.05/grid_growth_2.tres" id="28_hurxs"] [ext_resource type="Resource" uid="uid://dgimr2v12rjqu" path="res://mission/unit_1.03_1.05/grid_growth_3.tres" id="29_rhn1n"] @@ -230,7 +229,7 @@ cell_center_y = false cell_center_z = false [node name="Sun" type="DirectionalLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.642788, 0.766044, 0, -0.766045, 0.642787, 0, 0, 0) +transform = Transform3D(0.430511, -0.372862, -0.821969, 0, 0.910684, -0.413104, 0.902585, 0.177846, 0.392059, 0, 0, 0) light_energy = 2.0 light_indirect_energy = 3.0 light_volumetric_fog_energy = 3.07 @@ -441,9 +440,6 @@ text = "Complete" offset_right = 40.0 offset_bottom = 23.0 -[node name="building-arcology2" parent="." instance=ExtResource("27_m8wco")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, -16, -14) - [connection signal="all_missions_completed" from="MissionManager" to="." method="_on_mission_manager_all_missions_completed"] [connection signal="mission_started" from="MissionManager" to="." method="_on_mission_manager_mission_started"] [connection signal="pressed" from="MissionManager/LearningPanel/MarginContainer/VBoxContainer/HBoxContainer/CompleteButton" to="MissionManager/LearningPanel" method="_on_complete_button_pressed"] diff --git a/structures/power-plant.tres b/structures/power-plant.tres index 7dd9b82..cb6ad7b 100644 --- a/structures/power-plant.tres +++ b/structures/power-plant.tres @@ -12,7 +12,7 @@ price = 5000 population_count = 0 kW_usage = 0.0 kW_production = 40.0 -selector_scale = 13 +selector_scale = 2.8 unlocked = false spawn_builder = false description = "A power-generating facility that produces electricity to keep your city's buildings operational and citizens happy. Produces 40 kW of energy."