From d4f467656d5ec2a9bba37cce37e66744f0476851 Mon Sep 17 00:00:00 2001 From: dingo Date: Wed, 11 Feb 2026 15:00:04 -0500 Subject: [PATCH] Add HazardZone tile tint config and state payload --- Game/Dungeon/DungeonHandler.cs | 18 ++++++++ Game/Dungeon/DungeonSimulation.cs | 4 +- Game/Dungeon/ProjectileInstance.cs | 2 + .../20260211121000_AddHazardZoneTintFields.cs | 41 +++++++++++++++++++ Migrations/GameDbContextModelSnapshot.cs | 8 ++++ Services/Admin/Pages/Abilities/Edit.cshtml | 13 ++++++ Services/Admin/Pages/Abilities/Edit.cshtml.cs | 7 ++++ data/entities/MobAbilityDefinition.cs | 11 +++++ pending-clientChanges.md | 18 ++++++++ 9 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 Migrations/20260211121000_AddHazardZoneTintFields.cs diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index 71b9661..3f38403 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -2977,6 +2977,24 @@ public sealed partial class DungeonHandler : IClientMessageHandler backY = p.BackY }), + hazards = (sendSpatialThisTick ? sim.HazardZones.Values.Where(h => !spatialFiltering || IsNearby(h.X, h.Y)) : Enumerable.Empty()) + .Select(h => new + { + id = h.Id, + sourceMobId = h.SourceMobId, + x = h.X, + y = h.Y, + radius = h.Radius, + duration = h.Duration, + tickInterval = h.TickInterval, + nextTickIn = h.NextTickIn, + damagePerTick = h.DamagePerTick, + damageTypeKey = h.DamageTypeKey, + visualKey = h.VisualKey, + tintColor = h.TintColor, + tintOpacity = h.TintOpacity + }), + portals = sim.Portals.Values .Where(p => p.IsActive) .Select(p => new diff --git a/Game/Dungeon/DungeonSimulation.cs b/Game/Dungeon/DungeonSimulation.cs index e16fe34..0797bc3 100644 --- a/Game/Dungeon/DungeonSimulation.cs +++ b/Game/Dungeon/DungeonSimulation.cs @@ -1282,7 +1282,9 @@ public partial class DungeonSimulation Duration = ability.EffectDuration, NextTickIn = ability.DotTickInterval, DamageTypeKey = ability.DamageTypeKey, - VisualKey = ability.VisualEffectKey ?? "hazard_default" + VisualKey = ability.VisualEffectKey ?? "hazard_default", + TintColor = string.IsNullOrWhiteSpace(ability.HazardTintColor) ? "#ff5500" : ability.HazardTintColor, + TintOpacity = Math.Clamp(ability.HazardTintOpacity, 0f, 1f) }; HazardZones[hazard.Id] = hazard; diff --git a/Game/Dungeon/ProjectileInstance.cs b/Game/Dungeon/ProjectileInstance.cs index 3de5662..1710579 100644 --- a/Game/Dungeon/ProjectileInstance.cs +++ b/Game/Dungeon/ProjectileInstance.cs @@ -105,6 +105,8 @@ public class HazardZone public string DamageTypeKey { get; set; } = "fire"; public string VisualKey { get; set; } = "hazard_default"; + public string TintColor { get; set; } = "#ff5500"; + public float TintOpacity { get; set; } = 0.45f; } /// diff --git a/Migrations/20260211121000_AddHazardZoneTintFields.cs b/Migrations/20260211121000_AddHazardZoneTintFields.cs new file mode 100644 index 0000000..d4613a1 --- /dev/null +++ b/Migrations/20260211121000_AddHazardZoneTintFields.cs @@ -0,0 +1,41 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SystemRevivalServer.Migrations +{ + /// + public partial class AddHazardZoneTintFields : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "HazardTintColor", + table: "dungeon_mob_abilities", + type: "varchar(16)", + maxLength: 16, + nullable: false, + defaultValue: "#ff5500"); + + migrationBuilder.AddColumn( + name: "HazardTintOpacity", + table: "dungeon_mob_abilities", + type: "float", + nullable: false, + defaultValue: 0.45f); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "HazardTintColor", + table: "dungeon_mob_abilities"); + + migrationBuilder.DropColumn( + name: "HazardTintOpacity", + table: "dungeon_mob_abilities"); + } + } +} diff --git a/Migrations/GameDbContextModelSnapshot.cs b/Migrations/GameDbContextModelSnapshot.cs index e180771..0e3076e 100644 --- a/Migrations/GameDbContextModelSnapshot.cs +++ b/Migrations/GameDbContextModelSnapshot.cs @@ -1952,6 +1952,14 @@ namespace SystemRevivalServer.Migrations b.Property("HpThresholdBelow") .HasColumnType("float"); + b.Property("HazardTintColor") + .IsRequired() + .HasMaxLength(16) + .HasColumnType("varchar(16)"); + + b.Property("HazardTintOpacity") + .HasColumnType("float"); + b.Property("IsEnabled") .HasColumnType("tinyint(1)"); diff --git a/Services/Admin/Pages/Abilities/Edit.cshtml b/Services/Admin/Pages/Abilities/Edit.cshtml index 4bb50a0..26baa11 100644 --- a/Services/Admin/Pages/Abilities/Edit.cshtml +++ b/Services/Admin/Pages/Abilities/Edit.cshtml @@ -195,6 +195,19 @@

