From ce5460791fff176f8ef87a97a8aeac87ef4de4cd Mon Sep 17 00:00:00 2001 From: Andrew Gilewsky Date: Wed, 3 Apr 2024 00:32:33 +0100 Subject: [PATCH] DRS duel minor fixes. --- .../Foray/DelubrumReginae/DRS2StygimolochWarrior/DRS2.cs | 1 + .../DelubrumReginae/DRS2StygimolochWarrior/Entrapment.cs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/DRS2.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/DRS2.cs index a10a6e352..6799fada3 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/DRS2.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/DRS2.cs @@ -15,6 +15,7 @@ class Coerce : Components.StatusDrivenForcedMarch public Coerce() : base(4, (uint)SID.ForwardMarch, (uint)SID.AboutFace, (uint)SID.LeftFace, (uint)SID.RightFace) { } } +[ModuleInfo(GroupType = BossModuleInfo.GroupType.CFC, GroupID = 761, NameID = 9754)] public class DRS2 : BossModule { public DRS2(WorldState ws, Actor primary) : base(ws, primary, new ArenaBoundsSquare(new(-160, 78), 17.5f)) { } diff --git a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/Entrapment.cs b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/Entrapment.cs index be0729d13..34dc3a8d5 100644 --- a/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/Entrapment.cs +++ b/BossMod/Modules/Shadowbringers/Foray/DelubrumReginae/DRS2StygimolochWarrior/Entrapment.cs @@ -32,10 +32,10 @@ public struct Pattern } protected TrapType TrapToTake; // note that 'normal' means none here + private readonly Pattern[] _allowedPatterns; private Pattern _curPattern; private BitMask _uncovered; private BitMask _exploded; - private Pattern[] _allowedPatterns; private BitMask _possiblePatterns; private Pattern _potentiallyUnsafe; private bool _possiblePatternsDirty; @@ -218,7 +218,7 @@ protected static BitMask BuildMask(params int[] bits) class EntrapmentNormal : Entrapment { - private static Pattern[] _allowedPatterns = [ + private readonly static Pattern[] _allowedPatterns = [ new() { Normal = BuildMask( 8, 9, 10, 11, 12, 13, 18, 20, 34, 35, 36, 37, 38, 40, 42, 45) }, new() { Normal = BuildMask( 8, 9, 11, 16, 19, 20, 21, 22, 26, 30, 32, 36, 40, 41, 42, 45) }, new() { Normal = BuildMask( 9, 11, 12, 13, 14, 16, 17, 27, 28, 32, 33, 38, 41, 42, 43, 44) }, @@ -231,7 +231,7 @@ public EntrapmentNormal() : base(_allowedPatterns) { } class EntrapmentInescapable : Entrapment { // TODO: don't think these patterns are actually correct... - private static Pattern[] _allowedPatterns = [ + private readonly static Pattern[] _allowedPatterns = [ new() { Normal = BuildMask(3, 8, 20, 25, 38, 43, 46, 49, 52), Toad = BuildMask(10, 50, 53), Ice = BuildMask(40), Mini = BuildMask(29) }, new() { Normal = BuildMask(2, 8, 11, 16, 25, 29, 38, 46), Toad = BuildMask(0, 4, 44), Ice = BuildMask(49), Mini = BuildMask(34) }, new() { Normal = BuildMask(5, 8, 11, 16, 18, 22, 24, 29, 43, 49, 53), Toad = BuildMask(6, 33, 38), Ice = BuildMask(4), Mini = BuildMask(48) },