843a29e7dc
## Summary After #2670, `BaseCreature` stores one master. Callers still reached it through three differently gated names plus hand-rolled combinations of the `Controlled`/`Summoned` flags. Each gate is now one named view: | Member | Definition | Meaning | |---|---|---| | `Master` | the reference; its setter does the follower bookkeeping; serialized as before | whoever the creature answers to | | `ControlMaster` | `Controlled ? Master : null` | the owner | | `SummonMaster` | `Summoned ? Master : null` | the summoner | | `GetMaster()` | `ControlMaster ?? SummonMaster` | who answers for the creature | `ControlMaster` and `SummonMaster` stay settable so custom code keeps compiling: both setters assign `Master`. There is no guard, so a write through either one can read back as null until the matching flag is set. An enraged creature is the one shape with a master and neither flag. It keeps its meer through `Master`, while `GetMaster()` stays null, so the meer never answers for it (notoriety, kill credit). Readers move onto the view they mean: - "Owner or summoner" pairs and `ControlMaster ?? SummonMaster` collapse into `GetMaster()`: pack instinct, familiars, golem, house access, mounts, pack horse, Solen friendship, spell target and guild checks, and the `[` pet command. - Checks such as `Controlled && ControlMaster == from` drop the flag the view already applies. Checks that don't reduce keep it: `Controlled && ControlMaster != from`, a possibly-null `from`, and `MageAI.CanDispel`'s `Summoned &&`. **No behavior change, save format unchanged** (the schema generator produces no diff). Edge cases for custom code and shard operators: - `SummonMaster = x` on a plain pet now replaces its owner (#2670 made that a no-op), and `ControlMaster = null` on an uncontrolled summon now clears its caster (it did nothing before). - `SpellHelper.GetGuildFor` no longer falls back to an enraged creature's meer. Meer mages have no guild. ## Docs - `dev-docs/content-patterns.md` § Masters: which view answers which question, how to set a master, and which flag checks are redundant. - `dev-docs/runuo-migration-docs/09-items-mobiles-creatures.md` § Masters: RunUO's two-field reads mapped onto the views, plus the gotcha for creatures that set `SummonMaster` without `Summoned` (the write compiles, the read now returns null; use `Master`). - The `modernuo-content-patterns` and `migrate-items-mobiles` skills point at both. ## Test plan - [x] `MasterViewsTests`: all four views across wild, pet, controlled summon, uncontrolled summon and enraged shapes; reassigning `Master` moves follower slots; `SetControlMaster(null)` keeps an uncontrolled summon's caster; deleting a summon returns the caster's slots - [x] Serialization tests updated to the new views (round-trip, legacy v22, v23 migration) - [x] UOContent.Tests (1178 passed, 2 skipped) and Server.Tests (907) green
62 lines
1.3 KiB
C#
62 lines
1.3 KiB
C#
using System;
|
|
using ModernUO.Serialization;
|
|
|
|
namespace Server.Mobiles;
|
|
|
|
[SerializationGenerator(0, false)]
|
|
public partial class DarkWolfFamiliar : BaseFamiliar
|
|
{
|
|
private DateTime m_NextRestore;
|
|
|
|
public DarkWolfFamiliar()
|
|
{
|
|
Body = 99;
|
|
Hue = 0x901;
|
|
BaseSoundID = 0xE5;
|
|
|
|
SetStr(100);
|
|
SetDex(90);
|
|
SetInt(90);
|
|
|
|
SetHits(60);
|
|
SetStam(90);
|
|
SetMana(0);
|
|
|
|
SetDamage(5, 10);
|
|
|
|
SetDamageType(ResistanceType.Physical, 100);
|
|
|
|
SetResistance(ResistanceType.Physical, 40, 50);
|
|
SetResistance(ResistanceType.Fire, 25, 40);
|
|
SetResistance(ResistanceType.Cold, 25, 40);
|
|
SetResistance(ResistanceType.Poison, 25, 40);
|
|
SetResistance(ResistanceType.Energy, 25, 40);
|
|
|
|
SetSkill(SkillName.Wrestling, 85.1, 90.0);
|
|
SetSkill(SkillName.Tactics, 50.0);
|
|
|
|
ControlSlots = 1;
|
|
}
|
|
|
|
public override string CorpseName => "a dark wolf corpse";
|
|
public override string DefaultName => "a dark wolf";
|
|
|
|
public override void OnThink()
|
|
{
|
|
base.OnThink();
|
|
|
|
if (Core.Now < m_NextRestore)
|
|
{
|
|
return;
|
|
}
|
|
|
|
m_NextRestore = Core.Now + TimeSpan.FromSeconds(2.0);
|
|
|
|
var caster = GetMaster();
|
|
|
|
if (caster != null)
|
|
{
|
|
++caster.Stam;
|
|
}
|
|
}
|
|
}
|