Merge branch 'main' into race-chains-and-stations

# Conflicts:
#	JotunnModStub/Aswid/AswidRace.cs
#	JotunnModStub/Factions/FactionHostilityPatch.cs
#	JotunnModStub/Factions/FactionMerchantCatalog.cs
#	JotunnModStub/Furling/FurlingPatches.cs
This commit is contained in:
kanym 2026-08-07 17:15:10 +02:00
commit f60b8d8f7d
48 changed files with 1865 additions and 380 deletions

View file

@ -0,0 +1,116 @@
using BepInEx.Configuration;
namespace RacesOfValheim
{
/// <summary>
/// Every tunable number behind the Draugh's abilities, bound as BepInEx ConfigEntry so they
/// show up in Configuration Manager without touching code - see
/// CONFIGURATION-MANAGER-HOWTO.md. Bound once, from RacesOfValheim.Awake(). One section per
/// topic (matches SkadiConfig/AswidConfig's layout) rather than one shared section, so each
/// shows up as its own entry in Configuration Manager's category list.
///
/// No keybinds here: every Draugh ability triggers automatically off a game event (a parry, a
/// hit taken, a hit landed, death) rather than a key press, unlike Skadi or Aswid.
///
/// Tier-gate thresholds (which progression state unlocks each ability) are left as-is, same
/// boundary drawn for Skadi's progression table - these are a differently-shaped piece of
/// config (per-tier unlock tables, not flat values).
/// </summary>
public static class DraughConfig
{
// ─── Passive combat (always active) ───────────────────────────────────
public static ConfigEntry<float> PhysicalResistMultiplier;
public static ConfigEntry<float> FireSpiritWeaknessMultiplier;
// ─── Sunken Menace (tier 2+: Wet heals instead of hurts) ─────────────────
public static ConfigEntry<float> WetHealthRegenMultiplier;
// ─── Rotting Edge (tier 3+: poison on hit, poison splash on parry) ──────
public static ConfigEntry<float> PoisonOnHitPercent;
public static ConfigEntry<float> ParryWindow;
public static ConfigEntry<float> PoisonSplashDamage;
// ─── Undead Fortitude (tier 4+: crit on staggered, death aura) ──────────
public static ConfigEntry<float> StaggerCritMultiplier;
public static ConfigEntry<float> DeathAuraRadius;
// ─── North Wind (tier 5+: AoE frost on parry, on the same cooldown) ──────
public static ConfigEntry<float> NorthWindCooldown;
public static ConfigEntry<float> NorthWindRadius;
public static ConfigEntry<float> NorthWindFrostDamage;
public static ConfigEntry<float> NorthWindPushForce;
// ─── Undying Will (tier 6+: survive death by burning Eitr) ──────────────
public static ConfigEntry<float> UndyingWillCooldown;
public static ConfigEntry<float> UndyingWillEitrDrainPerTick;
public static ConfigEntry<float> UndyingWillTickInterval;
// ─── Swarm of Terror (tier 7+: spawn friendly seeker brood on melee hits) ─
public static ConfigEntry<float> SwarmDetectionRadius;
public static ConfigEntry<float> SwarmSpawnCooldown;
public static ConfigEntry<int> SwarmSpawnCount;
public static ConfigEntry<float> SwarmBroodLifetime;
// ─── Steal Their Breath (tier 8+: cancel Undying Will death by a kill) ────
public static ConfigEntry<float> StealBreathHealPercent;
public static void Bind(ConfigFile config)
{
const string combat = "Draugh - Passive Combat";
PhysicalResistMultiplier = config.Bind(combat, "Physical Resist Multiplier", 0.8f,
new ConfigDescription("Multiplies incoming blunt/slash/pierce damage (0.8 = 20% resistance).", new AcceptableValueRange<float>(0f, 1f)));
FireSpiritWeaknessMultiplier = config.Bind(combat, "Fire/Spirit Weakness Multiplier", 1.5f,
new ConfigDescription("Multiplies incoming fire/spirit damage (1.5 = 50% weaker).", new AcceptableValueRange<float>(1f, 3f)));
const string sunkenMenace = "Draugh - Sunken Menace";
WetHealthRegenMultiplier = config.Bind(sunkenMenace, "Wet Health Regen Multiplier", 1.25f,
new ConfigDescription("Health regen multiplier while Wet, tier 2+ (Wet heals instead of hurting).", new AcceptableValueRange<float>(1f, 3f)));
const string rottingEdge = "Draugh - Rotting Edge";
PoisonOnHitPercent = config.Bind(rottingEdge, "Poison On Hit Percent", 0.20f,
new ConfigDescription("Fraction of physical damage dealt added as poison, tier 3+.", new AcceptableValueRange<float>(0f, 1f)));
ParryWindow = config.Bind(rottingEdge, "Parry Window", 0.25f,
new ConfigDescription("Seconds after a block still counts as a parry for Poison Splash/North Wind.", new AcceptableValueRange<float>(0.05f, 1f)));
PoisonSplashDamage = config.Bind(rottingEdge, "Poison Splash Damage", 40f,
new ConfigDescription("Flat poison damage dealt to whoever you parry, tier 3+.", new AcceptableValueRange<float>(0f, 200f)));
const string fortitude = "Draugh - Undead Fortitude";
StaggerCritMultiplier = config.Bind(fortitude, "Stagger Crit Multiplier", 1.30f,
new ConfigDescription("Multiplies physical damage dealt to staggered enemies, tier 4+.", new AcceptableValueRange<float>(1f, 3f)));
DeathAuraRadius = config.Bind(fortitude, "Death Aura Radius", 100f,
new ConfigDescription("Meters within which an ally's death drops Human Meat for you, tier 4+.", new AcceptableValueRange<float>(10f, 300f)));
const string northWind = "Draugh - North Wind";
NorthWindCooldown = config.Bind(northWind, "Cooldown", 20f,
new ConfigDescription("Seconds between North Wind triggers, tier 5+.", new AcceptableValueRange<float>(0f, 120f)));
NorthWindRadius = config.Bind(northWind, "Radius", 8f,
new ConfigDescription("Meters from you that North Wind damages.", new AcceptableValueRange<float>(1f, 30f)));
NorthWindFrostDamage = config.Bind(northWind, "Frost Damage", 50f,
new ConfigDescription("Flat frost damage dealt to everything in range.", new AcceptableValueRange<float>(0f, 200f)));
NorthWindPushForce = config.Bind(northWind, "Push Force", 20f,
new ConfigDescription("Knockback applied to everything hit.", new AcceptableValueRange<float>(0f, 100f)));
const string undyingWill = "Draugh - Undying Will";
UndyingWillCooldown = config.Bind(undyingWill, "Cooldown", 600f,
new ConfigDescription("Seconds between Undying Will triggers, tier 6+.", new AcceptableValueRange<float>(0f, 3600f)));
UndyingWillEitrDrainPerTick = config.Bind(undyingWill, "Eitr Drain Per Tick", 2f,
new ConfigDescription("Eitr spent per tick while surviving on borrowed time.", new AcceptableValueRange<float>(0f, 20f)));
UndyingWillTickInterval = config.Bind(undyingWill, "Tick Interval", 0.2f,
new ConfigDescription("Seconds between Eitr drain ticks.", new AcceptableValueRange<float>(0.05f, 2f)));
const string swarm = "Draugh - Swarm Of Terror";
SwarmDetectionRadius = config.Bind(swarm, "Melee Detection Radius", 5f,
new ConfigDescription("Meters within which a hit taken counts as melee and can trigger a spawn, tier 7+.", new AcceptableValueRange<float>(1f, 20f)));
SwarmSpawnCooldown = config.Bind(swarm, "Spawn Cooldown", 10f,
new ConfigDescription("Seconds between spawns.", new AcceptableValueRange<float>(0f, 60f)));
SwarmSpawnCount = config.Bind(swarm, "Spawn Count", 2,
new ConfigDescription("Friendly Seeker Broodlings spawned per trigger.", new AcceptableValueRange<int>(1, 10)));
SwarmBroodLifetime = config.Bind(swarm, "Brood Lifetime", 9.5f,
new ConfigDescription("Seconds a spawned broodling survives before it dies on its own.", new AcceptableValueRange<float>(1f, 60f)));
const string stealBreath = "Draugh - Steal Their Breath";
StealBreathHealPercent = config.Bind(stealBreath, "Heal Percent", 0.25f,
new ConfigDescription("Fraction of max health healed when a kill cancels an in-progress Undying Will death, tier 8+.", new AcceptableValueRange<float>(0f, 1f)));
}
}
}

