From 244635ca3f401966fb7d5c4743b697207362b548 Mon Sep 17 00:00:00 2001 From: dingo Date: Fri, 26 Dec 2025 09:10:43 -0500 Subject: [PATCH] Additional tools for Admin portal, and huge NameSpace Revamp --- Api/AdminController.cs | 4 +- Api/AuthApiController.cs | 4 +- Api/ItemsController.cs | 6 +- Api/StatsController.cs | 4 +- Game/Dungeon/CraftingHandler.cs | 4 +- Game/Dungeon/DungeonHandler.cs | 13 +- Game/Dungeon/DungeonPlayerSession.cs | 4 +- Game/Dungeon/DungeonSimulation.cs | 4 +- Game/Dungeon/LootService.cs | 22 +- Game/Dungeon/MobInstance.cs | 4 +- Game/Dungeon/TickResult.cs | 2 +- Game/GameContracts.cs | 233 ---- Game/GameHandler.cs | 927 -------------- Game/GameOpCodes.cs | 2 +- Game/GameSimulation.cs | 1118 ----------------- Game/ItemDatabase.cs | 241 ---- Game/ItemService.cs | 4 +- .../20251209142654_Initialize.Designer.cs | 120 +- ...1215205932_AddDungeonBeltItems.Designer.cs | 126 +- Migrations/20251217153258_MobLoot.Designer.cs | 126 +- .../20251217153958_MobLoot2.Designer.cs | 144 +-- .../20251217174913_fixdeathchests.Designer.cs | 144 +-- .../20251217201208_DungeonBrowser.Designer.cs | 150 +-- ...20251219151110_CDN Integration.Designer.cs | 152 +-- .../20251220180402_CDN Fight 4.Designer.cs | 152 +-- .../20251223134442_CraftingSystem.Designer.cs | 208 +-- .../20251223165033_Crafting2.Designer.cs | 208 +-- ...225225335_craftingrecipechange.Designer.cs | 208 +-- Migrations/GameDbContextModelSnapshot.cs | 208 +-- Networking/Messages/CharContracts.cs | 2 +- Networking/Messages/WorldContracts.cs | 2 +- Program.cs | 45 +- Services/Admin/Pages/AdminPageModel.cs | 2 +- Services/Admin/Pages/Assets/Index.cshtml | 2 +- Services/Admin/Pages/Assets/Index.cshtml.cs | 6 +- Services/Admin/Pages/Broadcast/Index.cshtml | 133 ++ .../Admin/Pages/Broadcast/Index.cshtml.cs | 139 ++ Services/Admin/Pages/Index.cshtml.cs | 4 +- Services/Admin/Pages/Items/Edit.cshtml | 2 +- Services/Admin/Pages/Items/Edit.cshtml.cs | 7 +- Services/Admin/Pages/Items/Index.cshtml | 2 +- Services/Admin/Pages/Items/Index.cshtml.cs | 8 +- Services/Admin/Pages/Login.cshtml | 2 +- Services/Admin/Pages/Login.cshtml.cs | 4 +- Services/Admin/Pages/Logout.cshtml.cs | 2 +- .../Admin/Pages/LootTables/Edit.cshtml.cs | 6 +- .../Admin/Pages/LootTables/Index.cshtml.cs | 6 +- Services/Admin/Pages/Mobs/Edit.cshtml | 100 +- Services/Admin/Pages/Mobs/Edit.cshtml.cs | 73 +- Services/Admin/Pages/Mobs/Index.cshtml | 2 +- Services/Admin/Pages/Mobs/Index.cshtml.cs | 8 +- Services/Admin/Pages/Players/Character.cshtml | 422 +++---- .../Admin/Pages/Players/Character.cshtml.cs | 41 +- Services/Admin/Pages/Players/Edit.cshtml | 2 +- Services/Admin/Pages/Players/Edit.cshtml.cs | 6 +- Services/Admin/Pages/Players/Index.cshtml | 2 +- Services/Admin/Pages/Players/Index.cshtml.cs | 4 +- .../Admin/Pages/Players/_ItemTooltip.cshtml | 4 +- Services/Admin/Pages/Recipes/Edit.cshtml | 2 +- Services/Admin/Pages/Recipes/Edit.cshtml.cs | 6 +- Services/Admin/Pages/Recipes/Index.cshtml | 2 +- Services/Admin/Pages/Recipes/Index.cshtml.cs | 6 +- Services/Admin/Pages/Server/Index.cshtml | 145 +++ Services/Admin/Pages/Server/Index.cshtml.cs | 114 ++ Services/Admin/Pages/Shared/_Layout.cshtml | 8 + Services/Admin/Pages/_ViewImports.cshtml | 2 +- Services/Auth/AccountsRepository.cs | 2 +- Services/Auth/AdminAuthService.cs | 2 +- Services/Auth/AuthService.cs | 2 +- Services/Auth/IAccountsRepository.cs | 2 +- Services/Auth/SessionAudit.cs | 2 +- Services/Characters/CharacterService.cs | 2 +- Services/Characters/ICharacterRepository.cs | 2 +- Services/Characters/ICharacterService.cs | 2 +- Services/ServerBroadcastService.cs | 78 ++ Services/World/WorldHandler.cs | 2 - Services/World/WorldService.cs | 4 +- World/IWorldService.cs | 2 +- data/ConnectionStringFactory.cs | 2 +- data/DatabaseHealthCheck.cs | 2 +- data/DatabaseManager.cs | 2 +- data/DatabaseOptions.cs | 2 +- data/DesignTimeDbContextFactory.cs | 2 +- data/GameDbContext.cs | 4 +- data/IDatabaseManager.cs | 2 +- data/ServiceCollectionExtensions.cs | 4 +- data/entities/Account.cs | 2 +- data/entities/Character.cs | 36 +- data/entities/ClientAsset.cs | 2 +- data/entities/CraftedItem.cs | 2 +- data/entities/CraftingRecipes.cs | 2 +- data/entities/CraftingSkills.cs | 4 +- data/entities/DeathChest.cs | 2 +- data/entities/DefaultDungeonItems.cs | 481 ------- data/entities/DefaultDungeonMobs.cs | 228 ---- data/entities/Dungeon.cs | 2 +- data/entities/DungeonBeltItem.cs | 2 +- data/entities/DungeonCharacter.cs | 2 +- data/entities/DungeonCharacterCombatStats.cs | 2 +- data/entities/DungeonCharacterItem.cs | 4 +- data/entities/DungeonCharacterStats.cs | 2 +- data/entities/DungeonItemDefinition.cs | 4 +- data/entities/DungeonLearnedSpell.cs | 2 +- data/entities/DungeonLootTableEntry.cs | 4 +- data/entities/DungeonMobCombatStats.cs | 4 +- data/entities/DungeonMobDefinition.cs | 4 +- data/entities/DungeonMobLootTable.cs | 4 +- data/entities/DungeonPersistence.cs | 2 +- data/entities/DungeonSpellDefinition.cs | 4 +- data/entities/DungeonStashItem.cs | 2 +- data/entities/EquipmentSlot.cs | 2 +- data/entities/GameItem.cs | 2 +- data/entities/GameRecipe.cs | 2 +- data/entities/InventoryItem.cs | 2 +- data/entities/ItemTemplate.cs | 2 +- data/entities/Items.cs | 55 +- data/entities/LevelSystem.cs | 6 +- data/entities/LootEntities.cs | 4 +- data/entities/MatchHistory.cs | 2 +- data/entities/MobDefinition.cs | 24 +- data/entities/Old_Character.cs | 2 +- data/entities/PlayerStats.cs | 2 +- data/entities/Session.cs | 2 +- data/entities/Zone.cs | 2 +- data/enums/DamageType.cs | 2 +- data/enums/DungeonEquipmentSlot.cs | 2 +- data/enums/EquipmentSlot.cs | 14 + data/enums/ItemRarity.cs | 2 +- data/enums/ItemType.cs | 2 +- data/enums/MobCategory.cs | 2 +- data/enums/MobType.cs | 2 +- data/enums/PlayerState.cs | 2 +- data/enums/SpellType.cs | 2 +- 133 files changed, 2153 insertions(+), 4776 deletions(-) delete mode 100644 Game/GameContracts.cs delete mode 100644 Game/GameHandler.cs delete mode 100644 Game/GameSimulation.cs delete mode 100644 Game/ItemDatabase.cs create mode 100644 Services/Admin/Pages/Broadcast/Index.cshtml create mode 100644 Services/Admin/Pages/Broadcast/Index.cshtml.cs create mode 100644 Services/Admin/Pages/Server/Index.cshtml create mode 100644 Services/Admin/Pages/Server/Index.cshtml.cs create mode 100644 Services/ServerBroadcastService.cs delete mode 100644 data/entities/DefaultDungeonItems.cs delete mode 100644 data/entities/DefaultDungeonMobs.cs create mode 100644 data/enums/EquipmentSlot.cs diff --git a/Api/AdminController.cs b/Api/AdminController.cs index 5dcdc63..908d749 100644 --- a/Api/AdminController.cs +++ b/Api/AdminController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; +using DataServer.Data; using Server.Services.Auth; -namespace VoidScavengers.Api; +namespace Server.Api; /// /// Admin API endpoints for account and server management diff --git a/Api/AuthApiController.cs b/Api/AuthApiController.cs index 8650b60..8096fb4 100644 --- a/Api/AuthApiController.cs +++ b/Api/AuthApiController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; +using DataServer.Data; using Server.Services.Auth; -namespace VoidScavengers.Api; +namespace Server.Api; /// /// HTTP authentication endpoints (for admin/API access) diff --git a/Api/ItemsController.cs b/Api/ItemsController.cs index 5cb530e..6b0629b 100644 --- a/Api/ItemsController.cs +++ b/Api/ItemsController.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; +using DataServer.Data; using Server.Services.Auth; -using VoidScavengers.Game; +using Server.Game; -namespace VoidScavengers.Api; +namespace Server.Api; /// /// API endpoints for game items and recipes diff --git a/Api/StatsController.cs b/Api/StatsController.cs index 047696d..68b07b0 100644 --- a/Api/StatsController.cs +++ b/Api/StatsController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; +using DataServer.Data; -namespace VoidScavengers.Api; +namespace Server.Api; /// /// API endpoints for player statistics and leaderboards diff --git a/Game/Dungeon/CraftingHandler.cs b/Game/Dungeon/CraftingHandler.cs index 406d2bd..c559e03 100644 --- a/Game/Dungeon/CraftingHandler.cs +++ b/Game/Dungeon/CraftingHandler.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; using Server.Networking; using Server.Networking.Messages; using System.Text.Json; diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index 675e811..6708ab3 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -3,9 +3,9 @@ using System.Text.Json; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Server.Data; -using Server.Data.Entities; -using Server.Data.Enums; +using DataServer.Data; +using DataServer.Data.Entities; +using DataServer.Data.Enums; using Server.Networking; using Server.Networking.Handling; using Server.Networking.Messages; @@ -120,12 +120,7 @@ public sealed class DungeonHandler : IClientMessageHandler if (mobs.Count == 0) { - // Seed default mobs - var defaults = DefaultDungeonMobs.GetDefaultMobs(); - db.Set().AddRange(defaults); - await db.SaveChangesAsync(); - mobs = defaults; - _log.LogInformation("Seeded {Count} default mob definitions", defaults.Count); + _log.LogCritical("Dungeon Mobs Table EMPTY"); } // Debug: Log which mobs have SpriteConfigJson diff --git a/Game/Dungeon/DungeonPlayerSession.cs b/Game/Dungeon/DungeonPlayerSession.cs index d88ba13..3990e1b 100644 --- a/Game/Dungeon/DungeonPlayerSession.cs +++ b/Game/Dungeon/DungeonPlayerSession.cs @@ -1,5 +1,5 @@ -using Server.Data.Entities; -using Server.Data.Enums; +using DataServer.Data.Entities; +using DataServer.Data.Enums; using Server.Networking; namespace Server.Game.Dungeon; diff --git a/Game/Dungeon/DungeonSimulation.cs b/Game/Dungeon/DungeonSimulation.cs index 13ccff5..8fb23e9 100644 --- a/Game/Dungeon/DungeonSimulation.cs +++ b/Game/Dungeon/DungeonSimulation.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -using Server.Data.Entities; -using Server.Data.Enums; +using DataServer.Data.Entities; +using DataServer.Data.Enums; namespace Server.Game.Dungeon; diff --git a/Game/Dungeon/LootService.cs b/Game/Dungeon/LootService.cs index b7e5baf..e0cf94d 100644 --- a/Game/Dungeon/LootService.cs +++ b/Game/Dungeon/LootService.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; namespace Server.Game.Dungeon; @@ -89,7 +89,7 @@ public class LootService // Seed default items if empty if (items.Count == 0) { - items = await SeedDefaultItemsAsync(db); + _log.LogCritical("Database Items EMPTY!"); } _itemDefinitions = items.ToDictionary(i => i.Id); @@ -412,12 +412,12 @@ public class LootService }; } - private async Task> SeedDefaultItemsAsync(GameDbContext db) - { - var items = DefaultDungeonItems.GetDefaultItems(); - db.Set().AddRange(items); - await db.SaveChangesAsync(); - _log.LogInformation("Seeded {Count} default item definitions", items.Count); - return items; - } + //private async Task> SeedDefaultItemsAsync(GameDbContext db) + //{ + // var items = DefaultDungeonItems.GetDefaultItems(); + // db.Set().AddRange(items); + // await db.SaveChangesAsync(); + // _log.LogInformation("Seeded {Count} default item definitions", items.Count); + // return items; + //} } diff --git a/Game/Dungeon/MobInstance.cs b/Game/Dungeon/MobInstance.cs index 2048f17..6b5e3d7 100644 --- a/Game/Dungeon/MobInstance.cs +++ b/Game/Dungeon/MobInstance.cs @@ -1,5 +1,5 @@ -using Server.Data.Entities; -using Server.Data.Enums; +using DataServer.Data.Entities; +using DataServer.Data.Enums; namespace Server.Game.Dungeon; diff --git a/Game/Dungeon/TickResult.cs b/Game/Dungeon/TickResult.cs index 561b033..5bec9e1 100644 --- a/Game/Dungeon/TickResult.cs +++ b/Game/Dungeon/TickResult.cs @@ -1,4 +1,4 @@ -using Server.Data.Enums; +using DataServer.Data.Enums; namespace Server.Game.Dungeon; diff --git a/Game/GameContracts.cs b/Game/GameContracts.cs deleted file mode 100644 index 054357e..0000000 --- a/Game/GameContracts.cs +++ /dev/null @@ -1,233 +0,0 @@ -using System.Text.Json.Serialization; - -namespace VoidScavengers.Networking.Messages; - -// ===== Lobby Contracts ===== -public sealed record LobbyJoinRequest(string PlayerName); -public sealed record LobbyJoinResult(bool Ok, string? Error, string? LobbyId, int PlayerCount); -public sealed record LobbyState(string LobbyId, LobbyPlayer[] Players, int CountdownSeconds); -public sealed record LobbyPlayer(ulong PlayerId, string Name, bool Ready); -public sealed record LobbyReadyRequest(bool Ready); -public sealed record LobbyCountdown(int SecondsRemaining); - -// ===== Game Start ===== -public sealed record GameStartInfo( - string MatchId, - int MapSeed, - float MapWidth, - float MapHeight, - PlayerSpawnInfo Self, - PlayerSpawnInfo[] OtherPlayers, - AsteroidInfo[] Asteroids, - ResourceNodeInfo[] Resources, - ExtractionZoneInfo[] ExtractionZones -); - -public sealed record PlayerSpawnInfo( - ulong PlayerId, - string Name, - float X, - float Y, - float Rotation, - int Health, - int MaxHealth -); - -public sealed record AsteroidInfo( - int Id, - float X, - float Y, - float Radius, - int AsteroidType // 0=small, 1=medium, 2=large -); - -public sealed record ResourceNodeInfo( - int Id, - float X, - float Y, - int ResourceType, // 0=scrap, 1=energy, 2=rare - int Amount -); - -public sealed record ExtractionZoneInfo( - int Id, - float X, - float Y, - float Radius, - bool Active, - int ActivatesAtTick -); - -// ===== Game State Snapshots ===== -public sealed record GameStateSnapshot( - long Tick, - float TimeRemaining, - int PlayersAlive, - EntityState[] Entities, - ProjectileState[] Projectiles, - ResourceState[] Resources -); - -public sealed record EntityState( - ulong Id, - int Type, // 0=player, 1=dropped_item - float X, - float Y, - float Rotation, - float VelX, - float VelY, - int Health, - int? ItemId // For dropped items -); - -public sealed record ProjectileState( - int Id, - float X, - float Y, - float VelX, - float VelY, - ulong OwnerId, - int ProjectileType -); - -public sealed record ResourceState( - int Id, - int Amount -); - -// ===== Player Input ===== -public sealed record MoveInput( - float Dx, // -1 to 1 normalized - float Dy, // -1 to 1 normalized - float AimAngle, // Radians, where player is aiming - uint Seq // Client sequence number for reconciliation -); - -public sealed record ActionInput( - int ActionType, // 0=interact, 1=pickup, 2=use_ability - int? TargetId -); - -public sealed record ShootInput( - float AimAngle, - uint Seq -); - -public sealed record DropInput( - int InventorySlot -); - -public sealed record CraftRequest( - int RecipeId -); - -// ===== Events ===== -public sealed record SpawnEvent( - ulong EntityId, - int EntityType, - float X, - float Y, - object? Data // Type-specific spawn data -); - -public sealed record DespawnEvent(ulong EntityId); - -public sealed record DamageEvent( - ulong TargetId, - ulong? SourceId, - int Amount, - int NewHealth, - int DamageType // 0=projectile, 1=collision, 2=zone -); - -public sealed record DeathEvent( - ulong PlayerId, - ulong? KillerId, - string PlayerName, - string? KillerName, - DroppedItemInfo[] DroppedItems -); - -public sealed record DroppedItemInfo( - int DropId, - float X, - float Y, - int ItemId, - int Quantity -); - -public sealed record PickupEvent( - ulong PlayerId, - int DropId, - int ItemId, - int Quantity -); - -public sealed record ProjectileEvent( - int ProjectileId, - ulong OwnerId, - float X, - float Y, - float VelX, - float VelY, - int ProjectileType -); - -public sealed record ExplosionEvent( - float X, - float Y, - float Radius, - int ExplosionType -); - -public sealed record CraftCompleteEvent( - ulong PlayerId, - int RecipeId, - int ResultItemId, - int Quantity -); - -public sealed record ExtractEvent( - ulong PlayerId, - string PlayerName, - int TotalLootValue -); - -// ===== Game End ===== -public sealed record GameEndInfo( - string MatchId, - string Reason, // "last_standing", "time_expired", "all_extracted" - ulong? WinnerId, - string? WinnerName, - PlayerStatsInfo[] PlayerStats -); - -public sealed record PlayerStatsInfo( - ulong PlayerId, - string Name, - int Kills, - int Deaths, - int DamageDealt, - int ResourcesCollected, - int ItemsCrafted, - bool Extracted, - int FinalPlacement -); - -// ===== Inventory State (sent periodically or on change) ===== -public sealed record InventoryUpdate( - InventorySlot[] Slots, - int ScrapCount, - int EnergyCount, - int RareCount -); - -public sealed record InventorySlot( - int SlotIndex, - int? ItemId, - int Quantity -); - -// ===== Chat ===== -public sealed record ChatMessage(string Text); -public sealed record ChatReceived(ulong SenderId, string SenderName, string Text, long Timestamp); diff --git a/Game/GameHandler.cs b/Game/GameHandler.cs deleted file mode 100644 index 3e760b1..0000000 --- a/Game/GameHandler.cs +++ /dev/null @@ -1,927 +0,0 @@ -using System.Collections.Concurrent; -using System.Numerics; -using System.Text.Json; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Server.Networking; -using Server.Networking.Handling; -using Server.Networking.Messages; -using Server.Services.Auth; - -namespace VoidScavengers.Game; - -/// -/// Handles all game-related messages and manages match instances. -/// Integrates with the existing SystemRevival server architecture. -/// -public sealed class GameHandler : IClientMessageHandler -{ - private readonly ILogger _log; - private readonly ISessionRegistry _sessions; - private readonly IMessageSerializer _ser; - private readonly MatchManager _matchManager; - - public GameHandler( - ILogger log, - ISessionRegistry sessions, - IMessageSerializer ser, - MatchManager matchManager) - { - _log = log; - _sessions = sessions; - _ser = ser; - _matchManager = matchManager; - } - - public IReadOnlyCollection SupportedOpCodes => new[] - { - // Lobby - GameOpCodes.LOBBY_JOIN, - GameOpCodes.LOBBY_READY, - GameOpCodes.LOBBY_LEAVE, - - // Game Input - GameOpCodes.INPUT_MOVE, - GameOpCodes.INPUT_ACTION, - GameOpCodes.INPUT_SHOOT, - GameOpCodes.INPUT_DROP, - GameOpCodes.INPUT_CRAFT, - - // Chat - GameOpCodes.CHAT_SEND - }; - - public async Task HandleAsync(int opCode, IConnection connection, ReadOnlyMemory payload, CancellationToken ct) - { - // All game operations require authentication - if (!_sessions.TryGet(connection.Id, out var accountId, out _)) - { - await SendErrorAsync(connection, "auth_required", ct); - return; - } - - try - { - switch (opCode) - { - case GameOpCodes.LOBBY_JOIN: - await HandleLobbyJoinAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.LOBBY_READY: - await HandleLobbyReadyAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.LOBBY_LEAVE: - await HandleLobbyLeaveAsync(connection, accountId, ct); - break; - - case GameOpCodes.INPUT_MOVE: - await HandleMoveInputAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.INPUT_SHOOT: - await HandleShootInputAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.INPUT_ACTION: - await HandleActionInputAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.INPUT_CRAFT: - await HandleCraftInputAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.INPUT_DROP: - await HandleDropInputAsync(connection, accountId, payload, ct); - break; - - case GameOpCodes.CHAT_SEND: - await HandleChatAsync(connection, accountId, payload, ct); - break; - } - } - catch (Exception ex) - { - _log.LogError(ex, "Error handling opcode {OpCode} from account {AccountId}", opCode, accountId); - await SendErrorAsync(connection, "internal_error", ct); - } - } - - private async Task HandleLobbyJoinAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var request = _ser.Deserialize(payload); - - // Get or create player name (in production, fetch from database) - string playerName = request?.PlayerName ?? $"Player{accountId % 10000}"; - - var (ok, lobbyId, error) = await _matchManager.JoinLobbyAsync(accountId, conn, playerName); - - var result = new LobbyJoinResult(ok, error, lobbyId, ok ? _matchManager.GetLobbyPlayerCount(lobbyId!) : 0); - await SendAsync(conn, GameOpCodes.LOBBY_JOIN_RESULT, result, ct); - } - - private async Task HandleLobbyReadyAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var request = _ser.Deserialize(payload); - await _matchManager.SetPlayerReadyAsync(accountId, request?.Ready ?? true); - } - - private async Task HandleLobbyLeaveAsync(IConnection conn, ulong accountId, CancellationToken ct) - { - await _matchManager.LeaveLobbyAsync(accountId); - } - - private Task HandleMoveInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var input = _ser.Deserialize(payload); - if (input == null) return Task.CompletedTask; - - _matchManager.EnqueueInput(accountId, new PlayerInput - { - PlayerId = accountId, - Type = InputType.Move, - Dx = input.Dx, - Dy = input.Dy, - AimAngle = input.AimAngle, - Seq = input.Seq - }); - - return Task.CompletedTask; - } - - private Task HandleShootInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var input = _ser.Deserialize(payload); - if (input == null) return Task.CompletedTask; - - _matchManager.EnqueueInput(accountId, new PlayerInput - { - PlayerId = accountId, - Type = InputType.Shoot, - AimAngle = input.AimAngle, - Seq = input.Seq - }); - - return Task.CompletedTask; - } - - private Task HandleActionInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var input = _ser.Deserialize(payload); - - _matchManager.EnqueueInput(accountId, new PlayerInput - { - PlayerId = accountId, - Type = InputType.Action, - TargetId = input?.TargetId - }); - - return Task.CompletedTask; - } - - private Task HandleCraftInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var input = _ser.Deserialize(payload); - if (input == null) return Task.CompletedTask; - - _matchManager.EnqueueInput(accountId, new PlayerInput - { - PlayerId = accountId, - Type = InputType.Craft, - TargetId = input.RecipeId - }); - - return Task.CompletedTask; - } - - private Task HandleDropInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var input = _ser.Deserialize(payload); - if (input == null) return Task.CompletedTask; - - _matchManager.EnqueueInput(accountId, new PlayerInput - { - PlayerId = accountId, - Type = InputType.Drop, - TargetId = input.SlotIndex - }); - - return Task.CompletedTask; - } - - private async Task HandleChatAsync(IConnection conn, ulong accountId, ReadOnlyMemory payload, CancellationToken ct) - { - var msg = _ser.Deserialize(payload); - if (string.IsNullOrWhiteSpace(msg?.Text)) return; - - // Sanitize and limit message - string text = msg.Text.Trim(); - if (text.Length > 200) text = text[..200]; - - await _matchManager.BroadcastChatAsync(accountId, text); - } - - private async Task SendAsync(IConnection conn, int opCode, T data, CancellationToken ct) - { - var payload = _ser.Serialize(data); - var wire = _ser.Serialize(new ServerMessage(opCode, payload)); - await conn.SendAsync(wire, ct); - } - - private async Task SendErrorAsync(IConnection conn, string error, CancellationToken ct) - { - await SendAsync(conn, OpCodes.ERROR, new { error }, ct); - } -} - -// ===== Input message types for deserialization ===== -public sealed record LobbyJoinRequest(string? PlayerName); -public sealed record LobbyReadyRequest(bool Ready); -public sealed record LobbyJoinResult(bool Ok, string? Error, string? LobbyId, int PlayerCount); -public sealed record MoveInputMsg(float Dx, float Dy, float AimAngle, uint Seq); -public sealed record ShootInputMsg(float AimAngle, uint Seq); -public sealed record ActionInputMsg(int? TargetId); -public sealed record CraftInputMsg(int RecipeId); -public sealed record DropInputMsg(int SlotIndex); -public sealed record ChatMsg(string Text); - -/// -/// Static OpCodes class for game-specific operations -/// -public static class GameOpCodes -{ - // Lobby - public const int LOBBY_JOIN = 400; - public const int LOBBY_JOIN_RESULT = 401; - public const int LOBBY_STATE = 402; - public const int LOBBY_READY = 403; - public const int LOBBY_COUNTDOWN = 404; - public const int LOBBY_LEAVE = 405; - - // Game State - public const int GAME_START = 420; - public const int GAME_STATE = 421; - public const int GAME_TICK = 422; - public const int GAME_END = 423; - - // Input - public const int INPUT_MOVE = 450; - public const int INPUT_ACTION = 451; - public const int INPUT_SHOOT = 452; - public const int INPUT_DROP = 453; - public const int INPUT_CRAFT = 454; - - // Events - public const int EVENT_SPAWN = 470; - public const int EVENT_DESPAWN = 471; - public const int EVENT_DAMAGE = 472; - public const int EVENT_DEATH = 473; - public const int EVENT_PICKUP = 474; - public const int EVENT_PROJECTILE = 475; - public const int EVENT_EXPLOSION = 476; - - // Chat - public const int CHAT_SEND = 500; - public const int CHAT_RECEIVE = 501; -} - -/// -/// Manages lobbies, matchmaking, and active game instances -/// -public sealed class MatchManager : IDisposable -{ - private readonly ILogger _log; - private readonly IMessageSerializer _ser; - private readonly IServiceScopeFactory _scopeFactory; - - private readonly ConcurrentDictionary _lobbies = new(); - private readonly ConcurrentDictionary _matches = new(); - private readonly ConcurrentDictionary _playerToLobby = new(); - private readonly ConcurrentDictionary _playerToMatch = new(); - private readonly ConcurrentDictionary _playerConnections = new(); - - private readonly Timer _tickTimer; - private readonly Timer _lobbyTimer; - - private const int MinPlayersToStart = 2; - private const int MaxPlayersPerLobby = 8; - private const int LobbyCountdownSeconds = 10; - - public MatchManager(ILogger log, IMessageSerializer ser, IServiceScopeFactory scopeFactory) - { - _log = log; - _ser = ser; - _scopeFactory = scopeFactory; - - // Game tick timer (20 Hz) - _tickTimer = new Timer(OnGameTick, null, 50, 50); - - // Lobby update timer (1 Hz) - _lobbyTimer = new Timer(OnLobbyTick, null, 1000, 1000); - } - - public async Task<(bool ok, string? lobbyId, string? error)> JoinLobbyAsync(ulong accountId, IConnection conn, string playerName) - { - // Remove from any existing lobby - await LeaveLobbyAsync(accountId); - - // Find or create lobby - Lobby? lobby = null; - foreach (var l in _lobbies.Values) - { - if (l.Phase == LobbyPhase.Waiting && l.Players.Count < MaxPlayersPerLobby) - { - lobby = l; - break; - } - } - - if (lobby == null) - { - lobby = new Lobby - { - Id = Guid.NewGuid().ToString("N")[..8], - CreatedAt = DateTime.UtcNow - }; - _lobbies[lobby.Id] = lobby; - _log.LogInformation("Created new lobby {LobbyId}", lobby.Id); - } - - var player = new LobbyPlayer - { - AccountId = accountId, - Name = playerName, - Ready = false, - Connection = conn - }; - - lobby.Players[accountId] = player; - _playerToLobby[accountId] = lobby.Id; - _playerConnections[accountId] = conn; - - _log.LogInformation("Player {AccountId} ({Name}) joined lobby {LobbyId}", accountId, playerName, lobby.Id); - - // Broadcast updated lobby state - await BroadcastLobbyStateAsync(lobby); - - return (true, lobby.Id, null); - } - - public async Task LeaveLobbyAsync(ulong accountId) - { - if (_playerToLobby.TryRemove(accountId, out var lobbyId)) - { - if (_lobbies.TryGetValue(lobbyId, out var lobby)) - { - lobby.Players.Remove(accountId); - - // Clean up empty lobbies - if (lobby.Players.Count == 0) - { - _lobbies.TryRemove(lobbyId, out _); - _log.LogInformation("Removed empty lobby {LobbyId}", lobbyId); - } - else - { - // Reset countdown if in progress - if (lobby.Phase == LobbyPhase.Countdown) - { - lobby.Phase = LobbyPhase.Waiting; - lobby.CountdownSeconds = 0; - } - await BroadcastLobbyStateAsync(lobby); - } - } - } - - _playerConnections.TryRemove(accountId, out _); - } - - public async Task SetPlayerReadyAsync(ulong accountId, bool ready) - { - if (!_playerToLobby.TryGetValue(accountId, out var lobbyId)) return; - if (!_lobbies.TryGetValue(lobbyId, out var lobby)) return; - if (!lobby.Players.TryGetValue(accountId, out var player)) return; - - player.Ready = ready; - await BroadcastLobbyStateAsync(lobby); - - // Check if all players ready - if (lobby.Players.Count >= MinPlayersToStart && - lobby.Players.Values.All(p => p.Ready) && - lobby.Phase == LobbyPhase.Waiting) - { - lobby.Phase = LobbyPhase.Countdown; - lobby.CountdownSeconds = LobbyCountdownSeconds; - _log.LogInformation("Lobby {LobbyId} starting countdown", lobbyId); - } - } - - public int GetLobbyPlayerCount(string lobbyId) - { - return _lobbies.TryGetValue(lobbyId, out var lobby) ? lobby.Players.Count : 0; - } - - public void EnqueueInput(ulong accountId, PlayerInput input) - { - if (!_playerToMatch.TryGetValue(accountId, out var matchId)) return; - if (!_matches.TryGetValue(matchId, out var match)) return; - - match.Simulation.EnqueueInput(accountId, input); - } - - public async Task BroadcastChatAsync(ulong senderId, string text) - { - // Find which match/lobby the sender is in - string? targetId = null; - Dictionary? targets = null; - string? senderName = null; - - if (_playerToMatch.TryGetValue(senderId, out var matchId) && - _matches.TryGetValue(matchId, out var match)) - { - targets = match.Connections; - senderName = match.Simulation.Players.TryGetValue(senderId, out var p) ? p.Name : "Unknown"; - } - else if (_playerToLobby.TryGetValue(senderId, out var lobbyId) && - _lobbies.TryGetValue(lobbyId, out var lobby)) - { - targets = lobby.Players.ToDictionary(kv => kv.Key, kv => kv.Value.Connection); - senderName = lobby.Players.TryGetValue(senderId, out var p) ? p.Name : "Unknown"; - } - - if (targets == null) return; - - var chatMsg = new - { - senderId, - senderName, - text, - timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() - }; - - var payload = _ser.Serialize(chatMsg); - var wire = _ser.Serialize(new ServerMessage(GameOpCodes.CHAT_RECEIVE, payload)); - - foreach (var (_, conn) in targets) - { - try - { - await conn.SendAsync(wire); - } - catch { /* ignore failed sends */ } - } - } - - private async void OnLobbyTick(object? state) - { - foreach (var lobby in _lobbies.Values.ToList()) - { - if (lobby.Phase == LobbyPhase.Countdown) - { - lobby.CountdownSeconds--; - - // Broadcast countdown - await BroadcastToLobbyAsync(lobby, GameOpCodes.LOBBY_COUNTDOWN, - new { seconds = lobby.CountdownSeconds }); - - if (lobby.CountdownSeconds <= 0) - { - // Start the match! - await StartMatchAsync(lobby); - } - } - } - } - - private async Task StartMatchAsync(Lobby lobby) - { - lobby.Phase = LobbyPhase.Starting; - - var matchId = Guid.NewGuid().ToString("N")[..12]; - var seed = (int)(DateTime.UtcNow.Ticks % int.MaxValue); - var simulation = new GameSimulation(matchId, seed); - - var match = new MatchInstance - { - Id = matchId, - Simulation = simulation, - StartedAt = DateTime.UtcNow - }; - - // Add players to match - int playerIndex = 0; - foreach (var (accountId, lobbyPlayer) in lobby.Players) - { - var spawnPos = simulation.GetSpawnPosition(playerIndex, lobby.Players.Count); - simulation.AddPlayer(accountId, lobbyPlayer.Name, spawnPos); - - match.Connections[accountId] = lobbyPlayer.Connection; - _playerToMatch[accountId] = matchId; - _playerToLobby.TryRemove(accountId, out _); - - playerIndex++; - } - - _matches[matchId] = match; - _lobbies.TryRemove(lobby.Id, out _); - - // Start simulation - simulation.StartGame(); - - // Send GAME_START to all players - foreach (var (accountId, conn) in match.Connections) - { - var startInfo = BuildGameStartInfo(simulation, accountId); - var payload = _ser.Serialize(startInfo); - var wire = _ser.Serialize(new ServerMessage(GameOpCodes.GAME_START, payload)); - - try - { - await conn.SendAsync(wire); - } - catch (Exception ex) - { - _log.LogWarning(ex, "Failed to send GAME_START to {AccountId}", accountId); - } - } - - _log.LogInformation("Match {MatchId} started with {PlayerCount} players", matchId, match.Connections.Count); - } - - private object BuildGameStartInfo(GameSimulation sim, ulong forPlayerId) - { - var self = sim.Players[forPlayerId]; - var others = sim.Players.Values.Where(p => p.Id != forPlayerId).ToArray(); - - return new - { - matchId = sim.MatchId, - mapSeed = sim.MapSeed, - mapWidth = sim.MapWidth, - mapHeight = sim.MapHeight, - self = new - { - playerId = self.Id, - name = self.Name, - x = self.X, - y = self.Y, - rotation = self.Rotation, - health = self.Health, - maxHealth = self.MaxHealth - }, - otherPlayers = others.Select(p => new - { - playerId = p.Id, - name = p.Name, - x = p.X, - y = p.Y, - rotation = p.Rotation, - health = p.Health, - maxHealth = p.MaxHealth - }).ToArray(), - asteroids = sim.Asteroids.Values.Select(a => new - { - id = a.Id, - x = a.X, - y = a.Y, - radius = a.Radius, - type = a.Type - }).ToArray(), - resources = sim.Resources.Values.Select(r => new - { - id = r.Id, - x = r.X, - y = r.Y, - resourceType = r.ResourceType, - amount = r.Amount - }).ToArray(), - extractionZones = sim.ExtractionZones.Values.Select(z => new - { - id = z.Id, - x = z.X, - y = z.Y, - radius = z.Radius, - active = z.Active, - activatesAtTick = z.ActivatesAtTick - }).ToArray() - }; - } - - private async void OnGameTick(object? state) - { - foreach (var match in _matches.Values.ToList()) - { - if (match.Simulation.Phase != GamePhase.InProgress) continue; - - // Advance simulation - var events = match.Simulation.Tick(); - - // Broadcast state snapshot every tick - await BroadcastGameStateAsync(match); - - // Broadcast events - foreach (var evt in events) - { - await BroadcastEventAsync(match, evt); - - // Handle game end - if (evt.Type == EventType.GameEnd) - { - await EndMatchAsync(match); - } - } - } - } - - private async Task BroadcastGameStateAsync(MatchInstance match) - { - var sim = match.Simulation; - - var state = new - { - tick = sim.CurrentTick, - timeRemaining = sim.TimeRemaining, - playersAlive = sim.Players.Values.Count(p => p.Alive), - entities = sim.Players.Values.Where(p => p.Alive).Select(p => new - { - id = p.Id, - type = 0, // player - x = p.X, - y = p.Y, - rotation = p.Rotation, - health = p.Health, - scrap = p.Scrap, - energy = p.Energy, - rare = p.Rare, - inventory = p.Inventory, - equippedWeaponId = p.EquippedWeaponId, - name = p.Name - }).ToArray(), - projectiles = sim.Projectiles.Values.Select(p => new - { - id = p.Id, - x = p.X, - y = p.Y, - velX = p.VelX, - velY = p.VelY, - ownerId = p.OwnerId - }).ToArray(), - droppedItems = sim.DroppedItems.Values.Select(d => new - { - id = d.Id, - x = d.X, - y = d.Y, - itemId = d.ItemId, - quantity = d.Quantity - }).ToArray(), - resources = sim.Resources.Values.Where(r => r.Amount > 0).Select(r => new - { - id = r.Id, - amount = r.Amount - }).ToArray() - }; - - var payload = _ser.Serialize(state); - var wire = _ser.Serialize(new ServerMessage(GameOpCodes.GAME_STATE, payload)); - - foreach (var (_, conn) in match.Connections) - { - try - { - await conn.SendAsync(wire); - } - catch { /* ignore */ } - } - } - - private async Task BroadcastEventAsync(MatchInstance match, GameEvent evt) - { - int opCode = evt.Type switch - { - EventType.Spawn => GameOpCodes.EVENT_SPAWN, - EventType.Despawn => GameOpCodes.EVENT_DESPAWN, - EventType.Damage => GameOpCodes.EVENT_DAMAGE, - EventType.Death => GameOpCodes.EVENT_DEATH, - EventType.Pickup => GameOpCodes.EVENT_PICKUP, - EventType.Projectile => GameOpCodes.EVENT_PROJECTILE, - EventType.Explosion => GameOpCodes.EVENT_EXPLOSION, - EventType.GameEnd => GameOpCodes.GAME_END, - _ => 0 - }; - - if (opCode == 0) return; - - var payload = _ser.Serialize(evt.Data); - var wire = _ser.Serialize(new ServerMessage(opCode, payload)); - - foreach (var (_, conn) in match.Connections) - { - try - { - await conn.SendAsync(wire); - } - catch { /* ignore */ } - } - } - - private async Task EndMatchAsync(MatchInstance match) - { - // Get match results before cleanup - var results = match.Simulation.GetMatchResults(); - - // Persist stats to database - try - { - await PersistMatchResultsAsync(match.Id, results); - } - catch (Exception ex) - { - _log.LogError(ex, "Failed to persist match results for {MatchId}", match.Id); - } - - // Remove players from match tracking - foreach (var accountId in match.Connections.Keys) - { - _playerToMatch.TryRemove(accountId, out _); - } - - _matches.TryRemove(match.Id, out _); - _log.LogInformation("Match {MatchId} ended with {PlayerCount} players", match.Id, results.Count); - } - - private async Task PersistMatchResultsAsync(string matchId, List results) - { - using var scope = _scopeFactory.CreateScope(); - var db = scope.ServiceProvider.GetRequiredService(); - - foreach (var result in results) - { - // Get or create player stats - var stats = await db.PlayerStats.FirstOrDefaultAsync(s => s.AccountId == result.AccountId); - if (stats == null) - { - stats = new Server.Data.PlayerStats - { - AccountId = result.AccountId, - CreatedAt = DateTime.UtcNow - }; - db.PlayerStats.Add(stats); - } - - // Update lifetime stats - stats.MatchesPlayed++; - stats.Kills += result.Kills; - stats.Deaths += result.Deaths; - stats.TotalDamageDealt += result.DamageDealt; - stats.TotalDamageTaken += result.DamageTaken; - stats.TotalScrapCollected += result.ScrapCollected; - stats.TotalEnergyCollected += result.EnergyCollected; - stats.TotalRareCollected += result.RareCollected; - stats.ItemsCrafted += result.ItemsCrafted; - stats.TotalPlayTimeSeconds += result.SurvivalTimeSeconds; - - if (result.SurvivalTimeSeconds > stats.LongestSurvivalSeconds) - stats.LongestSurvivalSeconds = result.SurvivalTimeSeconds; - - // Win/loss tracking - bool isWin = result.Result == MatchPlayerResultType.Won || result.Result == MatchPlayerResultType.Extracted; - if (isWin) - stats.Wins++; - else - stats.Losses++; - - if (result.Result == MatchPlayerResultType.Extracted) - stats.Extractions++; - - // Simple Elo calculation (can be made more sophisticated) - int eloChange = CalculateEloChange(stats.Elo, result.Placement, result.TotalPlayers, isWin); - stats.Elo = Math.Max(0, stats.Elo + eloChange); - - // Record match history - var history = new Server.Data.MatchHistory - { - MatchId = matchId, - AccountId = result.AccountId, - Result = isWin - ? (result.Result == MatchPlayerResultType.Extracted - ? Server.Data.MatchResult.Extracted - : Server.Data.MatchResult.Win) - : Server.Data.MatchResult.Loss, - Placement = result.Placement, - TotalPlayers = result.TotalPlayers, - Kills = result.Kills, - Deaths = result.Deaths, - DamageDealt = result.DamageDealt, - DamageTaken = result.DamageTaken, - ScrapCollected = result.ScrapCollected, - EnergyCollected = result.EnergyCollected, - RareCollected = result.RareCollected, - ItemsCrafted = result.ItemsCrafted, - SurvivalTimeSeconds = result.SurvivalTimeSeconds, - MatchDurationSeconds = result.MatchDurationSeconds, - EloChange = eloChange, - EloAfter = stats.Elo, - PlayedAt = DateTime.UtcNow - }; - db.MatchHistory.Add(history); - } - - await db.SaveChangesAsync(); - _log.LogInformation("Persisted stats for match {MatchId}", matchId); - } - - private int CalculateEloChange(int currentElo, int placement, int totalPlayers, bool isWin) - { - // Simple Elo-like system based on placement - // K-factor varies by Elo (higher K for lower Elo = faster adjustment) - int kFactor = currentElo < 1200 ? 32 : (currentElo < 1600 ? 24 : 16); - - // Expected score based on placement (1st = 1.0, last = 0.0) - float expectedPlacement = totalPlayers / 2f; - float actualScore = (totalPlayers - placement) / (float)(totalPlayers - 1); - float expectedScore = 0.5f; // Assume average performance expected - - // Bonus for winning - if (isWin) actualScore = Math.Max(actualScore, 0.75f); - - int change = (int)(kFactor * (actualScore - expectedScore)); - - // Clamp to reasonable range - return Math.Clamp(change, -50, 50); - } - - private async Task BroadcastLobbyStateAsync(Lobby lobby) - { - var state = new - { - lobbyId = lobby.Id, - phase = lobby.Phase.ToString(), - countdownSeconds = lobby.CountdownSeconds, - players = lobby.Players.Values.Select(p => new - { - accountId = p.AccountId, - name = p.Name, - ready = p.Ready - }).ToArray() - }; - - await BroadcastToLobbyAsync(lobby, GameOpCodes.LOBBY_STATE, state); - } - - private async Task BroadcastToLobbyAsync(Lobby lobby, int opCode, T data) - { - var payload = _ser.Serialize(data); - var wire = _ser.Serialize(new ServerMessage(opCode, payload)); - - foreach (var player in lobby.Players.Values) - { - try - { - await player.Connection.SendAsync(wire); - } - catch { /* ignore */ } - } - } - - public void Dispose() - { - _tickTimer.Dispose(); - _lobbyTimer.Dispose(); - } -} - -// ===== Lobby & Match Data Structures ===== -public sealed class Lobby -{ - public string Id { get; set; } = ""; - public LobbyPhase Phase { get; set; } = LobbyPhase.Waiting; - public int CountdownSeconds { get; set; } - public DateTime CreatedAt { get; set; } - public Dictionary Players { get; } = new(); -} - -public sealed class LobbyPlayer -{ - public ulong AccountId { get; set; } - public string Name { get; set; } = ""; - public bool Ready { get; set; } - public IConnection Connection { get; set; } = null!; -} - -public enum LobbyPhase -{ - Waiting, - Countdown, - Starting -} - -public sealed class MatchInstance -{ - public string Id { get; set; } = ""; - public GameSimulation Simulation { get; set; } = null!; - public DateTime StartedAt { get; set; } - public Dictionary Connections { get; } = new(); -} diff --git a/Game/GameOpCodes.cs b/Game/GameOpCodes.cs index 8fa929f..59b8c37 100644 --- a/Game/GameOpCodes.cs +++ b/Game/GameOpCodes.cs @@ -1,4 +1,4 @@ -namespace VoidScavengers.Networking.Messages; +namespace Server.Networking.Messages; /// /// OpCodes for Void Scavengers game - extends base OpCodes diff --git a/Game/GameSimulation.cs b/Game/GameSimulation.cs deleted file mode 100644 index 726634f..0000000 --- a/Game/GameSimulation.cs +++ /dev/null @@ -1,1118 +0,0 @@ -using System.Collections.Concurrent; -using System.Numerics; - -namespace VoidScavengers.Game; - -/// -/// Core game simulation for a single match instance -/// -public sealed class GameSimulation -{ - public string MatchId { get; } - public int MapSeed { get; } - public float MapWidth { get; } - public float MapHeight { get; } - public long CurrentTick { get; private set; } - public GamePhase Phase { get; private set; } = GamePhase.WaitingForPlayers; - public float TimeRemaining { get; private set; } - - private readonly Random _rng; - private readonly Dictionary _players = new(); - private readonly Dictionary _asteroids = new(); - private readonly Dictionary _resources = new(); - private readonly Dictionary _droppedItems = new(); - private readonly Dictionary _projectiles = new(); - private readonly Dictionary _extractionZones = new(); - - private readonly ConcurrentQueue _inputQueue = new(); - private readonly List _pendingEvents = new(); - - private int _nextEntityId = 1; - private int _nextProjectileId = 1; - - // Game constants - public const float TickRate = 20f; // 20 ticks per second - public const float TickDelta = 1f / TickRate; - public const float MatchDuration = 300f; // 5 minutes - public const float PlayerSpeed = 120f; - public const float PlayerRadius = 12f; - public const int StartingHealth = 100; - public const float PickupRadius = 24f; - public const float ExtractionTime = 5f; // Seconds to extract - - public GameSimulation(string matchId, int seed, float width = 2000f, float height = 2000f) - { - MatchId = matchId; - MapSeed = seed; - MapWidth = width; - MapHeight = height; - _rng = new Random(seed); - TimeRemaining = MatchDuration; - - GenerateMap(); - } - - private void GenerateMap() - { - // Generate asteroids (obstacles) - int asteroidCount = 40 + _rng.Next(20); - for (int i = 0; i < asteroidCount; i++) - { - var asteroid = new Asteroid - { - Id = _nextEntityId++, - X = 100 + (float)_rng.NextDouble() * (MapWidth - 200), - Y = 100 + (float)_rng.NextDouble() * (MapHeight - 200), - Radius = 30 + (float)_rng.NextDouble() * 50, - Type = _rng.Next(3) - }; - _asteroids[asteroid.Id] = asteroid; - } - - // Generate resource nodes - int resourceCount = 60 + _rng.Next(30); - for (int i = 0; i < resourceCount; i++) - { - var typeRoll = _rng.NextDouble(); - int resourceType = typeRoll < 0.6 ? 0 : (typeRoll < 0.9 ? 1 : 2); // 60% scrap, 30% energy, 10% rare - - var resource = new ResourceNode - { - Id = _nextEntityId++, - X = 50 + (float)_rng.NextDouble() * (MapWidth - 100), - Y = 50 + (float)_rng.NextDouble() * (MapHeight - 100), - ResourceType = resourceType, - Amount = resourceType switch - { - 0 => 3 + _rng.Next(5), // Scrap: 3-7 - 1 => 2 + _rng.Next(3), // Energy: 2-4 - 2 => 1 + _rng.Next(2), // Rare: 1-2 - _ => 1 - }, - MaxAmount = 0 // Set below - }; - resource.MaxAmount = resource.Amount; - _resources[resource.Id] = resource; - } - - // Generate extraction zones (3-4 around map edges) - var zonePositions = new[] - { - (MapWidth * 0.1f, MapHeight * 0.5f), - (MapWidth * 0.9f, MapHeight * 0.5f), - (MapWidth * 0.5f, MapHeight * 0.1f), - (MapWidth * 0.5f, MapHeight * 0.9f) - }; - - for (int i = 0; i < zonePositions.Length; i++) - { - var zone = new ExtractionZone - { - Id = _nextEntityId++, - X = zonePositions[i].Item1, - Y = zonePositions[i].Item2, - Radius = 60f, - Active = i == 0, // First zone active at start - ActivatesAtTick = i == 0 ? 0 : (long)(TickRate * 60 * (i + 1)) // Stagger activation - }; - _extractionZones[zone.Id] = zone; - } - } - - public Vector2 GetSpawnPosition(int playerIndex, int totalPlayers) - { - // Spawn players in a circle around the center - float angle = (float)(2 * Math.PI * playerIndex / Math.Max(totalPlayers, 1)); - float spawnRadius = Math.Min(MapWidth, MapHeight) * 0.35f; - float centerX = MapWidth / 2; - float centerY = MapHeight / 2; - - return new Vector2( - centerX + (float)Math.Cos(angle) * spawnRadius, - centerY + (float)Math.Sin(angle) * spawnRadius - ); - } - - public PlayerEntity AddPlayer(ulong playerId, string name, Vector2 position) - { - var player = new PlayerEntity - { - Id = playerId, - Name = name, - X = position.X, - Y = position.Y, - Rotation = (float)_rng.NextDouble() * MathF.PI * 2, - Health = StartingHealth, - MaxHealth = StartingHealth, - Speed = PlayerSpeed, - Alive = true, - Scrap = 0, - Energy = 0, - Rare = 0, - EquippedWeaponId = null, - Inventory = new int?[6] // 6 inventory slots - }; - _players[playerId] = player; - return player; - } - - public void RemovePlayer(ulong playerId) - { - if (_players.TryGetValue(playerId, out var player)) - { - if (player.Alive) - { - // Drop all items - DropPlayerLoot(player); - } - _players.Remove(playerId); - } - } - - public void EnqueueInput(ulong playerId, PlayerInput input) - { - input.PlayerId = playerId; - _inputQueue.Enqueue(input); - } - - public void StartGame() - { - Phase = GamePhase.InProgress; - CurrentTick = 0; - TimeRemaining = MatchDuration; - } - - /// - /// Advance simulation by one tick. Returns events that occurred. - /// - public List Tick() - { - if (Phase != GamePhase.InProgress) return new List(); - - _pendingEvents.Clear(); - CurrentTick++; - TimeRemaining -= TickDelta; - - // Process all queued inputs - while (_inputQueue.TryDequeue(out var input)) - { - ProcessInput(input); - } - - // Update all entities - UpdatePlayers(); - UpdateProjectiles(); - UpdateExtractionZones(); - - // Check win conditions - CheckEndConditions(); - - return new List(_pendingEvents); - } - - private void ProcessInput(PlayerInput input) - { - if (!_players.TryGetValue(input.PlayerId, out var player) || !player.Alive) - return; - - switch (input.Type) - { - case InputType.Move: - player.InputDx = Math.Clamp(input.Dx, -1f, 1f); - player.InputDy = Math.Clamp(input.Dy, -1f, 1f); - player.Rotation = input.AimAngle; - break; - - case InputType.Shoot: - TryShoot(player, input.AimAngle); - break; - - case InputType.Action: - TryAction(player, input.TargetId); - break; - - case InputType.Craft: - TryCraft(player, input.TargetId ?? 0); - break; - - case InputType.Drop: - TryDrop(player, input.TargetId ?? 0); - break; - } - } - - private void UpdatePlayers() - { - foreach (var player in _players.Values) - { - if (!player.Alive) continue; - - // Apply movement - float dx = player.InputDx * player.Speed * TickDelta; - float dy = player.InputDy * player.Speed * TickDelta; - - float newX = player.X + dx; - float newY = player.Y + dy; - - // Collision with asteroids - bool blocked = false; - foreach (var asteroid in _asteroids.Values) - { - float distSq = (newX - asteroid.X) * (newX - asteroid.X) + - (newY - asteroid.Y) * (newY - asteroid.Y); - float minDist = PlayerRadius + asteroid.Radius; - if (distSq < minDist * minDist) - { - blocked = true; - // Push out of collision - float dist = MathF.Sqrt(distSq); - if (dist > 0.001f) - { - float overlap = minDist - dist; - newX += (newX - asteroid.X) / dist * overlap; - newY += (newY - asteroid.Y) / dist * overlap; - } - } - } - - // Clamp to map bounds - newX = Math.Clamp(newX, PlayerRadius, MapWidth - PlayerRadius); - newY = Math.Clamp(newY, PlayerRadius, MapHeight - PlayerRadius); - - player.X = newX; - player.Y = newY; - - // Check resource pickup - CheckResourcePickup(player); - - // Check dropped item pickup - CheckDroppedItemPickup(player); - - // Update extraction progress - UpdateExtraction(player); - - // Clear input for next tick - player.InputDx = 0; - player.InputDy = 0; - } - } - - private void CheckResourcePickup(PlayerEntity player) - { - foreach (var resource in _resources.Values.ToList()) - { - if (resource.Amount <= 0) continue; - - float distSq = (player.X - resource.X) * (player.X - resource.X) + - (player.Y - resource.Y) * (player.Y - resource.Y); - - if (distSq < PickupRadius * PickupRadius) - { - int amount = resource.Amount; - switch (resource.ResourceType) - { - case 0: player.Scrap += amount; player.TotalScrapCollected += amount; break; - case 1: player.Energy += amount; player.TotalEnergyCollected += amount; break; - case 2: player.Rare += amount; player.TotalRareCollected += amount; break; - } - - // Remove the resource node entirely - _resources.Remove(resource.Id); - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Pickup, - PlayerId = player.Id, - TargetId = resource.Id, - Data = new { resourceType = resource.ResourceType, amount, removed = true } - }); - } - } - } - - private void CheckDroppedItemPickup(PlayerEntity player) - { - foreach (var drop in _droppedItems.Values.ToList()) - { - float distSq = (player.X - drop.X) * (player.X - drop.X) + - (player.Y - drop.Y) * (player.Y - drop.Y); - - if (distSq < PickupRadius * PickupRadius) - { - // Try to add to inventory - if (TryAddToInventory(player, drop.ItemId, drop.Quantity)) - { - _droppedItems.Remove(drop.Id); - _pendingEvents.Add(new GameEvent - { - Type = EventType.Pickup, - PlayerId = player.Id, - TargetId = drop.Id, - Data = new { itemId = drop.ItemId, quantity = drop.Quantity } - }); - } - } - } - } - - private bool TryAddToInventory(PlayerEntity player, int itemId, int quantity) - { - var itemDef = ItemDatabase.Get(itemId); - if (itemDef == null) return false; - - // For weapons/tools/armor, find empty slot - if (!itemDef.Stackable) - { - for (int i = 0; i < player.Inventory.Length; i++) - { - if (player.Inventory[i] == null) - { - player.Inventory[i] = itemId; - // Auto-equip weapon if none equipped - if (itemDef.Type == ItemType.Weapon && player.EquippedWeaponId == null) - { - player.EquippedWeaponId = itemId; - } - return true; - } - } - return false; // No room - } - - // Resources are stored separately, always accepted - return true; - } - - private void UpdateExtraction(PlayerEntity player) - { - bool inZone = false; - foreach (var zone in _extractionZones.Values) - { - if (!zone.Active) continue; - - float distSq = (player.X - zone.X) * (player.X - zone.X) + - (player.Y - zone.Y) * (player.Y - zone.Y); - - if (distSq < zone.Radius * zone.Radius) - { - inZone = true; - player.ExtractionProgress += TickDelta; - - if (player.ExtractionProgress >= ExtractionTime) - { - // Player extracts! - ExtractPlayer(player); - } - break; - } - } - - if (!inZone) - { - player.ExtractionProgress = 0; - } - } - - private void ExtractPlayer(PlayerEntity player) - { - player.Alive = false; - player.Extracted = true; - player.ExtractedAtTick = CurrentTick; - - // Calculate total loot value - int totalValue = player.Scrap * 1 + player.Energy * 2 + player.Rare * 5; - foreach (var itemId in player.Inventory) - { - if (itemId.HasValue) - { - var item = ItemDatabase.Get(itemId.Value); - if (item != null) totalValue += item.LootValue; - } - } - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Extract, - PlayerId = player.Id, - Data = new { playerName = player.Name, totalValue } - }); - } - - private void TryShoot(PlayerEntity player, float angle) - { - if (player.EquippedWeaponId == null) return; - var weapon = ItemDatabase.Get(player.EquippedWeaponId.Value); - if (weapon == null || weapon.Type != ItemType.Weapon) return; - - // Check fire rate cooldown - float cooldown = 1f / weapon.FireRate; - if (CurrentTick - player.LastShotTick < cooldown * TickRate) return; - - player.LastShotTick = CurrentTick; - - // Create projectile(s) - int pellets = weapon.PelletCount; - for (int i = 0; i < pellets; i++) - { - float spread = pellets > 1 ? (float)(_rng.NextDouble() - 0.5) * weapon.Spread : 0; - float finalAngle = angle + spread; - - var proj = new Projectile - { - Id = _nextProjectileId++, - OwnerId = player.Id, - X = player.X, - Y = player.Y, - VelX = MathF.Cos(finalAngle) * weapon.ProjectileSpeed, - VelY = MathF.Sin(finalAngle) * weapon.ProjectileSpeed, - Damage = weapon.Damage, - Range = weapon.Range, - DistanceTraveled = 0, - ExplosionRadius = weapon.ExplosionRadius, - WeaponId = weapon.Id - }; - _projectiles[proj.Id] = proj; - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Projectile, - Data = new { proj.Id, proj.OwnerId, proj.X, proj.Y, proj.VelX, proj.VelY, WeaponId = weapon.Id } - }); - } - } - - private void UpdateProjectiles() - { - foreach (var proj in _projectiles.Values.ToList()) - { - float dx = proj.VelX * TickDelta; - float dy = proj.VelY * TickDelta; - float moveDist = MathF.Sqrt(dx * dx + dy * dy); - - proj.X += dx; - proj.Y += dy; - proj.DistanceTraveled += moveDist; - - // Check range - if (proj.DistanceTraveled > proj.Range) - { - if (proj.ExplosionRadius > 0) - { - CreateExplosion(proj.X, proj.Y, proj.ExplosionRadius, proj.Damage, proj.OwnerId); - } - _projectiles.Remove(proj.Id); - continue; - } - - // Check asteroid collision - bool hitAsteroid = false; - foreach (var asteroid in _asteroids.Values) - { - float distSq = (proj.X - asteroid.X) * (proj.X - asteroid.X) + - (proj.Y - asteroid.Y) * (proj.Y - asteroid.Y); - if (distSq < asteroid.Radius * asteroid.Radius) - { - hitAsteroid = true; - if (proj.ExplosionRadius > 0) - { - CreateExplosion(proj.X, proj.Y, proj.ExplosionRadius, proj.Damage, proj.OwnerId); - } - break; - } - } - if (hitAsteroid) - { - _projectiles.Remove(proj.Id); - continue; - } - - // Check player collision - foreach (var target in _players.Values) - { - if (target.Id == proj.OwnerId || !target.Alive) continue; - - float distSq = (proj.X - target.X) * (proj.X - target.X) + - (proj.Y - target.Y) * (proj.Y - target.Y); - - if (distSq < PlayerRadius * PlayerRadius) - { - if (proj.ExplosionRadius > 0) - { - CreateExplosion(proj.X, proj.Y, proj.ExplosionRadius, proj.Damage, proj.OwnerId); - } - else - { - DealDamage(target, proj.Damage, proj.OwnerId); - } - _projectiles.Remove(proj.Id); - break; - } - } - - // Out of bounds - if (proj.X < 0 || proj.X > MapWidth || proj.Y < 0 || proj.Y > MapHeight) - { - _projectiles.Remove(proj.Id); - } - } - } - - private void CreateExplosion(float x, float y, float radius, int damage, ulong ownerId) - { - _pendingEvents.Add(new GameEvent - { - Type = EventType.Explosion, - Data = new { x, y, radius } - }); - - foreach (var target in _players.Values) - { - if (!target.Alive) continue; - - float distSq = (x - target.X) * (x - target.X) + (y - target.Y) * (y - target.Y); - if (distSq < radius * radius) - { - // Damage falloff based on distance - float dist = MathF.Sqrt(distSq); - float falloff = 1f - (dist / radius); - int actualDamage = (int)(damage * falloff); - if (actualDamage > 0) - { - DealDamage(target, actualDamage, ownerId); - } - } - } - } - - private void DealDamage(PlayerEntity target, int damage, ulong? sourceId) - { - target.Health -= damage; - target.DamageTaken += damage; - - // Track damage dealt by source - if (sourceId.HasValue && _players.TryGetValue(sourceId.Value, out var source)) - { - source.DamageDealt += damage; - } - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Damage, - PlayerId = target.Id, - SourceId = sourceId, - Data = new { damage, newHealth = target.Health } - }); - - if (target.Health <= 0) - { - KillPlayer(target, sourceId); - } - } - - private void KillPlayer(PlayerEntity player, ulong? killerId) - { - player.Alive = false; - player.Health = 0; - player.DiedAtTick = CurrentTick; - - var drops = DropPlayerLoot(player); - - string? killerName = null; - if (killerId.HasValue && _players.TryGetValue(killerId.Value, out var killer)) - { - killerName = killer.Name; - killer.Kills++; - } - player.Deaths++; - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Death, - PlayerId = player.Id, - SourceId = killerId, - Data = new - { - playerName = player.Name, - killerName, - drops = drops.Select(d => new { d.Id, d.X, d.Y, d.ItemId, d.Quantity }).ToArray() - } - }); - } - - private List DropPlayerLoot(PlayerEntity player) - { - var drops = new List(); - float dropAngle = 0; - float dropRadius = 30f; - - // Drop resources as items - if (player.Scrap > 0) - { - drops.Add(CreateDrop(player.X, player.Y, 1, player.Scrap, ref dropAngle, dropRadius)); - } - if (player.Energy > 0) - { - drops.Add(CreateDrop(player.X, player.Y, 2, player.Energy, ref dropAngle, dropRadius)); - } - if (player.Rare > 0) - { - drops.Add(CreateDrop(player.X, player.Y, 3, player.Rare, ref dropAngle, dropRadius)); - } - - // Drop inventory items - foreach (var itemId in player.Inventory) - { - if (itemId.HasValue) - { - drops.Add(CreateDrop(player.X, player.Y, itemId.Value, 1, ref dropAngle, dropRadius)); - } - } - - // Clear player resources - player.Scrap = 0; - player.Energy = 0; - player.Rare = 0; - player.Inventory = new int?[6]; - player.EquippedWeaponId = null; - - return drops; - } - - private DroppedItem CreateDrop(float x, float y, int itemId, int quantity, ref float angle, float radius) - { - var drop = new DroppedItem - { - Id = _nextEntityId++, - X = x + MathF.Cos(angle) * radius, - Y = y + MathF.Sin(angle) * radius, - ItemId = itemId, - Quantity = quantity - }; - _droppedItems[drop.Id] = drop; - angle += MathF.PI / 4; // Spread drops around - return drop; - } - - private void TryAction(PlayerEntity player, int? targetId) - { - // For now, action just triggers resource gathering from a nearby node - // Could be extended for interacting with terminals, doors, etc. - } - - private void TryCraft(PlayerEntity player, int recipeId) - { - var recipe = RecipeDatabase.Get(recipeId); - if (recipe == null) return; - - var (scrapCost, energyCost, rareCost) = recipe.GetCost(); - - if (player.Scrap < scrapCost || player.Energy < energyCost || player.Rare < rareCost) - return; - - var item = ItemDatabase.Get(recipe.ResultItemId); - if (item == null) return; - - // Check if there's room for non-stackable items - if (!item.Stackable) - { - bool hasRoom = player.Inventory.Any(s => s == null); - if (!hasRoom) return; - } - - // Deduct resources - player.Scrap -= scrapCost; - player.Energy -= energyCost; - player.Rare -= rareCost; - - // Add item - if (item.Stackable) - { - // Resources handled separately - shouldn't craft resources - } - else - { - for (int i = 0; i < player.Inventory.Length; i++) - { - if (player.Inventory[i] == null) - { - player.Inventory[i] = recipe.ResultItemId; - // Auto-equip weapon if none equipped - if (item.Type == ItemType.Weapon && player.EquippedWeaponId == null) - { - player.EquippedWeaponId = recipe.ResultItemId; - } - break; - } - } - } - - player.ItemsCrafted++; - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Craft, - PlayerId = player.Id, - Data = new { recipeId, resultItemId = recipe.ResultItemId } - }); - } - - private void TryDrop(PlayerEntity player, int slotIndex) - { - if (slotIndex < 0 || slotIndex >= player.Inventory.Length) return; - if (player.Inventory[slotIndex] == null) return; - - int itemId = player.Inventory[slotIndex].Value; - player.Inventory[slotIndex] = null; - - // If dropping equipped weapon, unequip - if (player.EquippedWeaponId == itemId) - { - player.EquippedWeaponId = null; - // Try to equip another weapon - foreach (var invItem in player.Inventory) - { - if (invItem.HasValue) - { - var def = ItemDatabase.Get(invItem.Value); - if (def?.Type == ItemType.Weapon) - { - player.EquippedWeaponId = invItem.Value; - break; - } - } - } - } - - float dropAngle = player.Rotation + MathF.PI; // Drop behind player - var drop = new DroppedItem - { - Id = _nextEntityId++, - X = player.X + MathF.Cos(dropAngle) * 30f, - Y = player.Y + MathF.Sin(dropAngle) * 30f, - ItemId = itemId, - Quantity = 1 - }; - _droppedItems[drop.Id] = drop; - - _pendingEvents.Add(new GameEvent - { - Type = EventType.Drop, - PlayerId = player.Id, - Data = new { drop.Id, drop.X, drop.Y, drop.ItemId } - }); - } - - private void UpdateExtractionZones() - { - foreach (var zone in _extractionZones.Values) - { - if (!zone.Active && CurrentTick >= zone.ActivatesAtTick) - { - zone.Active = true; - _pendingEvents.Add(new GameEvent - { - Type = EventType.ZoneActivate, - Data = new { zoneId = zone.Id, zone.X, zone.Y, zone.Radius } - }); - } - } - } - - private void CheckEndConditions() - { - if (Phase != GamePhase.InProgress) return; - - int alivePlayers = _players.Values.Count(p => p.Alive); - - // Time expired - if (TimeRemaining <= 0) - { - EndGame("time_expired"); - return; - } - - // Last player standing (need at least 2 to start) - if (alivePlayers <= 1 && _players.Count >= 2) - { - EndGame("last_standing"); - return; - } - - // All players extracted - if (_players.Count > 0 && _players.Values.All(p => !p.Alive)) - { - EndGame("all_eliminated_or_extracted"); - } - } - - private void EndGame(string reason) - { - Phase = GamePhase.Ended; - - var winner = _players.Values - .Where(p => p.Alive || p.Extracted) - .OrderByDescending(p => p.Extracted ? 1 : 0) - .ThenByDescending(p => p.Kills) - .FirstOrDefault(); - - _pendingEvents.Add(new GameEvent - { - Type = EventType.GameEnd, - Data = new - { - reason, - winnerId = winner?.Id, - winnerName = winner?.Name - } - }); - } - - // ===== State Accessors ===== - public IReadOnlyDictionary Players => _players; - public IReadOnlyDictionary Asteroids => _asteroids; - public IReadOnlyDictionary Resources => _resources; - public IReadOnlyDictionary DroppedItems => _droppedItems; - public IReadOnlyDictionary Projectiles => _projectiles; - public IReadOnlyDictionary ExtractionZones => _extractionZones; - - /// - /// Gets match results for all players, sorted by placement - /// - public List GetMatchResults() - { - var results = new List(); - int totalPlayers = _players.Count; - int matchDurationSeconds = (int)(MatchDuration - TimeRemaining); - - // Calculate placements based on: extracted > alive > death order - var sortedPlayers = _players.Values - .OrderByDescending(p => p.Extracted) - .ThenByDescending(p => p.Alive) - .ThenByDescending(p => p.DiedAtTick == 0 ? long.MaxValue : p.DiedAtTick) - .ThenByDescending(p => p.Kills) - .ToList(); - - for (int i = 0; i < sortedPlayers.Count; i++) - { - var p = sortedPlayers[i]; - int placement = i + 1; - - // Determine result - MatchPlayerResultType resultType; - if (p.Extracted) - resultType = MatchPlayerResultType.Extracted; - else if (p.Alive && placement == 1) - resultType = MatchPlayerResultType.Won; - else - resultType = MatchPlayerResultType.Lost; - - // Calculate survival time - int survivalSeconds; - if (p.Extracted) - survivalSeconds = (int)(p.ExtractedAtTick / TickRate); - else if (!p.Alive && p.DiedAtTick > 0) - survivalSeconds = (int)(p.DiedAtTick / TickRate); - else - survivalSeconds = matchDurationSeconds; - - results.Add(new MatchPlayerResult - { - AccountId = p.Id, - PlayerName = p.Name, - Placement = placement, - TotalPlayers = totalPlayers, - Result = resultType, - Kills = p.Kills, - Deaths = p.Deaths, - DamageDealt = p.DamageDealt, - DamageTaken = p.DamageTaken, - ScrapCollected = p.TotalScrapCollected, - EnergyCollected = p.TotalEnergyCollected, - RareCollected = p.TotalRareCollected, - ItemsCrafted = p.ItemsCrafted, - SurvivalTimeSeconds = survivalSeconds, - MatchDurationSeconds = matchDurationSeconds - }); - } - - return results; - } -} - -/// -/// Result data for a single player in a match -/// -public sealed class MatchPlayerResult -{ - public ulong AccountId { get; set; } - public string PlayerName { get; set; } = ""; - public int Placement { get; set; } - public int TotalPlayers { get; set; } - public MatchPlayerResultType Result { get; set; } - public int Kills { get; set; } - public int Deaths { get; set; } - public int DamageDealt { get; set; } - public int DamageTaken { get; set; } - public int ScrapCollected { get; set; } - public int EnergyCollected { get; set; } - public int RareCollected { get; set; } - public int ItemsCrafted { get; set; } - public int SurvivalTimeSeconds { get; set; } - public int MatchDurationSeconds { get; set; } -} - -public enum MatchPlayerResultType -{ - Lost, - Won, - Extracted -} - -// ===== Entity Classes ===== -public sealed class PlayerEntity -{ - public ulong Id { get; set; } - public string Name { get; set; } = ""; - public float X { get; set; } - public float Y { get; set; } - public float Rotation { get; set; } - public int Health { get; set; } - public int MaxHealth { get; set; } - public float Speed { get; set; } - public bool Alive { get; set; } - public bool Extracted { get; set; } - - public int Scrap { get; set; } - public int Energy { get; set; } - public int Rare { get; set; } - public int?[] Inventory { get; set; } = new int?[6]; - public int? EquippedWeaponId { get; set; } - - public float InputDx { get; set; } - public float InputDy { get; set; } - public long LastShotTick { get; set; } - public float ExtractionProgress { get; set; } - - // Match statistics - public int Kills { get; set; } - public int Deaths { get; set; } - public int DamageDealt { get; set; } - public int DamageTaken { get; set; } - public int ItemsCrafted { get; set; } - - // Lifetime resource tracking (for this match) - public int TotalScrapCollected { get; set; } - public int TotalEnergyCollected { get; set; } - public int TotalRareCollected { get; set; } - - // Time tracking - public long JoinedAtTick { get; set; } - public long DiedAtTick { get; set; } - public long ExtractedAtTick { get; set; } -} - -public sealed class Asteroid -{ - public int Id { get; set; } - public float X { get; set; } - public float Y { get; set; } - public float Radius { get; set; } - public int Type { get; set; } -} - -public sealed class ResourceNode -{ - public int Id { get; set; } - public float X { get; set; } - public float Y { get; set; } - public int ResourceType { get; set; } - public int Amount { get; set; } - public int MaxAmount { get; set; } -} - -public sealed class DroppedItem -{ - public int Id { get; set; } - public float X { get; set; } - public float Y { get; set; } - public int ItemId { get; set; } - public int Quantity { get; set; } -} - -public sealed class Projectile -{ - public int Id { get; set; } - public ulong OwnerId { get; set; } - public float X { get; set; } - public float Y { get; set; } - public float VelX { get; set; } - public float VelY { get; set; } - public int Damage { get; set; } - public float Range { get; set; } - public float DistanceTraveled { get; set; } - public float ExplosionRadius { get; set; } - public int WeaponId { get; set; } -} - -public sealed class ExtractionZone -{ - public int Id { get; set; } - public float X { get; set; } - public float Y { get; set; } - public float Radius { get; set; } - public bool Active { get; set; } - public long ActivatesAtTick { get; set; } -} - -public enum GamePhase -{ - WaitingForPlayers, - Countdown, - InProgress, - Ended -} - -public sealed class PlayerInput -{ - public ulong PlayerId { get; set; } - public InputType Type { get; set; } - public float Dx { get; set; } - public float Dy { get; set; } - public float AimAngle { get; set; } - public int? TargetId { get; set; } - public uint Seq { get; set; } -} - -public enum InputType -{ - Move, - Shoot, - Action, - Craft, - Drop -} - -public sealed class GameEvent -{ - public EventType Type { get; set; } - public ulong? PlayerId { get; set; } - public ulong? SourceId { get; set; } - public int? TargetId { get; set; } - public object? Data { get; set; } -} - -public enum EventType -{ - Spawn, - Despawn, - Damage, - Death, - Pickup, - Projectile, - Explosion, - Craft, - Drop, - Extract, - ZoneActivate, - GameEnd -} diff --git a/Game/ItemDatabase.cs b/Game/ItemDatabase.cs deleted file mode 100644 index babe6b0..0000000 --- a/Game/ItemDatabase.cs +++ /dev/null @@ -1,241 +0,0 @@ -namespace VoidScavengers.Game; - -/// -/// Item definitions for Void Scavengers -/// -public static class ItemDatabase -{ - public static readonly Dictionary Items = new() - { - // ===== Resources (1-99) ===== - [1] = new ItemDef(1, "Scrap Metal", ItemType.Resource, 0, "Basic salvage material", 1, true), - [2] = new ItemDef(2, "Energy Cell", ItemType.Resource, 0, "Charged power source", 2, true), - [3] = new ItemDef(3, "Rare Alloy", ItemType.Resource, 0, "Precious refined metal", 5, true), - - // ===== Weapons (100-199) ===== - [100] = new ItemDef(100, "Pulse Pistol", ItemType.Weapon, 15, "Basic sidearm", 10, false) - { - Damage = 10, - FireRate = 4f, // shots per second - ProjectileSpeed = 400f, - Range = 300f, - AmmoType = 0 // energy-based, no ammo needed - }, - [101] = new ItemDef(101, "Scatter Gun", ItemType.Weapon, 25, "Close-range devastation", 20, false) - { - Damage = 6, // per pellet, 5 pellets - FireRate = 1.5f, - ProjectileSpeed = 350f, - Range = 150f, - AmmoType = 0, - PelletCount = 5, - Spread = 0.4f - }, - [102] = new ItemDef(102, "Rail Rifle", ItemType.Weapon, 40, "Long-range precision", 35, false) - { - Damage = 45, - FireRate = 0.8f, - ProjectileSpeed = 800f, - Range = 600f, - AmmoType = 0 - }, - [103] = new ItemDef(103, "Plasma Launcher", ItemType.Weapon, 60, "Area damage weapon", 50, false) - { - Damage = 30, - FireRate = 0.5f, - ProjectileSpeed = 250f, - Range = 400f, - AmmoType = 0, - ExplosionRadius = 50f - }, - - // ===== Tools (200-299) ===== - [200] = new ItemDef(200, "Mining Laser", ItemType.Tool, 15, "Harvests resources faster", 12, false) - { - HarvestMultiplier = 2.0f - }, - [201] = new ItemDef(201, "Scanner", ItemType.Tool, 20, "Reveals nearby resources and players", 15, false) - { - ScanRadius = 200f, - ScanCooldown = 10f - }, - [202] = new ItemDef(202, "Portable Shield", ItemType.Tool, 35, "Deployable cover", 25, false) - { - ShieldHealth = 100, - ShieldDuration = 15f - }, - - // ===== Consumables (300-399) ===== - [300] = new ItemDef(300, "Repair Kit", ItemType.Consumable, 10, "Restores 30 health", 8, true) - { - HealAmount = 30 - }, - [301] = new ItemDef(301, "Shield Booster", ItemType.Consumable, 15, "Temporary damage reduction", 12, true) - { - ShieldBoostDuration = 10f, - DamageReduction = 0.3f - }, - [302] = new ItemDef(302, "Speed Stim", ItemType.Consumable, 12, "Temporary speed boost", 10, true) - { - SpeedBoostDuration = 8f, - SpeedMultiplier = 1.5f - }, - - // ===== Armor/Equipment (400-499) ===== - [400] = new ItemDef(400, "Light Suit", ItemType.Armor, 20, "+20 max health", 15, false) - { - HealthBonus = 20, - SpeedPenalty = 0f - }, - [401] = new ItemDef(401, "Heavy Suit", ItemType.Armor, 45, "+50 max health, slower", 35, false) - { - HealthBonus = 50, - SpeedPenalty = 0.15f - }, - [402] = new ItemDef(402, "Thruster Pack", ItemType.Armor, 30, "Dash ability", 25, false) - { - DashDistance = 100f, - DashCooldown = 5f - } - }; - - public static ItemDef? Get(int id) => Items.TryGetValue(id, out var item) ? item : null; -} - -public sealed class ItemDef -{ - public int Id { get; } - public string Name { get; } - public ItemType Type { get; } - public int CraftCost { get; } // Total resource value to craft - public string Description { get; } - public int LootValue { get; } // Value when extracted - public bool Stackable { get; } - - // Weapon stats - public int Damage { get; init; } - public float FireRate { get; init; } - public float ProjectileSpeed { get; init; } - public float Range { get; init; } - public int AmmoType { get; init; } - public int PelletCount { get; init; } = 1; - public float Spread { get; init; } - public float ExplosionRadius { get; init; } - - // Tool stats - public float HarvestMultiplier { get; init; } = 1f; - public float ScanRadius { get; init; } - public float ScanCooldown { get; init; } - public int ShieldHealth { get; init; } - public float ShieldDuration { get; init; } - - // Consumable stats - public int HealAmount { get; init; } - public float ShieldBoostDuration { get; init; } - public float DamageReduction { get; init; } - public float SpeedBoostDuration { get; init; } - public float SpeedMultiplier { get; init; } = 1f; - - // Armor stats - public int HealthBonus { get; init; } - public float SpeedPenalty { get; init; } - public float DashDistance { get; init; } - public float DashCooldown { get; init; } - - public ItemDef(int id, string name, ItemType type, int craftCost, string desc, int lootValue, bool stackable) - { - Id = id; - Name = name; - Type = type; - CraftCost = craftCost; - Description = desc; - LootValue = lootValue; - Stackable = stackable; - } -} - -public enum ItemType -{ - Resource, - Weapon, - Tool, - Consumable, - Armor -} - -/// -/// Crafting recipes -/// -public static class RecipeDatabase -{ - public static readonly Dictionary Recipes = new() - { - // Basic weapons - [1] = new Recipe(1, 100, new[] { (1, 5), (2, 2) }), // Pulse Pistol: 5 scrap + 2 energy - [2] = new Recipe(2, 101, new[] { (1, 8), (2, 3) }), // Scatter Gun: 8 scrap + 3 energy - [3] = new Recipe(3, 102, new[] { (1, 10), (2, 5), (3, 2) }), // Rail Rifle: 10 scrap + 5 energy + 2 rare - [4] = new Recipe(4, 103, new[] { (1, 15), (2, 8), (3, 4) }), // Plasma Launcher - - // Tools - [10] = new Recipe(10, 200, new[] { (1, 6), (2, 3) }), // Mining Laser - [11] = new Recipe(11, 201, new[] { (1, 8), (2, 4), (3, 1) }), // Scanner - [12] = new Recipe(12, 202, new[] { (1, 12), (2, 6), (3, 2) }), // Portable Shield - - // Consumables - [20] = new Recipe(20, 300, new[] { (1, 3), (2, 2) }), // Repair Kit - [21] = new Recipe(21, 301, new[] { (1, 4), (2, 3) }), // Shield Booster - [22] = new Recipe(22, 302, new[] { (1, 3), (2, 4) }), // Speed Stim - - // Armor - [30] = new Recipe(30, 400, new[] { (1, 8), (3, 1) }), // Light Suit - [31] = new Recipe(31, 401, new[] { (1, 15), (3, 3) }), // Heavy Suit - [32] = new Recipe(32, 402, new[] { (1, 10), (2, 5), (3, 2) }), // Thruster Pack - }; - - public static Recipe? Get(int id) => Recipes.TryGetValue(id, out var r) ? r : null; -} - -public sealed class Recipe -{ - public int Id { get; } - public int ResultItemId { get; } - public (int ItemId, int Quantity)[] Ingredients { get; } - - public Recipe(int id, int resultItemId, (int, int)[] ingredients) - { - Id = id; - ResultItemId = resultItemId; - Ingredients = ingredients; - } - - public bool CanCraft(int scrap, int energy, int rare) - { - foreach (var (itemId, qty) in Ingredients) - { - int available = itemId switch - { - 1 => scrap, - 2 => energy, - 3 => rare, - _ => 0 - }; - if (available < qty) return false; - } - return true; - } - - public (int scrap, int energy, int rare) GetCost() - { - int s = 0, e = 0, r = 0; - foreach (var (itemId, qty) in Ingredients) - { - switch (itemId) - { - case 1: s += qty; break; - case 2: e += qty; break; - case 3: r += qty; break; - } - } - return (s, e, r); - } -} diff --git a/Game/ItemService.cs b/Game/ItemService.cs index db02126..3255d07 100644 --- a/Game/ItemService.cs +++ b/Game/ItemService.cs @@ -3,9 +3,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Server.Data; +using DataServer.Data; -namespace VoidScavengers.Game; +namespace Server.Game; /// /// Interface for item data access diff --git a/Migrations/20251209142654_Initialize.Designer.cs b/Migrations/20251209142654_Initialize.Designer.cs index ae7ea26..4321a3e 100644 --- a/Migrations/20251209142654_Initialize.Designer.cs +++ b/Migrations/20251209142654_Initialize.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -185,7 +185,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -223,7 +223,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -336,7 +336,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -368,7 +368,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -412,7 +412,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -456,7 +456,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -600,7 +600,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -629,7 +629,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -701,7 +701,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -736,7 +736,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -775,7 +775,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -894,7 +894,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -937,7 +937,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -981,7 +981,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1029,7 +1029,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1106,7 +1106,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1201,7 +1201,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1279,7 +1279,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1324,7 +1324,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1375,9 +1375,9 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1386,15 +1386,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1405,15 +1405,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1422,15 +1422,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1441,15 +1441,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1460,15 +1460,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1477,15 +1477,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1496,9 +1496,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1507,15 +1507,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1526,9 +1526,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1537,15 +1537,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1556,20 +1556,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1578,14 +1578,14 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1594,7 +1594,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251215205932_AddDungeonBeltItems.Designer.cs b/Migrations/20251215205932_AddDungeonBeltItems.Designer.cs index 562f0d9..8ce29d8 100644 --- a/Migrations/20251215205932_AddDungeonBeltItems.Designer.cs +++ b/Migrations/20251215205932_AddDungeonBeltItems.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -209,7 +209,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -247,7 +247,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -360,7 +360,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -392,7 +392,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -436,7 +436,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -480,7 +480,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -624,7 +624,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -653,7 +653,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -725,7 +725,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -760,7 +760,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -799,7 +799,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -918,7 +918,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -961,7 +961,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1005,7 +1005,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1053,7 +1053,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1130,7 +1130,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1225,7 +1225,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1303,7 +1303,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1348,7 +1348,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1399,9 +1399,9 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1410,9 +1410,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1421,15 +1421,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1440,15 +1440,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1457,15 +1457,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1476,15 +1476,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1495,15 +1495,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1512,15 +1512,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1531,9 +1531,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1542,15 +1542,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1561,9 +1561,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1572,15 +1572,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1591,20 +1591,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1613,14 +1613,14 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1629,7 +1629,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251217153258_MobLoot.Designer.cs b/Migrations/20251217153258_MobLoot.Designer.cs index 726d5b9..28f08c8 100644 --- a/Migrations/20251217153258_MobLoot.Designer.cs +++ b/Migrations/20251217153258_MobLoot.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -108,7 +108,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -212,7 +212,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -250,7 +250,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -363,7 +363,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -395,7 +395,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -439,7 +439,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -483,7 +483,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -627,7 +627,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -656,7 +656,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -728,7 +728,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -763,7 +763,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -802,7 +802,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -921,7 +921,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -964,7 +964,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1008,7 +1008,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1056,7 +1056,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1133,7 +1133,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1228,7 +1228,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1306,7 +1306,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1351,7 +1351,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1402,9 +1402,9 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1413,9 +1413,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1424,15 +1424,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1443,15 +1443,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1460,15 +1460,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1479,15 +1479,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1498,15 +1498,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1515,15 +1515,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1534,9 +1534,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1545,15 +1545,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1564,9 +1564,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1575,15 +1575,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1594,20 +1594,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1616,14 +1616,14 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1632,7 +1632,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251217153958_MobLoot2.Designer.cs b/Migrations/20251217153958_MobLoot2.Designer.cs index 86b2327..2b74e14 100644 --- a/Migrations/20251217153958_MobLoot2.Designer.cs +++ b/Migrations/20251217153958_MobLoot2.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -166,7 +166,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -294,7 +294,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -332,7 +332,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -445,7 +445,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -477,7 +477,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -521,7 +521,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -565,7 +565,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -709,7 +709,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -738,7 +738,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -810,7 +810,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -845,7 +845,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -884,7 +884,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1003,7 +1003,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1046,7 +1046,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1090,7 +1090,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1138,7 +1138,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1215,7 +1215,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1310,7 +1310,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1388,7 +1388,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1433,7 +1433,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1484,15 +1484,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1501,15 +1501,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1520,9 +1520,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1531,9 +1531,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1542,15 +1542,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1561,15 +1561,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1578,15 +1578,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1597,15 +1597,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1616,15 +1616,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1633,15 +1633,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1652,9 +1652,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1663,15 +1663,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1682,9 +1682,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1693,15 +1693,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1712,20 +1712,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1734,19 +1734,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1755,7 +1755,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251217174913_fixdeathchests.Designer.cs b/Migrations/20251217174913_fixdeathchests.Designer.cs index 0913de2..8271797 100644 --- a/Migrations/20251217174913_fixdeathchests.Designer.cs +++ b/Migrations/20251217174913_fixdeathchests.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -166,7 +166,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -294,7 +294,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -332,7 +332,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -445,7 +445,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -477,7 +477,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -521,7 +521,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -565,7 +565,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -709,7 +709,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -738,7 +738,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -810,7 +810,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -845,7 +845,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -884,7 +884,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1003,7 +1003,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1046,7 +1046,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1090,7 +1090,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1138,7 +1138,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1215,7 +1215,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1310,7 +1310,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1388,7 +1388,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1433,7 +1433,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1484,15 +1484,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1501,15 +1501,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1520,9 +1520,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1531,9 +1531,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1542,15 +1542,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1561,15 +1561,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1578,15 +1578,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1597,15 +1597,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1616,15 +1616,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1633,15 +1633,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1652,9 +1652,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1663,15 +1663,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1682,9 +1682,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1693,15 +1693,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1712,20 +1712,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1734,19 +1734,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1755,7 +1755,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251217201208_DungeonBrowser.Designer.cs b/Migrations/20251217201208_DungeonBrowser.Designer.cs index a8f4521..8ee3764 100644 --- a/Migrations/20251217201208_DungeonBrowser.Designer.cs +++ b/Migrations/20251217201208_DungeonBrowser.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -131,7 +131,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -166,7 +166,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -190,7 +190,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -294,7 +294,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -332,7 +332,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -445,7 +445,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -477,7 +477,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -521,7 +521,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -565,7 +565,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -709,7 +709,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -738,7 +738,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -800,7 +800,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -872,7 +872,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -907,7 +907,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -946,7 +946,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1065,7 +1065,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1108,7 +1108,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1152,7 +1152,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1200,7 +1200,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1277,7 +1277,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1372,7 +1372,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1450,7 +1450,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1495,7 +1495,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1546,15 +1546,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1563,15 +1563,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1582,9 +1582,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1593,9 +1593,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1604,15 +1604,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1623,15 +1623,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1640,15 +1640,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1659,15 +1659,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1678,24 +1678,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1704,15 +1704,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1723,9 +1723,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1734,15 +1734,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1753,9 +1753,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1764,15 +1764,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1783,20 +1783,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1805,19 +1805,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1826,7 +1826,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251219151110_CDN Integration.Designer.cs b/Migrations/20251219151110_CDN Integration.Designer.cs index b1d768a..fecc09b 100644 --- a/Migrations/20251219151110_CDN Integration.Designer.cs +++ b/Migrations/20251219151110_CDN Integration.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.ClientAsset", b => + modelBuilder.Entity("DataServer.Data.Entities.ClientAsset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("client_assets"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -183,7 +183,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -218,7 +218,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -242,7 +242,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -346,7 +346,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -384,7 +384,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -505,7 +505,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -537,7 +537,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -581,7 +581,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -625,7 +625,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -753,7 +753,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -782,7 +782,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -844,7 +844,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -916,7 +916,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -951,7 +951,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -990,7 +990,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1109,7 +1109,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1152,7 +1152,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1196,7 +1196,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1244,7 +1244,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1321,7 +1321,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1416,7 +1416,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1494,7 +1494,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1539,7 +1539,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1590,15 +1590,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1607,15 +1607,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1626,9 +1626,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1637,9 +1637,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1648,15 +1648,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1667,15 +1667,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1684,15 +1684,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1703,15 +1703,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1722,24 +1722,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1748,15 +1748,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1767,9 +1767,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1778,15 +1778,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1797,9 +1797,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1808,15 +1808,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1827,20 +1827,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1849,19 +1849,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1870,7 +1870,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251220180402_CDN Fight 4.Designer.cs b/Migrations/20251220180402_CDN Fight 4.Designer.cs index 5b2ce98..c7ca011 100644 --- a/Migrations/20251220180402_CDN Fight 4.Designer.cs +++ b/Migrations/20251220180402_CDN Fight 4.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.ClientAsset", b => + modelBuilder.Entity("DataServer.Data.Entities.ClientAsset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("client_assets"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -183,7 +183,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -218,7 +218,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -242,7 +242,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -346,7 +346,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -384,7 +384,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -505,7 +505,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -537,7 +537,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -581,7 +581,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -625,7 +625,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -742,7 +742,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -771,7 +771,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -833,7 +833,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -905,7 +905,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -940,7 +940,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -979,7 +979,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1098,7 +1098,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1141,7 +1141,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1185,7 +1185,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1233,7 +1233,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1310,7 +1310,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1405,7 +1405,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1483,7 +1483,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1528,7 +1528,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1579,15 +1579,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1596,15 +1596,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1615,9 +1615,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1626,9 +1626,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1637,15 +1637,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1656,15 +1656,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1673,15 +1673,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -1692,15 +1692,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1711,24 +1711,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -1737,15 +1737,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1756,9 +1756,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1767,15 +1767,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -1786,9 +1786,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1797,15 +1797,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -1816,20 +1816,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1838,19 +1838,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("Inventory"); @@ -1859,7 +1859,7 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251223134442_CraftingSystem.Designer.cs b/Migrations/20251223134442_CraftingSystem.Designer.cs index 71523e7..33666c8 100644 --- a/Migrations/20251223134442_CraftingSystem.Designer.cs +++ b/Migrations/20251223134442_CraftingSystem.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.ClientAsset", b => + modelBuilder.Entity("DataServer.Data.Entities.ClientAsset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("client_assets"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -183,7 +183,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -218,7 +218,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -242,7 +242,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -346,7 +346,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -376,7 +376,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_crafting_skills"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -414,7 +414,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -437,7 +437,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_item_crafted_link"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -466,7 +466,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_known_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -554,7 +554,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafted_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -613,7 +613,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -642,7 +642,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipe_ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -763,7 +763,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -795,7 +795,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -839,7 +839,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -883,7 +883,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1000,7 +1000,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1029,7 +1029,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1091,7 +1091,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1114,7 +1114,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_recipe_scrolls"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1186,7 +1186,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1221,7 +1221,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1260,7 +1260,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1379,7 +1379,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1422,7 +1422,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1466,7 +1466,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1514,7 +1514,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1591,7 +1591,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1686,7 +1686,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1764,7 +1764,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1809,7 +1809,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1860,15 +1860,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1877,15 +1877,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1896,9 +1896,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1907,9 +1907,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1918,9 +1918,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("CraftingSkills") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1929,15 +1929,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1948,15 +1948,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { - b.HasOne("Server.Data.Entities.DungeonCharacterItem", "CharacterItem") + b.HasOne("DataServer.Data.Entities.DungeonCharacterItem", "CharacterItem") .WithMany() .HasForeignKey("CharacterItemId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftedItem", "CraftedItem") + b.HasOne("DataServer.Data.Entities.DungeonCraftedItem", "CraftedItem") .WithMany() .HasForeignKey("CraftedItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1967,15 +1967,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("CraftedItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("KnownRecipes") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -1986,19 +1986,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") .WithMany() .HasForeignKey("BaseItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "Crafter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Crafter") .WithMany() .HasForeignKey("CrafterId"); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId"); @@ -2009,24 +2009,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "OutputItem") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "OutputItem") .WithMany() .HasForeignKey("OutputItemId"); b.Navigation("OutputItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany("Ingredients") .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2037,15 +2037,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2054,15 +2054,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -2073,15 +2073,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -2092,24 +2092,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2120,15 +2120,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2137,15 +2137,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2156,9 +2156,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -2167,15 +2167,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2186,9 +2186,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2197,15 +2197,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -2216,20 +2216,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2238,19 +2238,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("CraftingSkills"); @@ -2263,12 +2263,12 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Navigation("Ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251223165033_Crafting2.Designer.cs b/Migrations/20251223165033_Crafting2.Designer.cs index 0342b2d..a794d86 100644 --- a/Migrations/20251223165033_Crafting2.Designer.cs +++ b/Migrations/20251223165033_Crafting2.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.ClientAsset", b => + modelBuilder.Entity("DataServer.Data.Entities.ClientAsset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("client_assets"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -183,7 +183,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -218,7 +218,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -242,7 +242,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -346,7 +346,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -376,7 +376,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_crafting_skills"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -414,7 +414,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -437,7 +437,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_item_crafted_link"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -466,7 +466,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_known_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -554,7 +554,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafted_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -628,7 +628,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -657,7 +657,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipe_ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -778,7 +778,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -810,7 +810,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -854,7 +854,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -898,7 +898,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1015,7 +1015,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1044,7 +1044,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1106,7 +1106,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1129,7 +1129,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_recipe_scrolls"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1201,7 +1201,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1236,7 +1236,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1275,7 +1275,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1394,7 +1394,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1437,7 +1437,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1481,7 +1481,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1529,7 +1529,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1606,7 +1606,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1701,7 +1701,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1779,7 +1779,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1824,7 +1824,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1875,15 +1875,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1892,15 +1892,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1911,9 +1911,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1922,9 +1922,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1933,9 +1933,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("CraftingSkills") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1944,15 +1944,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1963,15 +1963,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { - b.HasOne("Server.Data.Entities.DungeonCharacterItem", "CharacterItem") + b.HasOne("DataServer.Data.Entities.DungeonCharacterItem", "CharacterItem") .WithMany() .HasForeignKey("CharacterItemId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftedItem", "CraftedItem") + b.HasOne("DataServer.Data.Entities.DungeonCraftedItem", "CraftedItem") .WithMany() .HasForeignKey("CraftedItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1982,15 +1982,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("CraftedItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("KnownRecipes") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2001,19 +2001,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") .WithMany() .HasForeignKey("BaseItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "Crafter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Crafter") .WithMany() .HasForeignKey("CrafterId"); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId"); @@ -2024,24 +2024,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "OutputItem") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "OutputItem") .WithMany() .HasForeignKey("OutputItemId"); b.Navigation("OutputItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany("Ingredients") .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2052,15 +2052,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2069,15 +2069,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -2088,15 +2088,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -2107,24 +2107,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2135,15 +2135,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2152,15 +2152,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2171,9 +2171,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -2182,15 +2182,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2201,9 +2201,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2212,15 +2212,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -2231,20 +2231,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2253,19 +2253,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("CraftingSkills"); @@ -2278,12 +2278,12 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Navigation("Ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/20251225225335_craftingrecipechange.Designer.cs b/Migrations/20251225225335_craftingrecipechange.Designer.cs index 6a60724..6a1817f 100644 --- a/Migrations/20251225225335_craftingrecipechange.Designer.cs +++ b/Migrations/20251225225335_craftingrecipechange.Designer.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -25,7 +25,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -84,7 +84,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.ClientAsset", b => + modelBuilder.Entity("DataServer.Data.Entities.ClientAsset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -136,7 +136,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("client_assets"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -183,7 +183,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -218,7 +218,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -242,7 +242,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -346,7 +346,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -376,7 +376,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_crafting_skills"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -414,7 +414,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -437,7 +437,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_item_crafted_link"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -466,7 +466,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_known_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -554,7 +554,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafted_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -625,7 +625,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -654,7 +654,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipe_ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -775,7 +775,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -807,7 +807,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -851,7 +851,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -895,7 +895,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1012,7 +1012,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1041,7 +1041,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1103,7 +1103,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1126,7 +1126,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_recipe_scrolls"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1198,7 +1198,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1233,7 +1233,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1272,7 +1272,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1391,7 +1391,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1434,7 +1434,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1478,7 +1478,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1526,7 +1526,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1603,7 +1603,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1698,7 +1698,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1776,7 +1776,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1821,7 +1821,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1872,15 +1872,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1889,15 +1889,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1908,9 +1908,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1919,9 +1919,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1930,9 +1930,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("CraftingSkills") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1941,15 +1941,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1960,15 +1960,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { - b.HasOne("Server.Data.Entities.DungeonCharacterItem", "CharacterItem") + b.HasOne("DataServer.Data.Entities.DungeonCharacterItem", "CharacterItem") .WithMany() .HasForeignKey("CharacterItemId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftedItem", "CraftedItem") + b.HasOne("DataServer.Data.Entities.DungeonCraftedItem", "CraftedItem") .WithMany() .HasForeignKey("CraftedItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1979,15 +1979,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("CraftedItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("KnownRecipes") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -1998,19 +1998,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") .WithMany() .HasForeignKey("BaseItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "Crafter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Crafter") .WithMany() .HasForeignKey("CrafterId"); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId"); @@ -2021,9 +2021,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "OutputItem") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "OutputItem") .WithMany() .HasForeignKey("OutputItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -2032,15 +2032,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("OutputItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany("Ingredients") .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2051,15 +2051,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2068,15 +2068,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -2087,15 +2087,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -2106,24 +2106,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2134,15 +2134,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2151,15 +2151,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2170,9 +2170,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -2181,15 +2181,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2200,9 +2200,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2211,15 +2211,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -2230,20 +2230,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2252,19 +2252,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("CraftingSkills"); @@ -2277,12 +2277,12 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Navigation("Ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Migrations/GameDbContextModelSnapshot.cs b/Migrations/GameDbContextModelSnapshot.cs index e14b2ff..5707a01 100644 --- a/Migrations/GameDbContextModelSnapshot.cs +++ b/Migrations/GameDbContextModelSnapshot.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Server.Data; +using DataServer.Data; #nullable disable @@ -22,7 +22,7 @@ namespace SystemRevivalServer.Migrations MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -81,7 +81,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("accounts", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.ClientAsset", b => + modelBuilder.Entity("DataServer.Data.Entities.ClientAsset", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -133,7 +133,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("client_assets"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -180,7 +180,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chests"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -215,7 +215,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_death_chest_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -239,7 +239,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_belt_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -343,7 +343,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_characters"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -373,7 +373,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_crafting_skills"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -411,7 +411,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -434,7 +434,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_item_crafted_link"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -463,7 +463,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_character_known_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -551,7 +551,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafted_items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -622,7 +622,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipes"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -651,7 +651,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_crafting_recipe_ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonItemDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonItemDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -772,7 +772,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_item_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -804,7 +804,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_learned_spells"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -848,7 +848,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -892,7 +892,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_loot_table_entries"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1009,7 +1009,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1038,7 +1038,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_mob_loot_tables"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1100,7 +1100,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_instances"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1123,7 +1123,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_recipe_scrolls"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonSpellDefinition", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonSpellDefinition", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1195,7 +1195,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_spell_definitions"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1230,7 +1230,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("dungeon_stash_items"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1269,7 +1269,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("equipment", (string)null); }); - modelBuilder.Entity("Server.Data.GameItem", b => + modelBuilder.Entity("DataServer.Data.GameItem", b => { b.Property("Id") .HasColumnType("int"); @@ -1388,7 +1388,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_items", (string)null); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { b.Property("Id") .HasColumnType("int"); @@ -1431,7 +1431,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("game_recipes", (string)null); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1475,7 +1475,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("inventories", (string)null); }); - modelBuilder.Entity("Server.Data.ItemTemplate", b => + modelBuilder.Entity("DataServer.Data.ItemTemplate", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1523,7 +1523,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("item_templates", (string)null); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1600,7 +1600,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("match_history", (string)null); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1695,7 +1695,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("characters", (string)null); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1773,7 +1773,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("player_stats", (string)null); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1818,7 +1818,7 @@ namespace SystemRevivalServer.Migrations b.ToTable("sessions", (string)null); }); - modelBuilder.Entity("Server.Data.Zone", b => + modelBuilder.Entity("DataServer.Data.Zone", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1869,15 +1869,15 @@ namespace SystemRevivalServer.Migrations b.ToTable("zones", (string)null); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "OwnerCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "OwnerCharacter") .WithMany() .HasForeignKey("OwnerCharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "VictimCharacter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "VictimCharacter") .WithMany() .HasForeignKey("VictimCharacterId"); @@ -1886,15 +1886,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("VictimCharacter"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChestItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChestItem", b => { - b.HasOne("Server.Data.Entities.DeathChest", "DeathChest") + b.HasOne("DataServer.Data.Entities.DeathChest", "DeathChest") .WithMany("Items") .HasForeignKey("DeathChestId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1905,9 +1905,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonBeltItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonBeltItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1916,9 +1916,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -1927,9 +1927,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterCraftingSkill", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterCraftingSkill", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("CraftingSkills") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) @@ -1938,15 +1938,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Character"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Inventory") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -1957,15 +1957,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ItemDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterItemCraftedLink", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterItemCraftedLink", b => { - b.HasOne("Server.Data.Entities.DungeonCharacterItem", "CharacterItem") + b.HasOne("DataServer.Data.Entities.DungeonCharacterItem", "CharacterItem") .WithMany() .HasForeignKey("CharacterItemId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftedItem", "CraftedItem") + b.HasOne("DataServer.Data.Entities.DungeonCraftedItem", "CraftedItem") .WithMany() .HasForeignKey("CraftedItemId") .OnDelete(DeleteBehavior.Cascade) @@ -1976,15 +1976,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("CraftedItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacterKnownRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacterKnownRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("KnownRecipes") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -1995,19 +1995,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftedItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftedItem", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "BaseItemDefinition") .WithMany() .HasForeignKey("BaseItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCharacter", "Crafter") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Crafter") .WithMany() .HasForeignKey("CrafterId"); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId"); @@ -2018,9 +2018,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "OutputItem") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "OutputItem") .WithMany() .HasForeignKey("OutputItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -2029,15 +2029,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("OutputItem"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipeIngredient", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipeIngredient", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany("Ingredients") .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2048,15 +2048,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLearnedSpell", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("LearnedSpells") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonSpellDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonSpellDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2065,15 +2065,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTableEntry", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTableEntry", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany("Entries") .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) @@ -2084,15 +2084,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("LootTable"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonMobLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonMobLootTable", b => { - b.HasOne("Server.Data.Entities.DungeonLootTable", "LootTable") + b.HasOne("DataServer.Data.Entities.DungeonLootTable", "LootTable") .WithMany() .HasForeignKey("LootTableId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonMobDefinition", "MobDefinition") + b.HasOne("DataServer.Data.Entities.DungeonMobDefinition", "MobDefinition") .WithMany() .HasForeignKey("MobDefinitionId") .OnDelete(DeleteBehavior.Cascade) @@ -2103,24 +2103,24 @@ namespace SystemRevivalServer.Migrations b.Navigation("MobDefinition"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonPersistence", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonPersistence", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Creator") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Creator") .WithMany() .HasForeignKey("CreatorId"); b.Navigation("Creator"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonRecipeScroll", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonRecipeScroll", b => { - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "ItemDefinition") .WithMany() .HasForeignKey("ItemDefinitionId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonCraftingRecipe", "Recipe") + b.HasOne("DataServer.Data.Entities.DungeonCraftingRecipe", "Recipe") .WithMany() .HasForeignKey("RecipeId") .OnDelete(DeleteBehavior.Cascade) @@ -2131,15 +2131,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Recipe"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonStashItem", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonStashItem", b => { - b.HasOne("Server.Data.Entities.DungeonCharacter", "Character") + b.HasOne("DataServer.Data.Entities.DungeonCharacter", "Character") .WithMany("Stash") .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition") + b.HasOne("DataServer.Data.Entities.DungeonItemDefinition", "Definition") .WithMany() .HasForeignKey("DefinitionId"); @@ -2148,15 +2148,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Definition"); }); - modelBuilder.Entity("Server.Data.EquipmentSlot", b => + modelBuilder.Entity("DataServer.Data.EquipmentSlot", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2167,9 +2167,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.GameRecipe", b => + modelBuilder.Entity("DataServer.Data.GameRecipe", b => { - b.HasOne("Server.Data.GameItem", "ResultItem") + b.HasOne("DataServer.Data.GameItem", "ResultItem") .WithMany() .HasForeignKey("ResultItemId") .OnDelete(DeleteBehavior.Cascade) @@ -2178,15 +2178,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("ResultItem"); }); - modelBuilder.Entity("Server.Data.InventoryItem", b => + modelBuilder.Entity("DataServer.Data.InventoryItem", b => { - b.HasOne("Server.Data.Old_Character", "Old_Character") + b.HasOne("DataServer.Data.Old_Character", "Old_Character") .WithMany() .HasForeignKey("CharacterId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.ItemTemplate", "ItemTemplate") + b.HasOne("DataServer.Data.ItemTemplate", "ItemTemplate") .WithMany() .HasForeignKey("ItemTemplateId") .OnDelete(DeleteBehavior.Restrict) @@ -2197,9 +2197,9 @@ namespace SystemRevivalServer.Migrations b.Navigation("Old_Character"); }); - modelBuilder.Entity("Server.Data.MatchHistory", b => + modelBuilder.Entity("DataServer.Data.MatchHistory", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany() .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2208,15 +2208,15 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Old_Character", b => + modelBuilder.Entity("DataServer.Data.Old_Character", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Characters") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Server.Data.Zone", "Zone") + b.HasOne("DataServer.Data.Zone", "Zone") .WithMany() .HasForeignKey("ZoneId") .OnDelete(DeleteBehavior.Restrict) @@ -2227,20 +2227,20 @@ namespace SystemRevivalServer.Migrations b.Navigation("Zone"); }); - modelBuilder.Entity("Server.Data.PlayerStats", b => + modelBuilder.Entity("DataServer.Data.PlayerStats", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithOne() - .HasForeignKey("Server.Data.PlayerStats", "AccountId") + .HasForeignKey("DataServer.Data.PlayerStats", "AccountId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Session", b => + modelBuilder.Entity("DataServer.Data.Session", b => { - b.HasOne("Server.Data.Account", "Account") + b.HasOne("DataServer.Data.Account", "Account") .WithMany("Sessions") .HasForeignKey("AccountId") .OnDelete(DeleteBehavior.Cascade) @@ -2249,19 +2249,19 @@ namespace SystemRevivalServer.Migrations b.Navigation("Account"); }); - modelBuilder.Entity("Server.Data.Account", b => + modelBuilder.Entity("DataServer.Data.Account", b => { b.Navigation("Characters"); b.Navigation("Sessions"); }); - modelBuilder.Entity("Server.Data.Entities.DeathChest", b => + modelBuilder.Entity("DataServer.Data.Entities.DeathChest", b => { b.Navigation("Items"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCharacter", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCharacter", b => { b.Navigation("CraftingSkills"); @@ -2274,12 +2274,12 @@ namespace SystemRevivalServer.Migrations b.Navigation("Stash"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonCraftingRecipe", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonCraftingRecipe", b => { b.Navigation("Ingredients"); }); - modelBuilder.Entity("Server.Data.Entities.DungeonLootTable", b => + modelBuilder.Entity("DataServer.Data.Entities.DungeonLootTable", b => { b.Navigation("Entries"); }); diff --git a/Networking/Messages/CharContracts.cs b/Networking/Messages/CharContracts.cs index 4548424..f4b8f47 100644 --- a/Networking/Messages/CharContracts.cs +++ b/Networking/Messages/CharContracts.cs @@ -1,4 +1,4 @@ -namespace SystemRevivalServer.Networking.Messages +namespace Server.Networking.Messages { public sealed record CharSummary(ulong CharacterId, string Name, int Level); diff --git a/Networking/Messages/WorldContracts.cs b/Networking/Messages/WorldContracts.cs index 7482d62..f6c253d 100644 --- a/Networking/Messages/WorldContracts.cs +++ b/Networking/Messages/WorldContracts.cs @@ -1,4 +1,4 @@ -namespace SystemRevivalServer.Networking.Messages +namespace Server.Networking.Messages { public sealed record WorldSpawnRequest(int ZoneId); public sealed record WorldSpawn( diff --git a/Program.cs b/Program.cs index 1a52bd7..1017379 100644 --- a/Program.cs +++ b/Program.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Hosting; -using Server.Data; +using DataServer.Data; using Server.Networking; using Server.Networking.Handling; using Server.Networking.Messages; @@ -15,7 +15,7 @@ using Server.Persistence; using Server.Redis; using Server.Services; using Server.Services.Auth; -using VoidScavengers.Game; +using Server.Game; var builder = WebApplication.CreateBuilder(args); @@ -73,8 +73,8 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); // Void Scavengers game -builder.Services.AddSingleton(); -builder.Services.AddSingleton(); +//builder.Services.AddSingleton(); +//builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(sp => sp.GetRequiredService()); builder.Services.AddSingleton(); @@ -84,6 +84,7 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); +builder.Services.AddSingleton(); builder.Services.AddHttpClient(); // For CDN file hash computation // Health checks @@ -122,25 +123,25 @@ catch (Exception ex) app.Logger.LogError(ex, "Failed to resolve IMessageSerializer"); } -try -{ - var matchMgr = app.Services.GetRequiredService(); - app.Logger.LogInformation("MatchManager resolved OK"); -} -catch (Exception ex) -{ - app.Logger.LogError(ex, "Failed to resolve MatchManager"); -} +//try +//{ +// var matchMgr = app.Services.GetRequiredService(); +// app.Logger.LogInformation("MatchManager resolved OK"); +//} +//catch (Exception ex) +//{ +// app.Logger.LogError(ex, "Failed to resolve MatchManager"); +//} -try -{ - var gameHandler = app.Services.GetRequiredService(); - app.Logger.LogInformation("GameHandler resolved OK, opcodes: {Ops}", string.Join(",", gameHandler.SupportedOpCodes)); -} -catch (Exception ex) -{ - app.Logger.LogError(ex, "Failed to resolve GameHandler"); -} +//try +//{ +// var gameHandler = app.Services.GetRequiredService(); +// app.Logger.LogInformation("GameHandler resolved OK, opcodes: {Ops}", string.Join(",", gameHandler.SupportedOpCodes)); +//} +//catch (Exception ex) +//{ +// app.Logger.LogError(ex, "Failed to resolve GameHandler"); +//} var handlers = app.Services.GetServices().ToList(); app.Logger.LogInformation("IClientMessageHandler count: {Count}", handlers.Count); diff --git a/Services/Admin/Pages/AdminPageModel.cs b/Services/Admin/Pages/AdminPageModel.cs index 36aef68..9de1933 100644 --- a/Services/Admin/Pages/AdminPageModel.cs +++ b/Services/Admin/Pages/AdminPageModel.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace VoidScavengers.Services.Admin.Pages; +namespace Server.Services.Admin.Pages; /// /// Base class for all admin pages that require authentication diff --git a/Services/Admin/Pages/Assets/Index.cshtml b/Services/Admin/Pages/Assets/Index.cshtml index 1822bfa..8d6e0bc 100644 --- a/Services/Admin/Pages/Assets/Index.cshtml +++ b/Services/Admin/Pages/Assets/Index.cshtml @@ -1,6 +1,6 @@ @page "/admin/assets" @model Assets.IndexModel -@using Server.Data.Entities +@using DataServer.Data.Entities @{ ViewData["Title"] = "CDN Assets"; } diff --git a/Services/Admin/Pages/Assets/Index.cshtml.cs b/Services/Admin/Pages/Assets/Index.cshtml.cs index 74c2ba7..7f09065 100644 --- a/Services/Admin/Pages/Assets/Index.cshtml.cs +++ b/Services/Admin/Pages/Assets/Index.cshtml.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; using Server.Services; using System.Net.Http; using System.Security.Cryptography; -namespace VoidScavengers.Services.Admin.Pages.Assets; +namespace Server.Services.Admin.Pages.Assets; public class IndexModel : AdminPageModel { diff --git a/Services/Admin/Pages/Broadcast/Index.cshtml b/Services/Admin/Pages/Broadcast/Index.cshtml new file mode 100644 index 0000000..bdd2c4f --- /dev/null +++ b/Services/Admin/Pages/Broadcast/Index.cshtml @@ -0,0 +1,133 @@ +@page "/admin/broadcast" +@model Broadcast.IndexModel +@{ + ViewData["Title"] = "Server Broadcast"; +} + +
+
+

