diff --git a/art/exported/characters/base/netfishing_base_character.glb b/art/exported/characters/base/netfishing_base_character.glb new file mode 100644 index 0000000..10b9d7d Binary files /dev/null and b/art/exported/characters/base/netfishing_base_character.glb differ diff --git a/art/exported/characters/base/netfishing_base_character.glb.import b/art/exported/characters/base/netfishing_base_character.glb.import new file mode 100644 index 0000000..b1409e1 --- /dev/null +++ b/art/exported/characters/base/netfishing_base_character.glb.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://w7n4gjqq1juc" +path="res://.godot/imported/netfishing_base_character.glb-0167c087f16181d405afb962dc877d2c.scn" + +[deps] + +source_file="res://art/exported/characters/base/netfishing_base_character.glb" +dest_files=["res://.godot/imported/netfishing_base_character.glb-0167c087f16181d405afb962dc877d2c.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={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 +gltf/texture_map_mode=1 diff --git a/art/source/characters/base/netfishing_base_character.blend b/art/source/characters/base/netfishing_base_character.blend index 33dfc3c..8727e6f 100644 Binary files a/art/source/characters/base/netfishing_base_character.blend and b/art/source/characters/base/netfishing_base_character.blend differ diff --git a/fish/species/bass/bass.tres b/fish/species/bass/bass.tres index 24b159f..bc2b026 100644 --- a/fish/species/bass/bass.tres +++ b/fish/species/bass/bass.tres @@ -1,14 +1,12 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" script_class="FishData" format=3 uid="uid://f1cibmajx3lo"] -[ext_resource type="Script" path="res://fish/fish_data.gd" id="1_fish_data"] +[ext_resource type="Script" uid="uid://h7hg45b7wmst" path="res://fish/fish_data.gd" id="1_fish_data"] [ext_resource type="Resource" path="res://fishing/bass_catch_profile.tres" id="2_profile"] -[ext_resource type="Script" path="res://fish/fish_availability.gd" id="3_availability_script"] -[ext_resource type="Texture2D" path="res://fish/species/bass/fish_bass_striped.png" id="4_texture"] +[ext_resource type="Script" uid="uid://bs7cqi88csolc" path="res://fish/fish_availability.gd" id="3_availability_script"] +[ext_resource type="Texture2D" uid="uid://dvh6s86asl4ix" path="res://fish/species/bass/fish_bass_striped.png" id="4_texture"] [sub_resource type="Resource" id="BassAvailability"] script = ExtResource("3_availability_script") -allow_day = true -allow_night = true preferred_bait_tags = Array[StringName]([&"worm", &"minnow"]) preferred_bait_weight_multiplier = 1.4 diff --git a/fish/species/carp/carp.tres b/fish/species/carp/carp.tres index 826ac13..5673834 100644 --- a/fish/species/carp/carp.tres +++ b/fish/species/carp/carp.tres @@ -1,14 +1,12 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" script_class="FishData" format=3 uid="uid://cdkdwpwu384ck"] -[ext_resource type="Script" path="res://fish/fish_data.gd" id="1_fish_data"] +[ext_resource type="Script" uid="uid://h7hg45b7wmst" path="res://fish/fish_data.gd" id="1_fish_data"] [ext_resource type="Resource" path="res://fishing/carp_catch_profile.tres" id="2_profile"] -[ext_resource type="Script" path="res://fish/fish_availability.gd" id="3_availability_script"] -[ext_resource type="Texture2D" path="res://fish/species/carp/fish_carp_common.png" id="4_texture"] +[ext_resource type="Script" uid="uid://bs7cqi88csolc" path="res://fish/fish_availability.gd" id="3_availability_script"] +[ext_resource type="Texture2D" uid="uid://c6pa1gqwv1a5s" path="res://fish/species/carp/fish_carp_common.png" id="4_texture"] [sub_resource type="Resource" id="CarpAvailability"] script = ExtResource("3_availability_script") -allow_day = true -allow_night = true preferred_bait_tags = Array[StringName]([&"corn", &"bread"]) preferred_bait_weight_multiplier = 1.5 diff --git a/fish/species/catfish_blue/catfish_blue.tres b/fish/species/catfish_blue/catfish_blue.tres index 893794f..9867c69 100644 --- a/fish/species/catfish_blue/catfish_blue.tres +++ b/fish/species/catfish_blue/catfish_blue.tres @@ -1,15 +1,13 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" script_class="FishData" format=3 uid="uid://v54vjd6k2mdb"] -[ext_resource type="Script" path="res://fish/fish_data.gd" id="1_fish_data"] +[ext_resource type="Script" uid="uid://h7hg45b7wmst" path="res://fish/fish_data.gd" id="1_fish_data"] [ext_resource type="Resource" path="res://fishing/bass_catch_profile.tres" id="2_profile"] -[ext_resource type="Script" path="res://fish/fish_availability.gd" id="3_availability_script"] -[ext_resource type="Texture2D" path="res://fish/species/catfish_blue/fish_catfish_blue.png" id="4_texture"] +[ext_resource type="Script" uid="uid://bs7cqi88csolc" path="res://fish/fish_availability.gd" id="3_availability_script"] +[ext_resource type="Texture2D" uid="uid://7f1dtcou8moe" path="res://fish/species/catfish_blue/fish_catfish_blue.png" id="4_texture"] [sub_resource type="Resource" id="BlueCatfishAvailability"] script = ExtResource("3_availability_script") allowed_location_tags = Array[StringName]([&"starter_pond"]) -allow_day = true -allow_night = true preferred_bait_tags = Array[StringName]([&"worm", &"minnow"]) preferred_bait_weight_multiplier = 1.35 diff --git a/fish/species/catfish_channel/catfish_channel.tres b/fish/species/catfish_channel/catfish_channel.tres index ffc1142..679d947 100644 --- a/fish/species/catfish_channel/catfish_channel.tres +++ b/fish/species/catfish_channel/catfish_channel.tres @@ -1,15 +1,13 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" script_class="FishData" format=3 uid="uid://b7kpxcciokl4"] -[ext_resource type="Script" path="res://fish/fish_data.gd" id="1_fish_data"] +[ext_resource type="Script" uid="uid://h7hg45b7wmst" path="res://fish/fish_data.gd" id="1_fish_data"] [ext_resource type="Resource" path="res://fishing/common_catch_profile.tres" id="2_profile"] -[ext_resource type="Script" path="res://fish/fish_availability.gd" id="3_availability_script"] -[ext_resource type="Texture2D" path="res://fish/species/catfish_channel/fish_catfish_channel.png" id="4_texture"] +[ext_resource type="Script" uid="uid://bs7cqi88csolc" path="res://fish/fish_availability.gd" id="3_availability_script"] +[ext_resource type="Texture2D" uid="uid://dvxpk2ltt3blb" path="res://fish/species/catfish_channel/fish_catfish_channel.png" id="4_texture"] [sub_resource type="Resource" id="ChannelCatfishAvailability"] script = ExtResource("3_availability_script") allowed_location_tags = Array[StringName]([&"starter_pond"]) -allow_day = true -allow_night = true preferred_bait_tags = Array[StringName]([&"worm"]) preferred_bait_weight_multiplier = 1.35 @@ -18,7 +16,6 @@ script = ExtResource("1_fish_data") id = &"catfish_channel" display_name = "channel catfish" allowed_water_types = 1 -rarity = 0 base_catch_weight = 2.0 catch_profile = ExtResource("2_profile") availability = SubResource("ChannelCatfishAvailability") @@ -26,8 +23,6 @@ weight_min_lb = 1.5 weight_max_lb = 7.0 display_scale_min = 0.85 display_scale_max = 1.35 -display_scale_curve = 1.0 sell_value_min = 4 sell_value_max = 7 -sell_value_curve = 1.0 display_texture = ExtResource("4_texture") diff --git a/fish/species/catfish_flathead/catfish_flathead.tres b/fish/species/catfish_flathead/catfish_flathead.tres index 1c93599..c927bc3 100644 --- a/fish/species/catfish_flathead/catfish_flathead.tres +++ b/fish/species/catfish_flathead/catfish_flathead.tres @@ -1,15 +1,13 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" script_class="FishData" format=3 uid="uid://c4r5ccnpw5nrq"] -[ext_resource type="Script" path="res://fish/fish_data.gd" id="1_fish_data"] +[ext_resource type="Script" uid="uid://h7hg45b7wmst" path="res://fish/fish_data.gd" id="1_fish_data"] [ext_resource type="Resource" path="res://fishing/bass_catch_profile.tres" id="2_profile"] -[ext_resource type="Script" path="res://fish/fish_availability.gd" id="3_availability_script"] -[ext_resource type="Texture2D" path="res://fish/species/catfish_flathead/fish_catfish_flathead.png" id="4_texture"] +[ext_resource type="Script" uid="uid://bs7cqi88csolc" path="res://fish/fish_availability.gd" id="3_availability_script"] +[ext_resource type="Texture2D" uid="uid://bacx63lp0yh7t" path="res://fish/species/catfish_flathead/fish_catfish_flathead.png" id="4_texture"] [sub_resource type="Resource" id="FlatheadCatfishAvailability"] script = ExtResource("3_availability_script") allowed_location_tags = Array[StringName]([&"starter_pond"]) -allow_day = true -allow_night = true preferred_bait_tags = Array[StringName]([&"worm", &"minnow"]) preferred_bait_weight_multiplier = 1.35 @@ -19,7 +17,6 @@ id = &"catfish_flathead" display_name = "flathead catfish" allowed_water_types = 1 rarity = 1 -base_catch_weight = 1.0 catch_profile = ExtResource("2_profile") availability = SubResource("FlatheadCatfishAvailability") weight_min_lb = 3.0 diff --git a/fish/species/catfish_white/catfish_white.tres b/fish/species/catfish_white/catfish_white.tres index 8059d7d..7655346 100644 --- a/fish/species/catfish_white/catfish_white.tres +++ b/fish/species/catfish_white/catfish_white.tres @@ -1,15 +1,13 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" script_class="FishData" format=3 uid="uid://cr3kar4oioloh"] -[ext_resource type="Script" path="res://fish/fish_data.gd" id="1_fish_data"] +[ext_resource type="Script" uid="uid://h7hg45b7wmst" path="res://fish/fish_data.gd" id="1_fish_data"] [ext_resource type="Resource" path="res://fishing/common_catch_profile.tres" id="2_profile"] -[ext_resource type="Script" path="res://fish/fish_availability.gd" id="3_availability_script"] -[ext_resource type="Texture2D" path="res://fish/species/catfish_white/fish_catfish_white.png" id="4_texture"] +[ext_resource type="Script" uid="uid://bs7cqi88csolc" path="res://fish/fish_availability.gd" id="3_availability_script"] +[ext_resource type="Texture2D" uid="uid://bf6kiawwekv7g" path="res://fish/species/catfish_white/fish_catfish_white.png" id="4_texture"] [sub_resource type="Resource" id="WhiteCatfishAvailability"] script = ExtResource("3_availability_script") allowed_location_tags = Array[StringName]([&"starter_pond"]) -allow_day = true -allow_night = true preferred_bait_tags = Array[StringName]([&"worm"]) preferred_bait_weight_multiplier = 1.35 @@ -18,16 +16,12 @@ script = ExtResource("1_fish_data") id = &"catfish_white" display_name = "white catfish" allowed_water_types = 1 -rarity = 0 base_catch_weight = 2.0 catch_profile = ExtResource("2_profile") availability = SubResource("WhiteCatfishAvailability") weight_min_lb = 1.0 weight_max_lb = 5.0 -display_scale_min = 0.8 display_scale_max = 1.25 -display_scale_curve = 1.0 sell_value_min = 4 sell_value_max = 6 -sell_value_curve = 1.0 display_texture = ExtResource("4_texture") diff --git a/main/main.tscn b/main/main.tscn index bc3afcd..2c8a6a7 100644 --- a/main/main.tscn +++ b/main/main.tscn @@ -1,51 +1,62 @@ -[gd_scene load_steps=47 format=3] +[gd_scene format=3 uid="uid://w6lvqm3bfhei"] [ext_resource type="PackedScene" path="res://world/test_world.tscn" id="1_world"] [ext_resource type="PackedScene" path="res://player/player.tscn" id="2_player"] -[ext_resource type="Script" path="res://main/main.gd" id="3_main"] +[ext_resource type="Script" uid="uid://c7u6jpr3f33t3" path="res://main/main.gd" id="3_main"] [ext_resource type="PackedScene" path="res://fishing/fishing_spot.tscn" id="4_spot"] [ext_resource type="PackedScene" path="res://ui/game_ui.tscn" id="5_ui"] [ext_resource type="Resource" path="res://fish/pools/fish_catalog.tres" id="6_pool"] [ext_resource type="Resource" path="res://economy/buyers/pelicans.tres" id="7_pelicans"] -[ext_resource type="Script" path="res://world/water_recovery_controller.gd" id="8_recovery"] -[ext_resource type="Script" path="res://save/player_save_manager.gd" id="9_save"] -[ext_resource type="Script" path="res://settings/player_settings_manager.gd" id="10_settings"] +[ext_resource type="Script" uid="uid://dvv0ublaoj4gr" path="res://world/water_recovery_controller.gd" id="8_recovery"] +[ext_resource type="Script" uid="uid://dfr5m2x77d8ed" path="res://save/player_save_manager.gd" id="9_save"] +[ext_resource type="Script" uid="uid://dwv3nvfke5xtu" path="res://settings/player_settings_manager.gd" id="10_settings"] [ext_resource type="Resource" path="res://items/catalog/item_catalog.tres" id="11_items"] [ext_resource type="Resource" path="res://economy/buyers/main_fishing_shop.tres" id="12_main_shop"] -[ext_resource type="AudioStream" path="res://audio/music/title/as_in_four_wolves.ogg" id="13_title_music"] -[ext_resource type="Script" path="res://ui/ui_pixelation_presenter.gd" id="14_pixelation"] +[ext_resource type="AudioStream" uid="uid://bgkfluumuen4m" path="res://audio/music/title/as_in_four_wolves.ogg" id="13_title_music"] +[ext_resource type="Script" uid="uid://bdtb05vkiicd" path="res://ui/ui_pixelation_presenter.gd" id="14_pixelation"] [ext_resource type="PackedScene" path="res://ui/pixelation_reset_overlay.tscn" id="15_reset"] [ext_resource type="PackedScene" path="res://main/world_pixelation_postprocess.tscn" id="16_world_pixelation"] -[ext_resource type="Script" path="res://network/network_session.gd" id="17_network_session"] -[ext_resource type="Script" path="res://network/network_profile_preferences.gd" id="18_network_profile"] -[ext_resource type="Script" path="res://network/saved_server_store.gd" id="19_saved_servers"] -[ext_resource type="Script" path="res://network/player_spawn_service.gd" id="20_spawn_service"] -[ext_resource type="Script" path="res://network/network_fishing_service.gd" id="21_network_fishing"] -[ext_resource type="Script" path="res://network/network_sale_service.gd" id="22_network_sale"] -[ext_resource type="Script" path="res://network/network_shop_service.gd" id="23_network_shop"] -[ext_resource type="Script" path="res://network/network_item_use_service.gd" id="24_network_item"] -[ext_resource type="Script" path="res://network/network_chat_service.gd" id="25_network_chat"] -[ext_resource type="Script" path="res://network/network_mail_service.gd" id="26_network_mail"] -[ext_resource type="Script" path="res://progression/player_asset_reservation_service.gd" id="27_reservations"] -[ext_resource type="Script" path="res://progression/player_appearance_store.gd" id="28_appearance"] -[ext_resource type="Script" path="res://network/network_profile_service.gd" id="29_profile_service"] -[ext_resource type="Script" path="res://network/player_identity_store.gd" id="30_player_identity"] -[ext_resource type="Script" path="res://network/host_identity_store.gd" id="31_host_identity"] -[ext_resource type="Script" path="res://network/known_player_store.gd" id="32_known_players"] -[ext_resource type="Script" path="res://network/server_trust_store.gd" id="33_server_trust"] -[ext_resource type="Script" path="res://network/player_relationship_store.gd" id="34_relationships"] -[ext_resource type="Script" path="res://network/host_ban_store.gd" id="35_bans"] -[ext_resource type="Script" path="res://network/network_player_list_service.gd" id="36_player_list"] -[ext_resource type="Script" path="res://network/player_data_root.gd" id="37_data_root"] -[ext_resource type="Script" path="res://network/identity_backup_service.gd" id="38_identity_backup"] -[ext_resource type="Script" path="res://ui/interface_font_controller.gd" id="39_fonts"] -[ext_resource type="Shader" path="res://ui/title_water_background.gdshader" id="40_title_water"] -[ext_resource type="Texture2D" path="res://art/patterns/pattern_tealdot.png" id="41_menu_pattern"] -[ext_resource type="Shader" path="res://ui/player_menu_pattern.gdshader" id="42_menu_pattern"] -[ext_resource type="Texture2D" path="res://art/patterns/pattern_moneyfish.png" id="43_shop_pattern"] +[ext_resource type="Script" uid="uid://u62a32ktf0y5" path="res://network/network_session.gd" id="17_network_session"] +[ext_resource type="Script" uid="uid://db8ua5psoql0w" path="res://network/network_profile_preferences.gd" id="18_network_profile"] +[ext_resource type="Script" uid="uid://b7j0er0u1nwy7" path="res://network/saved_server_store.gd" id="19_saved_servers"] +[ext_resource type="Script" uid="uid://8w70d0nrf4a7" path="res://network/player_spawn_service.gd" id="20_spawn_service"] +[ext_resource type="Script" uid="uid://b4v56htdn1y2l" path="res://network/network_fishing_service.gd" id="21_network_fishing"] +[ext_resource type="Script" uid="uid://sqqy3anotq6n" path="res://network/network_sale_service.gd" id="22_network_sale"] +[ext_resource type="Script" uid="uid://4ci4dbhyfc11" path="res://network/network_shop_service.gd" id="23_network_shop"] +[ext_resource type="Script" uid="uid://dx21uu253nmpw" path="res://network/network_item_use_service.gd" id="24_network_item"] +[ext_resource type="Script" uid="uid://b10jayoog5dc2" path="res://network/network_chat_service.gd" id="25_network_chat"] +[ext_resource type="Script" uid="uid://t235k67v0dno" path="res://network/network_mail_service.gd" id="26_network_mail"] +[ext_resource type="Script" uid="uid://bheplri3k6ch7" path="res://progression/player_asset_reservation_service.gd" id="27_reservations"] +[ext_resource type="Script" uid="uid://ci07gm3e7r8p6" path="res://progression/player_appearance_store.gd" id="28_appearance"] +[ext_resource type="Script" uid="uid://dc80t6nmksvm2" path="res://network/network_profile_service.gd" id="29_profile_service"] +[ext_resource type="Script" uid="uid://cqlgolkbx2riq" path="res://network/player_identity_store.gd" id="30_player_identity"] +[ext_resource type="Script" uid="uid://dtyoh0v77x52f" path="res://network/host_identity_store.gd" id="31_host_identity"] +[ext_resource type="Script" uid="uid://dossvvvh4yuid" path="res://network/known_player_store.gd" id="32_known_players"] +[ext_resource type="Script" uid="uid://cp2kam2btjkb0" path="res://network/server_trust_store.gd" id="33_server_trust"] +[ext_resource type="Script" uid="uid://c3fnebvjotixg" path="res://network/player_relationship_store.gd" id="34_relationships"] +[ext_resource type="Script" uid="uid://dmv6dqua5yl5a" path="res://network/host_ban_store.gd" id="35_bans"] +[ext_resource type="Script" uid="uid://bkidkp7ggtc3q" path="res://network/network_player_list_service.gd" id="36_player_list"] +[ext_resource type="Script" uid="uid://dpiv6wttry0j4" path="res://network/player_data_root.gd" id="37_data_root"] +[ext_resource type="Script" uid="uid://bu5q4a8jfvxkf" path="res://network/identity_backup_service.gd" id="38_identity_backup"] +[ext_resource type="Script" uid="uid://djmxy6jibi5y3" path="res://ui/interface_font_controller.gd" id="39_fonts"] +[ext_resource type="Shader" uid="uid://c8s1g7tn771du" path="res://ui/title_water_background.gdshader" id="40_title_water"] +[ext_resource type="Texture2D" uid="uid://f8a0cs0s7ler" path="res://art/patterns/pattern_tealdot.png" id="41_menu_pattern"] +[ext_resource type="Shader" uid="uid://byw3iub66qvog" path="res://ui/player_menu_pattern.gdshader" id="42_menu_pattern"] +[ext_resource type="Texture2D" uid="uid://b6xws1d2dnbnn" path="res://art/patterns/pattern_moneyfish.png" id="43_shop_pattern"] +[ext_resource type="PackedScene" uid="uid://w7n4gjqq1juc" path="res://art/exported/characters/base/netfishing_base_character.glb" id="44_4pcu1"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_title_water_native"] shader = ExtResource("40_title_water") +shader_parameter/surface_color = Color(0.1, 0.45, 0.62, 1) +shader_parameter/middle_color = Color(0.055, 0.285, 0.4, 1) +shader_parameter/depth_color = Color(0.02, 0.16, 0.27, 1) +shader_parameter/virtual_pixel_density = Vector2(320, 180) +shader_parameter/color_step_count = 14.0 +shader_parameter/continuous_depth_blend = 0.12 +shader_parameter/wave_speed = 0.1 +shader_parameter/wave_scale = 2.4 +shader_parameter/wave_strength = 0.012 +shader_parameter/caustic_strength = 0.018 [sub_resource type="ShaderMaterial" id="ShaderMaterial_player_menu_pattern"] shader = ExtResource("42_menu_pattern") @@ -61,18 +72,18 @@ shader_parameter/source_tile_size = Vector2(64, 64) shader_parameter/display_scale = 1.75 shader_parameter/scroll_velocity_pixels = Vector2(-7, -5) -[node name="Main" type="Node3D"] +[node name="Main" type="Node3D" unique_id=704196381] script = ExtResource("3_main") fish_catalog = ExtResource("6_pool") pelican_buyer_profile = ExtResource("7_pelicans") main_shop_buyer_profile = ExtResource("12_main_shop") item_catalog = ExtResource("11_items") -[node name="TitleBackgroundLayer" type="CanvasLayer" parent="."] +[node name="TitleBackgroundLayer" type="CanvasLayer" parent="." unique_id=1690754702] unique_name_in_owner = true layer = -1 -[node name="TitleBackground" type="ColorRect" parent="TitleBackgroundLayer"] +[node name="TitleBackground" type="ColorRect" parent="TitleBackgroundLayer" unique_id=1768697365] unique_name_in_owner = true material = SubResource("ShaderMaterial_title_water_native") anchors_preset = 15 @@ -82,148 +93,147 @@ grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 -[node name="PlayerMenuBackdrop" type="ColorRect" parent="."] +[node name="PlayerMenuBackdrop" type="ColorRect" parent="." unique_id=2055423661] unique_name_in_owner = true visible = false z_index = 10 -mouse_filter = 2 material = SubResource("ShaderMaterial_player_menu_pattern") -color = Color(1, 1, 1, 1) +mouse_filter = 2 -[node name="ShopBackdrop" type="ColorRect" parent="."] +[node name="ShopBackdrop" type="ColorRect" parent="." unique_id=1404109502] unique_name_in_owner = true visible = false z_index = 10 -mouse_filter = 2 material = SubResource("ShaderMaterial_shop_pattern") -color = Color(1, 1, 1, 1) +mouse_filter = 2 -[node name="InterfaceFontController" type="Node" parent="."] +[node name="InterfaceFontController" type="Node" parent="." unique_id=384169781] unique_name_in_owner = true script = ExtResource("39_fonts") -[node name="PlayerDataRoot" type="Node" parent="."] +[node name="PlayerDataRoot" type="Node" parent="." unique_id=281868360] unique_name_in_owner = true script = ExtResource("37_data_root") -[node name="IdentityBackupService" type="Node" parent="."] +[node name="IdentityBackupService" type="Node" parent="." unique_id=1606277266] unique_name_in_owner = true script = ExtResource("38_identity_backup") -[node name="NetworkSession" type="Node" parent="."] +[node name="NetworkSession" type="Node" parent="." unique_id=88578570] unique_name_in_owner = true script = ExtResource("17_network_session") -[node name="NetworkProfilePreferences" type="Node" parent="."] +[node name="NetworkProfilePreferences" type="Node" parent="." unique_id=2119445545] unique_name_in_owner = true script = ExtResource("18_network_profile") -[node name="PlayerIdentityStore" type="Node" parent="."] +[node name="PlayerIdentityStore" type="Node" parent="." unique_id=737958453] unique_name_in_owner = true script = ExtResource("30_player_identity") -[node name="HostIdentityStore" type="Node" parent="."] +[node name="HostIdentityStore" type="Node" parent="." unique_id=351659562] unique_name_in_owner = true script = ExtResource("31_host_identity") -[node name="KnownPlayerStore" type="Node" parent="."] +[node name="KnownPlayerStore" type="Node" parent="." unique_id=390068772] unique_name_in_owner = true script = ExtResource("32_known_players") -[node name="ServerTrustStore" type="Node" parent="."] +[node name="ServerTrustStore" type="Node" parent="." unique_id=1565692831] unique_name_in_owner = true script = ExtResource("33_server_trust") -[node name="PlayerRelationshipStore" type="Node" parent="."] +[node name="PlayerRelationshipStore" type="Node" parent="." unique_id=612731662] unique_name_in_owner = true script = ExtResource("34_relationships") -[node name="HostBanStore" type="Node" parent="."] +[node name="HostBanStore" type="Node" parent="." unique_id=1672077885] unique_name_in_owner = true script = ExtResource("35_bans") -[node name="PlayerAppearanceStore" type="Node" parent="."] +[node name="PlayerAppearanceStore" type="Node" parent="." unique_id=1740017030] unique_name_in_owner = true script = ExtResource("28_appearance") -[node name="NetworkProfileService" type="Node" parent="."] +[node name="NetworkProfileService" type="Node" parent="." unique_id=1074818740] unique_name_in_owner = true script = ExtResource("29_profile_service") -[node name="SavedServerStore" type="Node" parent="."] +[node name="SavedServerStore" type="Node" parent="." unique_id=660213994] unique_name_in_owner = true script = ExtResource("19_saved_servers") -[node name="PlayerSpawnService" type="Node" parent="."] +[node name="PlayerSpawnService" type="Node" parent="." unique_id=2097451957] unique_name_in_owner = true script = ExtResource("20_spawn_service") -[node name="NetworkFishingService" type="Node" parent="."] +[node name="NetworkFishingService" type="Node" parent="." unique_id=692209374] unique_name_in_owner = true script = ExtResource("21_network_fishing") -[node name="NetworkSaleService" type="Node" parent="."] +[node name="NetworkSaleService" type="Node" parent="." unique_id=1445041024] unique_name_in_owner = true script = ExtResource("22_network_sale") -[node name="NetworkShopService" type="Node" parent="."] +[node name="NetworkShopService" type="Node" parent="." unique_id=1493674695] unique_name_in_owner = true script = ExtResource("23_network_shop") -[node name="NetworkItemUseService" type="Node" parent="."] +[node name="NetworkItemUseService" type="Node" parent="." unique_id=255154670] unique_name_in_owner = true script = ExtResource("24_network_item") -[node name="NetworkChatService" type="Node" parent="."] +[node name="NetworkChatService" type="Node" parent="." unique_id=1956959711] unique_name_in_owner = true script = ExtResource("25_network_chat") -[node name="PlayerAssetReservationService" type="Node" parent="."] +[node name="PlayerAssetReservationService" type="Node" parent="." unique_id=217588893] unique_name_in_owner = true script = ExtResource("27_reservations") -[node name="NetworkMailService" type="Node" parent="."] +[node name="NetworkMailService" type="Node" parent="." unique_id=1415330316] unique_name_in_owner = true script = ExtResource("26_network_mail") -[node name="NetworkPlayerListService" type="Node" parent="."] +[node name="NetworkPlayerListService" type="Node" parent="." unique_id=1638035935] unique_name_in_owner = true script = ExtResource("36_player_list") -[node name="TestWorld" parent="." instance=ExtResource("1_world")] +[node name="TestWorld" parent="." unique_id=1334932296 instance=ExtResource("1_world")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0024132729, 0, -0.00093126297) -[node name="Players" type="Node3D" parent="."] +[node name="Players" type="Node3D" parent="." unique_id=550630144] -[node name="Player" parent="Players" instance=ExtResource("2_player")] +[node name="Player" parent="Players" unique_id=485429332 instance=ExtResource("2_player")] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 16) -[node name="FishingSpot" parent="." instance=ExtResource("4_spot")] +[node name="FishingSpot" parent="." unique_id=1461328864 instance=ExtResource("4_spot")] unique_name_in_owner = true -position = Vector3(0, 1.02, -18) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.02, -18) -[node name="WaterRecovery" type="Node" parent="."] +[node name="WaterRecovery" type="Node" parent="." unique_id=12981798] unique_name_in_owner = true script = ExtResource("8_recovery") -[node name="PlayerSaveManager" type="Node" parent="."] +[node name="PlayerSaveManager" type="Node" parent="." unique_id=223569593] unique_name_in_owner = true script = ExtResource("9_save") -[node name="PlayerSettingsManager" type="Node" parent="."] +[node name="PlayerSettingsManager" type="Node" parent="." unique_id=906991991] unique_name_in_owner = true script = ExtResource("10_settings") -[node name="TitleMusic" type="AudioStreamPlayer" parent="."] +[node name="TitleMusic" type="AudioStreamPlayer" parent="." unique_id=1292939956] unique_name_in_owner = true stream = ExtResource("13_title_music") volume_db = -80.0 bus = &"Music" -[node name="WorldPixelationPostprocess" parent="." instance=ExtResource("16_world_pixelation")] +[node name="WorldPixelationPostprocess" parent="." unique_id=344378000 instance=ExtResource("16_world_pixelation")] unique_name_in_owner = true -[node name="UIPresentation" type="SubViewportContainer" parent="."] +[node name="UIPresentation" type="SubViewportContainer" parent="." unique_id=1104419395] unique_name_in_owner = true z_index = 20 texture_filter = 1 @@ -233,14 +243,17 @@ mouse_filter = 0 stretch = true script = ExtResource("14_pixelation") -[node name="UIViewport" type="SubViewport" parent="UIPresentation"] +[node name="UIViewport" type="SubViewport" parent="UIPresentation" unique_id=461155312] transparent_bg = true handle_input_locally = false size = Vector2i(1152, 648) render_target_update_mode = 4 -[node name="GameUI" parent="UIPresentation/UIViewport" instance=ExtResource("5_ui")] +[node name="GameUI" parent="UIPresentation/UIViewport" unique_id=954136124 instance=ExtResource("5_ui")] unique_name_in_owner = true -[node name="PixelationResetOverlay" parent="." instance=ExtResource("15_reset")] +[node name="PixelationResetOverlay" parent="." unique_id=291636041 instance=ExtResource("15_reset")] unique_name_in_owner = true + +[node name="netfishing_base_character" parent="." unique_id=163901730 instance=ExtResource("44_4pcu1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.795597, 4.184117, 6.3531876) diff --git a/player/player.tscn b/player/player.tscn index c0bbc9f..8cbc081 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3] +[gd_scene load_steps=18 format=3] [ext_resource type="Script" path="res://player/player.gd" id="1_script"] [ext_resource type="Script" path="res://inventory/fish_inventory.gd" id="2_inventory"] @@ -12,24 +12,12 @@ [ext_resource type="Script" path="res://progression/player_cooler_capacity.gd" id="10_capacity"] [ext_resource type="Script" path="res://player/player_ground_shadow.gd" id="11_ground_shadow"] [ext_resource type="Material" path="res://player/materials/player_blob_shadow.tres" id="12_blob_shadow"] +[ext_resource type="PackedScene" path="res://art/exported/characters/base/netfishing_base_character.glb" id="13_character"] [sub_resource type="CapsuleShape3D" id="PlayerShape"] radius = 0.45 height = 1.8 -[sub_resource type="CapsuleMesh" id="PlayerMesh"] -radius = 0.45 -height = 1.8 - -[sub_resource type="StandardMaterial3D" id="PlayerMaterial"] -albedo_color = Color(0.95, 0.48, 0.18, 1) - -[sub_resource type="BoxMesh" id="FacingMarkerMesh"] -size = Vector3(0.24, 0.2, 0.4) - -[sub_resource type="StandardMaterial3D" id="FacingMarkerMaterial"] -albedo_color = Color(0.12, 0.18, 0.28, 1) - [sub_resource type="CylinderMesh" id="FishingRodMesh"] top_radius = 0.025 bottom_radius = 0.045 @@ -74,29 +62,24 @@ rotation_degrees = Vector3(-90, 0, 0) cast_shadow = 0 mesh = SubResource("GroundShadowMesh") -[node name="MeshInstance3D" type="MeshInstance3D" parent="Visuals"] -position = Vector3(0, 0.9, 0) -mesh = SubResource("PlayerMesh") -material_override = SubResource("PlayerMaterial") +[node name="CharacterRig" parent="Visuals" instance=ExtResource("13_character")] -[node name="FacingMarker" type="MeshInstance3D" parent="Visuals"] -position = Vector3(0, 1.0, -0.55) -mesh = SubResource("FacingMarkerMesh") -material_override = SubResource("FacingMarkerMaterial") +[node name="AnimationPlayer" parent="Visuals/CharacterRig"] +autoplay = "idle" [node name="FishingRod" type="Node3D" parent="Visuals"] unique_name_in_owner = true -position = Vector3(0.42, 1.05, -0.2) -rotation = Vector3(-0.436332, 0, 0) +position = Vector3(0.16, 0.38, 0.02) +rotation = Vector3(-0.785398, 0, 0) [node name="RodMesh" type="MeshInstance3D" parent="Visuals/FishingRod"] -position = Vector3(0, 0.6, 0) +position = Vector3(0, 0.42, 0) mesh = SubResource("FishingRodMesh") material_override = SubResource("FishingRodMaterial") [node name="FishingRodTip" type="Marker3D" parent="Visuals/FishingRod"] unique_name_in_owner = true -position = Vector3(0, 1.2, 0) +position = Vector3(0, 0.95, 0) [node name="CastOrigin" type="Marker3D" parent="."] unique_name_in_owner = true diff --git a/ui/game_theme.tres b/ui/game_theme.tres index 13d5de5..7da4650 100644 --- a/ui/game_theme.tres +++ b/ui/game_theme.tres @@ -1,25 +1,13 @@ -[gd_resource type="Theme" load_steps=13 format=3] +[gd_resource type="Theme" format=3 uid="uid://r35pr3k1nd34"] -[ext_resource type="FontFile" path="res://ui/fonts/Tuffy_Bold.otf" id="1_font"] +[ext_resource type="FontFile" uid="uid://xhdms1j01k2q" path="res://ui/fonts/Tuffy_Bold.otf" id="1_font"] -[sub_resource type="StyleBoxFlat" id="Panel"] -bg_color = Color(0.075, 0.145, 0.17, 0.96) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color(0.2, 0.55, 0.59, 0.65) -corner_radius_top_left = 10 -corner_radius_top_right = 10 -corner_radius_bottom_right = 10 -corner_radius_bottom_left = 10 - -[sub_resource type="StyleBoxFlat" id="ButtonNormal"] +[sub_resource type="StyleBoxFlat" id="ButtonDisabled"] content_margin_left = 12.0 content_margin_top = 7.0 content_margin_right = 12.0 content_margin_bottom = 7.0 -bg_color = Color(0.13, 0.27, 0.31, 1) +bg_color = Color(0.12, 0.18, 0.2, 0.8) corner_radius_top_left = 7 corner_radius_top_right = 7 corner_radius_bottom_right = 7 @@ -36,6 +24,17 @@ corner_radius_top_right = 7 corner_radius_bottom_right = 7 corner_radius_bottom_left = 7 +[sub_resource type="StyleBoxFlat" id="ButtonNormal"] +content_margin_left = 12.0 +content_margin_top = 7.0 +content_margin_right = 12.0 +content_margin_bottom = 7.0 +bg_color = Color(0.13, 0.27, 0.31, 1) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 + [sub_resource type="StyleBoxFlat" id="ButtonPressed"] content_margin_left = 12.0 content_margin_top = 7.0 @@ -47,55 +46,6 @@ corner_radius_top_right = 7 corner_radius_bottom_right = 7 corner_radius_bottom_left = 7 -[sub_resource type="StyleBoxFlat" id="ButtonDisabled"] -content_margin_left = 12.0 -content_margin_top = 7.0 -content_margin_right = 12.0 -content_margin_bottom = 7.0 -bg_color = Color(0.12, 0.18, 0.2, 0.8) -corner_radius_top_left = 7 -corner_radius_top_right = 7 -corner_radius_bottom_right = 7 -corner_radius_bottom_left = 7 - -[sub_resource type="StyleBoxFlat" id="DangerNormal"] -content_margin_left = 12.0 -content_margin_top = 7.0 -content_margin_right = 12.0 -content_margin_bottom = 7.0 -bg_color = Color(0.55, 0.17, 0.19, 1) -corner_radius_top_left = 7 -corner_radius_top_right = 7 -corner_radius_bottom_right = 7 -corner_radius_bottom_left = 7 - -[sub_resource type="StyleBoxFlat" id="DangerHover"] -content_margin_left = 12.0 -content_margin_top = 7.0 -content_margin_right = 12.0 -content_margin_bottom = 7.0 -bg_color = Color(0.82, 0.26, 0.29, 1) -corner_radius_top_left = 7 -corner_radius_top_right = 7 -corner_radius_bottom_right = 7 -corner_radius_bottom_left = 7 - -[sub_resource type="StyleBoxFlat" id="CardNormal"] -content_margin_left = 7.0 -content_margin_top = 7.0 -content_margin_right = 7.0 -content_margin_bottom = 7.0 -bg_color = Color(0.105, 0.205, 0.235, 1) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color(0.2, 0.36, 0.4, 1) -corner_radius_top_left = 8 -corner_radius_top_right = 8 -corner_radius_bottom_right = 8 -corner_radius_bottom_left = 8 - [sub_resource type="StyleBoxFlat" id="CardHover"] content_margin_left = 7.0 content_margin_top = 7.0 @@ -112,6 +62,22 @@ corner_radius_top_right = 8 corner_radius_bottom_right = 8 corner_radius_bottom_left = 8 +[sub_resource type="StyleBoxFlat" id="CardNormal"] +content_margin_left = 7.0 +content_margin_top = 7.0 +content_margin_right = 7.0 +content_margin_bottom = 7.0 +bg_color = Color(0.105, 0.205, 0.235, 1) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(0.2, 0.36, 0.4, 1) +corner_radius_top_left = 8 +corner_radius_top_right = 8 +corner_radius_bottom_right = 8 +corner_radius_bottom_left = 8 + [sub_resource type="StyleBoxFlat" id="CardPressed"] content_margin_left = 7.0 content_margin_top = 7.0 @@ -128,6 +94,28 @@ corner_radius_top_right = 8 corner_radius_bottom_right = 8 corner_radius_bottom_left = 8 +[sub_resource type="StyleBoxFlat" id="DangerHover"] +content_margin_left = 12.0 +content_margin_top = 7.0 +content_margin_right = 12.0 +content_margin_bottom = 7.0 +bg_color = Color(0.82, 0.26, 0.29, 1) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 + +[sub_resource type="StyleBoxFlat" id="DangerNormal"] +content_margin_left = 12.0 +content_margin_top = 7.0 +content_margin_right = 12.0 +content_margin_bottom = 7.0 +bg_color = Color(0.55, 0.17, 0.19, 1) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 + [sub_resource type="StyleBoxFlat" id="LineEdit"] content_margin_left = 8.0 content_margin_top = 5.0 @@ -144,34 +132,46 @@ corner_radius_top_right = 6 corner_radius_bottom_right = 6 corner_radius_bottom_left = 6 +[sub_resource type="StyleBoxFlat" id="Panel"] +bg_color = Color(0.075, 0.145, 0.17, 0.96) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color(0.2, 0.55, 0.59, 0.65) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + [resource] default_font = ExtResource("1_font") default_font_size = 23 -Label/colors/font_color = Color(0.956, 0.972, 0.976, 1) -Label/colors/font_shadow_color = Color(0, 0, 0, 0) -PanelContainer/styles/panel = SubResource("Panel") Button/colors/font_color = Color(0.956, 0.972, 0.976, 1) +Button/colors/font_disabled_color = Color(0.48, 0.55, 0.58, 1) Button/colors/font_hover_color = Color(1, 1, 1, 1) Button/colors/font_pressed_color = Color(0.04, 0.12, 0.14, 1) -Button/colors/font_disabled_color = Color(0.48, 0.55, 0.58, 1) -Button/styles/normal = SubResource("ButtonNormal") -Button/styles/hover = SubResource("ButtonHover") -Button/styles/pressed = SubResource("ButtonPressed") -Button/styles/focus = SubResource("ButtonHover") Button/styles/disabled = SubResource("ButtonDisabled") -OptionButton/styles/normal = SubResource("ButtonNormal") -OptionButton/styles/hover = SubResource("ButtonHover") -OptionButton/styles/pressed = SubResource("ButtonPressed") -OptionButton/styles/focus = SubResource("ButtonHover") -DangerButton/base_type = &"Button" -DangerButton/styles/normal = SubResource("DangerNormal") -DangerButton/styles/hover = SubResource("DangerHover") -DangerButton/styles/pressed = SubResource("DangerHover") -DangerButton/styles/focus = SubResource("DangerHover") +Button/styles/focus = SubResource("ButtonHover") +Button/styles/hover = SubResource("ButtonHover") +Button/styles/normal = SubResource("ButtonNormal") +Button/styles/pressed = SubResource("ButtonPressed") CardButton/base_type = &"Button" -CardButton/styles/normal = SubResource("CardNormal") -CardButton/styles/hover = SubResource("CardHover") -CardButton/styles/pressed = SubResource("CardPressed") -CardButton/styles/focus = SubResource("CardHover") CardButton/colors/font_pressed_color = Color(0.956, 0.972, 0.976, 1) +CardButton/styles/focus = SubResource("CardHover") +CardButton/styles/hover = SubResource("CardHover") +CardButton/styles/normal = SubResource("CardNormal") +CardButton/styles/pressed = SubResource("CardPressed") +DangerButton/base_type = &"Button" +DangerButton/styles/focus = SubResource("DangerHover") +DangerButton/styles/hover = SubResource("DangerHover") +DangerButton/styles/normal = SubResource("DangerNormal") +DangerButton/styles/pressed = SubResource("DangerHover") +Label/colors/font_color = Color(0.956, 0.972, 0.976, 1) +Label/colors/font_shadow_color = Color(0, 0, 0, 0) LineEdit/styles/normal = SubResource("LineEdit") +OptionButton/styles/focus = SubResource("ButtonHover") +OptionButton/styles/hover = SubResource("ButtonHover") +OptionButton/styles/normal = SubResource("ButtonNormal") +OptionButton/styles/pressed = SubResource("ButtonPressed") +PanelContainer/styles/panel = SubResource("Panel") diff --git a/world/environment/netfishing_sky.tres b/world/environment/netfishing_sky.tres index cb7d61b..1b43a5e 100644 --- a/world/environment/netfishing_sky.tres +++ b/world/environment/netfishing_sky.tres @@ -1,15 +1,13 @@ -[gd_resource type="Sky" load_steps=2 format=3] +[gd_resource type="Sky" format=3 uid="uid://dersyay71dyat"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_netfishing"] sky_top_color = Color(0.203922, 0.498039, 0.643137, 1) sky_horizon_color = Color(0.662745, 0.843137, 0.847059, 1) -sky_curve = 0.15 ground_bottom_color = Color(0.156863, 0.360784, 0.439216, 1) ground_horizon_color = Color(0.54902, 0.74902, 0.764706, 1) ground_curve = 0.08 sun_angle_max = 18.0 sun_curve = 0.22 -use_debanding = true [resource] sky_material = SubResource("ProceduralSkyMaterial_netfishing")