adjusted liquid behavior
This commit is contained in:
@@ -69,14 +69,14 @@ public class Chunk {
|
||||
return;
|
||||
}
|
||||
|
||||
Type type = typeof(T);
|
||||
object o = Activator.CreateInstance(type, x, y, this);
|
||||
|
||||
// check if not empty and overwrite not allowed:
|
||||
if (!Elements[x,y].IsEmpty() && !Main.Instance.AllowOverwrite) {
|
||||
return;
|
||||
}
|
||||
|
||||
Type type = typeof(T);
|
||||
object o = Activator.CreateInstance(type, x, y, this);
|
||||
|
||||
Elements[x, y].Chunk.RemoveFromChunk(Elements[x, y]);
|
||||
Elements[x, y] = o as Element;
|
||||
Elements[x, y].Active = true;
|
||||
|
||||
@@ -31,7 +31,7 @@ public class Element{
|
||||
Chunk.SetElementActive(this, Active);
|
||||
}
|
||||
|
||||
public Element(int x, int y, Chunk chunk) {
|
||||
public Element(int x, int y, Chunk chunk, bool active = true) {
|
||||
Position.X = x;
|
||||
Position.Y = y;
|
||||
Chunk = chunk;
|
||||
|
||||
@@ -24,11 +24,17 @@ public abstract class Liquid : Element {
|
||||
|
||||
if (Chunk.IsEmpty(Position + Vector2I.Down))
|
||||
Chunk.Swap(this, Position + Vector2I.Down);
|
||||
|
||||
else if (Chunk.IsEmpty(Position + randomDirection))
|
||||
Chunk.Swap(this, Position + randomDirection);
|
||||
else if (Chunk.IsEmpty(Position + randomDirection * VERTICAL_OPPOSITE))
|
||||
Chunk.Swap(this, Position + randomDirection * VERTICAL_OPPOSITE);
|
||||
|
||||
else if (Chunk.IsEmpty(Position + 1 * randomDirection))
|
||||
Chunk.Swap(this, Position + 1 * randomDirection);
|
||||
else if (Chunk.IsEmpty(Position - 1 * randomDirection * VERTICAL_OPPOSITE))
|
||||
Chunk.Swap(this, Position - 1 * randomDirection * VERTICAL_OPPOSITE);
|
||||
|
||||
else if (Chunk.IsEmpty(Position + 2 * randomDirection))
|
||||
Chunk.Swap(this, Position + 2 * randomDirection);
|
||||
else if (Chunk.IsEmpty(Position - 2 * randomDirection * VERTICAL_OPPOSITE))
|
||||
|
||||
Reference in New Issue
Block a user