Race Menu Ward: a buildable ward (2 wood, hammer/Misc, no crafting station) that manages your race outside the debug console - reset the race, switch between the server's boss progression and your own, and advance that personal progression by offering a boss's secondary drop to it. One is placed near the sacrificial stones on first load of a world, by the host only. BossProgressionManager grows a personal mode alongside the world one. The tier is stored on the character rather than the world, so a personal tier travels with the player between servers instead of being tied to whichever world unlocked it. resetrace and the ward now share RacesOfValheim.ResetRace so both paths clean up identical state. Also in progress, and NOT yet working: remote Trol sizing and remote Skadi flight. Both are computed from the observer instead of the observed - - Remote Trols are scaled from the observing player's own progression, and never show True Form, because SE_TrolTrueForm only exists on the transformed player's client. Each Trol now publishes its state and True Form flag onto its own ZDO for others to read. - Remote Skadi dragons sink to the terrain regardless of the altitude being replicated: Character.m_flying is only ever set on the flying player's client, so observers run grounded motion under gravity. Flight is mirrored through the ZDO and the remote copy's rigidbody gravity is disabled while it lasts. Neither has fixed the symptom yet, so both paths keep a throttled diagnostic log reporting what each observer actually computes. Committed to get the instrumentation onto the branch, not because it works. Packaging no longer hardcodes another machine's desktop path: Thunderstore and Nexus zips go to dist/ on Release builds only, and the DLL is copied into Valheim only when VALHEIM_INSTALL actually points at a plugins folder.
215 lines
8.9 KiB
C#
215 lines
8.9 KiB
C#
using HarmonyLib;
|
|
using UnityEngine;
|
|
|
|
namespace RacesOfValheim
|
|
{
|
|
[HarmonyPatch(typeof(VisEquipment), "UpdateColors")]
|
|
public static class TrolSkinColorPatch
|
|
{
|
|
// Golden blonde hair
|
|
private static readonly Color HairColor = new Color(0.9f, 0.8f, 0.4f, 1f);
|
|
|
|
public static void Postfix(VisEquipment __instance)
|
|
{
|
|
if (!__instance.m_isPlayer) return;
|
|
Player player = __instance.GetComponent<Player>();
|
|
if (player == null) return;
|
|
|
|
// ZDO first (in-game + remote players), then m_customData fallback
|
|
// (main menu preview and first spawn frame  Player.m_localPlayer is null there)
|
|
// DO NOT check player == Player.m_localPlayer in the fallback.
|
|
string race = "Human";
|
|
ZNetView nview = player.GetComponent<ZNetView>();
|
|
if (nview != null && nview.IsValid())
|
|
race = nview.GetZDO().GetString("RacesOfValheim_Race", "Human");
|
|
else if (player.m_customData != null &&
|
|
player.m_customData.TryGetValue("Race", out string savedRace))
|
|
race = savedRace;
|
|
|
|
if (race != "Trol") return;
|
|
|
|
// Apply skin, hair, beard colors here...
|
|
if (__instance.m_bodyModel != null && __instance.m_bodyModel.material != null)
|
|
{
|
|
// Peacock blue (deep greenish-blue)
|
|
Color trolColor = new Color(0.1f, 0.6f, 0.7f, 1f);
|
|
__instance.m_bodyModel.material.SetColor("_SkinColor", trolColor);
|
|
}
|
|
|
|
// Hair
|
|
var hairInst = Traverse.Create(__instance).Field("m_hairItemInstance").GetValue<GameObject>();
|
|
if (hairInst != null)
|
|
foreach (var r in hairInst.GetComponentsInChildren<Renderer>())
|
|
if (r.material != null) r.material.SetColor("_SkinColor", HairColor);
|
|
|
|
// Beard
|
|
var beardInst = Traverse.Create(__instance).Field("m_beardItemInstance").GetValue<GameObject>();
|
|
if (beardInst != null)
|
|
foreach (var r in beardInst.GetComponentsInChildren<Renderer>())
|
|
if (r.material != null) r.material.SetColor("_SkinColor", HairColor);
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(VisEquipment), "UpdateVisuals")]
|
|
public static class Trol_VisEquipment_UpdateVisuals_Patch
|
|
{
|
|
public static string GetPlayerRace(VisEquipment visEq)
|
|
{
|
|
Player player = visEq.GetComponent<Player>();
|
|
if (player != null)
|
|
{
|
|
ZNetView nview = player.GetComponent<ZNetView>();
|
|
if (nview != null && nview.IsValid())
|
|
return nview.GetZDO().GetString("RacesOfValheim_Race", "Human");
|
|
// No Player.m_localPlayer check  works for menu preview too
|
|
if (player.m_customData != null &&
|
|
player.m_customData.TryGetValue("Race", out string r))
|
|
return r;
|
|
}
|
|
return "Human";
|
|
}
|
|
|
|
public static void Postfix(VisEquipment __instance)
|
|
{
|
|
if (!__instance.m_isPlayer) return;
|
|
string race = GetPlayerRace(__instance);
|
|
|
|
if (race == "Trol")
|
|
{
|
|
// Apply model changes here...
|
|
}
|
|
else
|
|
{
|
|
// Revert changes here if needed
|
|
}
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "Update")]
|
|
public static class Trol_PlayerUpdate_Patch
|
|
{
|
|
// Published by each player onto their own ZDO. The size a Trol should be depends on that
|
|
// Trol's progression and True Form, both of which used to be read from whoever happened to
|
|
// be looking - so observers sized remote Trols from their own tier, and never saw True
|
|
// Form at all because the status effect only exists on the transformed player's client.
|
|
public const string StateKey = "RacesOfValheim_State";
|
|
public const string TrueFormKey = "RacesOfValheim_TrolTrueForm";
|
|
|
|
private static float lastRemoteLog = 0f;
|
|
|
|
private static float ScaleForState(int state)
|
|
{
|
|
if (state >= 6) return 1.30f;
|
|
if (state >= 4) return 1.25f;
|
|
return 1.2f;
|
|
}
|
|
|
|
public static void Postfix(Player __instance)
|
|
{
|
|
if (__instance == null) return;
|
|
|
|
ZNetView nview = __instance.GetComponent<ZNetView>();
|
|
bool zdoReady = nview != null && nview.IsValid();
|
|
|
|
string race = "Human";
|
|
if (zdoReady) race = nview.GetZDO().GetString("RacesOfValheim_Race", "Human");
|
|
else if (__instance.m_customData != null && __instance.m_customData.TryGetValue("Race", out string savedRace)) race = savedRace;
|
|
|
|
bool isLocal = __instance == Player.m_localPlayer;
|
|
bool isTrueFormActive;
|
|
int state;
|
|
|
|
if (isLocal)
|
|
{
|
|
state = BossProgressionManager.GetCurrentProgressionState();
|
|
isTrueFormActive = __instance.GetSEMan() != null &&
|
|
__instance.GetSEMan().HaveStatusEffect("SE_TrolTrueForm".GetStableHashCode());
|
|
|
|
// Publish so everyone else can size this character correctly.
|
|
if (zdoReady)
|
|
{
|
|
nview.GetZDO().Set(StateKey, state);
|
|
nview.GetZDO().Set(TrueFormKey, isTrueFormActive);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
state = zdoReady ? nview.GetZDO().GetInt(StateKey, BossProgressionManager.MinState) : BossProgressionManager.MinState;
|
|
isTrueFormActive = zdoReady && nview.GetZDO().GetBool(TrueFormKey, false);
|
|
}
|
|
|
|
GameObject visual = Traverse.Create(__instance).Field("m_visual").GetValue<GameObject>();
|
|
if (visual == null) return;
|
|
|
|
float targetScale = ScaleForState(state);
|
|
|
|
// TEMPORARY: remote Trol sizing still is not showing up for observers and static
|
|
// reading has not explained why, so report what each observer actually computes.
|
|
if (!isLocal && Time.time - lastRemoteLog > 2f)
|
|
{
|
|
lastRemoteLog = Time.time;
|
|
Jotunn.Logger.LogInfo(
|
|
$"[TrolSync] remote '{__instance.GetPlayerName()}' race='{race}' zdoReady={zdoReady} " +
|
|
$"state={state} trueForm={isTrueFormActive} target={targetScale:F2} " +
|
|
$"currentScale={visual.transform.localScale.x:F2} rootScale={__instance.transform.localScale.x:F2}");
|
|
}
|
|
|
|
if (race == "Trol")
|
|
{
|
|
// Prevent overriding scale while transforming or in True Form
|
|
bool isTransforming = isLocal && TrolRace.Instance != null && TrolRace.Instance.isTransforming;
|
|
|
|
if (!isTrueFormActive && !isTransforming &&
|
|
visual.transform.localScale != new Vector3(targetScale, targetScale, targetScale))
|
|
{
|
|
visual.transform.localScale = new Vector3(targetScale, targetScale, targetScale);
|
|
}
|
|
}
|
|
else if (visual.transform.localScale == new Vector3(targetScale, targetScale, targetScale))
|
|
{
|
|
// Reset scale if not Trol
|
|
visual.transform.localScale = Vector3.one;
|
|
}
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "GetMaxCarryWeight")]
|
|
public static class Trol_GetMaxCarryWeight_Patch
|
|
{
|
|
public static void Postfix(Player __instance, ref float __result)
|
|
{
|
|
if (__instance == null) return;
|
|
|
|
string race = "Human"; ZNetView nview = __instance.GetComponent<ZNetView>(); if (nview != null && nview.IsValid()) race = nview.GetZDO().GetString("RacesOfValheim_Race", "Human"); else if (__instance.m_customData != null && __instance.m_customData.TryGetValue("Race", out string savedRace)) race = savedRace; if (race == "Trol")
|
|
{
|
|
// Base carry weight is 300. We add 200 to make it 500.
|
|
// If they wear Megingjord, it will become 500 + 150 = 650.
|
|
__result += 200f;
|
|
|
|
int state = BossProgressionManager.GetCurrentProgressionState();
|
|
if (state >= 4)
|
|
{
|
|
__result += 50f; // After Bonemass
|
|
}
|
|
if (state >= 6)
|
|
{
|
|
__result += 50f; // After Yagluth
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "GetBodyArmor")]
|
|
public static class Trol_GetBodyArmor_Patch
|
|
{
|
|
public static void Postfix(Player __instance, ref float __result)
|
|
{
|
|
if (__instance == Player.m_localPlayer && TrolRace.IsTrol())
|
|
{
|
|
// +3 Armor per progression state (boss defeated)
|
|
int state = BossProgressionManager.GetCurrentProgressionState();
|
|
__result += 3f * state;
|
|
}
|
|
}
|
|
}
|
|
}
|