Done for the night
Need to change planning algo for square to go right to left.
This commit is contained in:
@@ -6,18 +6,14 @@ namespace ConsoleApp.Maps
|
||||
{
|
||||
public int X { get; }
|
||||
public int Y { get; }
|
||||
public int Z { get; }
|
||||
|
||||
public Cell(int x, int y, int z = default)
|
||||
|
||||
public Cell(int x, int y)
|
||||
{
|
||||
if (z != default)
|
||||
{
|
||||
if (x + y + z != 0) throw new ArgumentException("x + y + z must be 0");
|
||||
}
|
||||
|
||||
X = x;
|
||||
Y = y;
|
||||
Z = z;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,10 @@ namespace ConsoleApp.Maps
|
||||
North,
|
||||
South,
|
||||
East,
|
||||
West
|
||||
West,
|
||||
NorthEast,
|
||||
SouthEast,
|
||||
NorthWest,
|
||||
SouthWest
|
||||
}
|
||||
}
|
||||
@@ -1,13 +1,17 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using HexCore;
|
||||
|
||||
namespace ConsoleApp.Maps
|
||||
{
|
||||
public class HexMap : IHexMap
|
||||
{
|
||||
private int _mapHeight;
|
||||
private int _mapWidth;
|
||||
public Cell[,] Map { get; }
|
||||
public Cell StartingCell { get; }
|
||||
public Cell LastCell { get; }
|
||||
public Graph HexGraph { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Generate Hex map with cells of 25cm X 25cm
|
||||
@@ -19,27 +23,60 @@ namespace ConsoleApp.Maps
|
||||
//convert to cm
|
||||
x *= 100;
|
||||
y *= 100;
|
||||
|
||||
//calculate number of cells on x and y axis
|
||||
var xCellCount = (int)Math.Ceiling((decimal) (x) / 25);
|
||||
var yCellCount = (int)Math.Ceiling((decimal) (y) / 25);
|
||||
|
||||
_mapHeight = yCellCount;
|
||||
_mapWidth = xCellCount;
|
||||
|
||||
//Initialize Map
|
||||
Map = new Cell[xCellCount, yCellCount];
|
||||
|
||||
//set last cell;
|
||||
//set Starting cell;
|
||||
StartingCell = Map[0, 0];
|
||||
for (int r = 0; r < yCellCount; r++) {
|
||||
int r_offset = Convert.ToInt32(Math.Floor(Convert.ToDouble(r)/2));
|
||||
for (int q = r_offset; q < xCellCount - r_offset; q++) {
|
||||
// Console.WriteLine($"r:{r}, q:{q}-----x:{x}, y:{y}");
|
||||
Map[r, q] = new Cell(q, r, -q-r);
|
||||
|
||||
var unclearedTerrain = new TerrainType(1, "uncleared");
|
||||
var clearedTerrain = new TerrainType(2, "cleared");
|
||||
//Populate Map
|
||||
var list = new List<CellState>();
|
||||
for (int i = 0; i < _mapHeight; i++)
|
||||
{
|
||||
for (int j = 0; j < _mapWidth; j++)
|
||||
{
|
||||
list.Add(new CellState(false, new Coordinate2D(i, j, OffsetTypes.OddRowsRight), unclearedTerrain));
|
||||
}
|
||||
}
|
||||
var movement = new MovementType(1, "default");
|
||||
var movementTypes = new MovementTypes(
|
||||
new ITerrainType[] { unclearedTerrain, clearedTerrain },
|
||||
new Dictionary<IMovementType, Dictionary<ITerrainType, int>>
|
||||
{
|
||||
[movement] = new Dictionary<ITerrainType, int>
|
||||
{
|
||||
[unclearedTerrain] = 1,
|
||||
[clearedTerrain] = 2
|
||||
}
|
||||
}
|
||||
);
|
||||
HexGraph = GraphFactory.CreateRectangularGraph(_mapWidth, _mapHeight, movementTypes, unclearedTerrain);
|
||||
}
|
||||
|
||||
public List<GlobalDirection> PossibleMoves(ICell currentCell)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
var x = currentCell.X;
|
||||
var y = currentCell.Y;
|
||||
var possibles = new List<GlobalDirection>();
|
||||
|
||||
if(currentCell.Y != _mapHeight)
|
||||
possibles.Add(GlobalDirection.North);
|
||||
|
||||
if(currentCell.Y != 0)
|
||||
possibles.Add(GlobalDirection.South);
|
||||
|
||||
if(currentCell.X != _mapWidth && currentCell.Y != _mapHeight)
|
||||
possibles.Add(GlobalDirection.NorthEast);
|
||||
return possibles;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,5 @@ namespace ConsoleApp.Maps
|
||||
{
|
||||
int X { get; }
|
||||
int Y { get; }
|
||||
int Z { get; }
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using HexCore;
|
||||
|
||||
namespace ConsoleApp.Maps
|
||||
{
|
||||
@@ -9,5 +10,7 @@ namespace ConsoleApp.Maps
|
||||
Cell StartingCell { get; }
|
||||
Cell LastCell { get; }
|
||||
public List<GlobalDirection> PossibleMoves(ICell currentCell);
|
||||
|
||||
Graph HexGraph { get; }
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using HexCore;
|
||||
|
||||
namespace ConsoleApp.Maps
|
||||
{
|
||||
@@ -16,6 +17,7 @@ namespace ConsoleApp.Maps
|
||||
private int _mapHeight;
|
||||
public SquareMap(int x, int y)
|
||||
{
|
||||
HexGraph = default;
|
||||
//convert to cm
|
||||
x *= 100;
|
||||
y *= 100;
|
||||
@@ -23,7 +25,7 @@ namespace ConsoleApp.Maps
|
||||
var xCellCount = (int)Math.Ceiling((decimal) (x) / 25);
|
||||
var yCellCount = (int)Math.Ceiling((decimal) (y) / 25);
|
||||
|
||||
//set Width and height fields
|
||||
//set Width and height fields and Properties
|
||||
_mapWidth = xCellCount-1;
|
||||
_mapHeight = yCellCount-1;
|
||||
Height = _mapHeight;
|
||||
@@ -60,6 +62,8 @@ namespace ConsoleApp.Maps
|
||||
return possibles;
|
||||
}
|
||||
|
||||
public Graph HexGraph { get; }
|
||||
|
||||
public Cell this[in int x, in int y] => Map[x, y];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user