Compare commits

...

3 Commits

35 changed files with 1629 additions and 18 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 MiB

+34
View File
@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ejq7h5pgxl84"
path="res://.godot/imported/küchenraum.png-bb22e43621d167e1c76157f0a17f669c.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://art/indoor/küchenraum.png"
dest_files=["res://.godot/imported/küchenraum.png-bb22e43621d167e1c76157f0a17f669c.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
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/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
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c02unlmw2y6vv"
path="res://.godot/imported/misfortune_perspective_test.png-474d43838a9ea0101d6cdff123a0516b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://art/indoor/misfortune_perspective_test.png"
dest_files=["res://.godot/imported/misfortune_perspective_test.png-474d43838a9ea0101d6cdff123a0516b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
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/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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 564 KiB

After

Width:  |  Height:  |  Size: 417 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

+35
View File
@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b3uty8l1jdrjk"
path.s3tc="res://.godot/imported/sky_24_2k.png-6eebd1ef02e0e52a98645f3d1879ab9e.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://art/skyboxes/sky_24_2k.png"
dest_files=["res://.godot/imported/sky_24_2k.png-6eebd1ef02e0e52a98645f3d1879ab9e.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
Binary file not shown.

After

Width:  |  Height:  |  Size: 627 KiB

+35
View File
@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d1gij124516fl"
path.s3tc="res://.godot/imported/sky_29_2k.png-a941c0e080f4b37a36968dc654dd2c14.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://art/skyboxes/sky_29_2k.png"
dest_files=["res://.godot/imported/sky_29_2k.png-a941c0e080f4b37a36968dc654dd2c14.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
Binary file not shown.

After

Width:  |  Height:  |  Size: 993 KiB

+35
View File
@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d2osodaofb2ya"
path.s3tc="res://.godot/imported/sky_34_2k.png-9f6287d0381f17cc068eeb4166c83bd3.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://art/skyboxes/sky_34_2k.png"
dest_files=["res://.godot/imported/sky_34_2k.png-9f6287d0381f17cc068eeb4166c83bd3.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
Binary file not shown.

After

Width:  |  Height:  |  Size: 571 KiB

+35
View File
@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://df87h8he6c12t"
path.s3tc="res://.godot/imported/sky_37_2k.png-8ba5cf7cc018e8a0a90a73aefe633c16.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://art/skyboxes/sky_37_2k.png"
dest_files=["res://.godot/imported/sky_37_2k.png-8ba5cf7cc018e8a0a90a73aefe633c16.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
Binary file not shown.

After

Width:  |  Height:  |  Size: 728 KiB

+35
View File
@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d11xu6vq7jwdq"
path.s3tc="res://.godot/imported/sky_41_2k.png-ed5d885654e2b3558ec6ad4d08125f90.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://art/skyboxes/sky_41_2k.png"
dest_files=["res://.godot/imported/sky_41_2k.png-ed5d885654e2b3558ec6ad4d08125f90.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

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

@@ -3,15 +3,15 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c2dbd0q02x2h" uid="uid://c2dbd0q02x2h"
path="res://.godot/imported/babushka_ui_inventory_slot.png-cd1973aa1d3922af7e3271aeaf56cc88.ctex" path="res://.godot/imported/babushka_ui_inventory_slot.png-9d7d3ee5563e98c6963e4d5a2e761fcc.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://graphics/ui/babushka_ui_inventory_slot.png" source_file="res://art/ui/babushka_ui_inventory_slot.png"
dest_files=["res://.godot/imported/babushka_ui_inventory_slot.png-cd1973aa1d3922af7e3271aeaf56cc88.ctex"] dest_files=["res://.godot/imported/babushka_ui_inventory_slot.png-9d7d3ee5563e98c6963e4d5a2e761fcc.ctex"]
[params] [params]

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

@@ -3,15 +3,15 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c7wqla0mbu3np" uid="uid://c7wqla0mbu3np"
path="res://.godot/imported/babushka_ui_tmp_inventory_select.png-b544ba0ded36dd6bd66bd197fb76d424.ctex" path="res://.godot/imported/babushka_ui_tmp_inventory_select.png-4555eb73439162532df58b7148bf3ef2.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://graphics/ui/babushka_ui_tmp_inventory_select.png" source_file="res://art/ui/babushka_ui_tmp_inventory_select.png"
dest_files=["res://.godot/imported/babushka_ui_tmp_inventory_select.png-b544ba0ded36dd6bd66bd197fb76d424.ctex"] dest_files=["res://.godot/imported/babushka_ui_tmp_inventory_select.png-4555eb73439162532df58b7148bf3ef2.ctex"]
[params] [params]
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -3,7 +3,7 @@
[ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"] [ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
[ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"] [ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"]
[ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="4_5fdxq"] [ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="4_5fdxq"]
[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://graphics/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"] [ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
[node name="Inventory" type="Control"] [node name="Inventory" type="Control"]
layout_mode = 3 layout_mode = 3
+1 -1
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://c0kmdjeqkqrwv"] [gd_scene load_steps=4 format=3 uid="uid://c0kmdjeqkqrwv"]
[ext_resource type="Script" uid="uid://bh6wcyxh1f0cv" path="res://scripts/CSharp/Common/Inventory/SlotUi.cs" id="1_au0l0"] [ext_resource type="Script" uid="uid://bh6wcyxh1f0cv" path="res://scripts/CSharp/Common/Inventory/SlotUi.cs" id="1_au0l0"]
[ext_resource type="Texture2D" uid="uid://c2dbd0q02x2h" path="res://graphics/ui/babushka_ui_inventory_slot.png" id="2_7emux"] [ext_resource type="Texture2D" uid="uid://c2dbd0q02x2h" path="res://art/ui/babushka_ui_inventory_slot.png" id="2_7emux"]
[sub_resource type="LabelSettings" id="LabelSettings_7emux"] [sub_resource type="LabelSettings" id="LabelSettings_7emux"]
font_size = 15 font_size = 15
+4
View File
@@ -0,0 +1,4 @@
Credits:
Skyboxes:
https://freestylized.com/all-skybox/
+53 -1
View File
@@ -1,7 +1,8 @@
[gd_scene load_steps=16 format=3 uid="uid://br7yq757cawts"] [gd_scene load_steps=24 format=3 uid="uid://br7yq757cawts"]
[ext_resource type="Material" uid="uid://p1mf3uc4k164" path="res://art/materials/Tilleable_ground.tres" id="1_6i8r8"] [ext_resource type="Material" uid="uid://p1mf3uc4k164" path="res://art/materials/Tilleable_ground.tres" id="1_6i8r8"]
[ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="1_b1ibi"] [ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="1_b1ibi"]
[ext_resource type="Texture2D" uid="uid://d2osodaofb2ya" path="res://art/skyboxes/sky_34_2k.png" id="1_ww4l5"]
[ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farm/base_field.tscn" id="2_72r8y"] [ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farm/base_field.tscn" id="2_72r8y"]
[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="4_r4sre"] [ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="4_r4sre"]
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="5_obfp0"] [ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="5_obfp0"]
@@ -12,6 +13,45 @@
[ext_resource type="PackedScene" uid="uid://bqhnejufg5ei2" path="res://prefabs/farm/fence_part_01.tscn" id="10_84r6a"] [ext_resource type="PackedScene" uid="uid://bqhnejufg5ei2" path="res://prefabs/farm/fence_part_01.tscn" id="10_84r6a"]
[ext_resource type="PackedScene" uid="uid://cxceu5dgq3akw" path="res://prefabs/farm/fence_part_02.tscn" id="11_nmncb"] [ext_resource type="PackedScene" uid="uid://cxceu5dgq3akw" path="res://prefabs/farm/fence_part_02.tscn" id="11_nmncb"]
[ext_resource type="PackedScene" uid="uid://cm5oekefe6ct3" path="res://prefabs/farm/fence_part_03.tscn" id="12_ww4l5"] [ext_resource type="PackedScene" uid="uid://cm5oekefe6ct3" path="res://prefabs/farm/fence_part_03.tscn" id="12_ww4l5"]
[ext_resource type="Texture2D" uid="uid://c7f3t65jskd6v" path="res://art/mockups/house_prototype.png" id="13_nmncb"]
[sub_resource type="Shader" id="Shader_m0ieq"]
code = "
// NOTE: Shader automatically converted from Godot Engine 4.4.stable.mono's PanoramaSkyMaterial.
shader_type sky;
uniform sampler2D source_panorama : filter_linear, source_color, hint_default_black;
uniform float exposure : hint_range(0, 128) = 1.0;
uniform float speed = 0.002;
void sky() {
vec2 dir = vec2(SKY_COORDS.x + TIME * speed, SKY_COORDS.y);
COLOR = texture(source_panorama, dir).rgb * exposure;
}
"
[sub_resource type="ShaderMaterial" id="ShaderMaterial_prdor"]
shader = SubResource("Shader_m0ieq")
shader_parameter/source_panorama = ExtResource("1_ww4l5")
shader_parameter/exposure = 1.0
shader_parameter/speed = 0.002
[sub_resource type="Sky" id="Sky_ww4l5"]
sky_material = SubResource("ShaderMaterial_prdor")
[sub_resource type="Environment" id="Environment_m0ieq"]
background_mode = 2
sky = SubResource("Sky_ww4l5")
tonemap_mode = 2
glow_enabled = true
[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_prdor"]
dof_blur_far_distance = 563.99
dof_blur_far_transition = 6118.24
dof_blur_amount = 0.04
[sub_resource type="Compositor" id="Compositor_nmncb"]
[sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"] [sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"]
@@ -24,6 +64,11 @@ radius = 1.0
[node name="SceneFarmVesna" type="Node3D"] [node name="SceneFarmVesna" type="Node3D"]
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_m0ieq")
camera_attributes = SubResource("CameraAttributesPractical_prdor")
compositor = SubResource("Compositor_nmncb")
[node name="Floor" type="MeshInstance3D" parent="."] [node name="Floor" type="MeshInstance3D" parent="."]
transform = Transform3D(50, 0, 0, 0, 50, 0, 0, 0, 50, 0, 0, 0) transform = Transform3D(50, 0, 0, 0, 50, 0, 0, 0, 50, 0, 0, 0)
mesh = SubResource("PlaneMesh_8yprl") mesh = SubResource("PlaneMesh_8yprl")
@@ -42,6 +87,7 @@ _fieldParent = NodePath("../FieldService")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.618408, 0.785857, 0, -0.785857, 0.618408, -0.802612, 0, 4.73262) transform = Transform3D(1, 0, 0, 0, 0.618408, 0.785857, 0, -0.785857, 0.618408, -0.802612, 0, 4.73262)
light_color = Color(0.838036, 0.913171, 1, 1)
[node name="BaseField" parent="." instance=ExtResource("2_72r8y")] [node name="BaseField" parent="." instance=ExtResource("2_72r8y")]
transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.0574723, 0) transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.0574723, 0)
@@ -177,6 +223,12 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -45, 0
[node name="fence_part_03" parent="Fence/fencegroup5" instance=ExtResource("12_ww4l5")] [node name="fence_part_03" parent="Fence/fencegroup5" instance=ExtResource("12_ww4l5")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -45, 0, -3.5) transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -45, 0, -3.5)
[node name="House" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.28486, 1.15105, 6.0303)
pixel_size = 0.005
billboard = 1
texture = ExtResource("13_nmncb")
[connection signal="Interacted" from="HoePickup" to="HoePickup/SpriteSwitcher Hoe" method="SwitchState"] [connection signal="Interacted" from="HoePickup" to="HoePickup/SpriteSwitcher Hoe" method="SwitchState"]
[connection signal="Switch" from="HoePickup/SpriteSwitcher Hoe" to="Player3d" method="ActivateHoe"] [connection signal="Switch" from="HoePickup/SpriteSwitcher Hoe" to="Player3d" method="ActivateHoe"]
[connection signal="Interacted" from="Watering Can Pickup" to="Watering Can Pickup/SpriteSwitcher Hoe" method="SwitchState"] [connection signal="Interacted" from="Watering Can Pickup" to="Watering Can Pickup/SpriteSwitcher Hoe" method="SwitchState"]
+37
View File
@@ -0,0 +1,37 @@
[gd_scene load_steps=3 format=3 uid="uid://chvc0e4441o2k"]
[ext_resource type="Texture2D" uid="uid://ejq7h5pgxl84" path="res://art/indoor/küchenraum.png" id="2_ttdge"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="3_oibke"]
[node name="IndoorTest" type="Node2D"]
[node name="background" type="Sprite2D" parent="."]
texture = ExtResource("2_ttdge")
region_enabled = true
region_rect = Rect2(111, 292, 3323, 2160)
[node name="StaticBody2D" type="StaticBody2D" parent="background"]
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="background/StaticBody2D"]
position = Vector2(-1195, 1075)
polygon = PackedVector2Array(-467, -7, -472, -1988, 1922, -1684, 2851, -1753, 2860, -260, 1679, -421, -26, -12, -430, -7)
[node name="middleground" type="Sprite2D" parent="."]
position = Vector2(-234, 864)
texture = ExtResource("2_ttdge")
region_enabled = true
region_rect = Rect2(2093, 2947, 1905, 417)
[node name="foreground" type="Sprite2D" parent="."]
z_index = 2
position = Vector2(1168, 3)
texture = ExtResource("2_ttdge")
region_enabled = true
region_rect = Rect2(4707, 676, 2016, 2160)
[node name="Player2d" parent="." instance=ExtResource("3_oibke")]
position = Vector2(-3, 509)
[node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2(100, 0)
zoom = Vector2(0.325, 0.325)
+27
View File
@@ -0,0 +1,27 @@
[gd_scene load_steps=4 format=3 uid="uid://bm21nqepnwaik"]
[ext_resource type="Texture2D" uid="uid://c02unlmw2y6vv" path="res://art/indoor/misfortune_perspective_test.png" id="1_wvosl"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="2_a2ood"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"]
size = Vector2(1241.67, 409.333)
[node name="IndoorTest" type="Node2D"]
[node name="background" type="Sprite2D" parent="."]
scale = Vector2(3, 3)
texture = ExtResource("1_wvosl")
region_rect = Rect2(111, 292, 3323, 2160)
[node name="StaticBody2D" type="StaticBody2D" parent="background"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="background/StaticBody2D"]
position = Vector2(2.5, -129.667)
shape = SubResource("RectangleShape2D_a2ood")
[node name="Player2d" parent="." instance=ExtResource("2_a2ood")]
position = Vector2(-3, 509)
[node name="Camera2D" type="Camera2D" parent="."]
offset = Vector2(100, 0)
zoom = Vector2(0.325, 0.325)
+1 -3
View File
@@ -1,8 +1,7 @@
[gd_scene load_steps=13 format=3 uid="uid://dx7gn5yiq1aki"] [gd_scene load_steps=12 format=3 uid="uid://dx7gn5yiq1aki"]
[ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://prefabs/player.tscn" id="1_aa8yc"] [ext_resource type="PackedScene" uid="uid://dd3giw31imfk4" path="res://prefabs/player.tscn" id="1_aa8yc"]
[ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://art/mockups/trees/darktree1.png" id="2_k41x3"] [ext_resource type="Texture2D" uid="uid://cg1cxmqbo1pa" path="res://art/mockups/trees/darktree1.png" id="2_k41x3"]
[ext_resource type="Script" uid="uid://b4h7k5w0jsjri" path="res://scripts/CSharp/Common/CameraController.cs" id="2_tykdc"]
[ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://art/mockups/trees/darktree2.png" id="3_tykdc"] [ext_resource type="Texture2D" uid="uid://fcm6etmmj65d" path="res://art/mockups/trees/darktree2.png" id="3_tykdc"]
[ext_resource type="Texture2D" uid="uid://c8h24ouqcqlxv" path="res://art/mockups/trees/darktree3.png" id="4_4u5mu"] [ext_resource type="Texture2D" uid="uid://c8h24ouqcqlxv" path="res://art/mockups/trees/darktree3.png" id="4_4u5mu"]
[ext_resource type="Texture2D" uid="uid://dcimm8umxko8" path="res://art/mockups/trees/darktree4.png" id="5_y2pux"] [ext_resource type="Texture2D" uid="uid://dcimm8umxko8" path="res://art/mockups/trees/darktree4.png" id="5_y2pux"]
@@ -22,7 +21,6 @@ position = Vector2(586, 343)
[node name="Camera2D" type="Camera2D" parent="."] [node name="Camera2D" type="Camera2D" parent="."]
position = Vector2(578, 327) position = Vector2(578, 327)
script = ExtResource("2_tykdc")
[node name="background" type="Node2D" parent="."] [node name="background" type="Node2D" parent="."]
+1 -1
View File
@@ -1394,7 +1394,7 @@ shaded = true
texture = ExtResource("29_kse13") texture = ExtResource("29_kse13")
[node name="Player3d" parent="." instance=ExtResource("27_mqdni")] [node name="Player3d" parent="." instance=ExtResource("27_mqdni")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.032, 0, -0.061) transform = Transform3D(0.17, 0, 0, 0, 0.17, 0, 0, 0, 0.17, 0.032, 0.07, -0.061)
[node name="best_house" parent="." instance=ExtResource("31_lqlrn")] [node name="best_house" parent="." instance=ExtResource("31_lqlrn")]
transform = Transform3D(-5.24537e-09, 0, 0.12, 0, 0.12, 0, -0.12, 0, -5.24537e-09, 0.418, 0, -0.187) transform = Transform3D(-5.24537e-09, 0, 0.12, 0, 0.12, 0, -0.12, 0, -5.24537e-09, 0.418, 0, -0.187)
@@ -5,16 +5,52 @@ namespace Babushka.scripts.CSharp.Common.CharacterControls;
public partial class Player2D : Node2D public partial class Player2D : Node2D
{ {
[Export] private float _speed = 100f; [Export] private float _speed = 100f;
[Export] private AnimatedSprite2D _sprite;
private bool anyActionPressed;
public override void _Process(double delta) public override void _Process(double delta)
{ {
if (Input.IsActionPressed("move_right")) anyActionPressed = false;
if (Input.IsActionPressed("move_right"))
{
Position = new Vector2(Position.X + (_speed * (float)delta), Position.Y); Position = new Vector2(Position.X + (_speed * (float)delta), Position.Y);
if (Input.IsActionPressed("move_left")) _sprite.FlipH = false;
_sprite.Animation = "side_walking";
anyActionPressed = true;
}
if (Input.IsActionPressed("move_left"))
{
Position = new Vector2(Position.X - (_speed * (float)delta), Position.Y); Position = new Vector2(Position.X - (_speed * (float)delta), Position.Y);
if (Input.IsActionPressed("move_up")) _sprite.FlipH = true;
_sprite.Animation = "side_walking";
anyActionPressed = true;
}
if (Input.IsActionPressed("move_up"))
{
Position = new Vector2(Position.X, Position.Y - (_speed * (float)delta)); Position = new Vector2(Position.X, Position.Y - (_speed * (float)delta));
if (Input.IsActionPressed("move_down")) _sprite.Animation = "back walking";
anyActionPressed = true;
}
if (Input.IsActionPressed("move_down"))
{
Position = new Vector2(Position.X, Position.Y + (_speed * (float)delta)); Position = new Vector2(Position.X, Position.Y + (_speed * (float)delta));
_sprite.Animation = "front walking";
anyActionPressed = true;
}
if (anyActionPressed)
{
_sprite.Play();
}
else
{
_sprite.Animation = "front idle";
}
} }
} }
@@ -50,7 +50,6 @@ public partial class FarmingControls : Node3D
var dropPlane = new Plane(new Vector3(0, 0, 10), 10); var dropPlane = new Plane(new Vector3(0, 0, 10), 10);
Vector3? position3D = dropPlane.IntersectsRay(_camera.ProjectRayOrigin(mousePosition), Vector3? position3D = dropPlane.IntersectsRay(_camera.ProjectRayOrigin(mousePosition),
_camera.ProjectRayNormal(mousePosition)); _camera.ProjectRayNormal(mousePosition));
Debug.Print(position3D.ToString());
if (position3D.HasValue) if (position3D.HasValue)
{ {
@@ -25,6 +25,7 @@ public partial class FieldService : Node3D
{ {
if (fields.TryGetValue(key, out FieldBehaviour field)) if (fields.TryGetValue(key, out FieldBehaviour field))
return field; return field;
return field;
return null; return null;
} }