zoriya/Magical-Garden
1
0
Fork 0
mirror of https://github.com/zoriya/Magical-Garden.git synced 2026-06-04 17:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding tree power.

Browse Source
This commit is contained in:
Anonymous Raccoon
2018-08-13 17:30:54 +02:00
parent 3a2ee12182
commit 831441e5c2
2 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/SampleScene.unity
+1 -1
View File
@@ -13357,7 +13357,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 9cb1415fe0889b34b85613c01a46b855, type: 2}
- {fileID: 11400000, guid: f9daa4e1889a5c94eb3bc185cb5f6fb3, type: 2}
- {fileID: 0}
canOverrideTree: 2
canOverrideTree: 0
canBePlacedOn: 3
count: 0
- type: 0
Assets/Script/InventoryManager.cs
+72 -9
View File
@@ -89,7 +89,6 @@ public class InventoryManager : MonoBehaviour
{
Vector3Int cellPos = treeMap.WorldToCell(position);
int index = GetPlotIndex(cellPos);
print(GetPlotPositionByIndex(index));
Vector2Int plotPos = GetPlotPosition(cellPos);
plots[index].treePlaced = item.type;
@@ -103,7 +102,7 @@ public class InventoryManager : MonoBehaviour
}
}
CallOtherPowers();
CallPowers(index);
}
private void PlaceTree(TreeItem item, int index)
@@ -120,8 +119,6 @@ public class InventoryManager : MonoBehaviour
i++;
}
}
//CallOtherPowers();
}
private void DeleteTreeAt(int index)
@@ -140,12 +137,52 @@ public class InventoryManager : MonoBehaviour
}
}
private async void CallOtherPowers()
private async void CallPowers(int spawnIndex)
{
List<int> dontCallPlotPower = new List<int>();
//Spawn Power;
if (plots[spawnIndex].treePlaced == TreeType.SwapTree)
{
List<int> plot = new List<int>();
if (spawnIndex - 1 >= 0 && spawnIndex % 5 != 0 && plots[spawnIndex - 1].treePlaced != TreeType.Nothing)
plot.Add(spawnIndex - 1);
if (spawnIndex + 1 <= 24 && spawnIndex % 5 != 4 && plots[spawnIndex + 1].treePlaced != TreeType.Nothing)
plot.Add(spawnIndex + 1);
if (spawnIndex - 5 >= 0 && plots[spawnIndex - 5].treePlaced != TreeType.Nothing)
plot.Add(spawnIndex - 5);
if (spawnIndex + 5 <= 24 && plots[spawnIndex + 5].treePlaced != TreeType.Nothing)
plot.Add(spawnIndex + 5);
if (plot.Count > 0)
{
await Task.Delay(1000);
int r = Random.Range(0, plot.Count);
dontCallPlotPower.Add(plot[r]);
PlaceTree(items[(int)plots[plot[r]].treePlaced - 1], spawnIndex);
PlaceTree(items[(int)TreeType.SwapTree - 1], plot[r]);
}
}
//Check for other powers
List<int> callPowers = new List<int>();
int p = -1;
await Task.Delay(1000);
for (int i = 0; i < 25; i++)
{
if (callPowers.Count > 0)
{
p = i - 1;
i = callPowers[0];
callPowers.RemoveAt(0);
}
else if(p != -1)
{
i = p;
p = -1;
}
if (dontCallPlotPower.Contains(i))
continue;
@@ -189,7 +226,30 @@ public class InventoryManager : MonoBehaviour
int r = Random.Range(0, plot.Count);
dontCallPlotPower.Add(plot[r]);
DeleteTreeAt(i);
PlaceTree(items[(int)TreeType.Cactus - 1], plot[r]);
PlaceTree(items[(int)TreeType.AppleTree - 1], plot[r]);
await Task.Delay(1000);
}
}
else if (plots[i].treePlaced == TreeType.SwapTree && ((i - 1 >= 0 && i % 5 != 0 && plots[i - 1].treePlaced == TreeType.AppleTree) || (i + 1 <= 24 && i % 5 != 4 && plots[i + 1].treePlaced == TreeType.AppleTree) || (i - 5 >= 0 && plots[i - 5].treePlaced == TreeType.AppleTree) || (i + 5 <= 24 && plots[i + 5].treePlaced == TreeType.AppleTree)))
{
List<int> plot = new List<int>();
if (i - 1 >= 0 && i % 5 != 0 && plots[i - 1].treePlaced != TreeType.Nothing)
plot.Add(i - 1);
if (i + 1 <= 24 && i % 5 != 4 && plots[i + 1].treePlaced != TreeType.Nothing)
plot.Add(i + 1);
if (i - 5 >= 0 && plots[i - 5].treePlaced != TreeType.Nothing)
plot.Add(i - 5);
if (i + 5 <= 24 && plots[i + 5].treePlaced != TreeType.Nothing)
plot.Add(i + 5);
if (plot.Count > 0)
{
int r = Random.Range(0, plot.Count);
dontCallPlotPower.Add(plot[r]);
callPowers.Add(i);
PlaceTree(items[(int)plots[plot[r]].treePlaced - 1], i);
PlaceTree(items[(int)TreeType.SwapTree - 1], plot[r]);
await Task.Delay(1000);
}
}
@@ -198,9 +258,12 @@ public class InventoryManager : MonoBehaviour
public void StartDraggin(int index)
{
slots[index].transform.SetAsLastSibling();
draggedPosition = index;
defaultPos = slots[draggedPosition].transform.position;
if(items[index].count > 0)
{
slots[index].transform.SetAsLastSibling();
draggedPosition = index;
defaultPos = slots[draggedPosition].transform.position;
}
}
//public void AddItem(TreeItem item)