Server Broadcast

+

Send messages to all connected players

+
+ + @if (!string.IsNullOrEmpty(Model.Message)) + { +
+ @Model.Message +
+ } + + +
+

Quick Messages

+
+
+ @Html.AntiForgeryToken() + + + +
+
+ @Html.AntiForgeryToken() + + + +
+
+ @Html.AntiForgeryToken() + + + +
+
+ @Html.AntiForgeryToken() + + + +
+
+
+ + +
+ @Html.AntiForgeryToken() + +

Custom Message

+ +
+
+ + +
+ +
+ + +

Max 500 characters

+
+ +
+ + + How long the message displays on client +
+ + +
+
+ + +
+

Client Commands

+ +
+
+ @Html.AntiForgeryToken() +
+

Refresh Asset Manifest

+

Tell all clients to re-download the asset manifest

+
+ +
+ +
+ @Html.AntiForgeryToken() +
+

Force Reconnect

+

Disconnect all clients (they will auto-reconnect)

+
+ +
+
+
+ + +
+

Server Status

+
+
+

@Model.ConnectedPlayers

+

Connected Players

+
+
+

@Model.ActiveDungeons

+

Active Dungeons

+
+
+
+
diff --git a/Services/Admin/Pages/Broadcast/Index.cshtml.cs b/Services/Admin/Pages/Broadcast/Index.cshtml.cs new file mode 100644 index 0000000..ed153d2 --- /dev/null +++ b/Services/Admin/Pages/Broadcast/Index.cshtml.cs @@ -0,0 +1,139 @@ +using Microsoft.AspNetCore.Mvc; +using Server.Redis; + +namespace Server.Services.Admin.Pages.Broadcast; + +public class IndexModel : AdminPageModel +{ + private readonly IRedisManager _redis; + private readonly ILogger _logger; + + public IndexModel(IRedisManager redis, ILogger logger) + { + _redis = redis; + _logger = logger; + } + + public int ConnectedPlayers { get; set; } + public int ActiveDungeons { get; set; } + + [TempData] + public string? Message { get; set; } + [TempData] + public bool IsError { get; set; } + + public async Task OnGetAsync() + { + await LoadStats(); + } + + private async Task LoadStats() + { + try + { + // Try to get connected player count from Redis + var playerCount = await _redis.Db.StringGetAsync("server:player_count"); + if (playerCount.HasValue && int.TryParse(playerCount, out var count)) + ConnectedPlayers = count; + + var dungeonCount = await _redis.Db.StringGetAsync("server:dungeon_count"); + if (dungeonCount.HasValue && int.TryParse(dungeonCount, out var dCount)) + ActiveDungeons = dCount; + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Failed to load server stats from Redis"); + } + } + + public async Task OnPostQuickMessageAsync(string type, string message) + { + return await SendBroadcast(type, message, 10); + } + + public async Task OnPostCustomMessageAsync(string type, string message, int duration = 10) + { + if (string.IsNullOrWhiteSpace(message)) + { + Message = "Message cannot be empty."; + IsError = true; + return RedirectToPage(); + } + + return await SendBroadcast(type, message, duration); + } + + private async Task SendBroadcast(string type, string message, int duration) + { + try + { + var payload = System.Text.Json.JsonSerializer.Serialize(new + { + type = type, + message = message, + duration = duration, + timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds() + }); + + // Publish to Redis channel that game servers listen to + await _redis.Bus.PublishAsync("server:broadcast", payload); + + _logger.LogInformation("Broadcast sent: {Type} - {Message}", type, message); + Message = $"Broadcast sent to all connected players."; + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to send broadcast"); + Message = $"Failed to send broadcast: {ex.Message}"; + IsError = true; + } + + return RedirectToPage(); + } + + public async Task OnPostRefreshAssetsAsync() + { + try + { + var payload = System.Text.Json.JsonSerializer.Serialize(new + { + command = "refresh_assets", + timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds() + }); + + await _redis.Bus.PublishAsync("server:command", payload); + Message = "Asset refresh command sent."; + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to send asset refresh command"); + Message = $"Failed: {ex.Message}"; + IsError = true; + } + + return RedirectToPage(); + } + + public async Task OnPostForceReconnectAsync() + { + try + { + var payload = System.Text.Json.JsonSerializer.Serialize(new + { + command = "force_reconnect", + timestamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds() + }); + + await _redis.Bus.PublishAsync("server:command", payload); + Message = "Force reconnect command sent. All clients will reconnect."; + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to send force reconnect command"); + Message = $"Failed: {ex.Message}"; + IsError = true; + } + + return RedirectToPage(); + } +} diff --git a/Services/Admin/Pages/Index.cshtml.cs b/Services/Admin/Pages/Index.cshtml.cs index 19c05d5..f285d69 100644 --- a/Services/Admin/Pages/Index.cshtml.cs +++ b/Services/Admin/Pages/Index.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; -using Server.Data; +using DataServer.Data; -namespace VoidScavengers.Services.Admin.Pages; +namespace Server.Services.Admin.Pages; public class IndexModel : AdminPageModel { diff --git a/Services/Admin/Pages/Items/Edit.cshtml b/Services/Admin/Pages/Items/Edit.cshtml index 68640f1..0c5e7bd 100644 --- a/Services/Admin/Pages/Items/Edit.cshtml +++ b/Services/Admin/Pages/Items/Edit.cshtml @@ -1,6 +1,6 @@ @page "/admin/items/edit" @model Items.EditModel -@using Server.Data.Enums +@using DataServer.Data.Enums @{ ViewData["Title"] = Model.IsNew ? "Create Item" : $"Edit: {Model.Item.Name}"; } diff --git a/Services/Admin/Pages/Items/Edit.cshtml.cs b/Services/Admin/Pages/Items/Edit.cshtml.cs index 66d6f10..9d1b46c 100644 --- a/Services/Admin/Pages/Items/Edit.cshtml.cs +++ b/Services/Admin/Pages/Items/Edit.cshtml.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Mvc; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; +using DataServer.Data.Enums; -namespace VoidScavengers.Services.Admin.Pages.Items; +namespace Server.Services.Admin.Pages.Items; public class EditModel : AdminPageModel { diff --git a/Services/Admin/Pages/Items/Index.cshtml b/Services/Admin/Pages/Items/Index.cshtml index a293e07..823d36b 100644 --- a/Services/Admin/Pages/Items/Index.cshtml +++ b/Services/Admin/Pages/Items/Index.cshtml @@ -1,6 +1,6 @@ @page "/admin/items" @model Items.IndexModel -@using Server.Data.Enums +@using DataServer.Data.Enums @{ ViewData["Title"] = "Items"; } diff --git a/Services/Admin/Pages/Items/Index.cshtml.cs b/Services/Admin/Pages/Items/Index.cshtml.cs index fd24702..e25308b 100644 --- a/Services/Admin/Pages/Items/Index.cshtml.cs +++ b/Services/Admin/Pages/Items/Index.cshtml.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; -using Server.Data.Entities; -using Server.Data.Enums; +using DataServer.Data; +using DataServer.Data.Entities; +using DataServer.Data.Enums; -namespace VoidScavengers.Services.Admin.Pages.Items; +namespace Server.Services.Admin.Pages.Items; public class IndexModel : AdminPageModel { diff --git a/Services/Admin/Pages/Login.cshtml b/Services/Admin/Pages/Login.cshtml index afb7b91..3cfb7c7 100644 --- a/Services/Admin/Pages/Login.cshtml +++ b/Services/Admin/Pages/Login.cshtml @@ -10,7 +10,7 @@ - Admin Login - Void Scavengers + Admin Login - Dungeon Divers diff --git a/Services/Admin/Pages/Login.cshtml.cs b/Services/Admin/Pages/Login.cshtml.cs index f0d248e..e24163b 100644 --- a/Services/Admin/Pages/Login.cshtml.cs +++ b/Services/Admin/Pages/Login.cshtml.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; -using Server.Data; +using DataServer.Data; using Server.Services.Auth; -namespace VoidScavengers.Services.Admin.Pages; +namespace Server.Services.Admin.Pages; public class LoginModel : PageModel { diff --git a/Services/Admin/Pages/Logout.cshtml.cs b/Services/Admin/Pages/Logout.cshtml.cs index ceba518..95b0d3e 100644 --- a/Services/Admin/Pages/Logout.cshtml.cs +++ b/Services/Admin/Pages/Logout.cshtml.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace VoidScavengers.Services.Admin.Pages; +namespace Server.Services.Admin.Pages; public class LogoutModel : PageModel { diff --git a/Services/Admin/Pages/LootTables/Edit.cshtml.cs b/Services/Admin/Pages/LootTables/Edit.cshtml.cs index 9ea5f90..934b4f3 100644 --- a/Services/Admin/Pages/LootTables/Edit.cshtml.cs +++ b/Services/Admin/Pages/LootTables/Edit.cshtml.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; -namespace VoidScavengers.Services.Admin.Pages.LootTables; +namespace Server.Services.Admin.Pages.LootTables; public class EditModel : AdminPageModel { diff --git a/Services/Admin/Pages/LootTables/Index.cshtml.cs b/Services/Admin/Pages/LootTables/Index.cshtml.cs index 569ca93..813ec51 100644 --- a/Services/Admin/Pages/LootTables/Index.cshtml.cs +++ b/Services/Admin/Pages/LootTables/Index.cshtml.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; -namespace VoidScavengers.Services.Admin.Pages.LootTables; +namespace Server.Services.Admin.Pages.LootTables; public class IndexModel : AdminPageModel { diff --git a/Services/Admin/Pages/Mobs/Edit.cshtml b/Services/Admin/Pages/Mobs/Edit.cshtml index a543560..a3bf095 100644 --- a/Services/Admin/Pages/Mobs/Edit.cshtml +++ b/Services/Admin/Pages/Mobs/Edit.cshtml @@ -1,6 +1,6 @@ @page "/admin/mobs/edit" @model Mobs.EditModel -@using Server.Data.Enums +@using DataServer.Data.Enums @{ ViewData["Title"] = Model.IsNew ? "Create Mob" : $"Edit: {Model.Mob.Name}"; } @@ -243,9 +243,9 @@
-

Visual

+

Visual Settings

-
+
@@ -257,15 +257,71 @@
+
+ + +
+
+ + +
+
+ + +
-
- - +
+
+ + +
+
+
+

Sprite Sheets

+

Configure sprite sheets for different directions and states

+
+
+ @foreach (var sprite in Model.SpriteConfig.Sprites) + { +
+ + + + + +
+ } +
+ + @if (!Model.SpriteConfig.Sprites.Any()) + { +

No sprites configured. Add sprite sheets below.

+ } + + +
@@ -460,5 +516,37 @@ customInput.classList.add('hidden'); valueInput.value = '50'; } + + function addSprite() { + const html = ` +
+ + + + + +
+ `; + document.getElementById('spritesList').insertAdjacentHTML('beforeend', html); + } } diff --git a/Services/Admin/Pages/Mobs/Edit.cshtml.cs b/Services/Admin/Pages/Mobs/Edit.cshtml.cs index 0f09295..07f9633 100644 --- a/Services/Admin/Pages/Mobs/Edit.cshtml.cs +++ b/Services/Admin/Pages/Mobs/Edit.cshtml.cs @@ -1,10 +1,29 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; -using Server.Data.Entities; +using DataServer.Data; +using DataServer.Data.Entities; using System.Text.Json; -namespace VoidScavengers.Services.Admin.Pages.Mobs; +namespace Server.Services.Admin.Pages.Mobs; + +// Helper class for sprite configuration +public class MobSpriteConfig +{ + public Dictionary Sprites { get; set; } = new(); + public Dictionary Animations { get; set; } = new(); + public int FrameWidth { get; set; } = 64; + public int FrameHeight { get; set; } = 64; + public int Fps { get; set; } = 8; + + public int GetFrameCount(string key) => Animations.TryGetValue(key, out var anim) ? anim.Frames : 8; + public bool IsLooping(string key) => !Animations.TryGetValue(key, out var anim) || anim.Loop; + + public class SpriteAnimation + { + public int Frames { get; set; } = 8; + public bool Loop { get; set; } = true; + } +} public class EditModel : AdminPageModel { @@ -45,6 +64,21 @@ public class EditModel : AdminPageModel return value; return 0f; } + + // Sprite config helper + public MobSpriteConfig SpriteConfig + { + get + { + try + { + if (string.IsNullOrEmpty(Mob.SpriteConfigJson)) return new(); + var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true }; + return JsonSerializer.Deserialize(Mob.SpriteConfigJson, options) ?? new(); + } + catch { return new(); } + } + } public async Task OnGetAsync(int? id) { @@ -115,6 +149,39 @@ public class EditModel : AdminPageModel } } Mob.ResistancesJson = JsonSerializer.Serialize(resistances); + + // Parse sprite config from form + var spriteConfig = new MobSpriteConfig(); + if (int.TryParse(Request.Form["sprite_frameWidth"], out var fw)) spriteConfig.FrameWidth = fw; + if (int.TryParse(Request.Form["sprite_frameHeight"], out var fh)) spriteConfig.FrameHeight = fh; + if (int.TryParse(Request.Form["sprite_fps"], out var fps)) spriteConfig.Fps = fps; + + var spriteKeys = Request.Form["sprite_key[]"].ToArray(); + var spritePaths = Request.Form["sprite_path[]"].ToArray(); + var spriteFrames = Request.Form["sprite_frames[]"].ToArray(); + var spriteLoops = Request.Form["sprite_loop[]"].ToArray(); + + for (int i = 0; i < spriteKeys.Length && i < spritePaths.Length; i++) + { + var key = spriteKeys[i]?.Trim(); + var path = spritePaths[i]?.Trim(); + if (!string.IsNullOrEmpty(key) && !string.IsNullOrEmpty(path)) + { + spriteConfig.Sprites[key] = path; + var frames = i < spriteFrames.Length && int.TryParse(spriteFrames[i], out var f) ? f : 8; + var loop = spriteLoops.Contains(key) || spriteLoops.Contains("new"); + spriteConfig.Animations[key] = new MobSpriteConfig.SpriteAnimation { Frames = frames, Loop = loop }; + } + } + + if (spriteConfig.Sprites.Any()) + { + Mob.SpriteConfigJson = JsonSerializer.Serialize(spriteConfig, new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); + } + else + { + Mob.SpriteConfigJson = null; + } if (string.IsNullOrWhiteSpace(Mob.Name)) { diff --git a/Services/Admin/Pages/Mobs/Index.cshtml b/Services/Admin/Pages/Mobs/Index.cshtml index 63ca7ff..9a6f052 100644 --- a/Services/Admin/Pages/Mobs/Index.cshtml +++ b/Services/Admin/Pages/Mobs/Index.cshtml @@ -1,6 +1,6 @@ @page "/admin/mobs" @model Mobs.IndexModel -@using Server.Data.Enums +@using DataServer.Data.Enums @{ ViewData["Title"] = "Mobs"; } diff --git a/Services/Admin/Pages/Mobs/Index.cshtml.cs b/Services/Admin/Pages/Mobs/Index.cshtml.cs index 8d5a285..06d5dc7 100644 --- a/Services/Admin/Pages/Mobs/Index.cshtml.cs +++ b/Services/Admin/Pages/Mobs/Index.cshtml.cs @@ -1,10 +1,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Server.Data; -using Server.Data.Entities; -using Server.Data.Enums; +using DataServer.Data; +using DataServer.Data.Entities; +using DataServer.Data.Enums; -namespace VoidScavengers.Services.Admin.Pages.Mobs; +namespace Server.Services.Admin.Pages.Mobs; public class IndexModel : AdminPageModel { diff --git a/Services/Admin/Pages/Players/Character.cshtml b/Services/Admin/Pages/Players/Character.cshtml index 753785d..3547796 100644 --- a/Services/Admin/Pages/Players/Character.cshtml +++ b/Services/Admin/Pages/Players/Character.cshtml @@ -1,222 +1,204 @@ @page "/admin/players/character" @model Players.CharacterModel -@using Server.Data.Entities -@using Server.Data.Enums +@using DataServer.Data.Entities +@using DataServer.Data.Enums @{ ViewData["Title"] = $"Character: {Model.Character.Name}"; } -
+
← Back to Account -

@Model.Character.Name

-

Level @Model.Character.Level • @Model.Character.Gold.ToString("N0") Gold • Character ID: @Model.Character.Id

+

@Model.Character.Name

+

Level @Model.Character.Level • @Model.Character.Gold.ToString("N0") Gold • ID: @Model.Character.Id

@if (!string.IsNullOrEmpty(Model.Message)) { -
+
@Model.Message
} -
- -
+
+ +
-
+ @Html.AntiForgeryToken() -

Basic Information

+

Basic Information

-
+
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + +
- - + -
+ @Html.AntiForgeryToken() -

Character Stats

+

Stats

-
+
- - + +
- - + +
- - + +
- - + +
- - + +
- -
-
-

Max HP

-

@Model.Character.MaxHealth

-
-
-

Max Mana

-

@Model.Character.MaxMana

-
-
-

Max Stamina

-

@Model.Character.MaxStamina

-
-
-

XP Bonus

-

+@(((Model.Character.XpBonus - 1) * 100).ToString("0"))%

-
-
-

Move Speed

-

@Model.Character.MoveSpeed.ToString("0")

-
-
-

Atk Speed

-

@Model.Character.AttackSpeed.ToString("0.00")

-
+
+
HP
@Model.Character.MaxHealth
+
Mana
@Model.Character.MaxMana
+
Stam
@Model.Character.MaxStamina
+
XP+
@(((Model.Character.XpBonus - 1) * 100).ToString("0"))%
+
Spd
@Model.Character.MoveSpeed.ToString("0")
+
Atk
@Model.Character.AttackSpeed.ToString("0.0")
- - + - -
-

Lifetime Statistics

-
-
-

@Model.Character.TotalKills

-

Total Kills

-
-
-

@Model.Character.TotalDeaths

-

Deaths

-
-
-

@Model.Character.PlayersKilled

-

Players Killed

-
-
-

@Model.Character.DungeonsCompleted

-

Dungeons

-
-
-

@Model.Character.BossesKilled

-

Bosses

-
+ +
+

Inventory (@Model.InventoryItems.Count/30)

+ +
+ @for (int i = 0; i < 30; i++) + { + var item = Model.InventoryItems.FirstOrDefault(it => it.SlotIndex == i); + var rarityBorder = item?.ItemDefinition?.Rarity switch + { + ItemRarity.Uncommon => "border-green-500", + ItemRarity.Rare => "border-blue-500", + ItemRarity.Epic => "border-purple-500", + ItemRarity.Legendary => "border-orange-500", + _ => "border-gray-700" + }; +
onclick="showItemModal(@item.Id, @item.Quantity, @item.SlotIndex)" }> + @if (item?.ItemDefinition != null) + { + @if (!string.IsNullOrEmpty(item.ItemDefinition.SpritePath)) + { + + } + else + { + @item.ItemDefinition.Name.Substring(0, Math.Min(2, item.ItemDefinition.Name.Length)) + } + @if (item.Quantity > 1) + { + @item.Quantity + } + + } +
+ } +
+
+ + +
+

