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

🚧 reworked farming system to work with indices instead of positions

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-11-11 14:02:03 +01:00
parent 97dcadf07a
commit 55f0d2a77e
11 changed files with 98 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/CSharp/Common/Farming/FieldService.cs
+25 -16
View File
@@ -22,9 +22,9 @@ public partial class FieldService : Node
//Create
public bool TryAddEntry(string sceneName, Vector2I position, FieldBehaviour2D field)
public bool TryAddEntry(string sceneName, int fieldIndex, FieldBehaviour2D field)
{
GD.Print("Trying to add a field at: " + position);
GD.Print("Trying to add a field at: " + fieldIndex);
if (_outerDict != null )
{
FieldsInScene innerDict;
@@ -36,21 +36,25 @@ public partial class FieldService : Node
_outerDict.Add(sceneName, innerDict);
}
if (!innerDict.fields.ContainsKey(position))
if (!innerDict.fields.ContainsKey(fieldIndex))
{
innerDict.fields.Add(position, field);
innerDict.fields.Add(fieldIndex, field);
return true;
}
else
{
GD.PrintErr("Duplicate field at: " + fieldIndex);
}
}
return false;
}
// Read
public FieldBehaviour2D? TryGet(string key, Vector2I fieldPosition)
public FieldBehaviour2D? TryGet(string key, int fieldIndex)
{
if (_outerDict != null && _outerDict.TryGetValue(key, out FieldsInScene? field))
{
if (field.fields.TryGetValue(fieldPosition, out FieldBehaviour2D? fieldInstance))
if (field.fields.TryGetValue(fieldIndex, out FieldBehaviour2D? fieldInstance))
{
return fieldInstance;
}
@@ -60,42 +64,47 @@ public partial class FieldService : Node
//Update
public void UpdateEntry(string key, Vector2I fieldPosition, FieldBehaviour2D state)
public void UpdateEntry(string key, int fieldIndex, FieldBehaviour2D state)
{
if (_outerDict != null && _outerDict.TryGetValue(key, out FieldsInScene? field))
{
if (field.fields.ContainsKey(fieldPosition))
if (field.fields.ContainsKey(fieldIndex))
{
field.fields[fieldPosition] = state;
field.fields[fieldIndex] = state;
}
else
{
TryAddEntry(key, fieldPosition, state);
TryAddEntry(key, fieldIndex, state);
}
}
}
//Delete
public void RemoveEntry(string key, Vector2I fieldPosition)
public void RemoveEntry(string key, int fieldIndex)
{
if (_outerDict != null && _outerDict.TryGetValue(key, out FieldsInScene? field))
{
if (field.fields.ContainsKey(fieldPosition))
if (field.fields.ContainsKey(fieldIndex))
{
field.fields.Remove(fieldPosition);
field.fields.Remove(fieldIndex);
}
}
}
public int PositionToIndex(Vector2 position)
{
// some awesome code here
return 0;
}
}
internal class FieldsInScene
{
public Dictionary<Vector2I, FieldBehaviour2D?> fields;
public Dictionary<int, FieldBehaviour2D?> fields;
public FieldsInScene()
{
fields = new Dictionary<Vector2I, FieldBehaviour2D?>();
fields = new Dictionary<int, FieldBehaviour2D?>();
}
}