diff --git a/core/game_menu/assets/page_3/base.png b/core/game_menu/assets/page_3/base.png new file mode 100644 index 0000000..c99f531 Binary files /dev/null and b/core/game_menu/assets/page_3/base.png differ diff --git a/core/game_menu/assets/page_3/quality_button.png.import b/core/game_menu/assets/page_3/base.png.import similarity index 71% rename from core/game_menu/assets/page_3/quality_button.png.import rename to core/game_menu/assets/page_3/base.png.import index e87c8d2..ec61fc1 100644 --- a/core/game_menu/assets/page_3/quality_button.png.import +++ b/core/game_menu/assets/page_3/base.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dqqs83gh5mwof" -path="res://.godot/imported/quality_button.png-362af22cd4764f63b4532bc0ac31582c.ctex" +uid="uid://idvleok1gecb" +path="res://.godot/imported/base.png-35dfca664909be339bca935018608cfd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://core/game_menu/assets/page_3/quality_button.png" -dest_files=["res://.godot/imported/quality_button.png-362af22cd4764f63b4532bc0ac31582c.ctex"] +source_file="res://core/game_menu/assets/page_3/base.png" +dest_files=["res://.godot/imported/base.png-35dfca664909be339bca935018608cfd.ctex"] [params] diff --git a/core/game_menu/assets/page_3/borderless.png b/core/game_menu/assets/page_3/borderless.png new file mode 100644 index 0000000..2cb3b78 Binary files /dev/null and b/core/game_menu/assets/page_3/borderless.png differ diff --git a/core/game_menu/assets/page_3/resolution_button.png.import b/core/game_menu/assets/page_3/borderless.png.import similarity index 71% rename from core/game_menu/assets/page_3/resolution_button.png.import rename to core/game_menu/assets/page_3/borderless.png.import index 8d4ca78..5ddf0b6 100644 --- a/core/game_menu/assets/page_3/resolution_button.png.import +++ b/core/game_menu/assets/page_3/borderless.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bohvj2bmao03f" -path="res://.godot/imported/resolution_button.png-48bd04fd62af50e2585326b54ad8130f.ctex" +uid="uid://m5llqtaj5kla" +path="res://.godot/imported/borderless.png-7776006373879bd724ff6e75abfe2110.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://core/game_menu/assets/page_3/resolution_button.png" -dest_files=["res://.godot/imported/resolution_button.png-48bd04fd62af50e2585326b54ad8130f.ctex"] +source_file="res://core/game_menu/assets/page_3/borderless.png" +dest_files=["res://.godot/imported/borderless.png-7776006373879bd724ff6e75abfe2110.ctex"] [params] diff --git a/core/game_menu/assets/page_3/fullscreen.png b/core/game_menu/assets/page_3/fullscreen.png new file mode 100644 index 0000000..4d2a29e Binary files /dev/null and b/core/game_menu/assets/page_3/fullscreen.png differ diff --git a/core/game_menu/assets/page_3/fullscreen.png.import b/core/game_menu/assets/page_3/fullscreen.png.import new file mode 100644 index 0000000..a86e2ec --- /dev/null +++ b/core/game_menu/assets/page_3/fullscreen.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bftymw7ajgb25" +path="res://.godot/imported/fullscreen.png-74bf998c270deb1e85a7914014f931c3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/fullscreen.png" +dest_files=["res://.godot/imported/fullscreen.png-74bf998c270deb1e85a7914014f931c3.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 diff --git a/core/game_menu/assets/page_3/main_volume_button.png b/core/game_menu/assets/page_3/main_volume_button.png index 557d143..15cc3ae 100644 Binary files a/core/game_menu/assets/page_3/main_volume_button.png and b/core/game_menu/assets/page_3/main_volume_button.png differ diff --git a/core/game_menu/assets/page_3/music_volume_button.png b/core/game_menu/assets/page_3/music_volume_button.png index ad2d9ea..939932c 100644 Binary files a/core/game_menu/assets/page_3/music_volume_button.png and b/core/game_menu/assets/page_3/music_volume_button.png differ diff --git a/core/game_menu/assets/page_3/play_button.png b/core/game_menu/assets/page_3/play_button.png index 2dad0a5..f32e61b 100644 Binary files a/core/game_menu/assets/page_3/play_button.png and b/core/game_menu/assets/page_3/play_button.png differ diff --git a/core/game_menu/assets/page_3/quality_button.png b/core/game_menu/assets/page_3/quality_button.png deleted file mode 100644 index 8eb45a1..0000000 Binary files a/core/game_menu/assets/page_3/quality_button.png and /dev/null differ diff --git a/core/game_menu/assets/page_3/quit_button.png b/core/game_menu/assets/page_3/quit_button.png index 00afff9..dabd953 100644 Binary files a/core/game_menu/assets/page_3/quit_button.png and b/core/game_menu/assets/page_3/quit_button.png differ diff --git a/core/game_menu/assets/page_3/resolution_button.png b/core/game_menu/assets/page_3/resolution_button.png deleted file mode 100644 index 847f3e2..0000000 Binary files a/core/game_menu/assets/page_3/resolution_button.png and /dev/null differ diff --git a/core/game_menu/assets/page_3/resume_button.png b/core/game_menu/assets/page_3/resume_button.png index daa9e28..72bc278 100644 Binary files a/core/game_menu/assets/page_3/resume_button.png and b/core/game_menu/assets/page_3/resume_button.png differ diff --git a/core/game_menu/assets/page_3/save_button.png b/core/game_menu/assets/page_3/save_button.png index bc6adc9..448fab8 100644 Binary files a/core/game_menu/assets/page_3/save_button.png and b/core/game_menu/assets/page_3/save_button.png differ diff --git a/core/game_menu/assets/page_3/settings_button.png b/core/game_menu/assets/page_3/settings_button.png index 83ee667..7d8804f 100644 Binary files a/core/game_menu/assets/page_3/settings_button.png and b/core/game_menu/assets/page_3/settings_button.png differ diff --git a/core/game_menu/assets/page_3/sfx_volume_button.png b/core/game_menu/assets/page_3/sfx_volume_button.png index 812ff64..beebb4f 100644 Binary files a/core/game_menu/assets/page_3/sfx_volume_button.png and b/core/game_menu/assets/page_3/sfx_volume_button.png differ diff --git a/core/game_menu/assets/page_3/windowed.png b/core/game_menu/assets/page_3/windowed.png new file mode 100644 index 0000000..5596e56 Binary files /dev/null and b/core/game_menu/assets/page_3/windowed.png differ diff --git a/core/game_menu/assets/page_3/windowed.png.import b/core/game_menu/assets/page_3/windowed.png.import new file mode 100644 index 0000000..cb99201 --- /dev/null +++ b/core/game_menu/assets/page_3/windowed.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbcs6apfftxxw" +path="res://.godot/imported/windowed.png-3a6ae844e78a7d611e7a5eb2ac5e80f2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/game_menu/assets/page_3/windowed.png" +dest_files=["res://.godot/imported/windowed.png-3a6ae844e78a7d611e7a5eb2ac5e80f2.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 diff --git a/core/game_menu/audio_option.tscn b/core/game_menu/audio_option.tscn index c6140cd..97c40ac 100644 --- a/core/game_menu/audio_option.tscn +++ b/core/game_menu/audio_option.tscn @@ -19,16 +19,20 @@ texture = ExtResource("4_hduhm") texture = ExtResource("4_hduhm") [node name="AudioOption" type="VBoxContainer" unique_id=1509773712] +custom_minimum_size = Vector2(319, 177) offset_right = 319.0 offset_bottom = 177.0 theme_override_constants/separation = 0 +alignment = 1 script = ExtResource("1_orafl") image = ExtResource("2_vudub") [node name="Texture" type="TextureRect" parent="." unique_id=637050541] unique_name_in_owner = true +custom_minimum_size = Vector2(0, 115) layout_mode = 2 texture = ExtResource("2_vudub") +expand_mode = 1 stretch_mode = 5 [node name="HSlider" type="HSlider" parent="." unique_id=1286896253] diff --git a/core/game_menu/option_menu_button.tscn b/core/game_menu/option_menu_button.tscn index 0022b4a..4dda008 100644 --- a/core/game_menu/option_menu_button.tscn +++ b/core/game_menu/option_menu_button.tscn @@ -49,17 +49,18 @@ metadata/_edit_use_anchors_ = true [node name="Texture" type="TextureRect" parent="." unique_id=1177880405] unique_name_in_owner = true +custom_minimum_size = Vector2(302, 90) layout_mode = 1 anchors_preset = -1 -anchor_left = 0.42135417 -anchor_top = 0.45833334 -anchor_right = 0.5786458 -anchor_bottom = 0.5416667 +anchor_right = 1.0 +anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 pivot_offset_ratio = Vector2(0.5, 0.5) mouse_filter = 2 texture = ExtResource("1_movd1") +expand_mode = 1 +stretch_mode = 5 metadata/_edit_use_anchors_ = true [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] diff --git a/core/game_menu/page_3.tscn b/core/game_menu/page_3.tscn index 17e5dd9..f4ec270 100644 --- a/core/game_menu/page_3.tscn +++ b/core/game_menu/page_3.tscn @@ -17,23 +17,23 @@ mouse_filter = 2 [node name="TextureRect" type="TextureRect" parent="." index="1" unique_id=464034413] layout_mode = 0 -offset_left = 1040.0 -offset_top = 309.0 -offset_right = 1738.0 -offset_bottom = 836.0 +anchor_left = 0.5416667 +anchor_top = 0.28611112 +anchor_right = 0.90520835 +anchor_bottom = 0.7740741 texture = ExtResource("2_ckqcb") +metadata/_edit_use_anchors_ = true [node name="OptionMenu" parent="." index="2" unique_id=1055457221 instance=ExtResource("2_tymfi")] layout_mode = 0 anchors_preset = 0 -anchor_right = 0.0 -anchor_bottom = 0.0 -offset_left = 1385.0 -offset_top = 563.0 -offset_right = 1385.0 -offset_bottom = 563.0 +anchor_left = 0.7213542 +anchor_top = 0.5212963 +anchor_right = 0.7213542 +anchor_bottom = 0.5212963 grow_horizontal = 1 grow_vertical = 1 +metadata/_edit_use_anchors_ = true [node name="PlayButton" parent="OptionMenu/VBoxContainer" parent_id_path=PackedInt32Array(1055457221, 508055524) index="0" unique_id=1990327704] visible = false @@ -43,9 +43,11 @@ visible = false [node name="SettingsMenu" parent="." index="3" unique_id=1639777294 instance=ExtResource("4_twko7")] layout_mode = 1 -offset_left = 365.0 -offset_top = 304.0 -offset_right = 365.0 -offset_bottom = 304.0 +anchor_left = 0.19010417 +anchor_top = 0.28148147 +anchor_right = 0.36041668 +anchor_bottom = 0.75555557 +offset_right = 0.0 +offset_bottom = 0.0 [editable path="OptionMenu"] diff --git a/core/game_menu/settings_menu.tscn b/core/game_menu/settings_menu.tscn index decbdb9..429cf08 100644 --- a/core/game_menu/settings_menu.tscn +++ b/core/game_menu/settings_menu.tscn @@ -21,13 +21,14 @@ metadata/_edit_use_anchors_ = true unique_name_in_owner = true custom_minimum_size = Vector2(327, 512) layout_mode = 1 -anchors_preset = 15 +anchors_preset = -1 anchor_right = 1.0 -anchor_bottom = 1.0 +anchor_bottom = 1.0839844 grow_horizontal = 2 grow_vertical = 2 theme_override_constants/separation = 12 alignment = 1 +metadata/_edit_use_anchors_ = true [node name="MasterVolume_AudioOption" parent="AudioOptionsContainer" unique_id=1509773712 instance=ExtResource("1_hwcco")] layout_mode = 2 diff --git a/core/main_scene_ui/assets/button_daynightcycleoff.png b/core/main_scene_ui/assets/button_daynightcycleoff.png new file mode 100644 index 0000000..4ecc188 Binary files /dev/null and b/core/main_scene_ui/assets/button_daynightcycleoff.png differ diff --git a/core/main_scene_ui/assets/button_daynightcycleoff.png.import b/core/main_scene_ui/assets/button_daynightcycleoff.png.import new file mode 100644 index 0000000..e439d89 --- /dev/null +++ b/core/main_scene_ui/assets/button_daynightcycleoff.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bu3i1fieme2tl" +path="res://.godot/imported/button_daynightcycleoff.png-131eced9a7760b605f2000cb094084a8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/main_scene_ui/assets/button_daynightcycleoff.png" +dest_files=["res://.godot/imported/button_daynightcycleoff.png-131eced9a7760b605f2000cb094084a8.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 diff --git a/core/main_scene_ui/assets/button_weather_off.png b/core/main_scene_ui/assets/button_weather_off.png new file mode 100644 index 0000000..3ed9971 Binary files /dev/null and b/core/main_scene_ui/assets/button_weather_off.png differ diff --git a/core/main_scene_ui/assets/button_weather_off.png.import b/core/main_scene_ui/assets/button_weather_off.png.import new file mode 100644 index 0000000..305af3b --- /dev/null +++ b/core/main_scene_ui/assets/button_weather_off.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cimo71kc2x58a" +path="res://.godot/imported/button_weather_off.png-342a4361cdab31d6ec154c88e60f162b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://core/main_scene_ui/assets/button_weather_off.png" +dest_files=["res://.godot/imported/button_weather_off.png-342a4361cdab31d6ec154c88e60f162b.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 diff --git a/core/main_scene_ui/main_scene_ui.gd b/core/main_scene_ui/main_scene_ui.gd index 1e7f120..d1dfbaa 100644 --- a/core/main_scene_ui/main_scene_ui.gd +++ b/core/main_scene_ui/main_scene_ui.gd @@ -14,7 +14,11 @@ extends Control @onready var photo_mode_black_screen: ColorRect = $%PhotoModeBlackScreen @onready var audio_player: Control = $%AudioPlayer -var cycle = false +var _cycle = false +var _rain = false +var _snow = false +var _storm = false +var _wind = false var _photo_mode_mat_tween: Tween var _photo_mode_alpha_tween: Tween var _photo_mode_fold_tween: Tween @@ -62,21 +66,25 @@ func _on_time_of_day_row_on_option_changed(data: String) -> void: "Night": UIEvents.time_option_item_changed.emit(3) "Cycle": - cycle = !cycle - UIEvents.toggle_pause_daytime.emit(cycle) + _cycle = !_cycle + UIEvents.toggle_pause_daytime.emit(_cycle) _: pass func _on_weather_row_on_option_changed(data: String) -> void: match data: "Snow": - UIEvents.toggle_snow.emit(true) + _snow = !_snow + UIEvents.toggle_snow.emit(_snow) "Rain": - UIEvents.toggle_rain.emit(true) + _rain = !_rain + UIEvents.toggle_rain.emit(_rain) "Storm": - UIEvents.toggle_storm.emit(true) + _storm = !_storm + UIEvents.toggle_storm.emit(_storm) "Wind": - UIEvents.toggle_wind.emit(true) + _wind = !_wind + UIEvents.toggle_wind.emit(_wind) "Random": pick_random_weather() _: diff --git a/core/main_scene_ui/main_scene_ui.tscn b/core/main_scene_ui/main_scene_ui.tscn index 2126d86..b7dcb14 100644 --- a/core/main_scene_ui/main_scene_ui.tscn +++ b/core/main_scene_ui/main_scene_ui.tscn @@ -10,6 +10,7 @@ [ext_resource type="PackedScene" uid="uid://cpeyt1dgrtglc" path="res://core/radio/radio.tscn" id="5_nevjt"] [ext_resource type="Texture2D" uid="uid://blttomjog2rin" path="res://core/main_scene_ui/assets/button_weather_nosnow.png" id="6_167gj"] [ext_resource type="AudioStream" uid="uid://70cc8she43re" path="res://docs/gyms/radio/lofi_01.ogg" id="6_kd244"] +[ext_resource type="Texture2D" uid="uid://bu3i1fieme2tl" path="res://core/main_scene_ui/assets/button_daynightcycleoff.png" id="6_luj56"] [ext_resource type="Texture2D" uid="uid://bj0idkr7kd4ik" path="res://core/main_scene_ui/assets/button_weather_snow.png" id="6_xykej"] [ext_resource type="Texture2D" uid="uid://cc6e2piksgv1a" path="res://core/main_scene_ui/assets/button_weather01.png" id="6_yggu7"] [ext_resource type="Texture2D" uid="uid://d3v43kog5fwnf" path="res://core/main_scene_ui/assets/button_weather_rain.png" id="7_jpmw5"] @@ -72,6 +73,7 @@ data = "Night" [node name="IconButton5" parent="Rows/TimeOfDayRow" index="4" unique_id=315412403] data = "Cycle" image = ExtResource("5_fjfwt") +images = Array[Texture]([ExtResource("5_fjfwt"), ExtResource("6_luj56")]) apply_texture_on_selection = false [node name="ShowContainerTween" parent="Rows/TimeOfDayRow" index="5" unique_id=160227524] diff --git a/tgcc/chunk/prop/grass/grass_chunk.tres b/tgcc/chunk/prop/grass/grass_chunk.tres index d68f7a6..058b37c 100644 --- a/tgcc/chunk/prop/grass/grass_chunk.tres +++ b/tgcc/chunk/prop/grass/grass_chunk.tres @@ -29,6 +29,7 @@ shader_parameter/variance_color = Color(0.3, 0.5, 0.2, 1) shader_parameter/variance_intensity = 0.350000016625 shader_parameter/snow_color = Color(0.85, 0.9, 0.95, 1) shader_parameter/snow_visibility = 1.0 +shader_parameter/snow_coverage = 0.35 shader_parameter/height_min = 0.0 shader_parameter/height_max = 5.0 shader_parameter/shadow_intensity = 0.6000000285