admin/tictactoe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed function for shifting cells and marks. now allows for wrap around - next up is incorporating logic to delete or clear cells that get wrapped around

Browse Source
This commit is contained in:
cojoedmo
2026-01-29 01:44:29 -05:00
parent f07139c440
commit d9d33f9758
4 changed files with 120 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Gameplay/Actor.cs
View File

@@ -54,6 +54,39 @@ public partial class Actor : Sprite2D
return true;
}
public bool RotateMarks(int ROTATIONS = 1)
{
List<Cell> cells = new(_board._cells);
List<int> addresses = new(_board._cells.Select(c=>c._address).ToList());
Dictionary<int, int> cwShifts = new()
{
{0,1}, {1,2}, {2,5}, {3,0}, {4,4}, {5,8}, {6,3}, {7,6}, {8,7}
};
Dictionary<int, int> ccwShifts = new()
{
{0,3}, {1,0}, {2,1}, {3,6}, {4,4}, {5,2}, {6,7}, {7,8}, {8,5}
};
Dictionary<int, int> shifts = ROTATIONS > 0 ? cwShifts : ccwShifts;
for (int i = 0; i < Math.Abs(ROTATIONS); i++)
{
for (int j = 0; j < addresses.Count; j++)
{
int address = addresses[j];
int newAddress = shifts[address];
addresses[j] = newAddress;
}
}
for (int i = 0; i < _board._cells.Count; i++)
{
int newCellAddress = addresses[i];
_board._cells[i].Mark(cells[newCellAddress]._marker);
}
return true;
}
public bool ShuffleCells()
{
List<Vector2> positions = new(_board._cells.Select(c=>c.Position).ToList());
@@ -66,39 +99,63 @@ public partial class Actor : Sprite2D
return true;
}
public bool ShiftMarks(int COLUMNS = 0, int ROWS = 0)
public bool ShuffleMarks()
{
List<Actor> markers = new(_board._cells.Select(c=>c._marker).ToList());
int[,] cellsToTable = {{0,1,2},{3,4,5},{6,7,8}};
for (int i = 0; i < cellsToTable.GetLength(0); i++) //ROWS / Y
List<Cell> cells = new(_board._cells);
Globals.Shuffle(cells);
for (int i = 0; i < _board._cells.Count; i++)
{
for (int j = 0; j < cellsToTable.GetLength(1); j++) //COLUMNS / X
{
int toY = ROWS >= 0 ? cellsToTable.GetLength(0) - 1 - i : i;
int fromY = toY - ROWS;
int toX = COLUMNS >= 0 ? cellsToTable.GetLength(1) - 1 - j : j;
int fromX = toX - COLUMNS;
if (fromY >= 0 && fromY <= cellsToTable.GetLength(0) && fromX >= 0 && fromX <= cellsToTable.GetLength(1))
{
int toI = cellsToTable[toY, toX];
int fromI = cellsToTable[fromY, fromX];
if (_board._cells[fromI]._marker != null)
{
_board._cells[toI].Mark(_board._cells[fromI]._marker);
_board._cells[fromI].Mark();
}
else
{
_board._cells[toI].Mark();
}
}
}
_board._cells[i].Mark(cells[i]._marker);
}
_board.RenumberCells();
return true;
}
public bool ShiftCells(int SHIFT_ROWS_BY = 0,int SHIFT_COLUMNS_BY = 0)
{
List<Vector2> positions = new(_board._cells.Select(c=>c.Position).ToList());
int[,] addressTable = {{0,1,2},{3,4,5},{6,7,8}};
List<int> rows = new(){0,1,2};
List<int> columns = new(){0,1,2};
rows = Globals.ShiftList(rows, SHIFT_ROWS_BY);
columns = Globals.ShiftList(columns, SHIFT_COLUMNS_BY);
for (int i = 0; i < rows.Count; i++)
{
for (int j = 0; j < columns.Count; j++)
{
_board._cells[addressTable[rows[i],columns[j]]].Position = positions[addressTable[i,j]];
}
}
return true;
}
public bool ShiftMarks(int SHIFT_ROWS_BY = 0,int SHIFT_COLUMNS_BY = 0)
{
List<Actor> markers = new(_board._cells.Select(c=>c._marker).ToList());
int[,] addressTable = {{0,1,2},{3,4,5},{6,7,8}};
List<int> rows = new(){0,1,2};
List<int> columns = new(){0,1,2};
rows = Globals.ShiftList(rows, SHIFT_ROWS_BY);
columns = Globals.ShiftList(columns, SHIFT_COLUMNS_BY);
for (int i = 0; i < rows.Count; i++)
{
for (int j = 0; j < columns.Count; j++)
{
_board._cells[addressTable[rows[i],columns[j]]].Mark(markers[addressTable[i,j]]);
}
}
return true;
}
public bool SlideCells(int SHIFT_SPOTS = 1)
{
List<Vector2> positions = new(_board._cells.Select(c=>c.Position).ToList());
@@ -112,6 +169,19 @@ public partial class Actor : Sprite2D
return true;
}
public bool SlideMarks(int SHIFT_SPOTS = 1)
{
List<Vector2> positions = new(_board._cells.Select(c=>c.Position).ToList());
int start = SHIFT_SPOTS > 0 ? 0 : 9;
for (int i = 0; i < _board._cells.Count; i++)
{
int newSpot = (start + i + SHIFT_SPOTS) % 9;
_board._cells[i].Position = positions[newSpot];
}
_board.RenumberCells();
return true;
}
public bool SwapCells(int CELL_A_ADDRESS = -1, int CELL_B_ADDRESS = -1)
{
if (CELL_A_ADDRESS < -1 || CELL_A_ADDRESS > 8 || CELL_B_ADDRESS < -1 || CELL_B_ADDRESS > 8 || CELL_A_ADDRESS == CELL_B_ADDRESS)