Jonathan
/
Babushka
2
0
Fork 0
Code Pull Requests 3 Releases Activity

removed unnecessary icons from farming controls

Browse Source
remotes/checkIfPRContentChanged-1749884192368007736/inventory
kziolkowski 8 months ago
parent 15c2a84ecd
commit 73dc3063c0
3 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File

5
prefabs/Player2D.tscn
Unescape View File

@ -3498,11 +3498,8 @@ offset_top = 226.0
offset_bottom = 226.0
scale = Vector2(3, 3)
[node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_hoeSprite", "_wateringCanEmptySprite", "_wateringCanFilledSprite", "_movingPlayer", "_camera")]
[node name="FarmingControls" type="Node2D" parent="." node_paths=PackedStringArray("_movingPlayer", "_camera")]
script = ExtResource("291_31q85")
_hoeSprite = NodePath("../CharacterBody2D/visuals/Hoe")
_wateringCanEmptySprite = NodePath("../CharacterBody2D/visuals/WateringCanEmpty")
_wateringCanFilledSprite = NodePath("../CharacterBody2D/visuals/WateringCanFull")
_fieldPrefab = ExtResource("294_28qer")
_movingPlayer = NodePath("../CharacterBody2D")
_camera = NodePath("../CharacterBody2D/Camera2D")

40
scenes/Babushka_scene_farm_outside_2d.tscn
Unescape View File

@ -1,4 +1,4 @@
[gd_scene load_steps=55 format=3 uid="uid://gigb28qk8t12"]
[gd_scene load_steps=54 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"]
@ -25,7 +25,6 @@
[ext_resource type="Texture2D" uid="uid://3ed3dgq3irn2" path="res://art/farm/farming/farmobjekte/zaun/tilable fence end part2.png" id="21_if5vh"]
[ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="21_ualyd"]
[ext_resource type="Script" uid="uid://dhxtdhfqx3bte" path="res://scripts/CSharp/Common/Farming/FieldService2D.cs" id="25_0qu0h"]
[ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field_2d.tscn" id="26_vbdb2"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="27_klb81"]
[ext_resource type="PackedScene" uid="uid://ce0mc0ddijmyi" path="res://prefabs/interactions/sprite_switcher_2d.tscn" id="28_p6n74"]
[ext_resource type="Script" uid="uid://btusf04xnywhm" path="res://scripts/CSharp/Common/Inventory/ItemOnGround2D.cs" id="29_hukxv"]
@ -685,6 +684,7 @@ collision_mask = 6
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)
@ -734,34 +734,6 @@ _id = 1
position = Vector2(80, -368)
shape = SubResource("CircleShape2D_p6n74")
[node name="BaseField" parent="." instance=ExtResource("26_vbdb2")]
visible = false
position = Vector2(11280, 2560)
[node name="FieldBehaviour" parent="BaseField" index="1"]
FieldState = 3
[node name="BaseField2" parent="." instance=ExtResource("26_vbdb2")]
visible = false
position = Vector2(11280, 3304)
[node name="FieldBehaviour" parent="BaseField2" index="1"]
FieldState = 3
[node name="BaseField3" parent="." instance=ExtResource("26_vbdb2")]
visible = false
position = Vector2(12080, 3296)
[node name="FieldBehaviour" parent="BaseField3" index="1"]
FieldState = 3
[node name="BaseField4" parent="." instance=ExtResource("26_vbdb2")]
visible = false
position = Vector2(12080, 2544)
[node name="FieldBehaviour" parent="BaseField4" index="1"]
FieldState = 3
[node name="Hoe Pickup" parent="." node_paths=PackedStringArray("_sprites") instance=ExtResource("27_klb81")]
position = Vector2(7728, 2000)
rotation = 3.3074
@ -817,14 +789,6 @@ region_rect = Rect2(1, 1138, 418, 288)
[connection signal="InteractedTool" from="Watercan Pickup" to="YSorted/Player2d" method="ActivateTool"]
[editable path="YSorted/Brünnen/InteractionArea"]
[editable path="BaseField"]
[editable path="BaseField/FieldBehaviour/BasePlant"]
[editable path="BaseField2"]
[editable path="BaseField2/FieldBehaviour/BasePlant"]
[editable path="BaseField3"]
[editable path="BaseField3/FieldBehaviour/BasePlant"]
[editable path="BaseField4"]
[editable path="BaseField4/FieldBehaviour/BasePlant"]
[editable path="Hoe Pickup"]
[editable path="Watercan Pickup"]
[editable path="Watercan Pickup/ActiveInactive"]

29
scripts/CSharp/Common/Farming/FarmingControls2D.cs
Unescape View File

@ -1,4 +1,3 @@
using Babushka.scripts.CSharp.Common.Inventory;
using Godot;
using Godot.Collections;
@ -7,9 +6,6 @@ namespace Babushka.scripts.CSharp.Common.Farming;
[GlobalClass]
public partial class FarmingControls2D : Node2D
{
[Export] private Sprite2D _hoeSprite;
[Export] private Sprite2D _wateringCanEmptySprite;
[Export] private Sprite2D _wateringCanFilledSprite;
[Export] private PackedScene _fieldPrefab;
[Export] private Node2D _movingPlayer;
[Export] private Camera2D _camera;
@ -50,28 +46,6 @@ public partial class FarmingControls2D : Node2D
}
}
switch (toolId)
{
case 0:
_hoeSprite.Visible = activate;
break;
case 1:
if (activate)
{
_wateringCanEmptySprite.Visible = true;
GD.Print("Activating empty Watering can sprite.");
}
else
{
_wateringCanEmptySprite.Visible = false;
_wateringCanFilledSprite.Visible = false;
}
break;
default:
_toolId = -1;
break;
}
_toolId = activate ? toolId : -1;
return activate;
}
@ -99,9 +73,6 @@ public partial class FarmingControls2D : Node2D
{
if (_toolId == 1 )
{
GD.Print("Watering can in hand, filling.");
_wateringCanEmptySprite.Visible = !fillUp;
_wateringCanFilledSprite.Visible = fillUp;
_wateringCanFilled = fillUp;
}
}

Write Preview
Loading…
Cancel
Save