feat: regen buffs, wand aura, spellbook assess, indicator press flash
Four reports from one gate round. Three were mine; the fourth I first
mis-explained, and the correction is the useful part.
**The vital regeneration rates were never cast.** Regeneration (health),
Rejuvenation (stamina) and Mana Renewal (mana) all landed in the catch-all
Other bucket, which is off by default. Retail words each of the three
differently and two of the six phrasings do not begin with "Increases the
caster's" at all:
Increase caster's natural healing rate by 10%. <- and note "Increase"
Increases your Health Regeneration Rate by 50%. (Empyrean)
Increases the rate at which the caster regains Stamina by 10%.
Increases the caster's natural mana rate by 10%.
They are matched per vital, on by default, and ranked at the very tail of the
Life group so they finish the pass. The mana line had to be checked BEFORE the
generic "Increases the caster's X by N" match, which would otherwise read it as
a buff to a stat named "natural mana rate".
**Aura of Hermetic Link was the sixth aura line and the only one missed.**
"a magic casting implement's" is reached by none of the other alternatives, so
the wand's mana-conversion buff was silently in Other too.
**Right-clicking a spell in the spellbook did nothing.** I claimed this had
never worked; the user said it used to, and they were right -- I had checked
one file's history and concluded from it. The regression is 3e31b0ac, which
gave UiCatalogSlot its own RightClick case returning true unconditionally. On
any list that had not wired the examine seam -- the spellbook among them -- the
event was reported handled and UiRoot stopped bubbling. Two fixes: the row now
reports an unwired right-click UNHANDLED so bubbling continues, and the
spellbook wires the seam to the same appraisal window the spell bar uses.
Retail does this generically in the list rather than per window
(UIElement_ItemList::ListenToElementMessage @ 0x004E4F1F -> ExamineSpell
@ 0x00564A70), which is exactly why a per-controller seam could be forgotten
for one window and not another.
**No green flash when pressing an indicator.** Every indicator button authors
a full-size 0x100000F2 child whose DirectState is a draw-nothing File=0 image
and whose only other state, Normal_pressed, carries the green selector sprite
0x06004CE8 -- and the buttons author Normal_pressed with PassToChildren. But
UiButton.ConsumesDatChildren drops dat children at import, so the cascade had
nothing left to reach. The child is re-attached through the same repair the map
hotspot's rollover highlight already uses.
**tools/LayoutDump** is new, and is why the last two are diagnoses rather than
guesses: it prints an authored LayoutDesc tree -- geometry, edge modes, state
sets, PassToChildren, per-state media -- straight from the installed DATs.
"Does this button even have a pressed state?" was being answered by reading our
own importer and inferring; now it is read from the data.
Solution builds clean; 14,464 tests pass on the standard hermetic lane filter,
0 failures.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
fe1f124cd8
commit
46ce6f238c
14 changed files with 1003 additions and 18 deletions
|
|
@ -40,9 +40,15 @@ public sealed class BuffSettings
|
|||
public bool BuffBanes { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Anything else self-targeted with a duration (regeneration and friends).
|
||||
/// Off by default: useful to some characters, wasted mana for others, and
|
||||
/// it is the bucket anything unrecognised falls into.
|
||||
/// The vital regeneration rates — Regeneration (health), Rejuvenation
|
||||
/// (stamina), Mana Renewal (mana). Cast last, as the tail of a pass.
|
||||
/// </summary>
|
||||
public bool BuffRegeneration { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Anything else self-targeted with a duration. Off by default: useful to
|
||||
/// some characters, wasted mana for others, and it is the bucket anything
|
||||
/// unrecognised falls into.
|
||||
/// </summary>
|
||||
public bool BuffOther { get; set; }
|
||||
|
||||
|
|
@ -122,6 +128,7 @@ public static class BuffPlan
|
|||
BuffTargetKind.Protection => settings.BuffProtections,
|
||||
BuffTargetKind.Aura => settings.BuffAuras,
|
||||
BuffTargetKind.Bane => settings.BuffBanes,
|
||||
BuffTargetKind.Regeneration => settings.BuffRegeneration,
|
||||
BuffTargetKind.Other => settings.BuffOther,
|
||||
_ => false,
|
||||
};
|
||||
|
|
@ -187,7 +194,8 @@ public static class BuffPlan
|
|||
/// </list>
|
||||
/// </item>
|
||||
/// <item><b>Item Enchantment</b> — the banes and weapon auras.</item>
|
||||
/// <item><b>Life Magic</b> last — the protections and Armor Self.</item>
|
||||
/// <item><b>Life Magic</b> last — the protections and Armor Self, then
|
||||
/// the vital regeneration rates to finish.</item>
|
||||
/// </list>
|
||||
/// <para>
|
||||
/// <b>Willpower is matched as "Self".</b> Retail's spell is named Willpower
|
||||
|
|
@ -206,11 +214,23 @@ public static class BuffPlan
|
|||
_ => 3, // war/void and anything unschooled trail the rest
|
||||
};
|
||||
|
||||
// Only the creature group has an internal order; the other groups are
|
||||
// cast in whatever order the tiebreak gives.
|
||||
return (school * 10) + (school == 0 ? CreatureOrder(line) : 0);
|
||||
int within = school switch
|
||||
{
|
||||
0 => CreatureOrder(line),
|
||||
2 => LifeOrder(line),
|
||||
_ => 0, // the item group has no internal order
|
||||
};
|
||||
return (school * 10) + within;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Inside Life Magic the protections go first and the vital regeneration
|
||||
/// rates finish the pass — they are the buffs that matter least if mana
|
||||
/// runs out, and the ones a character most often wants topped up last.
|
||||
/// </summary>
|
||||
private static int LifeOrder(BuffLine line) =>
|
||||
line.Kind == BuffTargetKind.Regeneration ? 1 : 0;
|
||||
|
||||
private static int CreatureOrder(BuffLine line)
|
||||
{
|
||||
if (line.Kind == BuffTargetKind.Skill
|
||||
|
|
|
|||
|
|
@ -27,7 +27,13 @@ public enum BuffTargetKind
|
|||
/// though it is, in effect, a self buff.
|
||||
/// </summary>
|
||||
Bane,
|
||||
/// <summary>Any other self-targeted duration buff (regeneration and friends).</summary>
|
||||
/// <summary>
|
||||
/// A vital regeneration rate buff: Regeneration (health), Rejuvenation
|
||||
/// (stamina), Mana Renewal (mana), and their Empyrean/Prodigal kin. All
|
||||
/// Life Magic, and cast at the very end of a pass.
|
||||
/// </summary>
|
||||
Regeneration,
|
||||
/// <summary>Any other self-targeted duration buff.</summary>
|
||||
Other,
|
||||
}
|
||||
|
||||
|
|
@ -84,9 +90,13 @@ public static partial class BuffProfile
|
|||
/// Retail's own wording for the weapon/caster auras. Matched on the
|
||||
/// description rather than the "Aura of" name prefix so the older
|
||||
/// non-aura phrasings classify the same way.
|
||||
///
|
||||
/// "magic casting implement's" is the wand buff Aura of Hermetic Link, and
|
||||
/// it is the ONLY one of retail's six aura lines that none of the other
|
||||
/// alternatives reach -- it was silently landing in Other.
|
||||
/// </summary>
|
||||
[GeneratedRegex(
|
||||
@"\b(a weapon's|weapon or magic caster|magic caster|missile weapon's)\b",
|
||||
@"\b(a weapon's|weapon or magic caster|magic caster|missile weapon's|magic casting implement's)\b",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
|
||||
private static partial Regex AuraPattern();
|
||||
|
||||
|
|
@ -101,6 +111,36 @@ public static partial class BuffProfile
|
|||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
|
||||
private static partial Regex BanePattern();
|
||||
|
||||
/// <summary>
|
||||
/// The three vital-rate lines, matched one vital at a time. Retail words
|
||||
/// each of them differently and two of the six phrasings do not even begin
|
||||
/// with "Increases the caster's":
|
||||
/// <code>
|
||||
/// Increase caster's natural healing rate by 10%. (Regeneration)
|
||||
/// Increases your Health Regeneration Rate by 50%. (Empyrean)
|
||||
/// Increases the rate at which the caster regains Stamina by 10%. (Rejuvenation)
|
||||
/// Increases your Stamina Regeneration Rate by 50%. (Empyrean)
|
||||
/// Increases the caster's natural mana rate by 10%. (Mana Renewal)
|
||||
/// Increases your Mana Regeneration Rate by 50%. (Empyrean)
|
||||
/// </code>
|
||||
/// Note "Increase", not "Increases", in the health line — retail's own typo,
|
||||
/// which is exactly why matching a strict sentence shape lost these.
|
||||
/// </summary>
|
||||
[GeneratedRegex(
|
||||
"natural healing rate|Health Regeneration Rate",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
|
||||
private static partial Regex HealthRegenPattern();
|
||||
|
||||
[GeneratedRegex(
|
||||
"rate at which the caster regains Stamina|Stamina Regeneration Rate",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
|
||||
private static partial Regex StaminaRegenPattern();
|
||||
|
||||
[GeneratedRegex(
|
||||
"natural mana rate|Mana Regeneration Rate",
|
||||
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
|
||||
private static partial Regex ManaRegenPattern();
|
||||
|
||||
/// <summary>
|
||||
/// Retail's spell text says "Assess Monster" where the skill table says
|
||||
/// "Assess Creature". Without this the skill silently never matches and its
|
||||
|
|
@ -178,6 +218,30 @@ public static partial class BuffProfile
|
|||
return;
|
||||
}
|
||||
|
||||
// Regeneration before the generic "Increases the caster's X by N" match
|
||||
// further down, which would otherwise read Mana Renewal as a buff to a
|
||||
// stat named "natural mana rate".
|
||||
if (HealthRegenPattern().IsMatch(description))
|
||||
{
|
||||
kind = BuffTargetKind.Regeneration;
|
||||
target = "Health";
|
||||
return;
|
||||
}
|
||||
|
||||
if (StaminaRegenPattern().IsMatch(description))
|
||||
{
|
||||
kind = BuffTargetKind.Regeneration;
|
||||
target = "Stamina";
|
||||
return;
|
||||
}
|
||||
|
||||
if (ManaRegenPattern().IsMatch(description))
|
||||
{
|
||||
kind = BuffTargetKind.Regeneration;
|
||||
target = "Mana";
|
||||
return;
|
||||
}
|
||||
|
||||
// Auras next: "Increases a weapon's damage value" would otherwise be
|
||||
// read as raising something on the caster.
|
||||
if (AuraPattern().IsMatch(description))
|
||||
|
|
|
|||
|
|
@ -128,6 +128,8 @@ internal sealed class MossTankPanel
|
|||
$"Buff weapon auras: {OnOff(_buffSettings.BuffAuras)}";
|
||||
public string BanesText =>
|
||||
$"Buff banes (armor): {OnOff(_buffSettings.BuffBanes)}";
|
||||
public string RegenerationText =>
|
||||
$"Buff regen rates: {OnOff(_buffSettings.BuffRegeneration)}";
|
||||
public string OtherText =>
|
||||
$"Buff other self-spells: {OnOff(_buffSettings.BuffOther)}";
|
||||
|
||||
|
|
@ -159,6 +161,8 @@ internal sealed class MossTankPanel
|
|||
_buffSettings.BuffProtections = !_buffSettings.BuffProtections;
|
||||
public Action ToggleAuras => () => _buffSettings.BuffAuras = !_buffSettings.BuffAuras;
|
||||
public Action ToggleBanes => () => _buffSettings.BuffBanes = !_buffSettings.BuffBanes;
|
||||
public Action ToggleRegeneration =>
|
||||
() => _buffSettings.BuffRegeneration = !_buffSettings.BuffRegeneration;
|
||||
public Action ToggleOther => () => _buffSettings.BuffOther = !_buffSettings.BuffOther;
|
||||
|
||||
private static double Step(double value, int direction) =>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
vocabulary, and the toggle is just another Action.
|
||||
Adjuster buttons rather than typed fields, because editable text in a
|
||||
plugin panel needs keyboard routing plumbed through first. -->
|
||||
<panel x="40" y="120" w="360" h="404" title="MossTank — Settings" visible="{SettingsVisible}">
|
||||
<panel x="40" y="120" w="360" h="432" title="MossTank — Settings" visible="{SettingsVisible}">
|
||||
<label x="12" y="30" text="{DifficultyText}" color="#FFE8E4C8" />
|
||||
<button x="292" y="26" w="26" h="22" text="-" onclick="{DifficultyDown}" />
|
||||
<button x="322" y="26" w="26" h="22" text="+" onclick="{DifficultyUp}" />
|
||||
|
|
@ -43,8 +43,11 @@
|
|||
<label x="12" y="312" text="{BanesText}" color="#FF8F9C78" />
|
||||
<button x="292" y="308" w="56" h="22" text="toggle" onclick="{ToggleBanes}" />
|
||||
|
||||
<label x="12" y="340" text="{OtherText}" color="#FF8F9C78" />
|
||||
<button x="292" y="336" w="56" h="22" text="toggle" onclick="{ToggleOther}" />
|
||||
<label x="12" y="340" text="{RegenerationText}" color="#FF8F9C78" />
|
||||
<button x="292" y="336" w="56" h="22" text="toggle" onclick="{ToggleRegeneration}" />
|
||||
|
||||
<button x="12" y="368" w="108" h="26" text="Back" onclick="{CloseSettings}" />
|
||||
<label x="12" y="368" text="{OtherText}" color="#FF8F9C78" />
|
||||
<button x="292" y="364" w="56" h="22" text="toggle" onclick="{ToggleOther}" />
|
||||
|
||||
<button x="12" y="396" w="108" h="26" text="Back" onclick="{CloseSettings}" />
|
||||
</panel>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue