s425077/PotatoPlan
1
0
Fork 2
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'Oskar-ML' of https://git.wmi.amu.edu.pl/s425077/PotatoPlan into Oskar-ML

Browse Source
This commit is contained in:
BOTLester 2020-05-10 23:11:18 +02:00
commit 5424c2c66a
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Game1/Sources/Crops/Crops.cs
View File

@ -142,6 +142,10 @@ class Crops
} }
else else
{ {
if (cropType == 0)
{
return 16; //Barley
}
if (cropType == 1) if (cropType == 1)
{ {
return 16; //Barley return 16; //Barley

13
Game1/Sources/Objects/HandleRotation.cs
View File

@ -5,11 +5,12 @@ class HandleRotation
{ {
int rotationSpeed = 5, Rotation = 180; int rotationSpeed = 5, Rotation = 180;
private float oldSpeed, movementSpeed; private float oldSpeed, movementSpeed;
private Vector2 oldTile, oldPosition; private Vector2 oldTile, oldPosition, oldMovementSpeed;
private Vector2 Direction;
public Vector2 UpdatePosition(int Destination, float tractorSpeed, Vector2 Position, Crops crops) public Vector2 UpdatePosition(int Destination, float tractorSpeed, Vector2 Position, Crops crops, Vector2 oldDeltaPosition, Vector2 Target)
{ {
Vector2 Direction;
if (oldSpeed != crops.getSpeedFactor(tractorSpeed)) if (oldSpeed != crops.getSpeedFactor(tractorSpeed))
{ {
Position = new Vector2((int)Math.Round(Position.X), (int)Math.Round(Position.Y)); Position = new Vector2((int)Math.Round(Position.X), (int)Math.Round(Position.Y));
@ -105,7 +106,11 @@ class HandleRotation
} }
oldSpeed = crops.getSpeedFactor(tractorSpeed); oldSpeed = crops.getSpeedFactor(tractorSpeed);
oldPosition = Position; if (oldDeltaPosition.X < 1 && oldDeltaPosition.X > -1 && oldDeltaPosition.Y < 1 && oldDeltaPosition.Y > -1)
{
Position = Target;
}
oldMovementSpeed = Direction;
return Position; return Position;
} }

8
Game1/Sources/Objects/Tractor.cs
View File

@ -49,20 +49,20 @@ class Tractor
} }
else if (DeltaPosition.Y > 0) else if (DeltaPosition.Y > 0)
{ {
Position = handleRotation.UpdatePosition(0, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing)))); Position = handleRotation.UpdatePosition(0, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing))), DeltaPosition, TargetPosition);
} }
else if (DeltaPosition.Y < 0) else if (DeltaPosition.Y < 0)
{ {
Position = handleRotation.UpdatePosition(1, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing)))); Position = handleRotation.UpdatePosition(1, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing))), DeltaPosition, TargetPosition);
} }
} }
else if (DeltaPosition.X > 0) else if (DeltaPosition.X > 0)
{ {
Position = handleRotation.UpdatePosition(2, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing)))); Position = handleRotation.UpdatePosition(2, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing))), DeltaPosition, TargetPosition);
} }
else if (DeltaPosition.X < 0) else if (DeltaPosition.X < 0)
{ {
Position = handleRotation.UpdatePosition(3, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing)))); Position = handleRotation.UpdatePosition(3, tractorSpeed, Position, smartTractor.getFarm().getCrop((int)Math.Round(Position.X / (sizeTile + Spacing)), (int)Math.Round(Position.Y / (sizeTile + Spacing))), DeltaPosition, TargetPosition);
} }
} }