Reworked DSL for better architecture, implemented wall-phasing movement.
This commit is contained in:
@@ -6,12 +6,12 @@ public class CraftNode : ProgramNode
|
||||
{
|
||||
DisplayText = "Craft";
|
||||
}
|
||||
public override bool Execute(Robot robot)
|
||||
public override bool Execute(Robot robot, double delta)
|
||||
{
|
||||
GD.Print("Craft");
|
||||
if (nextNode != null)
|
||||
{
|
||||
return nextNode.Execute(robot);
|
||||
return nextNode.Execute(robot, delta);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -23,4 +23,10 @@ public class CraftNode : ProgramNode
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public override ProgramNode Duplicate()
|
||||
{
|
||||
CraftNode duplicate = new CraftNode();
|
||||
return duplicate;
|
||||
}
|
||||
}
|
||||
@@ -6,12 +6,12 @@ public class HarvestNode : ProgramNode
|
||||
{
|
||||
DisplayText = "Harvest";
|
||||
}
|
||||
public override bool Execute(Robot robot)
|
||||
public override bool Execute(Robot robot, double delta)
|
||||
{
|
||||
GD.Print("Harvest");
|
||||
if (nextNode != null)
|
||||
{
|
||||
return nextNode.Execute(robot);
|
||||
return nextNode.Execute(robot, delta);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -23,4 +23,10 @@ public class HarvestNode : ProgramNode
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public override ProgramNode Duplicate()
|
||||
{
|
||||
HarvestNode duplicate = new HarvestNode();
|
||||
return duplicate;
|
||||
}
|
||||
}
|
||||
@@ -8,19 +8,20 @@ public class MoveNode : ProgramNode
|
||||
{
|
||||
DisplayText = "Move";
|
||||
}
|
||||
public override bool Execute(Robot robot)
|
||||
public override bool Execute(Robot robot, double delta)
|
||||
{
|
||||
Vector3 worldTarget = GameData.map[targetPosition.Y].tiles[targetPosition.X, targetPosition.Z].Position;
|
||||
GD.Print(startPosition + "/" + worldTarget);
|
||||
startPosition = robot.Position;
|
||||
GD.Print(targetPosition);
|
||||
robot.Position = GameData.map[targetPosition.Y].tiles[targetPosition.X, targetPosition.Z].Position;
|
||||
if (nextNode != null)
|
||||
{
|
||||
return nextNode.Execute(robot);
|
||||
}
|
||||
else
|
||||
Vector3 direction = worldTarget - startPosition;
|
||||
robot.Translate(direction.Normalized() * (float)delta * GameData.robotSpeed);
|
||||
float distance = direction.Length();
|
||||
if (distance < 0.1f)
|
||||
{
|
||||
robot.Position = worldTarget;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public override void ReadParameters(NodeDisplay display)
|
||||
@@ -34,5 +35,12 @@ public class MoveNode : ProgramNode
|
||||
targetPosition = new Vector3I(posX, posY, posZ);
|
||||
}
|
||||
|
||||
|
||||
public override ProgramNode Duplicate()
|
||||
{
|
||||
MoveNode duplicate = new MoveNode
|
||||
{
|
||||
targetPosition = targetPosition
|
||||
};
|
||||
return duplicate;
|
||||
}
|
||||
}
|
||||
@@ -2,17 +2,10 @@ using Godot;
|
||||
|
||||
public abstract class ProgramNode
|
||||
{
|
||||
protected ProgramNode nextNode;
|
||||
public ProgramNode nextNode;
|
||||
public string DisplayText;
|
||||
public ProgramNode()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public abstract bool Execute(Robot robot);
|
||||
public abstract bool Execute(Robot robot, double delta);
|
||||
public abstract void ReadParameters(NodeDisplay display);
|
||||
public void LinkNode(ProgramNode nextNode)
|
||||
{
|
||||
this.nextNode = nextNode;
|
||||
}
|
||||
public abstract ProgramNode Duplicate();
|
||||
}
|
||||
Reference in New Issue
Block a user