View file

@ -120,14 +120,14 @@ namespace RacesOfValheim
if (!DraughRace.IsDraugh()) return;
// Apply specific damage modifiers for Draugh
// -20% damage received from slash, pierce, blunt
hit.m_damage.m_blunt *= 0.8f;
hit.m_damage.m_slash *= 0.8f;
hit.m_damage.m_pierce *= 0.8f;
// +50% damage received from fire, spirit
hit.m_damage.m_fire *= 1.5f;
hit.m_damage.m_spirit *= 1.5f;
float physResist = DraughConfig.PhysicalResistMultiplier.Value;
hit.m_damage.m_blunt *= physResist;
hit.m_damage.m_slash *= physResist;
hit.m_damage.m_pierce *= physResist;
float fireSpiritWeakness = DraughConfig.FireSpiritWeaknessMultiplier.Value;
hit.m_damage.m_fire *= fireSpiritWeakness;
hit.m_damage.m_spirit *= fireSpiritWeakness;
// Stage 4: Undead Fortitude (Poison Immunity)
if (BossProgressionManager.GetCurrentProgressionState() >= 4)

View file

@ -20,7 +20,7 @@ namespace RacesOfValheim
if (BossProgressionManager.GetCurrentProgressionState() >= 2)
{
// Invert the Wet debuff to actually heal the Draugh
__instance.m_healthRegenMultiplier = 1.25f; // +25% health regen
__instance.m_healthRegenMultiplier = DraughConfig.WetHealthRegenMultiplier.Value;
__instance.m_staminaRegenMultiplier = 1f; // No stamina penalty
__instance.m_tooltip = "The water restores your rotten flesh. Health regeneration increased.";
}
@ -47,20 +47,21 @@ namespace RacesOfValheim
float physDamage = hit.m_damage.m_blunt + hit.m_damage.m_slash + hit.m_damage.m_pierce + hit.m_damage.m_chop;
if (physDamage > 0f && hit.m_skill != Skills.SkillType.BloodMagic && hit.m_skill != Skills.SkillType.ElementalMagic)
{
// Add poison damage based on the physical damage (e.g., 20% of physical damage as poison DoT)
hit.m_damage.m_poison += physDamage * 0.20f;
// Add poison damage based on the physical damage
hit.m_damage.m_poison += physDamage * DraughConfig.PoisonOnHitPercent.Value;
}
}
if (BossProgressionManager.GetCurrentProgressionState() >= 4)
{
// Stage 4: Undead Fortitude (+30% crit damage on staggered enemies)
// Stage 4: Undead Fortitude (crit damage on staggered enemies)
if (__instance.IsStaggering())
{
hit.m_damage.m_blunt *= 1.30f;
hit.m_damage.m_slash *= 1.30f;
hit.m_damage.m_pierce *= 1.30f;
hit.m_damage.m_chop *= 1.30f;
float critMult = DraughConfig.StaggerCritMultiplier.Value;
hit.m_damage.m_blunt *= critMult;
hit.m_damage.m_slash *= critMult;
hit.m_damage.m_pierce *= critMult;
hit.m_damage.m_chop *= critMult;
}
}
}
@ -82,31 +83,31 @@ namespace RacesOfValheim
if (state >= 3)
{
// Check if it was a parry.
// Check if it was a parry.
float blockTimer = Traverse.Create(__instance).Field("m_blockTimer").GetValue<float>();
float parryTime = 0.25f; // Default Valheim parry window
float parryTime = DraughConfig.ParryWindow.Value;
if (blockTimer != -1f && blockTimer <= parryTime)
{
// Stage 3: Poison Splash
HitData poisonSplash = new HitData();
poisonSplash.m_damage.m_poison = 40f; // Flat base poison splash
poisonSplash.m_damage.m_poison = DraughConfig.PoisonSplashDamage.Value;
poisonSplash.m_point = attacker.GetCenterPoint();
poisonSplash.SetAttacker(__instance);
poisonSplash.m_dir = (attacker.GetCenterPoint() - __instance.GetCenterPoint()).normalized;
attacker.ApplyDamage(poisonSplash, true, false);
// Visual effect for splash
UnityEngine.Object.Instantiate(ZNetScene.instance.GetPrefab("vfx_OozeHit"), attacker.GetCenterPoint(), Quaternion.identity);
// Stage 5: North Wind (AoE Frost)
if (state >= 5)
{
if (Time.time - lastNorthWindTime >= 20f)
if (Time.time - lastNorthWindTime >= DraughConfig.NorthWindCooldown.Value)
{
lastNorthWindTime = Time.time;
// Visual effect for Nova (sledge frost effect)
GameObject iceHit = ZNetScene.instance.GetPrefab("vfx_sledge_iron_hit"); // Actually, vfx_ice_hit is better, or vfx_sledge_iron_hit which is used by Frostner
if (iceHit == null) iceHit = ZNetScene.instance.GetPrefab("vfx_ice_hit");
@ -115,25 +116,26 @@ namespace RacesOfValheim
UnityEngine.Object.Instantiate(iceHit, __instance.transform.position, Quaternion.identity);
}
// Find all characters within 8 meters
// Find all characters within range
float northWindRadius = DraughConfig.NorthWindRadius.Value;
List<Character> allCharacters = Character.GetAllCharacters();
foreach (Character ch in allCharacters)
{
if (ch == null || ch == __instance || ch.IsPlayer() || ch.IsDead()) continue;
if (Vector3.Distance(__instance.transform.position, ch.transform.position) <= 8f)
if (Vector3.Distance(__instance.transform.position, ch.transform.position) <= northWindRadius)
{
HitData northWind = new HitData();
northWind.m_damage.m_frost = 50f;
northWind.m_damage.m_frost = DraughConfig.NorthWindFrostDamage.Value;
northWind.m_point = ch.GetCenterPoint();
northWind.SetAttacker(__instance);
northWind.m_dir = (ch.GetCenterPoint() - __instance.GetCenterPoint()).normalized;
northWind.m_pushForce = 20f;
northWind.m_pushForce = DraughConfig.NorthWindPushForce.Value;
ch.ApplyDamage(northWind, true, false);
}
}
Player.m_localPlayer.Message(MessageHud.MessageType.TopLeft, "The northern wind blows");
}
}
@ -177,7 +179,7 @@ namespace RacesOfValheim
{
if (p.m_customData != null && p.m_customData.TryGetValue("Race", out string race) && race == "Draugh")
{
if (Vector3.Distance(__instance.transform.position, p.transform.position) <= 100f)
if (Vector3.Distance(__instance.transform.position, p.transform.position) <= DraughConfig.DeathAuraRadius.Value)
{
draughNearby = true;
break;
@ -229,7 +231,7 @@ namespace RacesOfValheim
}
float currentEitr = __instance.GetEitr();
if (currentEitr > 0f && Time.time - DraughRace.lastUndyingWillTime >= 600f) // 10 minutes
if (currentEitr > 0f && Time.time - DraughRace.lastUndyingWillTime >= DraughConfig.UndyingWillCooldown.Value)
{
// Trigger Undying Will!
DraughRace.lastUndyingWillTime = Time.time;
@ -279,12 +281,12 @@ namespace RacesOfValheim
if (hit == null || hit.GetAttacker() == null || hit.m_damage.GetTotalDamage() <= 0f) return;
// Melee check via distance
if (Vector3.Distance(hit.GetAttacker().transform.position, __instance.transform.position) <= 5f)
if (Vector3.Distance(hit.GetAttacker().transform.position, __instance.transform.position) <= DraughConfig.SwarmDetectionRadius.Value)
{
if (Time.time - DraughRace.lastSeekerSpawnTime >= 10f)
if (Time.time - DraughRace.lastSeekerSpawnTime >= DraughConfig.SwarmSpawnCooldown.Value)
{
DraughRace.lastSeekerSpawnTime = Time.time;
GameObject prefab = ObjectDB.instance.GetItemPrefab("SeekerBrood");
if (prefab == null)
{
@ -295,17 +297,17 @@ namespace RacesOfValheim
{
Player.m_localPlayer.Message(MessageHud.MessageType.Center, "Swarm of Terror!");
for (int i = 0; i < 2; i++)
for (int i = 0; i < DraughConfig.SwarmSpawnCount.Value; i++)
{
Vector3 spawnPos = __instance.transform.position + __instance.transform.forward * 1f + UnityEngine.Random.insideUnitSphere * 1.5f;
spawnPos.y = __instance.transform.position.y;
GameObject brood = UnityEngine.Object.Instantiate(prefab, spawnPos, Quaternion.identity);
Character c = brood.GetComponent<Character>();
if (c != null)
{
c.m_faction = Character.Faction.Players; // Make it friendly
// Remove drops
CharacterDrop drop = brood.GetComponent<CharacterDrop>();
if (drop != null)
@ -313,8 +315,7 @@ namespace RacesOfValheim
UnityEngine.Object.Destroy(drop);
}
// Kill after 9.5 seconds
DraughRace.Instance.StartCoroutine(DraughRace.Instance.KillBroodAfterTime(c, 9.5f));
DraughRace.Instance.StartCoroutine(DraughRace.Instance.KillBroodAfterTime(c, DraughConfig.SwarmBroodLifetime.Value));
}
}
}
@ -335,7 +336,7 @@ namespace RacesOfValheim
// Steal Their Breath triggered!
DraughRace.isUndying = false; // Break the routine loop
float healAmount = Player.m_localPlayer.GetMaxHealth() * 0.25f;
float healAmount = Player.m_localPlayer.GetMaxHealth() * DraughConfig.StealBreathHealPercent.Value;
Player.m_localPlayer.Heal(healAmount);
Player.m_localPlayer.Message(MessageHud.MessageType.Center, "Steal Their Breath! Death is denied.");

View file

@ -153,10 +153,9 @@ namespace RacesOfValheim
break;
}
// Drain 2 Eitr per tick (5 ticks per second = 10 eitr/sec)
p.UseEitr(2f);
yield return new WaitForSeconds(0.2f);
p.UseEitr(DraughConfig.UndyingWillEitrDrainPerTick.Value);
yield return new WaitForSeconds(DraughConfig.UndyingWillTickInterval.Value);
}
// Restore visuals