0.5 = 50% slow

+
+ +
+ + +
+

Used by HazardZone tile tint

+
+
+ + +

0 = invisible, 1 = solid

+
diff --git a/Services/Admin/Pages/Abilities/Edit.cshtml.cs b/Services/Admin/Pages/Abilities/Edit.cshtml.cs index 9ce1eff..fa70297 100644 --- a/Services/Admin/Pages/Abilities/Edit.cshtml.cs +++ b/Services/Admin/Pages/Abilities/Edit.cshtml.cs @@ -88,12 +88,17 @@ public class EditModel : AdminPageModel AnimationKey = Ability.AnimationKey, SoundEffectKey = Ability.SoundEffectKey, VisualEffectKey = Ability.VisualEffectKey, + HazardTintColor = Ability.HazardTintColor, + HazardTintOpacity = Math.Clamp(Ability.HazardTintOpacity, 0f, 1f), IsEnabled = true }; _db.MobAbilityDefinitions.Add(newAbility); await _db.SaveChangesAsync(); return RedirectToPage(new { id = newAbility.Id }); } + + Ability.HazardTintColor = string.IsNullOrWhiteSpace(Ability.HazardTintColor) ? "#ff5500" : Ability.HazardTintColor; + Ability.HazardTintOpacity = Math.Clamp(Ability.HazardTintOpacity, 0f, 1f); if (Ability.Id == 0) { @@ -147,6 +152,8 @@ public class EditModel : AdminPageModel existing.AnimationKey = Ability.AnimationKey; existing.SoundEffectKey = Ability.SoundEffectKey; existing.VisualEffectKey = Ability.VisualEffectKey; + existing.HazardTintColor = Ability.HazardTintColor; + existing.HazardTintOpacity = Ability.HazardTintOpacity; existing.IsEnabled = Ability.IsEnabled; existing.UpdatedAt = DateTime.UtcNow; diff --git a/data/entities/MobAbilityDefinition.cs b/data/entities/MobAbilityDefinition.cs index d114974..69129af 100644 --- a/data/entities/MobAbilityDefinition.cs +++ b/data/entities/MobAbilityDefinition.cs @@ -135,6 +135,17 @@ public class MobAbilityDefinition ///
[MaxLength(64)] public string? VisualEffectKey { get; set; } + + /// + /// Tile tint color for HazardZone abilities (hex, e.g. "#ff5500") + /// + [MaxLength(16)] + public string HazardTintColor { get; set; } = "#ff5500"; + + /// + /// Tile tint opacity for HazardZone abilities (0 to 1) + /// + public float HazardTintOpacity { get; set; } = 0.45f; public bool IsEnabled { get; set; } = true; diff --git a/pending-clientChanges.md b/pending-clientChanges.md index a331cfd..385ddaf 100644 --- a/pending-clientChanges.md +++ b/pending-clientChanges.md @@ -1,2 +1,20 @@ # Pending Client Changes +## HazardZone Tile Tinting (Ability Type 29) + +- `DUNGEON_STATE` now includes a top-level `hazards` array every tick. +- Each hazard item includes: + - `id` + - `sourceMobId` + - `x`, `y`, `radius` (world-space pixels) + - `duration` (seconds remaining) + - `tickInterval`, `nextTickIn` + - `damagePerTick`, `damageTypeKey` + - `visualKey` + - `tintColor` (hex from ability config, ex: `#ff5500`) + - `tintOpacity` (0..1 from ability config) +- Client behavior: + - Render tile tint overlay for the area covered by each active hazard in `hazards`. + - Keep overlays synchronized to the current `hazards` list from each state packet. + - Remove overlay when a hazard no longer exists in the list (expired/removed server-side). + - If multiple hazards overlap, blend/stack tints in a deterministic order (recommend by `id` ascending).