Dungeon adjustments

This commit is contained in:
dingo
2025-12-18 10:57:28 -05:00
parent 29dbe6974e
commit b346b02ae0
3 changed files with 72 additions and 45 deletions
+62 -29
View File
@@ -342,24 +342,27 @@ public sealed class DungeonHandler : IClientMessageHandler
var request = _ser.Deserialize<DungeonEnterRequest>(payload);
int tier = Math.Clamp(request.Tier, 1, 10);
int playerLevel = session.Character.Level;
var (bracketMin, bracketMax) = DungeonInstance.GetLevelBracket(playerLevel);
const int maxPlayersPerDungeon = 20;
// Try to find an existing dungeon of the same tier that isn't full
// Try to find an existing dungeon of the same tier AND bracket that isn't full
DungeonInstance? instance = null;
Guid dungeonId = Guid.Empty;
foreach (var (id, dungeon) in _dungeons)
{
if (dungeon.Tier == tier &&
dungeon.LevelBracketMin == bracketMin && // Must match bracket
dungeon.Simulation.Phase == DungeonPhase.Active &&
dungeon.Simulation.Players.Count < maxPlayersPerDungeon &&
(DateTime.UtcNow - dungeon.CreatedAt).TotalSeconds < 300) // Only join dungeons < 60s old
dungeon.IsJoinWindowOpen) // Use join window instead of hardcoded time
{
instance = dungeon;
dungeonId = id;
_log.LogInformation("Player {Name} joining existing dungeon {Id} (tier {Tier}, {Players}/{Max} players)",
session.Character.Name, id, tier, dungeon.Simulation.Players.Count, maxPlayersPerDungeon);
_log.LogInformation("Player {Name} joining existing dungeon {Id} (tier {Tier}, bracket {Min}-{Max}, {Players}/{Max} players)",
session.Character.Name, id, tier, bracketMin, bracketMax, dungeon.Simulation.Players.Count, maxPlayersPerDungeon);
break;
}
}
@@ -371,7 +374,7 @@ public sealed class DungeonHandler : IClientMessageHandler
int seed = Random.Shared.Next();
var layout = DungeonGenerator.Generate(seed, tier);
var simulation = new DungeonSimulation(layout, tier, _mobDefinitions);
var simulation = new DungeonSimulation(layout, tier, _mobDefinitions, bracketMin);
instance = new DungeonInstance
{
@@ -379,13 +382,22 @@ public sealed class DungeonHandler : IClientMessageHandler
Tier = tier,
Seed = seed,
Simulation = simulation,
CreatedAt = DateTime.UtcNow
CreatedAt = DateTime.UtcNow,
LevelBracketMin = bracketMin,
LevelBracketMax = bracketMax,
CreatorLevel = playerLevel,
CreatorCharacterId = session.CharacterId,
CreatorName = session.Character.Name
};
_dungeons[dungeonId] = instance;
_log.LogInformation("Player {Name} created new dungeon {Id} (tier {Tier})", session.Character.Name, dungeonId, tier);
_log.LogInformation("Player {Name} (Level {Level}) created new dungeon {Id} (tier {Tier}, bracket {Min}-{Max})",
session.Character.Name, playerLevel, dungeonId, tier, bracketMin, bracketMax);
}
// Update last activity
instance.LastPlayerActivity = DateTime.UtcNow;
var layout2 = instance.Simulation.Layout;
// Add player to dungeon
@@ -1605,14 +1617,15 @@ public sealed class DungeonHandler : IClientMessageHandler
// Get active dungeons in player's bracket
var availableDungeons = _dungeons.Values
.Where(d => d.IsLevelInBracket(playerLevel) &&
d.Simulation.Phase == DungeonPhase.Active &&
.Where(d => d.Simulation.Phase == DungeonPhase.Active &&
!d.BossKilled)
.Select(d => new
{
id = d.Id.ToString(),
tier = d.Tier,
levelBracket = $"{d.LevelBracketMin}-{d.LevelBracketMax}",
bracketMin = d.LevelBracketMin,
bracketMax = d.LevelBracketMax,
creatorName = d.CreatorName,
creatorLevel = d.CreatorLevel,
playerCount = d.Simulation.Players.Count,
@@ -1625,19 +1638,19 @@ public sealed class DungeonHandler : IClientMessageHandler
.ThenByDescending(d => d.createdAt)
.ToList();
// Also load persisted dungeons from database
// Also load persisted dungeons from database (all of them, not filtered by bracket)
using var scope = _scopeFactory.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
var persistedDungeons = await db.Set<DungeonPersistence>()
.Where(d => d.LevelBracketMin == bracketMin &&
d.LevelBracketMax == bracketMax &&
!d.IsCleared)
.Where(d => !d.IsCleared)
.Select(d => new
{
id = d.Id.ToString(),
tier = d.Tier,
levelBracket = $"{d.LevelBracketMin}-{d.LevelBracketMax}",
bracketMin = d.LevelBracketMin,
bracketMax = d.LevelBracketMax,
creatorName = d.CreatorName,
creatorLevel = d.CreatorLevel,
playerCount = 0,
@@ -1671,7 +1684,35 @@ public sealed class DungeonHandler : IClientMessageHandler
var request = _ser.Deserialize<DungeonCreateRequest>(payload);
int tier = Math.Clamp(request.Tier, 1, 10);
int playerLevel = session.Character.Level;
var (bracketMin, bracketMax) = DungeonInstance.GetLevelBracket(playerLevel);
// Get player's natural bracket, but allow them to select different ones within ±50 levels
var (naturalBracketMin, naturalBracketMax) = DungeonInstance.GetLevelBracket(playerLevel);
int bracketMin, bracketMax;
if (request.BracketMin > 0)
{
// Player specified a bracket - validate it's within ±50 levels of player
bracketMin = request.BracketMin;
(bracketMin, bracketMax) = DungeonInstance.GetLevelBracket(bracketMin); // Normalize to valid bracket
// Check if bracket start is within ±50 of player level
if (Math.Abs(bracketMin - playerLevel) > 50)
{
await SendAsync(connection, DungeonOpCodes.DUNGEON_ENTER_RESULT, new
{
ok = false,
error = "bracket_out_of_range",
message = $"You can only create dungeons for brackets within 50 levels of your level ({playerLevel})"
}, ct);
return;
}
}
else
{
// Use player's natural bracket
bracketMin = naturalBracketMin;
bracketMax = naturalBracketMax;
}
var dungeonId = Guid.NewGuid();
int seed = Random.Shared.Next();
@@ -1727,13 +1768,9 @@ public sealed class DungeonHandler : IClientMessageHandler
// Validate level bracket
if (!instance.IsLevelInBracket(playerLevel))
{
await SendAsync(connection, DungeonOpCodes.DUNGEON_ENTER_RESULT, new
{
ok = false,
error = "level_out_of_range",
message = $"Your level ({playerLevel}) is outside the dungeon's level bracket ({instance.LevelBracketMin}-{instance.LevelBracketMax})"
}, ct);
return;
// Players can join any bracket - just log a warning
_log.LogInformation("Player {Name} (Level {Level}) joining dungeon outside their bracket ({Min}-{Max})",
session.Character.Name, playerLevel, instance.LevelBracketMin, instance.LevelBracketMax);
}
// Check if full
@@ -1771,16 +1808,11 @@ public sealed class DungeonHandler : IClientMessageHandler
return;
}
// Validate level bracket
// Players can join any bracket - just log if outside their level
if (playerLevel < persisted.LevelBracketMin || playerLevel > persisted.LevelBracketMax)
{
await SendAsync(connection, DungeonOpCodes.DUNGEON_ENTER_RESULT, new
{
ok = false,
error = "level_out_of_range",
message = $"Your level ({playerLevel}) is outside the dungeon's level bracket ({persisted.LevelBracketMin}-{persisted.LevelBracketMax})"
}, ct);
return;
_log.LogInformation("Player {Name} (Level {Level}) joining persisted dungeon outside their bracket ({Min}-{Max})",
session.Character.Name, playerLevel, persisted.LevelBracketMin, persisted.LevelBracketMax);
}
// Restore dungeon from persistence
@@ -2786,6 +2818,7 @@ public class LootChestCloseRequest
public class DungeonCreateRequest
{
public int Tier { get; set; }
public int BracketMin { get; set; } // 0 = use player's natural bracket, otherwise specify bracket start level
}
public class DungeonJoinRequest
+1 -1
View File
@@ -108,7 +108,7 @@ public class DungeonSimulation
if (mobDef == null) continue;
// Use bracket-aware stat scaling
var stats = mobDef.GetStatsForTierAndBracket(Tier, BracketMin);
var stats = mobDef.GetStatsForBracket(BracketMin);
Mobs[mobSpawn.Id] = new MobInstance
{
+9 -15
View File
@@ -115,19 +115,13 @@ public class DungeonMobDefinition
set { AbilitiesJson = JsonSerializer.Serialize(value); }
}
/// <summary>
/// Calculate scaled stats for a specific dungeon tier
/// </summary>
public DungeonMobCombatStats GetStatsForTier(int tier)
{
return GetStatsForTierAndBracket(tier, 1); // Default to bracket 1 for backwards compatibility
}
/// <summary>
/// Calculate scaled stats for a specific dungeon tier and level bracket
/// Calculate scaled stats for a specific level bracket
/// Level bracket scaling: each bracket adds 15% to base stats
/// </summary>
public DungeonMobCombatStats GetStatsForTierAndBracket(int tier, int bracketMin)
public DungeonMobCombatStats GetStatsForBracket(int bracketMin)
{
// Calculate bracket number (1-10 = bracket 1, 11-20 = bracket 2, etc.)
int bracketNumber = Math.Max(1, (bracketMin - 1) / 10 + 1);
@@ -137,17 +131,17 @@ public class DungeonMobDefinition
return new DungeonMobCombatStats
{
MaxHealth = (int)(BaseHealth * Math.Pow(HealthPerTier, tier - 1) * bracketMultiplier),
PhysicalDamage = (int)(BasePhysicalDamage * Math.Pow(DamagePerTier, tier - 1) * bracketMultiplier),
MagicDamage = (int)(BaseMagicDamage * Math.Pow(DamagePerTier, tier - 1) * bracketMultiplier),
Armor = (int)(BaseArmor * Math.Pow(ArmorPerTier, tier - 1) * bracketMultiplier),
MagicResist = (int)(BaseMagicResist * Math.Pow(ArmorPerTier, tier - 1) * bracketMultiplier),
MaxHealth = (int)(BaseHealth * HealthPerTier * bracketMultiplier),
PhysicalDamage = (int)(BasePhysicalDamage * DamagePerTier * bracketMultiplier),
MagicDamage = (int)(BaseMagicDamage * DamagePerTier * bracketMultiplier),
Armor = (int)(BaseArmor * ArmorPerTier * bracketMultiplier),
MagicResist = (int)(BaseMagicResist * ArmorPerTier * bracketMultiplier),
MoveSpeed = MoveSpeed,
AttackRange = AttackRange,
AttackSpeed = AttackSpeed,
AggroRange = AggroRange,
LeashRange = LeashRange,
XpReward = (int)(BaseXp * Math.Pow(XpPerTier, tier - 1) * bracketMultiplier),
XpReward = (int)(BaseXp * XpPerTier * bracketMultiplier),
Resistances = Resistances
};
}