Fixed InventoryInstance behaviour

pull/16/head
kziolkowski 4 months ago
parent c56f654751
commit 0713e334b3

@ -178,13 +178,13 @@ radius = 300.0
shader = ExtResource("37_taxvr") shader = ExtResource("37_taxvr")
shader_parameter/speed = 1.0 shader_parameter/speed = 1.0
shader_parameter/minStrength = 0.05 shader_parameter/minStrength = 0.05
shader_parameter/maxStrength = 0.187 shader_parameter/maxStrength = 0.326
shader_parameter/strengthScale = 100.0 shader_parameter/strengthScale = 100.0
shader_parameter/interval = 3.5 shader_parameter/interval = 3.5
shader_parameter/detail = 2.095 shader_parameter/detail = 2.095
shader_parameter/distortion = 1.0 shader_parameter/distortion = 1.0
shader_parameter/heightOffset = 0.51 shader_parameter/heightOffset = 0.51
shader_parameter/offset = 1.0 shader_parameter/offset = 100.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_618my"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_618my"]
shader = ExtResource("37_taxvr") shader = ExtResource("37_taxvr")
@ -1093,6 +1093,7 @@ shape = SubResource("CircleShape2D_tm0yg")
[node name="SeedPickup" parent="YSorted" instance=ExtResource("25_hukxv")] [node name="SeedPickup" parent="YSorted" instance=ExtResource("25_hukxv")]
position = Vector2(10114, 2469) position = Vector2(10114, 2469)
_infiniteSupply = true
_finiteSupply = 3 _finiteSupply = 3
[node name="SpawnWithItem" parent="YSorted/SeedPickup" index="0"] [node name="SpawnWithItem" parent="YSorted/SeedPickup" index="0"]
@ -1282,6 +1283,7 @@ region_rect = Rect2(130, 0, 201, 278)
[node name="bush15" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"] [node name="bush15" type="Sprite2D" parent="YSorted/Farm visuals/Static/greenery/left side"]
modulate = Color(1, 0.86, 0.86, 1) modulate = Color(1, 0.86, 0.86, 1)
z_index = 2
material = SubResource("ShaderMaterial_bcdgk") material = SubResource("ShaderMaterial_bcdgk")
position = Vector2(7757, 4194) position = Vector2(7757, 4194)
scale = Vector2(3.21806, 3.18583) scale = Vector2(3.21806, 3.18583)

@ -1020,7 +1020,6 @@ z_index = 1
position = Vector2(-2031, 2949) position = Vector2(-2031, 2949)
_fieldParent = NodePath("../Farm visuals/FieldParent") _fieldParent = NodePath("../Farm visuals/FieldParent")
_hoe = ExtResource("29_36k8l") _hoe = ExtResource("29_36k8l")
_wateringCan = ExtResource("30_te7n5")
[node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")] [node name="FarmingControls" parent="YSorted/Vesna" index="1" node_paths=PackedStringArray("_camera")]
_camera = NodePath("../../../Camera2D") _camera = NodePath("../../../Camera2D")
@ -2074,10 +2073,11 @@ rotation = 1.5708
scale = Vector2(0.1, 10.8) scale = Vector2(0.1, 10.8)
texture = ExtResource("26_rnkrk") texture = ExtResource("26_rnkrk")
[node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals"] [node name="FieldParent" type="Node2D" parent="YSorted/Farm visuals" node_paths=PackedStringArray("fields")]
position = Vector2(53, 20) position = Vector2(53, 20)
scale = Vector2(1, 0.993819) scale = Vector2(1, 0.993819)
script = ExtResource("47_o4ch6") script = ExtResource("47_o4ch6")
fields = {}
metadata/_custom_type_script = "uid://dhxtdhfqx3bte" metadata/_custom_type_script = "uid://dhxtdhfqx3bte"
[node name="Area2D" type="Area2D" parent="YSorted/Farm visuals/FieldParent"] [node name="Area2D" type="Area2D" parent="YSorted/Farm visuals/FieldParent"]

@ -197,7 +197,7 @@ stream_2/stream = ExtResource("63_td2xu")
[node name="BabushkaSceneFarmOutside2d" type="Node2D"] [node name="BabushkaSceneFarmOutside2d" type="Node2D"]
script = ExtResource("1_6krrk") script = ExtResource("1_6krrk")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d_ducksCollected.tscn") _sceneNamesToLoad = PackedStringArray("res://scenes/res://scenes/Babushka_scene_farm_outside_2d.tscn.tscn")
[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")] [node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
position = Vector2(3180, 1961) position = Vector2(3180, 1961)

@ -6,7 +6,7 @@
[node name="BabushkaSceneStartMenu" type="Node2D"] [node name="BabushkaSceneStartMenu" type="Node2D"]
script = ExtResource("1_fj2fh") script = ExtResource("1_fj2fh")
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_farm_outside_2d.tscn") _sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_disclaimer.tscn")
[node name="CanvasLayer" type="CanvasLayer" parent="."] [node name="CanvasLayer" type="CanvasLayer" parent="."]

@ -114,7 +114,10 @@ public partial class InventoryInstance : Node
return InventoryActionResult.SourceDoesNotExist; return InventoryActionResult.SourceDoesNotExist;
itemInstance.amount -= 1; itemInstance.amount -= 1;
_slots[inventorySlot].itemInstance = null;
if(itemInstance.amount == 0)
_slots[inventorySlot].itemInstance = null;
EmitSignal(SignalName.InventoryContentsChanged); EmitSignal(SignalName.InventoryContentsChanged);
return InventoryActionResult.Success; return InventoryActionResult.Success;
} }

Loading…
Cancel
Save