- {enemyData ? (
+ {currentEnemy ? (
{isEnemyDefeated ? "SIGNAL_LOST" : "HOSTILE_DETECTED"}
@@ -117,7 +150,9 @@ const DungeonScreen = ({ session, socket }) => {
className={`fas ${isEnemyDefeated ? "fa-skull-crossbones" : "fa-robot"}`}
>
-
{enemyData.displayName}
+
+ {getEnemyDisplayName(currentEnemy)}
+
STRUCTURE INTEGRITY
@@ -132,8 +167,8 @@ const DungeonScreen = ({ session, socket }) => {
- LVL: {enemyData.level || 1}
- ID: {GameDataManager._cleanId(rawEnemyId)}
+ LVL: {currentEnemy.level || 1}
+ {currentEnemy.id}
) : (
@@ -158,7 +193,7 @@ const DungeonScreen = ({ session, socket }) => {
- {!isEnemyDefeated && enemyData && (
+ {!isEnemyDefeated && currentEnemy && (
@@ -170,7 +205,7 @@ const DungeonScreen = ({ session, socket }) => {
)}
- {(isLooted || !enemyData) && (
+ {(isLooted || !currentEnemy) && (
diff --git a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_ambush_zone.json b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_ambush_zone.json
index b0c5332..e020d8a 100644
--- a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_ambush_zone.json
+++ b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_ambush_zone.json
@@ -1,6 +1,6 @@
{
"rooms": {
- "id": "original:pirate_ambush_zone",
+ "id": "original:pirate/pirate_ambush_zone",
"hostiles": [
"original:pirates/scout_drone",
"original:pirates/raider_frigate",
diff --git a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_boss_bridge.json b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_boss_bridge.json
index 6a1d7ee..2c9e294 100644
--- a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_boss_bridge.json
+++ b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_boss_bridge.json
@@ -1,6 +1,6 @@
{
"rooms": {
- "id": "original:pirate_boss_bridge",
+ "id": "original:pirate/pirate_boss_bridge",
"hostiles": ["original:pirates/black_mark_cruiser"],
"gainXp": 100,
"credits": 2500
diff --git a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_patrol_room.json b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_patrol_room.json
index fe26cb9..cda0c2e 100644
--- a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_patrol_room.json
+++ b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_patrol_room.json
@@ -1,6 +1,6 @@
{
"rooms": {
- "id": "original:pirate_patrol_room",
+ "id": "original:pirate/pirate_patrol_room",
"hostiles": [
"original:pirates/scout_drone",
"original:pirates/scout_drone"
diff --git a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_supply_bay.json b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_supply_bay.json
index 54be8fe..6171c9e 100644
--- a/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_supply_bay.json
+++ b/game-server/datapacks/original/data/enemies/rooms/pirates/pirate_supply_bay.json
@@ -1,6 +1,6 @@
{
"rooms": {
- "id": "original:pirate_supply_bay",
+ "id": "original:pirate/pirate_supply_bay",
"hostiles": [],
"gainXp": 5,
"credits": 800,
diff --git a/game-server/datapacks/original/data/enemies/rooms/tutorial/tutorial_boss.json b/game-server/datapacks/original/data/enemies/rooms/tutorial/tutorial_boss.json
index edb6201..f60ef65 100644
--- a/game-server/datapacks/original/data/enemies/rooms/tutorial/tutorial_boss.json
+++ b/game-server/datapacks/original/data/enemies/rooms/tutorial/tutorial_boss.json
@@ -1,6 +1,6 @@
{
"rooms": {
- "id": "original:tutorial/tutorial_boss",
+ "id": "original:tutorial/tutorial_boss_room",
"hostiles": ["original:tutorial/tutorial_boss_hostile"],
"gainXp": 4,
"credits": 200
diff --git a/game-server/src/game/DungeonManager.js b/game-server/src/game/DungeonManager.js
new file mode 100644
index 0000000..b4d741c
--- /dev/null
+++ b/game-server/src/game/DungeonManager.js
@@ -0,0 +1,86 @@
+const DatapackLoader = require("./DatapackLoader");
+
+class DungeonManager {
+ constructor() {
+ this.activeSessions = new Map();
+ }
+
+ startDungeon(playerId, dungeonId) {
+ const dungeon = DatapackLoader.getDungeon(dungeonId);
+ if (!dungeon || !dungeon.rooms?.length) return null;
+
+ const session = {
+ dungeonId,
+ currentRoomIndex: 0,
+ isFinished: false,
+ currentEnemyHp: undefined,
+ rewards: { xp: 0, credits: 0, items: [] },
+ };
+
+ this.activeSessions.set(playerId, session);
+ return this.getCurrentRoomData(playerId);
+ }
+
+ getCurrentRoomData(playerId) {
+ const session = this.activeSessions.get(playerId);
+ if (!session) return null;
+
+ const dungeon = DatapackLoader.getDungeon(session.dungeonId);
+ const roomRef = dungeon.rooms[session.currentRoomIndex];
+ const roomData = DatapackLoader.getRoom(roomRef.id);
+ if (!roomData) return null;
+
+ const hostiles = (roomData.hostiles || [])
+ .map((hId) => {
+ const hostile = DatapackLoader.getEnemy(hId);
+ return hostile ? { ...hostile } : null;
+ })
+ .filter(Boolean);
+
+ return {
+ roomIndex: session.currentRoomIndex,
+ totalRooms: dungeon.rooms.length,
+ config: roomData,
+ hostiles,
+ };
+ }
+
+ moveToNextRoom(playerId) {
+ const session = this.activeSessions.get(playerId);
+ if (!session || session.isFinished) return null;
+
+ const dungeon = DatapackLoader.getDungeon(session.dungeonId);
+ const roomRef = dungeon.rooms[session.currentRoomIndex];
+ const currentRoom = DatapackLoader.getRoom(roomRef.id);
+
+ if (currentRoom) {
+ session.rewards.xp += currentRoom.gainXp || 0;
+ session.rewards.credits += currentRoom.credits || 0;
+
+ if (currentRoom.loot && Array.isArray(currentRoom.loot)) {
+ currentRoom.loot.forEach((item) => {
+ session.rewards.items.push({ ...item });
+ });
+ }
+ }
+
+ session.currentEnemyHp = undefined;
+
+ if (session.currentRoomIndex < dungeon.rooms.length - 1) {
+ session.currentRoomIndex++;
+ return this.getCurrentRoomData(playerId);
+ }
+
+ session.isFinished = true;
+ return {
+ status: "completed",
+ rewards: session.rewards,
+ };
+ }
+
+ leaveDungeon(playerId) {
+ this.activeSessions.delete(playerId);
+ }
+}
+
+module.exports = new DungeonManager();
diff --git a/game-server/src/sockets/handlers/dungeonHandler.js b/game-server/src/sockets/handlers/dungeonHandler.js
index b4f3d58..a3e0934 100644
--- a/game-server/src/sockets/handlers/dungeonHandler.js
+++ b/game-server/src/sockets/handlers/dungeonHandler.js
@@ -1,6 +1,6 @@
const { Player, Inventory } = require("../../models");
-const sessionManager = require("../../game/SessionManager");
const DatapackLoader = require("../../game/DatapackLoader");
+const dungeonManager = require("../../game/DungeonManager");
module.exports = (io, socket) => {
const userId = socket.user?.id;
@@ -8,80 +8,71 @@ module.exports = (io, socket) => {
socket.on("dungeon:start", async ({ dungeonId }) => {
try {
if (!userId) return;
-
const dungeon = DatapackLoader.getDungeon(dungeonId);
if (!dungeon) {
- return socket.emit("error", { message: "Dungeon coordinates invalid" });
+ return socket.emit("error", { message: "Dungeon not found" });
}
const player = await Player.findByPk(userId);
- if (player.energy < dungeon.energyCost) {
+ const energyCost = dungeon.meta?.energyCost || 0;
+
+ if (player.energy < energyCost) {
+ return socket.emit("error", { message: "Insufficient energy" });
+ }
+
+ await player.decrement("energy", { by: energyCost });
+
+ const firstRoom = dungeonManager.startDungeon(userId, dungeonId);
+ if (!firstRoom) {
return socket.emit("error", {
- message: "Insufficient energy for deployment",
+ message: "Failed to initialize dungeon",
});
}
- await player.decrement("energy", { by: dungeon.energyCost });
-
- const dungeonSession = {
- dungeonId: dungeon.id,
- currentRoomIndex: 0,
- isCompleted: false,
- startTime: Date.now(),
- rewards: [],
- };
-
- sessionManager.setPlayerScene(socket.id, "dungeon", dungeonSession);
-
- const firstRoomId = dungeon.rooms[0].id;
- const firstRoomData = DatapackLoader.getRoom(firstRoomId);
-
socket.emit("dungeon:started", {
dungeonId: dungeon.id,
- room: firstRoomData,
- roomIndex: 0,
- totalRooms: dungeon.rooms.length,
- remainingEnergy: player.energy - dungeon.energyCost,
+ room: firstRoom.config,
+ hostiles: firstRoom.hostiles,
+ roomIndex: firstRoom.roomIndex,
+ totalRooms: firstRoom.totalRooms,
+ remainingEnergy: player.energy - energyCost,
});
-
- console.log(`[Dungeon] Player ${userId} started ${dungeonId}`);
} catch (err) {
console.error("Dungeon Start Error:", err);
- socket.emit("error", { message: "Failed to initiate deployment" });
+ socket.emit("error", { message: "Critical deployment failure" });
}
});
- socket.on("dungeon:combat_step", async (data) => {
+ socket.on("dungeon:combat_step", async ({ enemyId }) => {
try {
- const session = sessionManager.getPlayerSession(socket.id);
- if (!session || session.scene !== "dungeon" || !session.sceneData) return;
+ if (!userId) return;
+
+ const session = dungeonManager.activeSessions.get(userId);
+ if (!session || session.isFinished) return;
- const dungeonSession = session.sceneData;
- const enemyId = sessionManager._cleanId(data.enemyId);
const enemyTemplate = DatapackLoader.getEnemy(enemyId);
-
if (!enemyTemplate) {
return socket.emit("error", { message: "Target data corrupted" });
}
- if (dungeonSession.currentEnemyHp === undefined) {
- dungeonSession.currentEnemyHp = enemyTemplate.stats?.hp || 100;
+ if (session.currentEnemyHp === undefined) {
+ session.currentEnemyHp = enemyTemplate.stats?.health || 100;
}
- const damage = Math.floor(Math.random() * 11) + 15;
- dungeonSession.currentEnemyHp -= damage;
+ const damage = Math.floor(Math.random() * 10) + 20;
+ session.currentEnemyHp -= damage;
- const isDefeated = dungeonSession.currentEnemyHp <= 0;
+ const isDefeated = session.currentEnemyHp <= 0;
socket.emit("dungeon:combat_result", {
damageDealt: damage,
- enemyHp: Math.max(0, dungeonSession.currentEnemyHp),
+ enemyHp: Math.max(0, session.currentEnemyHp),
targetDefeated: isDefeated,
- message: `Strike successful. Dealt ${damage} damage to units.`,
+ message: `Strike successful. Dealt ${damage} damage.`,
});
if (isDefeated) {
- console.log(`[Dungeon] Enemy ${enemyId} defeated by ${session.id}`);
+ session.currentEnemyHp = undefined;
}
} catch (err) {
console.error("Combat Error:", err);
@@ -90,62 +81,49 @@ module.exports = (io, socket) => {
socket.on("dungeon:next_room", async () => {
try {
- const session = sessionManager.getPlayerSession(socket.id);
+ if (!userId) return;
- if (!session || session.scene !== "dungeon" || !session.sceneData) {
- console.error(
- `[Dungeon Error] Invalid session for socket ${socket.id}`,
- );
- return;
+ const nextRoom = dungeonManager.moveToNextRoom(userId);
+ if (!nextRoom) {
+ return socket.emit("error", {
+ message: "Could not proceed to next room",
+ });
}
- const dungeonId = session.sceneData.dungeonId; // ТУТ була помилка (читання з undefined)
- const dungeon = DatapackLoader.getDungeon(dungeonId);
-
- const nextIndex = session.sceneData.currentRoomIndex + 1;
-
- if (nextIndex < dungeon.rooms.length) {
- session.sceneData.currentRoomIndex = nextIndex;
-
- const nextRoomId = dungeon.rooms[nextIndex].id;
- const nextRoomData = DatapackLoader.getRoom(nextRoomId);
-
- socket.emit("dungeon:room_update", {
- room: nextRoomData,
- roomIndex: nextIndex,
- });
+ if (nextRoom.status === "completed") {
+ await finalizeDungeon(socket, nextRoom.rewards);
} else {
- await finalizeDungeon(socket, session.sceneData, dungeon);
+ socket.emit("dungeon:room_update", {
+ room: nextRoom.config,
+ hostiles: nextRoom.hostiles,
+ roomIndex: nextRoom.roomIndex,
+ });
}
} catch (err) {
console.error("Dungeon Progress Error:", err);
- socket.emit("error", { message: "Failed to process next room" });
+ socket.emit("error", { message: "Navigation system error" });
}
});
+
+ socket.on("dungeon:leave", () => {
+ if (userId) dungeonManager.leaveDungeon(userId);
+ });
};
-async function finalizeDungeon(socket, sessionData, dungeon) {
+async function finalizeDungeon(socket, sessionRewards) {
const userId = socket.user.id;
- const earnedLoot = [];
+ try {
+ const player = await Player.findByPk(userId);
- dungeon.lootTable.forEach((entry) => {
- if (Math.random() * 100 <= entry.chance) {
- earnedLoot.push({ itemId: entry.itemId, quantity: 1 });
+ if (sessionRewards.credits > 0) {
+ await player.increment("credits", { by: sessionRewards.credits });
}
- });
- for (const item of earnedLoot) {
- const [invItem, created] = await Inventory.findOrCreate({
- where: { playerId: userId, itemId: item.itemId },
- defaults: { quantity: 0 },
+ socket.emit("dungeon:completed", {
+ rewards: sessionRewards,
+ message: "Mission successful. All objectives secured.",
});
- await invItem.increment("quantity", { by: item.quantity });
+ } finally {
+ dungeonManager.leaveDungeon(userId);
}
-
- sessionManager.setPlayerScene(socket.id, "world", null);
-
- socket.emit("dungeon:completed", {
- rewards: earnedLoot,
- message: "Mission successful. All objectives secured.",
- });
}