GAMES
+FIND, FIX, & FINISH
+ +
+
2. Game Actions (Socket.io)
-Status: Disconnected
- - +âš“ FFF Server Debugger
+ +
+
-
-
-
\ No newline at end of file
diff --git a/server/public/gameClient.js b/server/public/gameClient.js
index b6d0e5e..e160411 100644
--- a/server/public/gameClient.js
+++ b/server/public/gameClient.js
@@ -1,43 +1,89 @@
-/** socket.io communication functions to talk with server */
+const socket = io();
+let currentRoom = '';
-// client to server interations
+// --- Logging ---
+function log(msg, obj = '') {
+ const logDiv = document.getElementById('eventLog');
+ logDiv.innerHTML += `
+
+ + + +
+
+ 1. Connection & Lobby
+ ++ + + +
Status: Disconnected
+
+
+ + + +
+ + + +
2. Game Actions
+ ++ + + +
+ + + +
[${new Date().toLocaleTimeString()}] ${msg} ${obj ? JSON.stringify(obj) : ''}
`;
+ logDiv.scrollTop = logDiv.scrollHeight;
+}
+// --- HTTP Actions ---
+async function createLobby() {
+ const res = await fetch('/create-lobby', { method: 'POST' });
+ const data = await res.json();
+ document.getElementById('roomIdInput').value = data.gameId;
+ log("Lobby Created:", data);
+}
-// This file runs in the browser, not on the server!
+// --- Socket Actions ---
+function joinGame() {
+ const gameId = document.getElementById('roomIdInput').value;
+ const playerName = document.getElementById('nameInput').value || 'Tester';
+ currentRoom = gameId;
+ socket.emit('join_game', { gameId, playerName });
+ document.getElementById('connStatus').innerText = `Connected to ${gameId}`;
+}
-// 1. Connect to the server
-// (Leaving it empty connects to the same URL serving the page)
-const socket = io();
+function placeFleets() {
+ const fleetPositions = {
+ alpha: { q: 0, r: 0 }, // Example positions it will change in the future when the hexes are selectable
+ beta: { q: 1, r: 1 } // Example positions it will change in the future when the hexes are selectable
+ };
+ socket.emit('place_fleets', { gameId: currentRoom, fleetPositions });
+ log("Fleets sent to server.");
+}
-// 2. DOM Elements (Get references to your HTML tags)
-const statusDiv = document.getElementById('game-status');
-const joinBtn = document.getElementById('join-btn');
+function executeStrike() {
+ const q = parseInt(document.getElementById('targetQ').value);
+ const r = parseInt(document.getElementById('targetR').value);
+ socket.emit('execute_strike', { gameId: currentRoom, targetHex: { q, r } });
+ log(`Striking hex: ${q},${r}`);
+}
-// 3. Game State (Client side memory)
-let myPlayerId = null;
+function readyCheck() {
+ socket.emit('ready_check', { gameId: currentRoom});
+ log("Player marked as ready.");
+}
-// --- LISTENERS (Ears) ---
+// function move_fleet(fleetName, newPosition) {
+
+// log(`Moving fleet ${fleetName} to ${newPosition}`);
-socket.on('connect', () => {
- statusDiv.innerText = "Connected to Server!";
- myPlayerId = socket.id;
- console.log("My ID:", myPlayerId);
-});
+// socket.emit('move_fleet', { gameId: currentRoom, fleetName, newPosition });
+// }
-socket.on('player_joined', (data) => {
- statusDiv.innerText = `Player ${data.playerId} joined!`;
+// --- Listeners ---
+socket.on('room_update', (data) => log("Room Update:", data));
+socket.on('opponent_ready', () => log("Alert: Opponent has placed ships!"));
+socket.on('game_start', (data) => {
+ log("GAME START! Active Player:", data);
+ const statusDiv = document.getElementById('connStatus');
+ if (data.activePlayer === socket.id) {
+ statusDiv.innerText = "It's your turn!";
+ } else {
+ statusDiv.innerText = "Opponent's turn";
+ }
});
-
-socket.on('update_game_state', (move) => {
- console.log("Opponent moved:", move);
- // Code to update your game board UI goes here
+socket.on('strike_result', (data) => {
+ const color = data.hit ? 'red' : 'green';
+ if(data.isdestroyed){
+ log(`💥 FLEET DESTROYED!`, data);
+ }else{
+ log(`${data.hit ? '💥 HIT!' : '🌊 MISS!'}`, data);
+ }
+
});
-
-// --- EMITTERS (Mouth) ---
-
-joinBtn.addEventListener('click', () => {
- const gameId = prompt("Enter Game ID:");
- if(gameId) {
- socket.emit('join_game', { gameId });
+socket.on('game_over', (data) => log("GAME OVER!", data));
+socket.on('move_fleet', (data) => log("Fleet Moved:", data));
+socket.on('error', (msg) => log("ERROR:", msg));
+socket.on('turn_change', ({ activePlayer }) => {
+ const statusDiv = document.getElementById('connStatus');
+ if (activePlayer === socket.id) {
+ statusDiv.innerText = "It's your turn!";
+ // TODO: Enable buttons/interactions (e.g., enable move/strike buttons)
+ } else {
+ statusDiv.innerText = "Opponent's turn";
+ // TODO: Disable buttons/interactions to prevent actions out of turn
}
});
\ No newline at end of file
diff --git a/server/server.js b/server/server.js
index 406de48..aee8dcc 100644
--- a/server/server.js
+++ b/server/server.js
@@ -9,56 +9,35 @@ const { v4: uuidv4 } = require('uuid'); // Library to generate unique IDs
const app = express();
const server = http.createServer(app);
const io = new Server(server, { cors: { origin: "*" } });
+const cors = require('cors');
app.use(express.static('public'));
-
app.use(express.json());
+app.use(cors());
// --- DATABASE MOCKUP ---
-// In production, use Redis or a real DB
+// Each room now tracks specific game data
const lobbies = {};
-// --- 1. HTTP: LOBBY MANAGEMENT ---
+// --- HTTP: LOBBY MANAGEMENT ---
-// Create a Lobby
app.post('/create-lobby', (req, res) => {
- const gameId = uuidv4(); // Generate unique ID like '9b1deb4d...'
+ const gameId = uuidv4().substring(0, 6); // Shorter ID for easier sharing
lobbies[gameId] = {
- players: [],
- status: 'waiting' // waiting -> active
+ players: {}, // Using object keyed by socket.id
+ status: 'waiting',
+ turn: 1, // Tracks the current round number (starts at 1)
+ activePlayer: null, // Tracks whose turn it is
+ fleets: {}, // Secret fleet positions { socketId: { alpha: {q,r}, beta: {q,r} } }
+ assets: {}, // Tracks assets like fuel, special weapons, etc.
+ history: [] // Stores a log of all moves/strikes for replay or reconnection
};
- res.json({ gameId, message: 'Lobby created. Share this ID!' });
-});
-
-// Join Check (Just checks if valid, doesn't connect socket yet)
-app.post('/join-lobby', (req, res) => {
- const { gameId, userId } = req.body;
-
- if (!lobbies[gameId]) {
- return res.status(404).json({ error: 'Lobby not found' });
- }
-
- // Add logic here to store player info if needed
- res.json({ success: true, gameId });
-});
-
-// Start Game Trigger
-app.post('/start-game', (req, res) => {
- const { gameId } = req.body;
- if (lobbies[gameId]) {
- lobbies[gameId].status = 'active';
- // Notify everyone to connect to sockets now!
- res.json({ success: true, message: 'Game starting!' });
- } else {
- res.status(404).json({ error: 'Lobby not found' });
- }
+ res.json({ gameId, message: 'Lobby created!' });
});
-// --- 2. SOCKET.IO: GAME LOGIC ---
+// --- SOCKET.IO: GAME LOGIC ---
// socketHandler.js file has functions for game logic
gameLogic(io, lobbies);
-server.listen(3000, () => {
- console.log('Server running on port 3000');
-});
\ No newline at end of file
+server.listen(3000, 'localhost', () => console.log('Server running on port 3000'));
\ No newline at end of file
diff --git a/server/socketHandler.js b/server/socketHandler.js
index 6ff3069..ed68862 100644
--- a/server/socketHandler.js
+++ b/server/socketHandler.js
@@ -2,45 +2,330 @@
// game 'brain': will handle socket.io messages
module.exports = (io, lobbies) => {
+ //function to ensure that each player can perform an action only when it is its turn
+ const switchTurn = (gameId) => {
+ const lobby = lobbies[gameId];
+ if (!lobby) return;
+ const playerIds = Object.keys(lobby.players);
+ const currentIndex = playerIds.indexOf(lobby.activePlayer);
+ const nextIndex = (currentIndex + 1) % playerIds.length;
+ lobby.activePlayer = playerIds[nextIndex];
+ io.to(gameId).emit('turn_change', { activePlayer: lobby.activePlayer });
+ };
+
io.on('connection', (socket) => {
console.log(`Player connected: ${socket.id}`);
- // test
- socket.on('join_game', ({gameId}) => { // listen
- // Security: Only allow joining if the lobby exists in HTTP state
- if (!lobbies[gameId]) {
- socket.emit('error', 'Game does not exist');
- console.log('failure');
+ // // test
+ // socket.on('join_game', ({gameId}) => { // listen
+ // // Security: Only allow joining if the lobby exists in HTTP state
+ // if (!lobbies[gameId]) {
+ // socket.emit('error', 'Game does not exist');
+ // console.log('failure');
+ // return;
+ // }
+ // else
+ // console.log('success');
+
+ // // MAGIC HAPPENS HERE: Join the "Room"
+ // socket.join(gameId);
+ // console.log(`Socket ${socket.id} joined room ${gameId}`);
+
+ // // Notify others in ONLY this room
+ // io.to(gameId).emit('player_joined', { playerId: socket.id });
+ // });
+
+ // // test
+ // socket.on('game_move', (data) => {
+ // // do something like update gameState
+
+ // const { gameId, move } = data;
+ // // Broadcast move to everyone in the room EXCEPT the sender
+ // socket.to(gameId).emit('update_game_state', move);
+ // });
+
+ // /**************************************************************/
+ // // server to client interactions
+
+ // // init_game
+ // socket.on('init_game', (data) => {
+ // // TODO: send initialized game information back
+ // })
+
+ // //
+ socket.on('join_game', ({ gameId, playerName }) => {
+ const lobby = lobbies[gameId];
+ console.log(gameId);
+ console.log(playerName);
+ if (!lobby) {
+ socket.emit('error', `Game does not exist ${Object.keys(lobbies)}`);
+ for (let key in lobbies) {
+ console.log(key);
+ }
+ return;
+ }
+
+ if (Object.keys(lobby.players).length >= 2) {
+ socket.emit('error', 'Lobby is full');
return;
}
- else
- console.log('success');
- // MAGIC HAPPENS HERE: Join the "Room"
socket.join(gameId);
- console.log(`Socket ${socket.id} joined room ${gameId}`);
- // Notify others in ONLY this room
- io.to(gameId).emit('player_joined', { playerId: socket.id });
+ // Add player to lobby state
+ lobby.players[socket.id] = {
+ name: playerName || 'Unknown Commander',
+ ready: false,
+ color: Object.keys(lobby.players).length === 0 ? 'Red' : 'Blue'
+ };
+
+ console.log(`${playerName} joined room ${gameId}`);
+
+ // Broadcast updated player list to the room
+ io.to(gameId).emit('room_update', {
+ players: lobby.players,
+ status: lobby.status
+ });
+ });
+
+ // Handle Secret Fleet Placement
+ socket.on('place_fleets', ({ gameId, fleetPositions }) => {
+ const lobby = lobbies[gameId];
+ if (!lobby) {
+ socket.emit('error', 'Game does not exist');
+ return;
+ }
+
+ // We restructure the incoming data to add server-side HP
+ // This prevents players from trying to start with extra health
+ lobby.fleets[socket.id] = {
+ alpha: {
+ q: fleetPositions.alpha.q, // Position data. It will be automatically set when the player places their fleets in the future
+ r: fleetPositions.alpha.r,
+ hp: 2 //Health Initialized here
+ },
+ beta: {
+ q: fleetPositions.beta.q, // Position data. It will be automatically set when the player places their fleets in the future
+ r: fleetPositions.beta.r,
+ hp: 2 // Initialized here
+ }
+ };
+
+ socket.emit('fleets_placed_confirmation');
+ });
+
+ // Handle Ready Check to Start Game
+ socket.on('ready_check', ({gameId}) =>{
+ const lobby = lobbies[gameId];
+ if (!lobby) {
+ socket.emit('error', 'Game does not exist');
+ return;
+ }
+
+ lobby.players[socket.id].ready = true;
+
+ const allReady = Object.values(lobby.players).every(p => p.ready);//checks if all players are ready
+
+ if (allReady && Object.keys(lobby.players).length === 2) {
+ lobby.status = 'active';
+ lobby.assets = {};
+ Object.keys(lobby.players).forEach(id => {
+ lobby.assets[id] = {
+ fuel: 3,
+ fleetCube: 2
+ };
+ });
+ // Determine the first player. The 'Red' player is designated to go first.
+ const redPlayer = Object.entries(lobby.players).find(([, player]) => player.color === 'Red');
+ // Fallback to the first player in the list if 'Red' player isn't found for some reason.
+ const firstPlayerId = redPlayer ? redPlayer[0] : Object.keys(lobby.players)[0];
+ lobby.activePlayer = firstPlayerId;
+ io.to(gameId).emit('game_start', {
+ activePlayer: firstPlayerId
+ });
+ }
+ });
+
+
+ // Handle the "Finish" - Strike Logic
+ socket.on('execute_strike', ({ gameId, targetHex }) => {
+ const lobby = lobbies[gameId];
+ if (!lobby || lobby.status !== 'active') return;
+
+ if (lobby.activePlayer !== socket.id) {
+ socket.emit('error', 'It is not your turn.');
+ return;
+ }
+
+ // Find the opponent
+ const opponentId = Object.keys(lobby.players).find(id => id !== socket.id);
+ if (!opponentId) {
+ // This can happen if the opponent disconnects at the exact moment of a strike.
+ console.log(`Strike by ${socket.id} in game ${gameId} has no opponent.`);
+ return;
+ }
+ const opponentFleets = lobby.fleets[opponentId];
+
+ let hit = false;
+ let fleetKey = null;
+ let destroyed = false;
+
+ // 1. Check for Hit & Subtract HP
+ for (const key in opponentFleets) {
+ const fleet = opponentFleets[key];
+ // Ensure we only hit a fleet that is still "alive" (hp > 0)
+ if (fleet.q === targetHex.q && fleet.r === targetHex.r && fleet.hp > 0) {
+ hit = true;
+ fleetKey = key;
+ fleet.hp -= 1; // Persistent HP deduction on server
+
+ if (fleet.hp <= 0) {
+ destroyed = true;
+ }
+ break;
+ }
+ }
+
+ // 2. Broadcast result to the room
+ io.to(gameId).emit('strike_result', {
+ attacker: socket.id,
+ hit: hit,
+ targetHex: targetHex,
+ fleetKey: fleetKey,
+ hpRemaining: hit ? opponentFleets[fleetKey].hp : null,
+ isDestroyed: destroyed
+ });
+
+ // 3. Check for Total Victory
+ // If all fleets for the opponent have 0 HP, the attacker wins
+ const allDestroyed = Object.values(opponentFleets).every(f => f.hp <= 0);
+ if (allDestroyed) {
+ lobby.status = 'game_over';
+ io.to(gameId).emit('game_over', {
+ winner: lobby.players[socket.id].name,
+ winnerId: socket.id
+ });
+ } else {
+ switchTurn(gameId);
+ }
+ });
+
+ // Handle player leaving the game
+
+ socket.on('leave_game', ({ gameId }) => {
+ const lobby = lobbies[gameId];
+ if (lobby && lobby.players[socket.id]) {
+ const playerName = lobby.players[socket.id].name || 'A player';
+ delete lobby.players[socket.id];
+ delete lobby.fleets[socket.id];
+ if (lobby.assets) delete lobby.assets[socket.id];
+ socket.leave(gameId);
+
+ // If game was in progress, the other player wins.
+ if (lobby.status === 'active' && Object.keys(lobby.players).length > 0) {
+ const winnerId = Object.keys(lobby.players)[0];
+ lobby.status = 'game_over';
+ io.to(gameId).emit('game_over', {
+ winner: lobby.players[winnerId].name,
+ winnerId: winnerId,
+ reason: `${playerName} left the game.`
+ });
+ } else {
+ // Otherwise, just update the waiting room
+ io.to(gameId).emit('room_update', {
+ players: lobby.players,
+ status: lobby.status
+ });
+ }
+
+ if (Object.keys(lobby.players).length === 0) {
+ console.log(`Deleting empty lobby: ${gameId}`);
+ delete lobbies[gameId];
+ }
+ }
});
- // test
- socket.on('game_move', (data) => {
- // do something like update gameState
+ //Handle player move a single fleet
+ socket.on('move_fleet', ({ gameId, fleetKey, newPosition }) => {
+ const lobby = lobbies[gameId];
+ if (!lobby || lobby.status !== 'active') {
+ socket.emit('error', 'Game does not exist');
+ return;
+ }
+
+ if (lobby.activePlayer !== socket.id) {
+ socket.emit('error', 'It is not your turn.');
+ return;
+ }
+
+ const playerAssets = lobby.assets[socket.id];
+ if (playerAssets.fuel < 1) {
+ socket.emit('error', 'Not enough fuel to move.');
+ return;
+ }
+
+ const playerFleets = lobby.fleets[socket.id];
+ if (playerFleets && playerFleets[fleetKey]) {
+ playerAssets.fuel -= 1; // Consume fuel
+ // Update fleet position
+ playerFleets[fleetKey].q = newPosition.q;
+ playerFleets[fleetKey].r = newPosition.r;
- const { gameId, move } = data;
- // Broadcast move to everyone in the room EXCEPT the sender
- socket.to(gameId).emit('update_game_state', move);
+ // Notify all players in the room about the move
+ io.to(gameId).emit('fleet_moved', {
+ playerId: socket.id,
+ fleetKey: fleetKey,
+ newPosition: newPosition
+ });
+ socket.emit('update_assets', playerAssets); // Notify client of new fuel amount
+ switchTurn(gameId);
+ } else {
+ socket.emit('error', 'Invalid fleet move');
+ }
});
+ // Handle disconnection
+
+ socket.on('disconnect', () => {
+ console.log(`Player disconnected: ${socket.id}`);
+ // Find which game the player was in and handle their departure.
+ const gameId = Object.keys(lobbies).find(id => lobbies[id].players[socket.id]);
+
+ if (gameId) {
+ const lobby = lobbies[gameId];
+ const playerName = lobby.players[socket.id]?.name || 'A player';
+ console.log(`${playerName} from game ${gameId} disconnected.`);
+
+ // Remove player from the lobby state
+ delete lobby.players[socket.id];
+ delete lobby.fleets[socket.id];
+ if (lobby.assets) delete lobby.assets[socket.id];
- /**************************************************************/
- // server to client interactions
+ // If the game was in progress, end it and declare the other player the winner.
+ if (lobby.status === 'active' && Object.keys(lobby.players).length > 0) {
+ const winnerId = Object.keys(lobby.players)[0];
+ lobby.status = 'game_over';
+ io.to(gameId).emit('game_over', {
+ winner: lobby.players[winnerId].name,
+ winnerId: winnerId,
+ reason: `${playerName} has disconnected.`
+ });
+ } else {
+ // If game wasn't active, just update the lobby for any remaining player.
+ io.to(gameId).emit('room_update', {
+ players: lobby.players,
+ status: lobby.status
+ });
+ }
+
+ // If the lobby is now empty, delete it.
+ if (Object.keys(lobby.players).length === 0) {
+ console.log(`Deleting empty lobby: ${gameId}`);
+ delete lobbies[gameId];
+ }
+ }
+ });
- // init_game
- socket.on('init_game', (data) => {
- // TODO: send initialized game information back
- })
- //
});
+
};
\ No newline at end of file
diff --git a/server/tests/server.test.js b/server/tests/server.test.js
new file mode 100644
index 0000000..4c92db5
--- /dev/null
+++ b/server/tests/server.test.js
@@ -0,0 +1,44 @@
+/**
+ * server.test.js
+ * Description: will be used to test different express server http APIs
+ */
+
+const request = require('supertest'); // supertest lib is used for testing http apis
+const server = require('../server.js');
+
+describe('API Endpoints', () => { // label tests as 'API Endpoints'
+ // testing /create-lobby
+ it('should create a new lobby successfully', async () => {
+ // send request
+ const res = await request(server)
+ .post('/create-lobby') // url
+ .expect('Content-Type', /json/) // check headers
+ .expect(200); // check status code
+
+ // checks data
+ expect(res.body.gameId).toBeDefined();
+ expect(res.body.message).toBe('Lobby created!');
+ });
+
+ // testing /join-lobby
+ it('should join a lobby successfully', async () => {
+ // send request
+ const res = await request(server)
+ .post('/join-lobby') // url
+ .expect('Content-Type', /json/) // check headers
+ .expect(200); // check status code
+
+ // checks data
+ expect(res.body.message).toBe('Lobby joined!');
+ })
+
+ // testing 'place-fleets'
+
+ // execute_strike
+
+ // leave_game
+
+ // move_fleet
+
+ //
+});
\ No newline at end of file
diff --git a/server/tests/socket.test.js b/server/tests/socket.test.js
new file mode 100644
index 0000000..0620fff
--- /dev/null
+++ b/server/tests/socket.test.js
@@ -0,0 +1,89 @@
+/**
+ * socket.test.js
+ * Description: will be used to test different socket.io APIs
+ */
+
+const request = require('supertest');
+const { io: Client } = require('socket.io-client');
+const server = require('../server')
+
+describe('Socket.io Game Logic', () => {
+ let clientSocket;
+ let createGameId;
+
+ beforeAll((done) => {
+ if(!server.listening) {
+ server.listen(3000, () => {
+ request(server)
+ .post('/create-lobby')
+ .end((err, res) => {
+ if (err) return done(err);
+ createdGameId = res.body.gameId;
+ done();
+ });
+ })
+ } else {
+ // Server already running, just create lobby
+ request(server)
+ .post('/create-lobby')
+ .end((err, res) => {
+ if (err) return done(err);
+ createdGameId = res.body.gameId;
+ done();
+ });
+ }
+ });
+
+ afterAll((done) => {
+ server.close(done);
+ });
+
+ // 3. Before each test: Connect a new client
+ beforeEach((done) => {
+ // Connect to localhost:3000
+ clientSocket = new Client('http://localhost:3000');
+
+ clientSocket.on('connect', () => {
+ done();
+ });
+ });
+
+ // 4. After each test: Disconnect
+ afterEach(() => {
+ if (clientSocket.connected) {
+ clientSocket.disconnect();
+ }
+ });
+
+ // --- THE ACTUAL TESTS ---
+
+ test('should allow a user to join an existing game', (done) => {
+ // A. SETUP LISTENER (The "Ear")
+ // We must tell the test what to wait for BEFORE we send the message
+ clientSocket.on('player_joined', (data) => {
+ try {
+ expect(data).toHaveProperty('playerId');
+ done(); // SUCCESS: Tell Jest the test is finished
+ } catch (error) {
+ done(error);
+ }
+ });
+
+ // B. PERFORM ACTION (The "Mouth")
+ clientSocket.emit('join_game', { gameId: createdGameId });
+ });
+
+ test('should NOT allow joining a fake game', (done) => {
+ // We expect an error message back
+ clientSocket.on('error', (message) => {
+ try {
+ expect(message).toBe('Game does not exist');
+ done();
+ } catch (err) {
+ done(err);
+ }
+ });
+
+ clientSocket.emit('join_game', { gameId: 'fake-id-999' });
+ });
+});
\ No newline at end of file
diff --git a/server/tests/utils.test.js b/server/tests/utils.test.js
new file mode 100644
index 0000000..b8103c7
--- /dev/null
+++ b/server/tests/utils.test.js
@@ -0,0 +1 @@
+// will be used to test any helper functions we create
\ No newline at end of file
diff --git a/setup.sh b/setup.sh
index 97f9a45..b94e8e2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -15,5 +15,6 @@ echo "Downloading required packages"
npm install svelte vite @sveltejs/vite-plugin-svelte
npm i honeycomb-grid
npm i socket.io-client
+npm i uuid
echo "Task Completed!------------------------------"
\ No newline at end of file
diff --git a/src/app.html b/src/app.html
index f273cc5..5decdd2 100644
--- a/src/app.html
+++ b/src/app.html
@@ -2,8 +2,43 @@
-
+
%sveltekit.head%
+
+
+
+
%sveltekit.body%
diff --git a/src/lib/+map Multi.svelte b/src/lib/+map Multi.svelte
new file mode 100644
index 0000000..3252743
--- /dev/null
+++ b/src/lib/+map Multi.svelte
@@ -0,0 +1,491 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/lib/+map Single.svelte b/src/lib/+map Single.svelte
new file mode 100644
index 0000000..b38cf35
--- /dev/null
+++ b/src/lib/+map Single.svelte
@@ -0,0 +1,467 @@
+
+
+
+
+
+ {
+ if (targetingMode === 'directional') {
+ e.preventDefault();
+ rotation++;
+ }
+ }}
+ >
+
+
+ {#if warning.show}
+ {#key warning.id}
+
+
+
+
+ {warning.text}
+
+ {/key}
+ {/if}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/lib/+map.svelte b/src/lib/+map.svelte
deleted file mode 100644
index eb38f8d..0000000
--- a/src/lib/+map.svelte
+++ /dev/null
@@ -1,559 +0,0 @@
-
-
- {
+ if (targetingMode === 'directional') {
+ e.preventDefault();
+ rotation++;
+ }
+ }}
+ >
+
+
+ {#if warning.show}
+ {#key warning.id}
+
+
+
+
+ {warning.text}
+
+ {/key}
+ {/if}
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/lib/Sidebar Single.svelte b/src/lib/Sidebar Single.svelte
new file mode 100644
index 0000000..7573f75
--- /dev/null
+++ b/src/lib/Sidebar Single.svelte
@@ -0,0 +1,315 @@
+
+
+
+
+
+
+{#if !isSubmitted}
+
+{/if}
+
+
+
\ No newline at end of file
diff --git a/src/lib/StatusBar Single.svelte b/src/lib/StatusBar Single.svelte
new file mode 100644
index 0000000..f11bdd9
--- /dev/null
+++ b/src/lib/StatusBar Single.svelte
@@ -0,0 +1,300 @@
+
+
+
+
+
+
-
-
-
-
- {#if warning.show}
- {#key warning.id}
-
-
- {warning.text}
-
- {/key}
- {/if}
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/lib/gameStore.js b/src/lib/gameStore.js
new file mode 100644
index 0000000..e1d77eb
--- /dev/null
+++ b/src/lib/gameStore.js
@@ -0,0 +1,17 @@
+import { writable } from 'svelte/store';
+import { io } from 'socket.io-client';
+
+export const socket = writable(null);
+export const gameId = writable('');
+export const activePlayerId = writable(null);
+
+let socketInstance = null;
+
+export function initSocket() {
+ if (!socketInstance) {
+ socketInstance = io("http://localhost:3000");
+ socket.set(socketInstance);
+ }
+
+ return socketInstance;
+}
\ No newline at end of file
diff --git a/src/lib/gridUtils.js b/src/lib/gridUtils.js
new file mode 100644
index 0000000..de0deb1
--- /dev/null
+++ b/src/lib/gridUtils.js
@@ -0,0 +1,71 @@
+// @ts-nocheck
+export const getS = (h) => -h.q - h.r;
+
+/**
+ * Calculates which hexes should be highlighted based on mode and rotation
+ */
+export function getTargetHexes(centerHex, mode, rot, gridHexes) {
+ if (!centerHex) return [];
+
+ // Focus or Area start with the single hex under the cursor
+ if (mode === 'focus' || mode === 'area') return [centerHex];
+
+ if (mode === 'directional') {
+ const rotIndex = rot % 3;
+ let lineHexes = [];
+
+ if (rotIndex === 0) {
+ // Vertical
+ lineHexes = gridHexes.filter(h => h.col === centerHex.col)
+ .sort((a, b) => a.row - b.row);
+ } else if (rotIndex === 1) {
+ // Slant Right
+ lineHexes = gridHexes.filter(h => h.r === centerHex.r)
+ .sort((a, b) => a.q - b.q);
+ } else if (rotIndex === 2) {
+ // Slant Left
+ const centerS = getS(centerHex);
+ lineHexes = gridHexes.filter(h => getS(h) === centerS)
+ .sort((a, b) => a.q - b.q);
+ }
+
+ const index = lineHexes.indexOf(centerHex);
+ let startIndex = Math.max(0, Math.min(index - 1, lineHexes.length - 3));
+ const selection = lineHexes.slice(startIndex, startIndex + 3);
+
+ return selection.length === 3 ? selection : [];
+ }
+ return [];
+}
+
+/**
+ * Flood fill algorithm to ensure a group of hexes is contiguous
+ */
+export function isGroupConnected(group) {
+ if (group.length <= 1) return true;
+
+ const start = group[0];
+ const visited = new Set([`${start.q},${start.r}`]);
+ const queue = [start];
+
+ while (queue.length > 0) {
+ const current = queue.shift();
+
+ const neighbors = group.filter(h => {
+ const key = `${h.q},${h.r}`;
+ if (visited.has(key)) return false;
+
+ const dist = (Math.abs(h.q - current.q)
+ + Math.abs(h.r - current.r)
+ + Math.abs(getS(h) - getS(current))) / 2;
+ return dist === 1;
+ });
+
+ for (const neighbor of neighbors) {
+ visited.add(`${neighbor.q},${neighbor.r}`);
+ queue.push(neighbor);
+ }
+ }
+
+ return visited.size === group.length;
+}
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 96fde50..97dfa96 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,135 +1,152 @@
+
+
+
+
+ {isEnemyTurn ? 'ENEMY TURN' : 'FRIENDLY TURN'}
+
+ {currentTurn}
+
+
+ {#if isEnemyTurn}
+
+ {/if}
+
+
+
+
+ HEALTH
+
+
+
+ {#each Array(health) as _}
+ 
+ {/each}
+
+
+ {/each}
+
+ FUEL
+
+
+ {#each Array(fuel) as _}
+ 
+ {/each}
+
+
+ {/each}
+
+ // TESTING SPACE
+
+
+
+
+
+
+
+
-
+
{#if $page.url.pathname !== '/'}
- $isHovering = true}
- onmouseleave={() => $isHovering = false}
- >
- [ MAIN MENU ]
-
+ $isHovering = false}
+ onmouseenter={() => $isHovering = true}
+ onmouseleave={() => $isHovering = false}
+ >
+ [ MAIN MENU ]
+
{/if}
+
-
+
+
+
+
- {#if showMultiplayerModal}
-
-
-
\ No newline at end of file
diff --git a/vite.config.js b/vite.config.js
index d18ddfa..9ecfc62 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,5 +7,5 @@ export default defineConfig({
port: 5173,
strictPort: true
}
-}
+ }
);
- {#if modalStep === 0}
- 
-
+
\ No newline at end of file
diff --git a/src/routes/api/roll/+server.js b/src/routes/api/roll/+server.js
new file mode 100644
index 0000000..0ef5b94
--- /dev/null
+++ b/src/routes/api/roll/+server.js
@@ -0,0 +1,10 @@
+//Dice roll test printing functionality
+export async function POST({ request }) {
+ const data = await request.json();
+
+ // This prints perfectly in VS Code
+ console.log(`Dice Roll, number is [${data.result1}]`);
+ console.log(`Dice Roll, number is [${data.result2}]`);
+
+ return new Response(JSON.stringify({ success: true }));
+}
\ No newline at end of file
diff --git a/src/routes/credits/+page.svelte b/src/routes/credits/+page.svelte
index c6cdd19..5588662 100644
--- a/src/routes/credits/+page.svelte
+++ b/src/routes/credits/+page.svelte
@@ -14,9 +14,13 @@ Although immensely simplified, the game aims to highlight how different capabili
z-index: 10;
font-size: 3.5vh;
position: relative;
+ user-select: none;
+ -webkit-user-select: none;
}
+
.section-header {
font-family: 'Black Ops One', cursive;
font-size: 5vh;
- color: #a79d9d; }
+ color: #a79d9d;
+ }
\ No newline at end of file
diff --git a/src/routes/multiplayer/+page.svelte b/src/routes/multiplayer/+page.svelte
index c61efd9..71b0a89 100644
--- a/src/routes/multiplayer/+page.svelte
+++ b/src/routes/multiplayer/+page.svelte
@@ -1,8 +1,38 @@
+
+
IDENTIFICATION
- - - - - - {:else if modalStep === 1} -WELCOME, {nickname}
- -
-
-
-
-
-
-
- {:else if modalStep === 2}
- LOBBY CREATED
-{lobbyCode}
- - - - {:else if modalStep === 3} -JOIN FREQUENCY
- - - {/if} +
-
\ No newline at end of file
diff --git a/src/routes/singleplayer/+page.svelte b/src/routes/singleplayer/+page.svelte
index 17257f8..8412561 100644
--- a/src/routes/singleplayer/+page.svelte
+++ b/src/routes/singleplayer/+page.svelte
@@ -1,36 +1,60 @@
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/routes/tutorial/+page.svelte b/src/routes/tutorial/+page.svelte
index 01683e6..f06eb5d 100644
--- a/src/routes/tutorial/+page.svelte
+++ b/src/routes/tutorial/+page.svelte
@@ -18,8 +18,29 @@
FIND, FIX, & FINISH
- -
-
+ FIND, FIX, & FINISH
+ +
+