diff --git a/art/farm/farming/farmobjekte/hoe.png b/art/farm/farming/farmobjekte/hoe.png new file mode 100644 index 0000000..1168f92 Binary files /dev/null and b/art/farm/farming/farmobjekte/hoe.png differ diff --git a/art/farm/farming/farmobjekte/hoe.png.import b/art/farm/farming/farmobjekte/hoe.png.import new file mode 100644 index 0000000..7cd84a3 --- /dev/null +++ b/art/farm/farming/farmobjekte/hoe.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3pj2q7wtuion" +path.s3tc="res://.godot/imported/hoe.png-853a296e5efa279f2a8690499448ca67.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://art/farm/farming/farmobjekte/hoe.png" +dest_files=["res://.godot/imported/hoe.png-853a296e5efa279f2a8690499448ca67.s3tc.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/prefabs/Player3D.tscn b/prefabs/Player3D.tscn index b6b1f54..7a757c4 100644 --- a/prefabs/Player3D.tscn +++ b/prefabs/Player3D.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" uid="uid://bblprbhnbyv77" path="res://scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs" id="1_pkl5l"] [ext_resource type="Texture2D" uid="uid://duaideiajsu8r" path="res://art/characters/Vesna/babushka concept art vesna.png" id="2_3trg2"] [ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farm/base_field.tscn" id="2_oq5hi"] -[ext_resource type="Texture2D" uid="uid://c4ggew55w0icj" path="res://art/farm/farming/farmobjekte/harke.png" id="4_kngqo"] +[ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="4_pkl5l"] [ext_resource type="Script" uid="uid://b1sscdr4ptec8" path="res://scripts/CSharp/Common/Farming/FarmingControls.cs" id="4_q5t2e"] [ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="5_pkl5l"] [ext_resource type="Texture2D" uid="uid://dygkh117flcou" path="res://art/animation/vesna/Front/F01-Idle/0001.png" id="7_okmao"] @@ -1253,10 +1253,12 @@ fov = 70.0 [node name="Hoe" type="Sprite3D" parent="CharacterBody3D/Farming"] visible = false -pixel_size = 0.002 +pixel_size = 0.0015 billboard = 1 render_priority = 51 -texture = ExtResource("4_kngqo") +texture = ExtResource("4_pkl5l") +region_enabled = true +region_rect = Rect2(1048, 225, 250, 1164) [node name="Watering can" type="Sprite3D" parent="CharacterBody3D/Farming"] visible = false diff --git a/prefabs/interactions/sprite_switcher.tscn b/prefabs/interactions/sprite_switcher.tscn index 196aab6..9d1bd4c 100644 --- a/prefabs/interactions/sprite_switcher.tscn +++ b/prefabs/interactions/sprite_switcher.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://cf0jpuio8tgim"] [ext_resource type="Script" uid="uid://v34pl0nlp4x" path="res://scripts/CSharp/Common/SpriteSwitcher.cs" id="1_scmhv"] -[ext_resource type="Texture2D" uid="uid://c4ggew55w0icj" path="res://art/farm/farming/farmobjekte/harke.png" id="2_jv400"] +[ext_resource type="Texture2D" uid="uid://3pj2q7wtuion" path="res://art/farm/farming/farmobjekte/hoe.png" id="2_scmhv"] [sub_resource type="SphereMesh" id="SphereMesh_0ptl4"] @@ -20,8 +20,9 @@ _falseSprite = NodePath("Off Sprite") modulate = Color(0, 0.996078, 0, 1) pixel_size = 0.001 billboard = 1 -texture = ExtResource("2_jv400") -region_rect = Rect2(484, 143, 365, 1317) +texture = ExtResource("2_scmhv") +region_enabled = true +region_rect = Rect2(1048, 225, 250, 1164) [node name="Off Sprite" type="Sprite3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, -8.47033e-22, 0, 8.47033e-22, 1, 0.106585, 0, 0.0173626) @@ -29,8 +30,9 @@ visible = false modulate = Color(1, 0, 0, 1) pixel_size = 0.001 billboard = 1 -texture = ExtResource("2_jv400") -region_rect = Rect2(421, 0, 539, 965) +texture = ExtResource("2_scmhv") +region_enabled = true +region_rect = Rect2(1048, 225, 250, 1164) [node name="CSGMesh3D" type="CSGMesh3D" parent="."] transparency = 0.5 diff --git a/scenes/Babushka_scene_farm_vesna.tscn b/scenes/Babushka_scene_farm_vesna.tscn index dbf708c..9781201 100644 --- a/scenes/Babushka_scene_farm_vesna.tscn +++ b/scenes/Babushka_scene_farm_vesna.tscn @@ -65,12 +65,10 @@ shape = SubResource("SphereShape3D_0ptl4") [node name="On Sprite" parent="Watering Can Pickup/SpriteSwitcher Hoe" index="0"] texture = ExtResource("5_r4sre") -region_enabled = true region_rect = Rect2(-3, 1141, 423, 280) [node name="Off Sprite" parent="Watering Can Pickup/SpriteSwitcher Hoe" index="1"] texture = ExtResource("5_r4sre") -region_enabled = true region_rect = Rect2(-3, 1137, 424, 285) [node name="Inventory" parent="." instance=ExtResource("5_obfp0")]