RacesOfValheim/JotunnModStub/Skeleton/SkeletonProgression.cs
kanym 8c24ae3340 fix(skeleton): Summon on Kill was completely dead - fix the whole chain
Queen/Fader-tier Skeletons were supposed to raise a tamed ally from every
kill, but nothing ever spawned. Several independent bugs stacked up:

- Kill attribution failed whenever the death blow was a poison DOT tick
  (SE_Poison builds its own attacker-less HitData every second, and
  Character.ApplyDamage overwrites m_lastHit on every one of those ticks).
  Since PoisonAttacks bakes bonus poison onto every Skeleton hit from
  Bonemass on, this was the common case, not an edge case. Character_Damage_Patch
  now tracks recent player hits per ZDOID as a fallback (RecentSkeletonHits),
  the same pattern Aswid's own life-drain-kill check already uses.
- SummonPrefabName pointed at "Skeleton_friendly", which isn't a real
  prefab (confirmed against the live ZNetScene registry). Reuses the
  Bound Bone Pile's own SkeletonThrall_Melee instead - tamed, loot-stripped,
  forced-melee, and already proven to work.
- The rise VFX names ("vfx_skeleton_spawn", "vfx_bloodmagic_aoe") were
  guesses that never existed either; fx_summon_skeleton_spawn is the real
  one. Same fix applied to the pre-existing Auto-Resurrect effect, which
  had the identical wrong names.
- The actual "climbing out of the ground" motion is a separate Animator
  bool ("wakeup") set via ZSyncAnimation - the exact call vanilla's own
  CreatureSpawner makes. Without it the model was simply active from
  frame one, VFX playing around a skeleton that was already standing.
- Vanilla skeletons carry no Tameable component, which spammed "is tamed
  but missing tameable or monster AI script!" every time a raised one
  landed a hit. Same fix Fenrir already uses for the Ulv and Fenring:
  copy one in from the vanilla Wolf, done once at prefab registration so
  it also quietly fixes the Bound Bone Pile's own thralls.
- Added RaisedThrall.SetExpiry(), a station-independent hard lifespan -
  these skeletons are never bound to a pile, so the existing anchor/wither
  pair had nothing to key off. Summoned skeletons now wither 2 minutes
  after being raised.

Also adds a permanent `listprefabs <substring>` debug console command -
queries the live ZNetScene registry directly, which is how the wrong
prefab/VFX names above were actually confirmed rather than guessed.
2026-08-29 16:01:23 +02:00

134 lines
5.3 KiB
C#

using System;
namespace RacesOfValheim
{
public static class SkeletonProgression
{
public static float GetMaxHealthBonus(int state)
{
if (state == 0) return 0f;
if (state == 1) return 50f;
if (state == 2) return 80f;
if (state == 3) return 110f;
if (state == 4) return 140f;
if (state == 5) return 170f;
if (state == 6) return 200f;
if (state == 7) return 230f;
if (state >= 8) return 275f;
return 50f;
}
public struct SkeletonRules
{
public float LifestealPercent;
public bool EnhancedRegen;
public bool PoisonImmunity;
public bool PoisonAttacks;
public bool AutoResurrect;
public bool SummonOnKill;
public int MaxSummons;
public string SummonPrefab;
public bool AutoStunFirstHit;
public bool FireAura;
public string ModelPrefab;
public UnityEngine.Vector3 ScaleMultiplier;
}
public const string BaseModel = "Skeleton";
public const string PoisonModel = "Skeleton_Poison";
// The model worn from Moder on. It used to arrive at Fader; if that is preferred, move it
// and its scale back to the state >= 8 block - nothing else in this file depends on where
// they sit.
public const string FireModel = "Skeleton_Hildir";
// Hildir's skeleton is built on the same rig as the plain one, so it needs no reshaping to
// read as a player - unlike the charred twitcher this replaced, which is broader and
// shorter and wore a 0.85/1.20/0.85 squeeze to compensate. Tied to the model, not a tier.
public static readonly UnityEngine.Vector3 FireModelScale = UnityEngine.Vector3.one;
// Reuses the Bound Bone Pile's own melee thrall (SkeletonBonePile.ThrallMeleeName) rather
// than a standalone prefab, so a Queen/Fader kill raises the same tamed, loot-stripped,
// forced-melee skeleton the pile does - not a separate, unproven asset. "Skeleton_friendly"
// was tried first and never resolved to a real prefab; see the mod's own log for the
// "no prefab in the cache" warning that caught it.
public const string SummonPrefabName = SkeletonBonePile.ThrallMeleeName;
// Fader's dead stand taller than everyone else's. Applied to the player's root transform,
// which is how this race has always sized itself - so it carries the collider, the camera
// pivot and every equipment attachment up with it, rather than only the mesh.
public static readonly UnityEngine.Vector3 FaderScale = UnityEngine.Vector3.one * 1.15f;
/// <summary>
/// Every tier, exactly as the race's published progression describes it. The table had
/// drifted a long way from that description - poison immunity arrived two tiers late,
/// auto-stun four tiers late, and lifesteal jumped 20/30/40 instead of climbing in fives -
/// which is what players were reporting as "progression doesn't work".
///
/// The blocks are cumulative: each one only states what its boss adds or replaces.
/// </summary>
public static SkeletonRules GetRules(int state)
{
SkeletonRules rules = new SkeletonRules
{
LifestealPercent = 0f,
EnhancedRegen = false,
PoisonImmunity = false,
PoisonAttacks = false,
AutoResurrect = false,
SummonOnKill = false,
MaxSummons = 0,
SummonPrefab = "",
AutoStunFirstHit = false,
FireAura = false,
ModelPrefab = BaseModel,
ScaleMultiplier = UnityEngine.Vector3.one
};
if (state >= 2) // Eikthyr
{
rules.ModelPrefab = PoisonModel;
rules.PoisonImmunity = true;
rules.LifestealPercent = 0.05f;
}
if (state >= 3) // The Elder
{
rules.LifestealPercent = 0.10f;
rules.AutoStunFirstHit = true;
}
if (state >= 4) // Bonemass
{
rules.LifestealPercent = 0.15f;
rules.PoisonAttacks = true;
}
if (state >= 5) // Moder
{
rules.LifestealPercent = 0.20f;
rules.ModelPrefab = FireModel;
rules.ScaleMultiplier = FireModelScale;
rules.FireAura = true;
rules.EnhancedRegen = true;
}
if (state >= 6) // Yagluth
{
rules.LifestealPercent = 0.25f;
rules.AutoResurrect = true;
}
if (state >= 7) // The Queen
{
rules.LifestealPercent = 0.30f;
rules.SummonOnKill = true;
rules.MaxSummons = 3;
rules.SummonPrefab = SummonPrefabName;
}
if (state >= 8) // Fader
{
rules.LifestealPercent = 0.35f;
rules.MaxSummons = 5;
rules.ScaleMultiplier = FaderScale;
}
return rules;
}
}
}