fix(skeleton): rise on resurrect, truce for bound troops, pile and sentry on floors

The Yagluth auto-resurrect now plays the crypt rise. The player rig has no
rise state, so the body is hidden and the skeleton model is worn for the
length of the clip with "wakeup" set; the start time goes on the ZDO so
other clients play it too. The player takes no damage and does not move
until it is out.

Wild faction mobs left the player alone but attacked the player's thralls,
which are tamed and so in the Players faction. IsEnemy now gives a thrall
the same truce through its m_commandingRace, broken by a grudge against
any player. Covers every race with thralls.

The Bound Bone Pile and the Bound Sentry seed drop m_groundPiece and
m_groundOnly, so both can be built on floors and foundations.
This commit is contained in:
kanym 2026-10-07 04:11:08 +02:00
commit 1848725f2a
6 changed files with 324 additions and 4 deletions

View file

@ -126,12 +126,43 @@ namespace RacesOfValheim
return player.m_customData.TryGetValue("Race", out string race) ? race : null;
}
// The truce used to cover the player only. A thrall is tamed, so it sits in the Players
// faction, and a wild mob of the player's own faction still saw it as fair game: a wild
// Rancid Remains walked up to a Skeleton's bone pile, ignored the Skeleton and tore into
// the garrison. The thrall's own race is on the prefab (m_commandingRace), so the same
// faction sets answer for it without needing its owner nearby.
//
// The truce breaks the moment that wild mob holds a grudge against any player: it is
// fighting the thralls' master, and the thralls should fight back.
private static bool IsThrallTruce(Character thrallSide, Character wildSide)
{
if (wildSide.IsPlayer() || wildSide.IsTamed()) return false;
RaisedThrall thrall = thrallSide.GetComponent<RaisedThrall>();
if (thrall == null || string.IsNullOrEmpty(thrall.m_commandingRace)) return false;
if (wildSide.GetComponent<RaisedThrall>() != null) return false;
if (!IsAlliedMob(thrall.m_commandingRace, wildSide.gameObject.name)) return false;
foreach (Player player in Player.GetAllPlayers())
{
if (RaceGrudge.Holds(wildSide, player)) return false;
}
return true;
}
public static void Postfix(Character a, Character b, ref bool __result)
{
if (!FactionsConfig.Hostility) return;
if (!__result) return; // already not enemies, nothing to add
if (a == null || b == null) return;
if (IsThrallTruce(a, b) || IsThrallTruce(b, a))
{
__result = false;
return;
}
Character playerCharacter = a.IsPlayer() ? a : (b.IsPlayer() ? b : null);
Character monster = a.IsPlayer() ? b : (b.IsPlayer() ? a : null);
if (!(playerCharacter is Player p) || monster == null) return;