Lifetime Stats

+
+
@Model.Character.TotalKillsKills
+
@Model.Character.TotalDeathsDeaths
+
@Model.Character.PlayersKilledPvP Kills
+
@Model.Character.DungeonsCompletedDungeons
+
@Model.Character.BossesKilledBosses
- -
- -
-

Equipment

- -
+ +
+
+

Equipment

+
@foreach (var slot in new[] { - ("MainHand", "Weapon", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.MainHand)), - ("OffHand", "Off-Hand", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.OffHand)), - ("Head", "Head", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.Head)), - ("Chest", "Chest", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.Chest)), - ("Legs", "Legs", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.Legs)), - ("Boots", "Boots", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.Boots)), - ("Gloves", "Gloves", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.Gloves)), - ("Accessory1", "Accessory", Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == DungeonEquipmentSlot.Accessory1)) + (DungeonEquipmentSlot.MainHand, "Weapon"), + (DungeonEquipmentSlot.OffHand, "Off-Hand"), + (DungeonEquipmentSlot.Head, "Head"), + (DungeonEquipmentSlot.Chest, "Chest"), + (DungeonEquipmentSlot.Legs, "Legs"), + (DungeonEquipmentSlot.Boots, "Boots"), + (DungeonEquipmentSlot.Gloves, "Gloves"), + (DungeonEquipmentSlot.Accessory1, "Accessory") }) { -
-
- @if (slot.Item3?.ItemDefinition != null && !string.IsNullOrEmpty(slot.Item3.ItemDefinition.SpritePath)) + var item = Model.EquippedItems.FirstOrDefault(i => i.EquipSlot == slot.Item1); +
+
+ @if (item?.ItemDefinition != null && !string.IsNullOrEmpty(item.ItemDefinition.SpritePath)) { - + } else { - @slot.Item2.Substring(0, 1) + @slot.Item2.Substring(0, 1) }
-

@slot.Item2

- @if (slot.Item3?.ItemDefinition != null) - { -

@slot.Item3.ItemDefinition.Name

- } - else - { -

Empty

- } +

@slot.Item2

+

+ @(item?.ItemDefinition?.Name ?? "Empty") +

- - @if (slot.Item3?.ItemDefinition != null) + @if (item?.ItemDefinition != null) { - - @@ -225,119 +207,57 @@
- - -
-
-

Inventory (@Model.InventoryItems.Count items)

-
- -
- @for (int i = 0; i < 30; i++) - { - var item = Model.InventoryItems.FirstOrDefault(it => it.SlotIndex == i); -
onclick="showItemModal(@item.Id)" }> - @if (item?.ItemDefinition != null) - { - @if (!string.IsNullOrEmpty(item.ItemDefinition.SpritePath)) - { - @item.ItemDefinition.Name - } - else - { - @item.ItemDefinition.Name.Substring(0, Math.Min(3, item.ItemDefinition.Name.Length)) - } - - @if (item.Quantity > 1) - { - @item.Quantity - } - - - - var rarityBorder = item.ItemDefinition.Rarity switch - { - ItemRarity.Uncommon => "border-green-500", - ItemRarity.Rare => "border-blue-500", - ItemRarity.Epic => "border-purple-500", - ItemRarity.Legendary => "border-orange-500", - _ => "border-gray-700" - }; - -
- - - - } - else - { - @i - } -
- } -
-