Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 kziolkowski
|
267172d026 | ||
|
kziolkowski
|
917e6a5f7e | ||
|
kziolkowski
|
23ef4e9a63 | ||
|
kziolkowski
|
fa7cc66748 | ||
 cblech
|
7b006d19ef | ||
|
cblech
|
d76218f88f | ||
|
cblech
|
ae4f7d9c58 | ||
|
cblech
|
9a5caef52f | ||
|
cblech
|
2ab1c38de9 |
+4
-1
@@ -6,4 +6,7 @@
|
||||
# temporary files
|
||||
**/*.tmp
|
||||
**/*.translation
|
||||
**/*~lock~
|
||||
**/*~lock~
|
||||
|
||||
# override config can be used by developers to override the settings without pushing changes to the repository
|
||||
override.cfg
|
||||
|
||||
@@ -2,5 +2,6 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<EnableDynamicLoading>true</EnableDynamicLoading>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,5 @@
|
||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Description/@EntryValue">Godot Signal</s:String>
|
||||
<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Text/@EntryValue">[Signal]
|
||||
public delegate void $SignalName$EventHandler($END$);</s:String>
|
||||
<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=0B2502BD29F5EC4798EEFD2950AA7E06/Field/=SignalName/Expression/@EntryValue">suggestVariableName()</s:String></wpf:ResourceDictionary>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.0 MiB |
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://3ln8aleyxgp1"
|
||||
path="res://.godot/imported/UI_bag_export_01.png-849f65e7f0ae9838cbd0b40d7db0adbf.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/ui/UI/UI_bag_export_01.png"
|
||||
dest_files=["res://.godot/imported/UI_bag_export_01.png-849f65e7f0ae9838cbd0b40d7db0adbf.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: 94 KiB |
@@ -0,0 +1,34 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dcidjcsqk12p1"
|
||||
path="res://.godot/imported/UI_bag_export_02.png-1d79b1aa82b484e614d86097168b3404.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/ui/UI/UI_bag_export_02.png"
|
||||
dest_files=["res://.godot/imported/UI_bag_export_02.png-1d79b1aa82b484e614d86097168b3404.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
|
||||
+6
-15
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=822 format=3 uid="uid://c25udixd5m6l0"]
|
||||
[gd_scene load_steps=821 format=3 uid="uid://c25udixd5m6l0"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/Player2D.cs" id="1_ssqtd"]
|
||||
[ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yl84k"]
|
||||
@@ -698,7 +698,6 @@
|
||||
[ext_resource type="Texture2D" uid="uid://cxcaqeilw6qyv" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S02-Walk/0018.png" id="484_2au4g"]
|
||||
[ext_resource type="Texture2D" uid="uid://tywawvrx32tv" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S02-Walk/0019.png" id="485_tsiv1"]
|
||||
[ext_resource type="Texture2D" uid="uid://e0act1bcstyj" path="res://art/animation/Vesna2D/Vesna Anims Sequences/S02-Walk/0020.png" id="486_i2imi"]
|
||||
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="539_aew1f"]
|
||||
[ext_resource type="Texture2D" uid="uid://dihktwgykpaux" path="res://art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0001.png" id="545_mor3p"]
|
||||
[ext_resource type="Texture2D" uid="uid://gg5807j8g780" path="res://art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0002.png" id="546_gd1lw"]
|
||||
[ext_resource type="Texture2D" uid="uid://bldn11wgjaqle" path="res://art/animation/Vesna2D/Vesna Anims Tools/F02-Walk-Harke/0003.png" id="547_6lalt"]
|
||||
@@ -1581,7 +1580,7 @@ animations = [{
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"diagonal farming",
|
||||
"speed": 10.0
|
||||
"speed": 12.0
|
||||
}, {
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
@@ -3502,12 +3501,12 @@ y_sort_enabled = true
|
||||
script = ExtResource("1_yl84k")
|
||||
_farmingControls = NodePath("FarmingControls")
|
||||
|
||||
[node name="CharacterBody2D" type="CharacterBody2D" parent="." node_paths=PackedStringArray("_sprite")]
|
||||
[node name="CharacterBody2D" type="CharacterBody2D" parent="." node_paths=PackedStringArray("_sprite") groups=["PlantGrowing"]]
|
||||
position = Vector2(0, 374)
|
||||
collision_layer = 4
|
||||
collision_mask = 3
|
||||
script = ExtResource("1_ssqtd")
|
||||
_speed = 1500.0
|
||||
_speed = 500.0
|
||||
_sprite = NodePath("visuals/Animated Sprites")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
|
||||
@@ -3523,9 +3522,8 @@ position = Vector2(0, -374)
|
||||
[node name="Animated Sprites" type="AnimatedSprite2D" parent="CharacterBody2D/visuals"]
|
||||
position = Vector2(0, 450)
|
||||
sprite_frames = SubResource("SpriteFrames_4yiyq")
|
||||
animation = &"side pickup"
|
||||
frame = 6
|
||||
frame_progress = 0.00476268
|
||||
animation = &"diagonal farming"
|
||||
frame_progress = 0.503028
|
||||
offset = Vector2(0, -450)
|
||||
|
||||
[node name="Hoe" type="Sprite2D" parent="CharacterBody2D/visuals"]
|
||||
@@ -3558,13 +3556,6 @@ region_rect = Rect2(-1, 1128, 417, 299)
|
||||
position = Vector2(26, -469)
|
||||
zoom = Vector2(0.3, 0.3)
|
||||
|
||||
[node name="Inventory" parent="CharacterBody2D" instance=ExtResource("539_aew1f")]
|
||||
visible = false
|
||||
z_index = 100
|
||||
offset_top = 226.0
|
||||
offset_bottom = 226.0
|
||||
scale = Vector2(3, 3)
|
||||
|
||||
[node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer", "_camera")]
|
||||
script = ExtResource("291_31q85")
|
||||
_fieldPrefab = ExtResource("294_28qer")
|
||||
|
||||
@@ -1,20 +1,32 @@
|
||||
[gd_scene load_steps=5 format=3 uid="uid://cgjc4wurbgimy"]
|
||||
[gd_scene load_steps=8 format=3 uid="uid://cgjc4wurbgimy"]
|
||||
|
||||
[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="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
|
||||
[ext_resource type="Resource" uid="uid://datee0flk1e84" path="res://resources/items/pickaxe.tres" id="4_5fdxq"]
|
||||
[ext_resource type="Texture2D" uid="uid://dcidjcsqk12p1" path="res://art/ui/UI/UI_bag_export_02.png" id="4_df8i8"]
|
||||
[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
|
||||
[ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
|
||||
|
||||
[node name="Inventory" type="Control"]
|
||||
[node name="CanvasLayer" type="CanvasLayer"]
|
||||
layer = 90
|
||||
|
||||
[node name="Inventory" type="Control" parent="."]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_left = 174.0
|
||||
offset_top = 191.0
|
||||
offset_right = 174.0
|
||||
offset_bottom = 191.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
scale = Vector2(0.7, 0.7)
|
||||
script = ExtResource("1_6wusm")
|
||||
_inventoryOpenedOffset = -700.0
|
||||
|
||||
[node name="SlotsContainer" type="Control" parent="."]
|
||||
[node name="SlotsContainer" type="Control" parent="Inventory"]
|
||||
custom_minimum_size = Vector2(500, 0)
|
||||
layout_mode = 1
|
||||
anchors_preset = 13
|
||||
@@ -24,34 +36,23 @@ anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="Slots" type="GridContainer" parent="SlotsContainer"]
|
||||
custom_minimum_size = Vector2(1000, 200)
|
||||
layout_mode = 1
|
||||
anchors_preset = -1
|
||||
anchor_left = 0.5
|
||||
anchor_top = 1.0
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 1.0
|
||||
offset_bottom = 200.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 0
|
||||
theme_override_constants/h_separation = 0
|
||||
theme_override_constants/v_separation = 0
|
||||
columns = 10
|
||||
|
||||
[node name="SlotSelectContainer" type="Control" parent="SlotsContainer"]
|
||||
custom_minimum_size = Vector2(1000, 100)
|
||||
[node name="SlotSelectContainer" type="Control" parent="Inventory/SlotsContainer"]
|
||||
custom_minimum_size = Vector2(900, 100)
|
||||
layout_mode = 1
|
||||
anchors_preset = 7
|
||||
anchor_left = 0.5
|
||||
anchor_top = 1.0
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 1.0
|
||||
offset_left = -450.0
|
||||
offset_top = -115.0
|
||||
offset_right = 450.0
|
||||
offset_bottom = -15.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 0
|
||||
|
||||
[node name="Selector" type="TextureRect" parent="SlotsContainer/SlotSelectContainer"]
|
||||
visible = false
|
||||
[node name="Selector" type="TextureRect" parent="Inventory/SlotsContainer/SlotSelectContainer"]
|
||||
z_index = 10
|
||||
custom_minimum_size = Vector2(100, 100)
|
||||
layout_mode = 0
|
||||
offset_left = 1.0
|
||||
@@ -60,11 +61,316 @@ offset_bottom = 100.0
|
||||
texture = ExtResource("4_tiss4")
|
||||
expand_mode = 1
|
||||
|
||||
[node name="InventoryTester" type="Node" parent="."]
|
||||
[node name="SlotsMover" type="Control" parent="Inventory/SlotsContainer"]
|
||||
custom_minimum_size = Vector2(900, 610)
|
||||
layout_mode = 1
|
||||
anchors_preset = 12
|
||||
anchor_top = 1.0
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_left = -200.0
|
||||
offset_top = -611.0
|
||||
offset_right = 200.0
|
||||
offset_bottom = -1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 0
|
||||
|
||||
[node name="BackgroundContainer" type="Control" parent="Inventory/SlotsContainer/SlotsMover"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 0
|
||||
offset_left = 5.0
|
||||
offset_top = 384.0
|
||||
offset_right = 901.0
|
||||
offset_bottom = 1230.0
|
||||
mouse_filter = 2
|
||||
|
||||
[node name="TextureRect" type="TextureRect" parent="Inventory/SlotsContainer/SlotsMover/BackgroundContainer"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_left = -305.0
|
||||
offset_right = 303.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
mouse_filter = 2
|
||||
texture = ExtResource("3_vvo7l")
|
||||
expand_mode = 3
|
||||
|
||||
[node name="TextureRect2" type="TextureRect" parent="Inventory/SlotsContainer/SlotsMover/BackgroundContainer"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
mouse_filter = 2
|
||||
texture = ExtResource("3_vvo7l")
|
||||
expand_mode = 3
|
||||
flip_h = true
|
||||
|
||||
[node name="TextureRect3" type="TextureRect" parent="Inventory/SlotsContainer/SlotsMover/BackgroundContainer"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
mouse_filter = 2
|
||||
texture = ExtResource("4_df8i8")
|
||||
expand_mode = 3
|
||||
flip_h = true
|
||||
|
||||
[node name="Slots" type="Control" parent="Inventory/SlotsContainer/SlotsMover"]
|
||||
custom_minimum_size = Vector2(900, 610)
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_top = 496.0
|
||||
offset_bottom = 496.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
|
||||
[node name="Slot" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
|
||||
[node name="Slot2" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 100.0
|
||||
offset_right = 200.0
|
||||
|
||||
[node name="Slot3" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 201.0
|
||||
offset_right = 301.0
|
||||
|
||||
[node name="Slot4" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 301.0
|
||||
offset_right = 401.0
|
||||
|
||||
[node name="Slot5" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 401.0
|
||||
offset_right = 501.0
|
||||
|
||||
[node name="Slot6" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 501.0
|
||||
offset_right = 601.0
|
||||
|
||||
[node name="Slot7" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 601.0
|
||||
offset_right = 701.0
|
||||
|
||||
[node name="Slot8" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 702.0
|
||||
offset_right = 802.0
|
||||
|
||||
[node name="Slot9" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 802.0
|
||||
offset_right = 902.0
|
||||
|
||||
[node name="Slot10" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 101.0
|
||||
offset_top = 212.0
|
||||
offset_right = 201.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot11" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 201.0
|
||||
offset_top = 212.0
|
||||
offset_right = 301.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot12" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 301.0
|
||||
offset_top = 212.0
|
||||
offset_right = 401.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot13" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 401.0
|
||||
offset_top = 212.0
|
||||
offset_right = 501.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot14" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 501.0
|
||||
offset_top = 212.0
|
||||
offset_right = 601.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot15" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 602.0
|
||||
offset_top = 212.0
|
||||
offset_right = 702.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot16" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 702.0
|
||||
offset_top = 212.0
|
||||
offset_right = 802.0
|
||||
offset_bottom = 312.0
|
||||
|
||||
[node name="Slot17" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 102.0
|
||||
offset_top = 312.0
|
||||
offset_right = 202.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot18" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 202.0
|
||||
offset_top = 312.0
|
||||
offset_right = 302.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot19" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 302.0
|
||||
offset_top = 312.0
|
||||
offset_right = 402.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot20" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 402.0
|
||||
offset_top = 312.0
|
||||
offset_right = 502.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot21" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 502.0
|
||||
offset_top = 312.0
|
||||
offset_right = 602.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot22" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 603.0
|
||||
offset_top = 312.0
|
||||
offset_right = 703.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot23" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 703.0
|
||||
offset_top = 312.0
|
||||
offset_right = 803.0
|
||||
offset_bottom = 412.0
|
||||
|
||||
[node name="Slot24" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 102.0
|
||||
offset_top = 412.0
|
||||
offset_right = 202.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot25" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 202.0
|
||||
offset_top = 412.0
|
||||
offset_right = 302.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot26" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 302.0
|
||||
offset_top = 412.0
|
||||
offset_right = 402.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot27" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 402.0
|
||||
offset_top = 412.0
|
||||
offset_right = 502.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot28" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 502.0
|
||||
offset_top = 412.0
|
||||
offset_right = 602.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot29" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 603.0
|
||||
offset_top = 412.0
|
||||
offset_right = 703.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot30" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 703.0
|
||||
offset_top = 412.0
|
||||
offset_right = 803.0
|
||||
offset_bottom = 512.0
|
||||
|
||||
[node name="Slot31" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 102.0
|
||||
offset_top = 512.0
|
||||
offset_right = 202.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="Slot32" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 202.0
|
||||
offset_top = 512.0
|
||||
offset_right = 302.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="Slot33" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 302.0
|
||||
offset_top = 512.0
|
||||
offset_right = 402.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="Slot34" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 402.0
|
||||
offset_top = 512.0
|
||||
offset_right = 502.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="Slot35" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 502.0
|
||||
offset_top = 512.0
|
||||
offset_right = 602.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="Slot36" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 603.0
|
||||
offset_top = 512.0
|
||||
offset_right = 703.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="Slot37" parent="Inventory/SlotsContainer/SlotsMover/Slots" instance=ExtResource("5_u7kje")]
|
||||
layout_mode = 1
|
||||
offset_left = 703.0
|
||||
offset_top = 512.0
|
||||
offset_right = 803.0
|
||||
offset_bottom = 612.0
|
||||
|
||||
[node name="InventoryTester" type="Node" parent="Inventory"]
|
||||
script = ExtResource("3_exrk4")
|
||||
_testItemToCreate = ExtResource("4_5fdxq")
|
||||
|
||||
[node name="BabushkaUiTmpInventorySelect" type="Sprite2D" parent="."]
|
||||
visible = false
|
||||
position = Vector2(-648, 1020)
|
||||
texture = ExtResource("4_tiss4")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
[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="Texture2D" uid="uid://c2dbd0q02x2h" path="res://art/ui/babushka_ui_inventory_slot.png" id="2_7emux"]
|
||||
[ext_resource type="Texture2D" uid="uid://0p52bm8b1nrl" path="res://art/ui/UI/inventory_standard.png" id="2_7emux"]
|
||||
|
||||
[sub_resource type="LabelSettings" id="LabelSettings_7emux"]
|
||||
font_size = 15
|
||||
@@ -10,12 +10,9 @@ font_color = Color(0.203922, 1, 1, 1)
|
||||
[node name="Slot" type="Control"]
|
||||
custom_minimum_size = Vector2(100, 100)
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_bottom = 2.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
anchors_preset = 0
|
||||
offset_right = 100.0
|
||||
offset_bottom = 100.0
|
||||
script = ExtResource("1_au0l0")
|
||||
|
||||
[node name="TextureRect" type="TextureRect" parent="."]
|
||||
@@ -23,6 +20,10 @@ layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_left = 3.0
|
||||
offset_top = 3.0
|
||||
offset_right = -3.0
|
||||
offset_bottom = -3.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
texture = ExtResource("2_7emux")
|
||||
@@ -45,18 +46,15 @@ vertical_alignment = 1
|
||||
layout_mode = 1
|
||||
anchors_preset = -1
|
||||
anchor_left = 1.0
|
||||
anchor_top = 1.0
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
offset_left = -409.0
|
||||
offset_top = -329.0
|
||||
offset_left = -50.0
|
||||
offset_top = 9.0
|
||||
offset_right = -10.0
|
||||
offset_bottom = -10.0
|
||||
offset_bottom = 49.0
|
||||
grow_horizontal = 0
|
||||
grow_vertical = 0
|
||||
theme_override_colors/font_color = Color(0, 0, 0, 1)
|
||||
text = "999"
|
||||
horizontal_alignment = 2
|
||||
vertical_alignment = 2
|
||||
|
||||
[connection signal="gui_input" from="." to="." method="_on_gui_input"]
|
||||
|
||||
@@ -14,6 +14,7 @@ z_index = 1
|
||||
scale = Vector2(2.225, 2.225)
|
||||
|
||||
[node name="FieldBehaviour" type="Sprite2D" parent="."]
|
||||
z_index = -1
|
||||
texture = ExtResource("3_lsfck")
|
||||
script = ExtResource("2_femni")
|
||||
Tilled = ExtResource("3_lsfck")
|
||||
|
||||
@@ -1,11 +1,24 @@
|
||||
[gd_scene load_steps=6 format=3 uid="uid://c3hwbwo423nbm"]
|
||||
[gd_scene load_steps=8 format=3 uid="uid://c3hwbwo423nbm"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cms357f23fmfy" path="res://scripts/CSharp/Common/Farming/PlantBehaviour2D.cs" id="1_tikj4"]
|
||||
[ext_resource type="Shader" uid="uid://braevmqauoek7" path="res://prefabs/farm/swaying_plant.gdshader" id="2_goh03"]
|
||||
[ext_resource type="Texture2D" uid="uid://dtr4uga5uspg" path="res://art/farm/farming/farmobjekte/tomaten/tomaten baby.png" id="2_rmjrk"]
|
||||
[ext_resource type="Texture2D" uid="uid://b2gu6ur2xc7s4" path="res://art/farm/farming/farmobjekte/tomaten/tomaten blume.png" id="3_goh03"]
|
||||
[ext_resource type="Texture2D" uid="uid://cnwd3mb3jnuxm" path="res://art/farm/farming/farmobjekte/tomaten/teen adulte tomaten.png" id="4_u4cty"]
|
||||
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="5_tikj4"]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_u4cty"]
|
||||
shader = ExtResource("2_goh03")
|
||||
shader_parameter/speed = 3.0
|
||||
shader_parameter/minStrength = 0.05
|
||||
shader_parameter/maxStrength = 0.36
|
||||
shader_parameter/strengthScale = 100.0
|
||||
shader_parameter/interval = 3.5
|
||||
shader_parameter/detail = 1.0
|
||||
shader_parameter/distortion = 0.0
|
||||
shader_parameter/heightOffset = 0.635
|
||||
shader_parameter/offset = 0.0
|
||||
|
||||
[node name="BasePlant" type="Node2D" node_paths=PackedStringArray("_seeds", "_smallPlants", "_bigPlants", "_readyPlants")]
|
||||
script = ExtResource("1_tikj4")
|
||||
_seeds = [NodePath("Seeds/TomatoSeed"), NodePath("Seeds/TomatoSeed2"), NodePath("Seeds/TomatoSeed3")]
|
||||
@@ -18,6 +31,8 @@ position = Vector2(0, 0.5)
|
||||
|
||||
[node name="TomatoSeed" type="Sprite2D" parent="Seeds"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
flip_v = true
|
||||
region_enabled = true
|
||||
@@ -25,6 +40,8 @@ region_rect = Rect2(-2, 15, 85, 81)
|
||||
|
||||
[node name="TomatoSeed2" type="Sprite2D" parent="Seeds"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
flip_v = true
|
||||
region_enabled = true
|
||||
@@ -32,6 +49,8 @@ region_rect = Rect2(15, 177, 84, 108)
|
||||
|
||||
[node name="TomatoSeed3" type="Sprite2D" parent="Seeds"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
flip_v = true
|
||||
region_enabled = true
|
||||
@@ -42,24 +61,32 @@ position = Vector2(0, 0.5)
|
||||
|
||||
[node name="01" type="Sprite2D" parent="SmallPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(203, 1, 128, 164)
|
||||
|
||||
[node name="02" type="Sprite2D" parent="SmallPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(218, 204, 112, 130)
|
||||
|
||||
[node name="03" type="Sprite2D" parent="SmallPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(224, 399, 105, 105)
|
||||
|
||||
[node name="04" type="Sprite2D" parent="SmallPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(228, 600, 85, 92)
|
||||
@@ -69,24 +96,32 @@ position = Vector2(0, 2)
|
||||
|
||||
[node name="01" type="Sprite2D" parent="BigPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("3_goh03")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(-8, 1, 498, 682)
|
||||
|
||||
[node name="02" type="Sprite2D" parent="BigPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("3_goh03")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(575, 82, 516, 591)
|
||||
|
||||
[node name="03" type="Sprite2D" parent="BigPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("3_goh03")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(-25, 694, 521, 687)
|
||||
|
||||
[node name="04" type="Sprite2D" parent="BigPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("3_goh03")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(546, 697, 535, 687)
|
||||
@@ -96,24 +131,32 @@ position = Vector2(0, 2.3)
|
||||
|
||||
[node name="01" type="Sprite2D" parent="ReadyPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("4_u4cty")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(399, 3, 679, 808)
|
||||
|
||||
[node name="02" type="Sprite2D" parent="ReadyPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("4_u4cty")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1077, 109, 633, 695)
|
||||
|
||||
[node name="03" type="Sprite2D" parent="ReadyPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("4_u4cty")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(415, 838, 639, 817)
|
||||
|
||||
[node name="04" type="Sprite2D" parent="ReadyPlant"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("4_u4cty")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1167, 863, 528, 785)
|
||||
|
||||
+11
-1
@@ -11,7 +11,7 @@ config_version=5
|
||||
[application]
|
||||
|
||||
config/name="Babushka"
|
||||
run/main_scene="uid://gigb28qk8t12"
|
||||
run/main_scene="uid://dee2hgv85mdak"
|
||||
config/features=PackedStringArray("4.4", "C#", "Forward Plus")
|
||||
config/icon="uid://b2smanpdo1y5e"
|
||||
|
||||
@@ -69,11 +69,17 @@ text/autopauses={}
|
||||
[display]
|
||||
|
||||
window/size/always_on_top=true
|
||||
window/stretch/mode="viewport"
|
||||
window/stretch/aspect="keep_height"
|
||||
|
||||
[dotnet]
|
||||
|
||||
project/assembly_name="Babushka"
|
||||
|
||||
[editor]
|
||||
|
||||
movie_writer/movie_file="/home/kaddi/Documents/Repos/Godot/Babushka/clips/clip.avi"
|
||||
|
||||
[editor_plugins]
|
||||
|
||||
enabled=PackedStringArray("res://addons/anthonyec.camera_preview/plugin.cfg", "res://addons/dialogic/plugin.cfg")
|
||||
@@ -91,6 +97,10 @@ folder_colors={
|
||||
"res://shader/": "pink"
|
||||
}
|
||||
|
||||
[global_group]
|
||||
|
||||
PlantGrowing=""
|
||||
|
||||
[input]
|
||||
|
||||
move_left={
|
||||
|
||||
@@ -6,4 +6,5 @@
|
||||
script = ExtResource("1_07aya")
|
||||
name = "Pick Axe"
|
||||
color = Color(0.589014, 0.823353, 0.998475, 1)
|
||||
maxStack = 1
|
||||
metadata/_custom_type_script = "uid://cbskymrxs6ksu"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=54 format=3 uid="uid://gigb28qk8t12"]
|
||||
[gd_scene load_steps=55 format=3 uid="uid://gigb28qk8t12"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="1_7wfwe"]
|
||||
[ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
|
||||
@@ -31,6 +31,7 @@
|
||||
[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="29_p6n74"]
|
||||
[ext_resource type="Script" uid="uid://bdsel2amlbnuq" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith2D.cs" id="30_2nee2"]
|
||||
[ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="31_r0vdg"]
|
||||
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="32_2nee2"]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_xy0kg"]
|
||||
shader = ExtResource("13_7p0hq")
|
||||
@@ -87,21 +88,6 @@ size = Vector2(374, 295.995)
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_klb81"]
|
||||
size = Vector2(353, 296)
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lhtpe"]
|
||||
shader = ExtResource("13_7p0hq")
|
||||
shader_parameter/hue_shift = 0.0
|
||||
shader_parameter/saturation_mult = 1.0
|
||||
shader_parameter/value_mult = 1.068
|
||||
shader_parameter/brightness_add = 0.0
|
||||
shader_parameter/contrast_mult = 0.913
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"]
|
||||
size = Vector2(14208, 1176)
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"]
|
||||
resource_local_to_scene = true
|
||||
size = Vector2(7048, 1192)
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_2vojv"]
|
||||
shader = ExtResource("13_7p0hq")
|
||||
shader_parameter/hue_shift = 0.0
|
||||
@@ -117,6 +103,21 @@ size = Vector2(728, 368)
|
||||
resource_local_to_scene = true
|
||||
radius = 600.0
|
||||
|
||||
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lhtpe"]
|
||||
shader = ExtResource("13_7p0hq")
|
||||
shader_parameter/hue_shift = 0.0
|
||||
shader_parameter/saturation_mult = 1.0
|
||||
shader_parameter/value_mult = 1.068
|
||||
shader_parameter/brightness_add = 0.0
|
||||
shader_parameter/contrast_mult = 0.913
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_2nee2"]
|
||||
size = Vector2(14208, 1176)
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_p6n74"]
|
||||
resource_local_to_scene = true
|
||||
size = Vector2(7048, 1192)
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_kxdmn"]
|
||||
resource_local_to_scene = true
|
||||
radius = 300.0
|
||||
@@ -664,53 +665,14 @@ collision_mask = 2
|
||||
position = Vector2(-206.5, 12.001)
|
||||
shape = SubResource("RectangleShape2D_klb81")
|
||||
|
||||
[node name="Farm visuals" type="Node2D" parent="."]
|
||||
|
||||
[node name="Static" type="Node2D" parent="Farm visuals"]
|
||||
|
||||
[node name="House Mockup" type="Sprite2D" parent="Farm visuals/Static"]
|
||||
visible = false
|
||||
material = SubResource("ShaderMaterial_lhtpe")
|
||||
position = Vector2(5280, 1600)
|
||||
scale = Vector2(5, 5)
|
||||
texture = ExtResource("2_lhtpe")
|
||||
|
||||
[node name="StaticBody2D" type="StaticBody2D" parent="Farm visuals/Static/House Mockup"]
|
||||
visible = false
|
||||
collision_layer = 2
|
||||
collision_mask = 6
|
||||
|
||||
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Farm visuals/Static/House Mockup/StaticBody2D"]
|
||||
visible = false
|
||||
position = Vector2(-257.6, 236.8)
|
||||
polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6, -260.8, -310.4, -260.8, -235.2, -321.6, -124.8, -323.2, -57.6, -424, 84.8, -436.8, 118.4, -452.8, 136, -436.8, 726.4, -452.8, 817.6, -299.2, 785.6, -291.2, 785.6, -108.8, 241.6, -94.4)
|
||||
disabled = true
|
||||
|
||||
[node name="FieldParent" type="Node2D" parent="Farm visuals"]
|
||||
position = Vector2(48, 0)
|
||||
script = ExtResource("25_0qu0h")
|
||||
metadata/_custom_type_script = "uid://dhxtdhfqx3bte"
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="Farm visuals/FieldParent"]
|
||||
position = Vector2(-48, -16)
|
||||
collision_mask = 5
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"]
|
||||
position = Vector2(1536, 2964)
|
||||
shape = SubResource("RectangleShape2D_2nee2")
|
||||
|
||||
[node name="CollisionShape2D2" type="CollisionShape2D" parent="Farm visuals/FieldParent/Area2D"]
|
||||
position = Vector2(13772, 2960)
|
||||
shape = SubResource("RectangleShape2D_p6n74")
|
||||
|
||||
[node name="YSorted" type="Node2D" parent="."]
|
||||
z_index = 1
|
||||
y_sort_enabled = true
|
||||
|
||||
[node name="Player2d" parent="YSorted" node_paths=PackedStringArray("_fieldParent") instance=ExtResource("1_7wfwe")]
|
||||
z_index = 1
|
||||
position = Vector2(1064, 2128)
|
||||
_fieldParent = NodePath("../../Farm visuals/FieldParent")
|
||||
position = Vector2(1071, 2125)
|
||||
_fieldParent = NodePath("../Farm visuals/FieldParent")
|
||||
|
||||
[node name="Brünnen" type="Sprite2D" parent="YSorted"]
|
||||
z_index = 1
|
||||
@@ -734,6 +696,46 @@ _id = 1
|
||||
position = Vector2(80, -368)
|
||||
shape = SubResource("CircleShape2D_p6n74")
|
||||
|
||||
[node name="Farm visuals" type="Node2D" parent="YSorted"]
|
||||
position = Vector2(-60, 122)
|
||||
|
||||
[node name="Static" type="Node2D" parent="YSorted/Farm visuals"]
|
||||
|
||||
[node name="House Mockup" type="Sprite2D" parent="YSorted/Farm visuals/Static"]
|
||||
visible = false
|
||||
material = SubResource("ShaderMaterial_lhtpe")
|
||||
position = Vector2(5280, 1600)
|
||||
scale = Vector2(5, 5)
|
||||
texture = ExtResource("2_lhtpe")
|
||||
|
||||
[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Farm visuals/Static/House Mockup"]
|
||||
visible = false
|
||||
collision_layer = 2
|
||||
collision_mask = 6
|
||||
|
||||
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="YSorted/Farm visuals/Static/House Mockup/StaticBody2D"]
|
||||
visible = false
|
||||
position = Vector2(-257.6, 236.8)
|
||||
polygon = PackedVector2Array(232, -4.80005, 0, 0, 0, -96, -262.4, -97.6, -265.6, -260.8, -310.4, -260.8, -235.2, -321.6, -124.8, -323.2, -57.6, -424, 84.8, -436.8, 118.4, -452.8, 136, -436.8, 726.4, -452.8, 817.6, -299.2, 785.6, -291.2, 785.6, -108.8, 241.6, -94.4)
|
||||
disabled = true
|
||||
|
||||
[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"]
|
||||
position = Vector2(48, 0)
|
||||
script = ExtResource("25_0qu0h")
|
||||
metadata/_custom_type_script = "uid://dhxtdhfqx3bte"
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="YSorted/Farm visuals/FieldParent"]
|
||||
position = Vector2(-48, -16)
|
||||
collision_mask = 5
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Farm visuals/FieldParent/Area2D"]
|
||||
position = Vector2(1536, 2964)
|
||||
shape = SubResource("RectangleShape2D_2nee2")
|
||||
|
||||
[node name="CollisionShape2D2" type="CollisionShape2D" parent="YSorted/Farm visuals/FieldParent/Area2D"]
|
||||
position = Vector2(13772, 2960)
|
||||
shape = SubResource("RectangleShape2D_p6n74")
|
||||
|
||||
[node name="Hoe Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")]
|
||||
position = Vector2(7728, 2000)
|
||||
rotation = 3.3074
|
||||
@@ -779,16 +781,33 @@ region_rect = Rect2(-2, 1135, 421, 292)
|
||||
texture = ExtResource("29_p6n74")
|
||||
region_rect = Rect2(1, 1138, 418, 288)
|
||||
|
||||
[connection signal="mouse_entered" from="Farm visuals/FieldParent/Area2D" to="Farm visuals/FieldParent" method="MouseEnteredAllowedArea"]
|
||||
[connection signal="mouse_exited" from="Farm visuals/FieldParent/Area2D" to="Farm visuals/FieldParent" method="MouseExitedAllowedArea"]
|
||||
[node name="CanvasLayer" parent="." instance=ExtResource("32_2nee2")]
|
||||
visible = false
|
||||
|
||||
[node name="Inventory" parent="CanvasLayer" index="0"]
|
||||
anchors_preset = 7
|
||||
anchor_left = 0.5
|
||||
anchor_top = 1.0
|
||||
anchor_right = 0.5
|
||||
offset_left = -172.8
|
||||
offset_top = -194.4
|
||||
offset_right = 172.8
|
||||
grow_vertical = 0
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 8
|
||||
|
||||
[connection signal="PickedUpTool" from="YSorted/Player2d" to="Hoe Pickup" method="SetSpriteActiveState"]
|
||||
[connection signal="PickedUpTool" from="YSorted/Player2d" to="Watercan Pickup" method="SetSpriteActiveState"]
|
||||
[connection signal="InteractedTool" from="YSorted/Brünnen/InteractionArea" to="YSorted/Player2d" method="TryFillWateringCan"]
|
||||
[connection signal="mouse_entered" from="YSorted/Farm visuals/FieldParent/Area2D" to="YSorted/Farm visuals/FieldParent" method="MouseEnteredAllowedArea"]
|
||||
[connection signal="mouse_exited" from="YSorted/Farm visuals/FieldParent/Area2D" to="YSorted/Farm visuals/FieldParent" method="MouseExitedAllowedArea"]
|
||||
[connection signal="Interacted" from="Hoe Pickup" to="Hoe Pickup/ItemOnGround" method="TryPickUp"]
|
||||
[connection signal="InteractedTool" from="Hoe Pickup" to="YSorted/Player2d" method="ActivateTool"]
|
||||
[connection signal="InteractedTool" from="Watercan Pickup" to="YSorted/Player2d" method="ActivateTool"]
|
||||
|
||||
[editable path="YSorted/Player2d"]
|
||||
[editable path="YSorted/Brünnen/InteractionArea"]
|
||||
[editable path="Hoe Pickup"]
|
||||
[editable path="Watercan Pickup"]
|
||||
[editable path="Watercan Pickup/ActiveInactive"]
|
||||
[editable path="CanvasLayer"]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System.Threading;
|
||||
|
||||
using System.Threading.Tasks;
|
||||
using Godot;
|
||||
|
||||
@@ -8,6 +8,7 @@ public partial class Player2D : CharacterBody2D
|
||||
{
|
||||
[Export] private float _speed = 100f;
|
||||
[Export] private AnimatedSprite2D _sprite;
|
||||
[Export] private SceneTree.GroupCallFlags _fieldFlags;
|
||||
|
||||
// -1 means no tool.
|
||||
private int _toolID = -1;
|
||||
@@ -15,13 +16,14 @@ public partial class Player2D : CharacterBody2D
|
||||
private bool anyActionPressed;
|
||||
private bool _wateringInProgress;
|
||||
private bool _pickupAnimationInProgress;
|
||||
private bool _farmingAnimationInProgress;
|
||||
private Vector2 _lastDirection = Vector2.Zero;
|
||||
|
||||
|
||||
public override void _Process(double delta)
|
||||
{
|
||||
anyActionPressed = false;
|
||||
|
||||
if (_pickupAnimationInProgress || _wateringInProgress)
|
||||
if (_pickupAnimationInProgress || _wateringInProgress || _farmingAnimationInProgress)
|
||||
return;
|
||||
|
||||
if (Input.IsActionPressed("move_right"))
|
||||
@@ -115,6 +117,9 @@ public partial class Player2D : CharacterBody2D
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Called by FarmingControls Signal.
|
||||
/// </summary>
|
||||
public void PlayWateringAnimation()
|
||||
{
|
||||
if (_toolID == 1 && !_wateringInProgress)
|
||||
@@ -146,4 +151,18 @@ public partial class Player2D : CharacterBody2D
|
||||
_pickupAnimationInProgress = false;
|
||||
}
|
||||
|
||||
public void PlayFarmingAnimation()
|
||||
{
|
||||
_sprite.Animation = "diagonal farming";
|
||||
_sprite.Play();
|
||||
_farmingAnimationInProgress = true;
|
||||
Task.Run(DelayedFarmingReset);
|
||||
}
|
||||
|
||||
private async Task DelayedFarmingReset()
|
||||
{
|
||||
await Task.Delay(1000);
|
||||
_farmingAnimationInProgress = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using Babushka.scripts.CSharp.Common.CharacterControls;
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Farming;
|
||||
@@ -14,9 +15,10 @@ public partial class PlantBehaviour2D : Node2D
|
||||
[Export] private Sprite2D[] _readyPlants;
|
||||
[Export] private PlantState _state = PlantState.None;
|
||||
[Export] private FieldBehaviour2D _field;
|
||||
|
||||
|
||||
private Sprite2D _currentPlantSprite = null;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Transitions the plant to its next growth stage.
|
||||
/// </summary>
|
||||
@@ -25,6 +27,8 @@ public partial class PlantBehaviour2D : Node2D
|
||||
if (_field.FieldState != FieldState.Watered)
|
||||
return;
|
||||
|
||||
GetTree().CallGroup("PlantGrowing", Player2D.MethodName.PlayFarmingAnimation);
|
||||
|
||||
switch (_state)
|
||||
{
|
||||
case PlantState.None:
|
||||
@@ -58,7 +62,7 @@ public partial class PlantBehaviour2D : Node2D
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
_field.UpdateFieldState(FieldState.Tilled);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,27 @@
|
||||
#nullable enable
|
||||
using System;
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Inventory;
|
||||
|
||||
public partial class InventoryManager : Node
|
||||
{
|
||||
public static InventoryManager Instance { get; private set; }
|
||||
[Signal]
|
||||
public delegate void SlotIndexChangedEventHandler(int newIndex);
|
||||
|
||||
public static InventoryManager Instance { get; private set; } = null!;
|
||||
public int CurrentSelectedSlotIndex
|
||||
{
|
||||
get => _currentSelectedSlotIndex;
|
||||
set
|
||||
{
|
||||
_currentSelectedSlotIndex = value;
|
||||
EmitSignalSlotIndexChanged(_currentSelectedSlotIndex);
|
||||
}
|
||||
}
|
||||
|
||||
public InventoryInstance playerInventory;
|
||||
public InventoryInstance playerInventory = new InventoryInstance();
|
||||
|
||||
private int _currentSelectedSlotIndex = 0;
|
||||
|
||||
public override void _EnterTree()
|
||||
{
|
||||
@@ -16,8 +30,7 @@ public partial class InventoryManager : Node
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
playerInventory = new InventoryInstance();
|
||||
playerInventory.SlotAmount = 30;
|
||||
playerInventory.SlotAmount = 37;
|
||||
}
|
||||
|
||||
public InventoryActionResult CreateItem(
|
||||
@@ -68,4 +81,14 @@ public partial class InventoryManager : Node
|
||||
{
|
||||
return playerInventory.AddItem(itemInstance);
|
||||
}
|
||||
}
|
||||
|
||||
public InventorySlot GetCurrentSelectedSlot()
|
||||
{
|
||||
if (CurrentSelectedSlotIndex < 0 || CurrentSelectedSlotIndex > 8)
|
||||
throw new ArgumentOutOfRangeException(
|
||||
nameof(CurrentSelectedSlotIndex),
|
||||
"currentInventoryBarIndex must be between 0 and 8 (inclusively)");
|
||||
|
||||
return playerInventory.Slots[CurrentSelectedSlotIndex];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,28 +1,34 @@
|
||||
#nullable enable
|
||||
using Godot;
|
||||
|
||||
namespace Babushka.scripts.CSharp.Common.Inventory;
|
||||
|
||||
public partial class InventoryUi : Control
|
||||
{
|
||||
private GridContainer _slots;
|
||||
private Control _slots;
|
||||
private Control _slotsMover;
|
||||
private InventoryInstance _playerInventory;
|
||||
private Control _slotSelect;
|
||||
|
||||
private int? _slotOnMouse;
|
||||
|
||||
private int _selectedSlot = 0;
|
||||
|
||||
private bool _inventoryExtended = false;
|
||||
private Tween? _inventoryExtensionTween;
|
||||
|
||||
[Export]
|
||||
private float _inventoryClosedOffset = 0f;
|
||||
|
||||
[Export]
|
||||
private float _inventoryOpenedOffset = 200f;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
GD.Print("Ready inventory ui");
|
||||
_slots = GetNode<GridContainer>("SlotsContainer/Slots");
|
||||
_slots = GetNode<Control>("SlotsContainer/SlotsMover/Slots");
|
||||
_slotsMover = GetNode<Control>("SlotsContainer/SlotsMover");
|
||||
_playerInventory = InventoryManager.Instance.playerInventory;
|
||||
_slotSelect = GetNode<Control>("SlotsContainer/SlotSelectContainer/Selector");
|
||||
PopulateSlots();
|
||||
//PopulateSlots();
|
||||
SubscribeSlots();
|
||||
SetSlotContent();
|
||||
SetSlotSelectPosition();
|
||||
InventoryManager.Instance.playerInventory.InventoryContentsChanged += SetSlotContent;
|
||||
@@ -54,7 +60,7 @@ public partial class InventoryUi : Control
|
||||
|
||||
private void SetSlotSelectPosition()
|
||||
{
|
||||
_slotSelect.Position = new Vector2(_selectedSlot * 100, 0);
|
||||
_slotSelect.Position = new Vector2(InventoryManager.Instance.CurrentSelectedSlotIndex * 100, 0);
|
||||
}
|
||||
|
||||
private void PopulateSlots()
|
||||
@@ -68,6 +74,17 @@ public partial class InventoryUi : Control
|
||||
_slots.AddChild(slotInstance);
|
||||
}
|
||||
}
|
||||
|
||||
private void SubscribeSlots()
|
||||
{
|
||||
for (var index = 0; index < _playerInventory.Slots.Count; index++)
|
||||
{
|
||||
var slotInstance = _slots.GetChild<SlotUi>(index);
|
||||
slotInstance.index = index;
|
||||
slotInstance.Clicked += SlotClicked;
|
||||
_slots.AddChild(slotInstance);
|
||||
}
|
||||
}
|
||||
|
||||
private void UnsubscribeSlots()
|
||||
{
|
||||
@@ -108,17 +125,17 @@ public partial class InventoryUi : Control
|
||||
|
||||
if (Input.IsActionJustPressed("ui_inventory_disadvance"))
|
||||
{
|
||||
_selectedSlot++;
|
||||
if (_selectedSlot > 9)
|
||||
_selectedSlot = 0;
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex++;
|
||||
if (InventoryManager.Instance.CurrentSelectedSlotIndex > 8)
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex = 0;
|
||||
SetSlotSelectPosition();
|
||||
}
|
||||
|
||||
if (Input.IsActionJustPressed("ui_inventory_advance"))
|
||||
{
|
||||
_selectedSlot--;
|
||||
if (_selectedSlot < 0)
|
||||
_selectedSlot = 9;
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex--;
|
||||
if (InventoryManager.Instance.CurrentSelectedSlotIndex < 0)
|
||||
InventoryManager.Instance.CurrentSelectedSlotIndex = 8;
|
||||
SetSlotSelectPosition();
|
||||
}
|
||||
}
|
||||
@@ -134,7 +151,7 @@ public partial class InventoryUi : Control
|
||||
_inventoryExtensionTween = GetTree().CreateTween();
|
||||
_slotSelect.Hide();
|
||||
_inventoryExtensionTween
|
||||
.TweenProperty(_slots, "offset_bottom", -100, 0.4)
|
||||
.TweenProperty(_slotsMover, "offset_bottom", _inventoryOpenedOffset, 0.4)
|
||||
.SetTrans(Tween.TransitionType.Quad)
|
||||
.SetEase(Tween.EaseType.Out);
|
||||
}
|
||||
@@ -144,7 +161,7 @@ public partial class InventoryUi : Control
|
||||
_inventoryExtensionTween = GetTree().CreateTween();
|
||||
_slotSelect.Show();
|
||||
_inventoryExtensionTween
|
||||
.TweenProperty(_slots, "offset_bottom", 200, 0.4)
|
||||
.TweenProperty(_slotsMover, "offset_bottom", _inventoryClosedOffset, 0.4)
|
||||
.SetTrans(Tween.TransitionType.Quad)
|
||||
.SetEase(Tween.EaseType.Out);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user