From c3f7b7c67dc608bf4aae46a7413e2299db637af1 Mon Sep 17 00:00:00 2001 From: Victor Turgeon Date: Sun, 11 Jun 2023 17:43:05 -0400 Subject: [PATCH 1/2] some visual stuff --- levels/test_level.tscn | 37 +++++++++++++++++++++++++++---------- shaders/water_plane.tscn | 21 +++++++++++++-------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/levels/test_level.tscn b/levels/test_level.tscn index 8f71af2..3ad1da1 100644 --- a/levels/test_level.tscn +++ b/levels/test_level.tscn @@ -1,22 +1,39 @@ -[gd_scene load_steps=7 format=3 uid="uid://cbs0x36e3ranm"] +[gd_scene load_steps=10 format=3 uid="uid://cbs0x36e3ranm"] -[ext_resource type="MeshLibrary" uid="uid://bo7ir5us230sa" path="res://assets/tilesets/tileset.tres" id="1_l447d"] +[ext_resource type="MeshLibrary" uid="uid://dwo1m72yajrb1" path="res://assets/tilesets/tileset.tres" id="1_l447d"] [ext_resource type="PackedScene" uid="uid://b5gb5paiupum" path="res://player/player.tscn" id="2_ojnju"] -[ext_resource type="AudioStream" uid="uid://bba7tiqty57ek" path="res://music/jazz.ogg" id="3_brvx4"] +[ext_resource type="AudioStream" uid="uid://byo1w5vecks0m" path="res://music/jazz.ogg" id="3_brvx4"] [ext_resource type="PackedScene" uid="uid://c2casdi4d2o3j" path="res://shaders/water_plane.tscn" id="3_ga7wg"] +[ext_resource type="Shader" path="res://shaders/water.gdshader" id="4_nrn2i"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_f48s3"] +render_priority = 0 +shader = ExtResource("4_nrn2i") +shader_parameter/albedo = null +shader_parameter/albedo2 = null +shader_parameter/metallic = 0.0 +shader_parameter/roughness = 0.02 +shader_parameter/wave_direction = Vector2(2, 0) +shader_parameter/wave_direction2 = Vector2(0, 1) +shader_parameter/time_scale = 0.0 + +[sub_resource type="Sky" id="Sky_arxx1"] +sky_material = SubResource("ShaderMaterial_f48s3") [sub_resource type="Environment" id="Environment_lo4sd"] +background_mode = 2 +sky = SubResource("Sky_arxx1") ambient_light_source = 3 -ambient_light_color = Color(0.54902, 0.815686, 0.964706, 1) +ambient_light_color = Color(0.717647, 0.886275, 0.980392, 1) ssao_radius = 11.01 sdfgi_enabled = true sdfgi_use_occlusion = true sdfgi_bounce_feedback = 0.56 glow_intensity = 1.69 fog_enabled = true -fog_light_color = Color(0.294118, 0.439216, 0.411765, 1) -fog_light_energy = 0.8 -fog_density = 0.005 +fog_light_color = Color(0.298039, 0.713726, 0.992157, 1) +fog_light_energy = 1.37 +fog_density = 0.001 fog_height = -1.0 fog_height_density = 0.5 volumetric_fog_enabled = true @@ -28,7 +45,7 @@ volumetric_fog_detail_spread = 1.68179 adjustment_enabled = true adjustment_brightness = 1.1 adjustment_contrast = 1.25 -adjustment_saturation = 0.8 +adjustment_saturation = 1.1 [sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_5s8jn"] @@ -49,7 +66,7 @@ stream = ExtResource("3_brvx4") autoplay = true [node name="water_plane" parent="." instance=ExtResource("3_ga7wg")] -transform = Transform3D(227.061, 0, -196.07, 0, 300, 0, 196.07, 0, 227.061, 0, 0.257405, 0) +transform = Transform3D(189.216, 0, -163.39, 0, 249.998, 0, 163.39, 0, 189.216, 0, 0.257405, 0) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.175911, -0.891337, 0.41782, 0.878449, 0.333691, 0.34202, -0.444278, 0.306869, 0.841694, 0, 3.35555, 0) @@ -63,4 +80,4 @@ environment = SubResource("Environment_lo4sd") camera_attributes = SubResource("CameraAttributesPhysical_5s8jn") [node name="player" parent="." instance=ExtResource("2_ojnju")] -transform = Transform3D(1, 0, 0, 0, 0.414487, 0.910055, 0, -0.910055, 0.414487, 0, 32.5889, 13.9222) +transform = Transform3D(1, 0, 0, 0, 0.414487, 0.910055, 0, -0.910055, 0.414487, -2.98987, 38.8435, 15.148) diff --git a/shaders/water_plane.tscn b/shaders/water_plane.tscn index 317e495..ab42d24 100644 --- a/shaders/water_plane.tscn +++ b/shaders/water_plane.tscn @@ -4,8 +4,8 @@ [ext_resource type="Texture2D" uid="uid://bsw8l5crn3aid" path="res://assets/textures/water.png" id="2_83coh"] [sub_resource type="QuadMesh" id="QuadMesh_x322w"] -subdivide_width = 200 -subdivide_depth = 200 +subdivide_width = 1 +subdivide_depth = 1 orientation = 1 [sub_resource type="FastNoiseLite" id="FastNoiseLite_ido7w"] @@ -13,9 +13,11 @@ noise_type = 3 fractal_type = 2 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_ntr7e"] +width = 1920 +height = 1920 seamless = true as_normal_map = true -bump_strength = 1.5 +bump_strength = 21.8 noise = SubResource("FastNoiseLite_ido7w") [sub_resource type="FastNoiseLite" id="FastNoiseLite_bfpu3"] @@ -24,18 +26,21 @@ seed = 69 fractal_type = 2 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_wvpl0"] +width = 1920 +height = 1920 seamless = true +seamless_blend_skirt = 0.283 as_normal_map = true -bump_strength = 1.5 +bump_strength = 20.8 noise = SubResource("FastNoiseLite_bfpu3") [sub_resource type="ShaderMaterial" id="ShaderMaterial_yma05"] render_priority = 0 shader = ExtResource("1_yfj5n") -shader_parameter/albedo = Color(0.101961, 0.0509804, 0.431373, 1) -shader_parameter/albedo2 = Color(0.658824, 0.905882, 0.929412, 1) -shader_parameter/metallic = 0.0 -shader_parameter/roughness = 0.02 +shader_parameter/albedo = Color(0.0980392, 0.0470588, 0.415686, 1) +shader_parameter/albedo2 = Color(0.298039, 0.341176, 0.658824, 1) +shader_parameter/metallic = 0.809 +shader_parameter/roughness = 0.166 shader_parameter/wave_direction = Vector2(2, 0) shader_parameter/wave_direction2 = Vector2(0, 1) shader_parameter/time_scale = 0.005 From 1dcdf370a36f188b155125f7e8114c346f7099ac Mon Sep 17 00:00:00 2001 From: Victor Turgeon Date: Sun, 11 Jun 2023 17:49:57 -0400 Subject: [PATCH 2/2] changed values in description --- player/player.tscn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/player/player.tscn b/player/player.tscn index 11bb68c..de8bcdf 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -410,8 +410,8 @@ offset_right = -132.0 offset_bottom = -135.0 grow_horizontal = 0 grow_vertical = 0 -text = "Kash Flow: +1M$/sec. PR: +10%. Mtons: +10. -Cost: 6M$. Cost: 5M$. PR: -5%. +text = "Kash Flow: +2M$/sec. PR: +10%. Mtons: +20. +Cost: 6M$. Cost: 5M$. PR: -15%. Cost: 30M$." label_settings = SubResource("LabelSettings_adeuk")