diff --git a/fish/fish_data.gd b/fish/fish_data.gd index 0207e7b..aa73d2a 100644 --- a/fish/fish_data.gd +++ b/fish/fish_data.gd @@ -98,4 +98,4 @@ func get_sale_value_for_weight(weight_lb: float) -> int: func get_rarity_name() -> String: - return Rarity.keys()[rarity].capitalize() + return Rarity.keys()[rarity].to_lower() diff --git a/fish/pools/test_water_pool.tres b/fish/pools/test_water_pool.tres index 96d61a5..a2634ca 100644 --- a/fish/pools/test_water_pool.tres +++ b/fish/pools/test_water_pool.tres @@ -1,10 +1,11 @@ -[gd_resource type="Resource" load_steps=5 format=3] +[gd_resource type="Resource" load_steps=6 format=3] [ext_resource type="Script" path="res://fish/fish_pool.gd" id="1_pool"] [ext_resource type="Resource" path="res://fish/species/bluegill/bluegill.tres" id="2_bluegill"] [ext_resource type="Resource" path="res://fish/species/bass/bass.tres" id="3_bass"] [ext_resource type="Resource" path="res://fish/species/carp/carp.tres" id="4_carp"] +[ext_resource type="Resource" path="res://fish/species/sunfish/sunfish.tres" id="5_sunfish"] [resource] script = ExtResource("1_pool") -candidates = [ExtResource("2_bluegill"), ExtResource("3_bass"), ExtResource("4_carp")] +candidates = [ExtResource("2_bluegill"), ExtResource("3_bass"), ExtResource("4_carp"), ExtResource("5_sunfish")] diff --git a/fish/species/bass/bass.tres b/fish/species/bass/bass.tres index d9ffd1c..bf7d261 100644 --- a/fish/species/bass/bass.tres +++ b/fish/species/bass/bass.tres @@ -3,7 +3,7 @@ [ext_resource type="Script" 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/bass.svg" id="4_texture"] +[ext_resource type="Texture2D" path="res://fish/species/bass/fish_bass_striped.png" id="4_texture"] [sub_resource type="Resource" id="BassAvailability"] script = ExtResource("3_availability_script") @@ -15,7 +15,7 @@ preferred_bait_weight_multiplier = 1.4 [resource] script = ExtResource("1_fish_data") id = &"bass" -display_name = "Bass" +display_name = "striped bass" rarity = 1 base_catch_weight = 4.0 catch_profile = ExtResource("2_profile") diff --git a/fish/species/bass/fish_bass_striped.png b/fish/species/bass/fish_bass_striped.png new file mode 100644 index 0000000..89b5b5e Binary files /dev/null and b/fish/species/bass/fish_bass_striped.png differ diff --git a/fish/species/bass/fish_bass_striped.png.import b/fish/species/bass/fish_bass_striped.png.import new file mode 100644 index 0000000..4acdf63 --- /dev/null +++ b/fish/species/bass/fish_bass_striped.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dvh6s86asl4ix" +path="res://.godot/imported/fish_bass_striped.png-b8c0def688ff4dd2d32a6dd21fa2339c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://fish/species/bass/fish_bass_striped.png" +dest_files=["res://.godot/imported/fish_bass_striped.png-b8c0def688ff4dd2d32a6dd21fa2339c.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/fish/species/bluegill/bluegill.tres b/fish/species/bluegill/bluegill.tres index f3eb81d..e766b5f 100644 --- a/fish/species/bluegill/bluegill.tres +++ b/fish/species/bluegill/bluegill.tres @@ -3,12 +3,12 @@ [ext_resource type="Script" 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="Resource" path="res://fish/default_availability.tres" id="3_availability"] -[ext_resource type="Texture2D" path="res://fish/species/bluegill/bluegill.svg" id="4_texture"] +[ext_resource type="Texture2D" path="res://fish/species/bluegill/fish_bluegill.png" id="4_texture"] [resource] script = ExtResource("1_fish_data") id = &"bluegill" -display_name = "Bluegill" +display_name = "bluegill" rarity = 0 base_catch_weight = 10.0 catch_profile = ExtResource("2_profile") diff --git a/fish/species/bluegill/fish_bluegill.png b/fish/species/bluegill/fish_bluegill.png new file mode 100644 index 0000000..8569e3c Binary files /dev/null and b/fish/species/bluegill/fish_bluegill.png differ diff --git a/fish/species/bluegill/fish_bluegill.png.import b/fish/species/bluegill/fish_bluegill.png.import new file mode 100644 index 0000000..2e6cf9c --- /dev/null +++ b/fish/species/bluegill/fish_bluegill.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bwsl8862rf2vs" +path="res://.godot/imported/fish_bluegill.png-2307d25b88382e057d2259e28f2f89aa.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://fish/species/bluegill/fish_bluegill.png" +dest_files=["res://.godot/imported/fish_bluegill.png-2307d25b88382e057d2259e28f2f89aa.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/fish/species/carp/carp.tres b/fish/species/carp/carp.tres index 571cf69..bb4642d 100644 --- a/fish/species/carp/carp.tres +++ b/fish/species/carp/carp.tres @@ -3,7 +3,7 @@ [ext_resource type="Script" 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/carp.svg" id="4_texture"] +[ext_resource type="Texture2D" path="res://fish/species/carp/fish_carp_common.png" id="4_texture"] [sub_resource type="Resource" id="CarpAvailability"] script = ExtResource("3_availability_script") @@ -15,7 +15,7 @@ preferred_bait_weight_multiplier = 1.5 [resource] script = ExtResource("1_fish_data") id = &"carp" -display_name = "Carp" +display_name = "common carp" rarity = 2 base_catch_weight = 1.5 catch_profile = ExtResource("2_profile") diff --git a/fish/species/carp/fish_carp_common.png b/fish/species/carp/fish_carp_common.png new file mode 100644 index 0000000..50d0b31 Binary files /dev/null and b/fish/species/carp/fish_carp_common.png differ diff --git a/fish/species/carp/fish_carp_common.png.import b/fish/species/carp/fish_carp_common.png.import new file mode 100644 index 0000000..855c974 --- /dev/null +++ b/fish/species/carp/fish_carp_common.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c6pa1gqwv1a5s" +path="res://.godot/imported/fish_carp_common.png-4111bce53aeff44874d8e561aa1600a2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://fish/species/carp/fish_carp_common.png" +dest_files=["res://.godot/imported/fish_carp_common.png-4111bce53aeff44874d8e561aa1600a2.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/fish/species/sunfish/fish_sunfish.png b/fish/species/sunfish/fish_sunfish.png new file mode 100644 index 0000000..138699e Binary files /dev/null and b/fish/species/sunfish/fish_sunfish.png differ diff --git a/fish/species/sunfish/fish_sunfish.png.import b/fish/species/sunfish/fish_sunfish.png.import new file mode 100644 index 0000000..d64d9fe --- /dev/null +++ b/fish/species/sunfish/fish_sunfish.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x0exmgq6g7yy" +path="res://.godot/imported/fish_sunfish.png-a59a80b2543272e8c6e8ab17d8d3670e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://fish/species/sunfish/fish_sunfish.png" +dest_files=["res://.godot/imported/fish_sunfish.png-a59a80b2543272e8c6e8ab17d8d3670e.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/fish/species/sunfish/sunfish.tres b/fish/species/sunfish/sunfish.tres new file mode 100644 index 0000000..2346b71 --- /dev/null +++ b/fish/species/sunfish/sunfish.tres @@ -0,0 +1,24 @@ +[gd_resource type="Resource" load_steps=5 format=3] + +[ext_resource type="Script" 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="Resource" path="res://fish/default_availability.tres" id="3_availability"] +[ext_resource type="Texture2D" path="res://fish/species/sunfish/fish_sunfish.png" id="4_texture"] + +[resource] +script = ExtResource("1_fish_data") +id = &"sunfish" +display_name = "sunfish" +rarity = 0 +base_catch_weight = 7.0 +catch_profile = ExtResource("2_profile") +availability = ExtResource("3_availability") +weight_min_lb = 0.4 +weight_max_lb = 2.5 +display_scale_min = 0.7 +display_scale_max = 1.1 +display_scale_curve = 1.0 +sell_value_min = 3 +sell_value_max = 3 +sell_value_curve = 1.0 +display_texture = ExtResource("4_texture") diff --git a/player/player.gd b/player/player.gd index b06e5c5..705cb1c 100644 --- a/player/player.gd +++ b/player/player.gd @@ -56,6 +56,7 @@ class ShowcaseCameraSnapshot: @export_range(-80.0, 80.0, 1.0) var showcase_camera_pitch: float = -8.0 @export_range(1.0, 10.0, 0.1) var showcase_camera_zoom_distance: float = 3.6 @export_range(0.5, 3.0, 0.05) var showcase_camera_target_height: float = 1.45 +@export_range(0.01, 1.0, 0.01) var catch_presentation_base_scale: float = 0.10 @export_category("Camera") @export var mouse_sensitivity: float = 0.005 @@ -369,7 +370,11 @@ func begin_catch_showcase(fish_catch: FishCatchType) -> void: _showcase_rod_state_stored = true _fishing_rod.visible = false _catch_sprite.texture = fish_catch.fish.display_texture - _catch_display.scale = Vector3.ONE * fish_catch.display_scale + _catch_display.scale = ( + Vector3.ONE + * fish_catch.display_scale + * catch_presentation_base_scale + ) _catch_display.visible = _catch_sprite.texture != null