BTH/depthsbelow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Yay pathfinding! (AGAIN (YES IT ACTUALLY WORKS NOW))

Browse Source
This commit is contained in:
Simon Holmberg
2012-10-29 14:36:42 +01:00
parent 3c40dd354e
commit ef13987044
4 changed files with 115 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DepthsBelow/DepthsBelow/Component/PathFinder.cs
+1 -1
View File
@@ -166,7 +166,7 @@ namespace DepthsBelow.Component
if (path == null) if (path == null)
Debug.WriteLine(this.Parent.ToString() + ": Path not found!"); Debug.WriteLine(this.Parent.ToString() + ": Path not found!");
this.CollisionMap = new byte[100, 100]; //this.CollisionMap = new byte[100, 100];
return path; return path;
} }
DepthsBelow/DepthsBelow/Interface.cs
+82 -55
View File
@@ -193,68 +193,95 @@ namespace DepthsBelow
Point mainpath = Point.Zero; Point mainpath = Point.Zero;
Stack<Soldier> soldierStack = new Stack<Soldier>(); Stack<Soldier> soldierStack = new Stack<Soldier>();
//core.Squad.Where(a=>a.Selected).ToList().ForEach(a => soldierStack.Push(a)); //core.Squad.Where(a=>a.Selected).ToList().ForEach(a => soldierStack.Push(a));
foreach (var soldier in core.Squad) /*foreach (var soldier in core.Squad)
{ {
if (soldier.Selected) if (soldier.Selected)
{ {
soldierStack.Push(soldier); soldierStack.Push(soldier);
} }
} }*/
byte[,] collisionMap = Core.Map.GetCollisionMap(); // Don't move into other soldiers
int X=5; bool blocked = false;
int Y=5; foreach (var soldier in core.Squad)
int x,y,dx,dy; if (soldier.Position == mouseGridPos)
x = y = dx =0; blocked = true;
dy = -1;
int t = (int)MathHelper.Max(X,Y);
int maxI = t*t;
for(int i =0; i < maxI; i++){
if ((-X/2 < x&&x <= X/2) && (-Y/2 < y&&y <= Y/2))
{
Point point = new Point(x + mouseGridPos.X, y + mouseGridPos.Y);
if (collisionMap[point.X,point.Y]==1)
{
if (soldierStack.Count==0)
{
break;
}
var soldier = soldierStack.Pop();
if (soldier==null)
{
break;
}
else
{
soldier.GetComponent<Component.PathFinder>().Goal = point;
Console.WriteLine(x + " " + y);
Console.WriteLine(soldier.GetComponent<Component.PathFinder>().Goal.X + " " + soldier.GetComponent<Component.PathFinder>().Goal.Y);
}
}
} if (!blocked)
if( (x == y) || ((x < 0) && (x == -y)) || ((x > 0) && (x == 1-y))){ {
t = dx; byte[,] collisionMap = Core.Map.GetCollisionMap();
dx = -dy;
dy = t; // Try pathfinding
} foreach (var unit in core.Squad)
x += dx; {
y += dy; if (unit.Selected)
} {
//foreach (var unit in core.Squad) if (mainpath == Point.Zero)
//{ {
// if (unit.Selected) mainpath = unit.Position;
// { }
// if (mainpath==Point.Zero) Vector2 fromMain = new Vector2((mainpath.X - unit.Position.X)*Grid.TileSize,
// { (mainpath.Y - unit.Position.Y)*Grid.TileSize);
// mainpath = unit.Position; var goal = Grid.WorldToGrid(mouseWorldPos - fromMain);
// } unit.GetComponent<Component.PathFinder>().Goal = goal;
// Vector2 fromMain = new Vector2((mainpath.X - unit.Position.X) * 30,(mainpath.Y-unit.Position.Y) * 30); if (unit.GetComponent<Component.PathFinder>().IsMoving == false)
// unit.GetComponent<Component.PathFinder>().Goal = Grid.WorldToGrid(mouseWorldPos - fromMain); {
// } // If a path was not found, add the unit to the stack
//} soldierStack.Push(unit);
}
else
{
collisionMap[goal.X, goal.Y] = 0;
}
}
}
// Loop in a spiral and assign the soldiers in the stack their own unblocked positions
int X = 10;
int Y = 10;
int x, y, dx, dy;
x = y = dx = 0;
dy = -1;
int t = (int) MathHelper.Max(X, Y);
int maxI = t*t;
for (int i = 0; i < maxI; i++)
{
if ((-X/2 < x && x <= X/2) && (-Y/2 < y && y <= Y/2))
{
Point point = new Point(x + mouseGridPos.X, y + mouseGridPos.Y);
if (collisionMap[point.X, point.Y] == 1)
{
if (soldierStack.Count == 0)
{
break;
}
var soldier = soldierStack.Pop();
if (soldier == null)
{
break;
}
else
{
soldier.GetComponent<Component.PathFinder>().Goal = point;
Console.WriteLine(x + " " + y);
Console.WriteLine(soldier.GetComponent<Component.PathFinder>().Goal.X + " " +
soldier.GetComponent<Component.PathFinder>().Goal.Y);
}
}
}
if ((x == y) || ((x < 0) && (x == -y)) || ((x > 0) && (x == 1 - y)))
{
t = dx;
dx = -dy;
dy = t;
}
x += dx;
y += dy;
}
}
} }
} }
}; };
DepthsBelow/DepthsBelow/SmallEnemy.cs
+7 -1
View File
@@ -61,6 +61,12 @@ namespace DepthsBelow
}; };
AddComponent(stat); AddComponent(stat);
} }
public override void Remove()
{
Swarm.Remove(this);
base.Remove();
}
public bool Selected public bool Selected
{ {
@@ -148,7 +154,7 @@ namespace DepthsBelow
{ {
if (Utility.AttackTest(this.GetComponent<Component.Stat>(), entity, Utility.CalculateHitChance(this.GetComponent<Component.Stat>(), this.Transform.World.Position, entity))) if (Utility.AttackTest(this.GetComponent<Component.Stat>(), entity, Utility.CalculateHitChance(this.GetComponent<Component.Stat>(), this.Transform.World.Position, entity)))
{ {
return; break;
} }
} }
} }
DepthsBelow/DepthsBelow/Soldier.cs
+25 -18
View File
@@ -82,6 +82,13 @@ namespace DepthsBelow
GetDodge = 20 GetDodge = 20
}; };
AddComponent(stat); AddComponent(stat);
}
public override void Remove()
{
Squad.Remove(this);
base.Remove();
} }
public bool Selected public bool Selected
@@ -112,24 +119,24 @@ namespace DepthsBelow
{ {
List<Point> soldierCollisions = new List<Point>(); List<Point> soldierCollisions = new List<Point>();
// Collision with units at a standstill // Collision with units at a standstill
//foreach (var soldier in Squad) //foreach (var soldier in Squad)
//{ //{
// if (soldier != this) // if (soldier != this)
// { // {
// if (!soldier.GetComponent<PathFinder>().IsMoving) // if (!soldier.GetComponent<PathFinder>().IsMoving)
// { // {
// soldierCollisions.Add(soldier.Transform.Grid); // soldierCollisions.Add(soldier.Transform.Grid);
// } // }
// if (soldier.Transform.Grid == nextNode.Position) // if (soldier.Transform.Grid == nextNode.Position)
// { // {
// GetComponent<PathFinder>().RecreatePath(soldierCollisions); // GetComponent<PathFinder>().RecreatePath(soldierCollisions);
// nextNode = GetComponent<PathFinder>().Next(); // nextNode = GetComponent<PathFinder>().Next();
// break; // break;
// } // }
// } // }
//} //}
// Collision with moving units // Collision with moving units
//foreach (var soldier in Squad) //foreach (var soldier in Squad)