SkeletonRace hides it every frame, but that script only ever runs for the local player in a loaded world - so the moment the body swap started working in the menu, the helmet came back with it. Hiding it from the visuals postfix instead covers the preview, remote players and the first frame after a race change, none of which reach SkeletonRace. Scaled to zero rather than deactivated, since Valheim re-enables the instance on every refresh, and restored only from zero so another race scaling the same helmet is left alone. Armour is untouched, as asked. fix(dvergar): stop the two-star tier turning back into a pink human The star offsets are authored against a dverger's own texture, where a brightened, desaturated result is a pale dverger. Ours multiplies the human skin texture, where the same result is white - and a white multiplier is no tint at all, which is exactly what two stars produced: an ordinary human. One star survived only because its offset was smaller. Saturation now has a floor and value a ceiling, so a tier can shift the colour but never wash it out. The resolved offsets and the colour each one lands on are logged once per session, so if a tier still reads wrong it can be tuned against the real numbers rather than by eye.
713 lines
34 KiB
C#
713 lines
34 KiB
C#
using HarmonyLib;
|
|
using UnityEngine;
|
|
using Jotunn.Managers;
|
|
using System.Linq;
|
|
namespace RacesOfValheim
|
|
{
|
|
public static class SkeletonPatches
|
|
{
|
|
// Cache the skeleton mesh and materials for performance
|
|
private static Mesh skeletonMesh = null;
|
|
private static Material[] skeletonMaterials = null;
|
|
|
|
// Model names already reported as missing. The body swap runs from a visual refresh, so
|
|
// without this a mistyped prefab id would log every time equipment changes.
|
|
private static readonly System.Collections.Generic.HashSet<string> warnedMissingModels =
|
|
new System.Collections.Generic.HashSet<string>();
|
|
|
|
// Model parts whose bone mapping has already been reported this session.
|
|
private static readonly System.Collections.Generic.HashSet<string> loggedBoneMaps =
|
|
new System.Collections.Generic.HashSet<string>();
|
|
|
|
private static void WarnMissingModelOnce(string prefabName)
|
|
{
|
|
if (!warnedMissingModels.Add(prefabName)) return;
|
|
|
|
Jotunn.Logger.LogWarning(
|
|
$"[Skeleton] Body model prefab '{prefabName}' not found - the race has no mesh at this tier. " +
|
|
"Check the id in SkeletonProgression.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Makes the Skeleton's max health exactly what its progression promises.
|
|
///
|
|
/// A Skeleton cannot eat, so SkeletonRace fakes three permanent foods whose values are
|
|
/// scaled to add up to the tier's bonus. That is a good way to keep food-based health
|
|
/// regeneration working - Valheim regenerates from the food list, so a Skeleton with no
|
|
/// food would never heal - but a bad way to land an exact number: the value the game reads
|
|
/// is Food.m_health, which UpdateFood recomputes every second as
|
|
/// Pow(remaining/burnTime, 0.3) * m_food, and anything that leaves those three foods
|
|
/// partly burnt, partly rebuilt or one short quietly costs health. A Bonemass-tier
|
|
/// Skeleton reported 95 max health where the table promises 25 + 140.
|
|
///
|
|
/// So the foods stay, for regeneration, and the total they feed into is overwritten here.
|
|
/// GetTotalFoodValue has exactly one caller, Player.UpdateFood, which passes the result
|
|
/// straight to SetMaxHealth - so this is the single point where the number is decided, and
|
|
/// it now comes from the progression table rather than from three scaled sausages.
|
|
/// </summary>
|
|
[HarmonyPatch(typeof(Player), "GetTotalFoodValue")]
|
|
public static class Player_GetTotalFoodValue_SkeletonHealth_Patch
|
|
{
|
|
public static void Postfix(Player __instance, ref float hp)
|
|
{
|
|
if (__instance != Player.m_localPlayer || !SkeletonRace.IsSkeleton()) return;
|
|
|
|
int state = BossProgressionManager.GetCurrentProgressionState();
|
|
hp = __instance.m_baseHP + SkeletonProgression.GetMaxHealthBonus(state);
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "UseStamina")]
|
|
public static class Player_UseStamina_Patch
|
|
{
|
|
public static bool Prefix(Player __instance)
|
|
{
|
|
if ((SkeletonRace.IsSkeleton() || AswidRace.IsAswid() || DraughRace.IsDraugh()) && __instance == Player.m_localPlayer)
|
|
{
|
|
// Infinite stamina: skip the original UseStamina method
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "ConsumeItem")]
|
|
public static class Player_ConsumeItem_Patch
|
|
{
|
|
public static bool Prefix(Player __instance, ItemDrop.ItemData item, ref bool __result)
|
|
{
|
|
if (__instance == Player.m_localPlayer)
|
|
{
|
|
if (SkeletonRace.IsSkeleton() && item.m_shared.m_itemType == ItemDrop.ItemData.ItemType.Consumable && (item.m_shared.m_food > 0 || item.m_shared.m_foodStamina > 0 || item.m_shared.m_foodEitr > 0))
|
|
{
|
|
__instance.Message(MessageHud.MessageType.Center, "Skeletons do not need to eat.");
|
|
__result = false;
|
|
return false;
|
|
}
|
|
else if (AswidRace.IsAswid() && !AswidRace.BypassAswidFoodCheck && item.m_shared.m_itemType == ItemDrop.ItemData.ItemType.Consumable && (item.m_shared.m_food > 0 || item.m_shared.m_foodStamina > 0 || item.m_shared.m_foodEitr > 0))
|
|
{
|
|
__instance.Message(MessageHud.MessageType.Center, "Mortal food disgusts you.");
|
|
__result = false;
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(MessageHud), "ShowMessage")]
|
|
public static class MessageHud_ShowMessage_Patch
|
|
{
|
|
private static System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<float>> messageTimestamps = new System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<float>>();
|
|
private static System.Collections.Generic.Dictionary<string, float> messageBans = new System.Collections.Generic.Dictionary<string, float>();
|
|
|
|
public static bool Prefix(MessageHud __instance, MessageHud.MessageType type, string text)
|
|
{
|
|
if (Player.m_localPlayer != null && SkeletonRace.IsSkeleton())
|
|
{
|
|
if (string.IsNullOrEmpty(text)) return true;
|
|
|
|
// Exception for resting messages to never be filtered
|
|
string lowerText = text.ToLower();
|
|
if (text == "$se_resting_name" || text == "$se_resting" || lowerText.Contains("resting") || lowerText.Contains("riposo"))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
float currentTime = Time.time;
|
|
|
|
// Check if message is currently banned (4 hours = 14400 seconds)
|
|
if (messageBans.TryGetValue(text, out float banTime))
|
|
{
|
|
if (currentTime - banTime < 14400f)
|
|
{
|
|
return false; // Still banned
|
|
}
|
|
else
|
|
{
|
|
messageBans.Remove(text); // Ban expired
|
|
if (messageTimestamps.ContainsKey(text))
|
|
{
|
|
messageTimestamps[text].Clear(); // Reset spam count
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!messageTimestamps.ContainsKey(text))
|
|
{
|
|
messageTimestamps[text] = new System.Collections.Generic.List<float>();
|
|
}
|
|
|
|
// Remove timestamps older than 5 seconds
|
|
messageTimestamps[text].RemoveAll(t => currentTime - t > 5f);
|
|
|
|
if (messageTimestamps[text].Count >= 2)
|
|
{
|
|
// Trigger a 4-hour ban
|
|
messageBans[text] = currentTime;
|
|
return false;
|
|
}
|
|
|
|
messageTimestamps[text].Add(currentTime);
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "Message")]
|
|
public static class Player_Message_Patch
|
|
{
|
|
public static bool Prefix(Player __instance, MessageHud.MessageType type, string msg)
|
|
{
|
|
if (__instance == Player.m_localPlayer)
|
|
{
|
|
if (msg == "$msg_eatanother" || msg.ToLower().Contains("eat") || msg.ToLower().Contains("mangiare") || msg.ToLower().Contains("boccone"))
|
|
{
|
|
if (AswidRace.IsAswid())
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Hud), "UpdateFood")]
|
|
public static class Hud_UpdateFood_Patch
|
|
{
|
|
private static readonly string[] foodElements = new string[]
|
|
{
|
|
"hudroot/healthpanel/foodicon",
|
|
"hudroot/healthpanel/foodicon (1)",
|
|
"hudroot/healthpanel/food0",
|
|
"hudroot/healthpanel/food1",
|
|
"hudroot/healthpanel/food2",
|
|
"hudroot/healthpanel/FoodText",
|
|
"hudroot/healthpanel/Food"
|
|
};
|
|
|
|
public static bool Prefix(Hud __instance, Player player)
|
|
{
|
|
try
|
|
{
|
|
if (player == Player.m_localPlayer && SkeletonRace.IsSkeleton())
|
|
{
|
|
if (__instance.m_foodBarRoot != null && __instance.m_foodBarRoot.gameObject.activeSelf)
|
|
{
|
|
__instance.m_foodBarRoot.gameObject.SetActive(false);
|
|
}
|
|
|
|
foreach (string path in foodElements)
|
|
{
|
|
Transform t = __instance.transform.Find(path);
|
|
if (t != null && t.gameObject.activeSelf)
|
|
{
|
|
t.gameObject.SetActive(false);
|
|
}
|
|
}
|
|
|
|
return false; // Safely skip original Valheim Hud.UpdateFood
|
|
}
|
|
else
|
|
{
|
|
if (__instance.m_foodBarRoot != null && !__instance.m_foodBarRoot.gameObject.activeSelf)
|
|
{
|
|
__instance.m_foodBarRoot.gameObject.SetActive(true);
|
|
}
|
|
|
|
foreach (string path in foodElements)
|
|
{
|
|
Transform t = __instance.transform.Find(path);
|
|
if (t != null && !t.gameObject.activeSelf)
|
|
{
|
|
t.gameObject.SetActive(true);
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|
|
catch (System.Exception e)
|
|
{
|
|
if (player == Player.m_localPlayer && SkeletonRace.IsSkeleton()) return false;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(VisEquipment), "UpdateVisuals")]
|
|
public static class VisEquipment_UpdateVisuals_Patch
|
|
{
|
|
public static void Postfix(VisEquipment __instance)
|
|
{
|
|
if (!__instance.m_isPlayer) return;
|
|
Player p = __instance.GetComponent<Player>();
|
|
if (p == null) return;
|
|
|
|
// Race and tier both come through SkeletonVisuals, which falls back to
|
|
// m_customData when there is no ZNetView. That is the whole of what was keeping
|
|
// the race off the main-menu character preview: the preview player carries its
|
|
// saved custom data but has no network view, so an unconditional ZDO read gave up
|
|
// before it could find out it was looking at a Skeleton.
|
|
string race = SkeletonVisuals.GetPlayerRace(p);
|
|
|
|
if (race == SkeletonVisuals.RaceId)
|
|
{
|
|
if (__instance.m_bodyModel != null)
|
|
{
|
|
// Ensure the base model is hidden
|
|
__instance.m_bodyModel.enabled = false;
|
|
|
|
int state = SkeletonVisuals.GetProgressionState(p);
|
|
SkeletonProgression.SkeletonRules rules = SkeletonProgression.GetRules(state);
|
|
string targetBodyName = $"SkeletonBody_{rules.ModelPrefab}";
|
|
|
|
// Check if we already created the Skeleton body for this VisEquipment
|
|
Transform parentTransform = __instance.m_bodyModel.transform.parent;
|
|
|
|
// Destroy old bodies if state changed
|
|
for (int i = parentTransform.childCount - 1; i >= 0; i--)
|
|
{
|
|
Transform child = parentTransform.GetChild(i);
|
|
if (child.name.StartsWith("SkeletonBody") && child.name != targetBodyName)
|
|
{
|
|
UnityEngine.Object.Destroy(child.gameObject);
|
|
}
|
|
}
|
|
|
|
Transform skeletonBodyTransform = parentTransform.Find(targetBodyName);
|
|
|
|
if (skeletonBodyTransform == null)
|
|
{
|
|
GameObject skelPrefab = PrefabManager.Cache.GetPrefab<GameObject>(rules.ModelPrefab);
|
|
if (skelPrefab == null)
|
|
{
|
|
// The human body was switched off two lines up, so an unresolved
|
|
// model leaves an invisible player rather than an obvious error.
|
|
// Say so once per tier instead of failing silently.
|
|
WarnMissingModelOnce(rules.ModelPrefab);
|
|
}
|
|
if (skelPrefab != null)
|
|
{
|
|
GameObject skelObj = new GameObject(targetBodyName);
|
|
skelObj.transform.SetParent(parentTransform, false);
|
|
|
|
SkinnedMeshRenderer[] smrs = skelPrefab.GetComponentsInChildren<SkinnedMeshRenderer>(true);
|
|
foreach (SkinnedMeshRenderer smr in smrs)
|
|
{
|
|
GameObject partObj = UnityEngine.Object.Instantiate(smr.gameObject, skelObj.transform);
|
|
partObj.name = smr.gameObject.name;
|
|
SkinnedMeshRenderer newSmr = partObj.GetComponent<SkinnedMeshRenderer>();
|
|
|
|
// Map bones by name
|
|
Transform[] playerBones = __instance.m_bodyModel.bones;
|
|
LogBoneMapping(rules.ModelPrefab, newSmr, playerBones);
|
|
|
|
Transform[] newBones = new Transform[newSmr.bones.Length];
|
|
for (int i = 0; i < newSmr.bones.Length; i++)
|
|
{
|
|
newBones[i] = ResolveBone(playerBones, newSmr.bones[i]);
|
|
}
|
|
newSmr.bones = newBones;
|
|
|
|
if (newSmr.rootBone != null)
|
|
{
|
|
newSmr.rootBone = ResolveBone(playerBones, newSmr.rootBone);
|
|
}
|
|
}
|
|
|
|
skeletonBodyTransform = skelObj.transform;
|
|
}
|
|
}
|
|
|
|
if (skeletonBodyTransform != null)
|
|
{
|
|
skeletonBodyTransform.gameObject.SetActive(true);
|
|
}
|
|
|
|
// Prevent Animator from freezing when body is disabled
|
|
Animator anim = __instance.GetComponentInChildren<Animator>();
|
|
if (anim != null)
|
|
{
|
|
anim.cullingMode = AnimatorCullingMode.AlwaysAnimate;
|
|
}
|
|
|
|
HideItemInstances(__instance, "m_hairItemInstances");
|
|
HideItemInstances(__instance, "m_beardItemInstances");
|
|
SetHelmetVisible(__instance, false);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Not a skeleton, ensure human body is visible and skeleton is hidden
|
|
if (__instance.m_bodyModel != null)
|
|
{
|
|
__instance.m_bodyModel.enabled = true;
|
|
Transform parentTransform = __instance.m_bodyModel.transform.parent;
|
|
if (parentTransform != null)
|
|
{
|
|
for (int i = 0; i < parentTransform.childCount; i++)
|
|
{
|
|
Transform child = parentTransform.GetChild(i);
|
|
if (child.name.StartsWith("SkeletonBody"))
|
|
{
|
|
child.gameObject.SetActive(false);
|
|
}
|
|
}
|
|
}
|
|
|
|
ShowItemInstances(__instance, "m_hairItemInstances");
|
|
ShowItemInstances(__instance, "m_beardItemInstances");
|
|
SetHelmetVisible(__instance, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// A helmet on a skull looks like a helmet floating in a skull, so the race hides it.
|
|
///
|
|
/// SkeletonRace does this every frame in a world, but it only ever runs for the local
|
|
/// player - which is why the helmet came back on the main-menu preview once the body
|
|
/// swap started working there. Doing it here covers the menu, remote players and the
|
|
/// first frame after a race change, all of which reach this postfix and none of which
|
|
/// reach SkeletonRace.
|
|
///
|
|
/// Scaled rather than deactivated, because Valheim re-enables the instance whenever it
|
|
/// refreshes visuals - the approach the Dvergar's hood already proved out.
|
|
/// </summary>
|
|
private static void SetHelmetVisible(VisEquipment visEq, bool visible)
|
|
{
|
|
GameObject helmet = Traverse.Create(visEq).Field<GameObject>("m_helmetItemInstance").Value;
|
|
if (helmet == null) return;
|
|
|
|
Vector3 wanted = visible ? Vector3.one : Vector3.zero;
|
|
|
|
// Only ever undo our own hiding: another race may legitimately be scaling this.
|
|
if (!visible && helmet.transform.localScale != Vector3.zero)
|
|
{
|
|
helmet.transform.localScale = wanted;
|
|
}
|
|
else if (visible && helmet.transform.localScale == Vector3.zero)
|
|
{
|
|
helmet.transform.localScale = wanted;
|
|
}
|
|
}
|
|
|
|
private static void HideItemInstances(VisEquipment visEq, string fieldName)
|
|
{
|
|
try
|
|
{
|
|
var field = typeof(VisEquipment).GetField(fieldName, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
|
|
if (field != null)
|
|
{
|
|
var list = field.GetValue(visEq) as System.Collections.Generic.List<GameObject>;
|
|
if (list != null)
|
|
{
|
|
foreach (GameObject go in list)
|
|
{
|
|
if (go != null) go.SetActive(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
catch (System.Exception e)
|
|
{
|
|
Jotunn.Logger.LogWarning($"Failed to hide {fieldName}: {e.Message}");
|
|
}
|
|
}
|
|
|
|
private static void ShowItemInstances(VisEquipment visEq, string fieldName)
|
|
{
|
|
try
|
|
{
|
|
var field = typeof(VisEquipment).GetField(fieldName, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
|
|
if (field != null)
|
|
{
|
|
var list = field.GetValue(visEq) as System.Collections.Generic.List<GameObject>;
|
|
if (list != null)
|
|
{
|
|
foreach (GameObject go in list)
|
|
{
|
|
if (go != null) go.SetActive(true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
catch (System.Exception e) { }
|
|
}
|
|
|
|
// Bones worth reporting on. Not remapped - the player rig has a real 'Jaw' bone and the
|
|
// name match lands on it correctly, which is exactly why the plain and poison skeletons
|
|
// always looked right. An earlier attempt pinned this group to the head instead and
|
|
// deformed all three models; the log is what settled it.
|
|
private static readonly string[] SkullParts = { "jaw", "teeth", "tooth", "tongue", "chin", "mandible" };
|
|
|
|
/// <summary>
|
|
/// Finds the player bone a creature bone should be skinned to.
|
|
/// </summary>
|
|
private static Transform ResolveBone(Transform[] playerBones, Transform sourceBone)
|
|
{
|
|
if (sourceBone == null) return playerBones[0];
|
|
|
|
Transform direct = FindBoneByName(playerBones, sourceBone.name);
|
|
if (direct != null) return direct;
|
|
|
|
// Nothing by that name. Follow the creature's own hierarchy upward until something
|
|
// matches, so an unmapped part rides its nearest real parent rather than being
|
|
// dumped on bones[0], which is the root.
|
|
for (Transform parent = sourceBone.parent; parent != null; parent = parent.parent)
|
|
{
|
|
Transform match = FindBoneByName(playerBones, parent.name);
|
|
if (match != null) return match;
|
|
}
|
|
|
|
return playerBones[0];
|
|
}
|
|
|
|
/// <summary>
|
|
/// Reports how a model's bones landed on the player rig, once per model per session.
|
|
/// The mandible problem is not diagnosable from a screenshot - it matters whether the
|
|
/// jaw has a bone at all, whether it matched something, and what it matched - and this
|
|
/// answers all three in one line each.
|
|
/// </summary>
|
|
private static void LogBoneMapping(string modelName, SkinnedMeshRenderer smr, Transform[] playerBones)
|
|
{
|
|
if (!loggedBoneMaps.Add($"{modelName}/{smr.name}")) return;
|
|
|
|
Jotunn.Logger.LogInfo($"[Skeleton] '{modelName}' part '{smr.name}': {smr.bones.Length} bones.");
|
|
|
|
foreach (Transform bone in smr.bones)
|
|
{
|
|
if (bone == null) continue;
|
|
|
|
string lower = bone.name.ToLower();
|
|
bool interesting = false;
|
|
foreach (string part in SkullParts)
|
|
{
|
|
if (lower.Contains(part)) { interesting = true; break; }
|
|
}
|
|
|
|
Transform resolved = ResolveBone(playerBones, bone);
|
|
bool isRootFallback = resolved == playerBones[0] &&
|
|
FindBoneByName(playerBones, bone.name) == null;
|
|
|
|
if (!interesting && !isRootFallback) continue;
|
|
|
|
// The rest pose comes with it. Three models share this rig bone for bone, yet
|
|
// only one of them wears its jaw wrongly - so the difference is in how that
|
|
// jaw is posed or bound, not in where it is mapped. Printing the source
|
|
// transform next to the player's own gives the exact correction to apply
|
|
// rather than another guess at it.
|
|
Transform playerEquivalent = FindBoneByName(playerBones, bone.name);
|
|
|
|
Jotunn.Logger.LogInfo(
|
|
$"[Skeleton] '{bone.name}' -> '{(resolved != null ? resolved.name : "null")}'" +
|
|
(isRootFallback ? " (ROOT FALLBACK)" : "") +
|
|
(interesting ? " (skull part)" : ""));
|
|
|
|
if (!interesting) continue;
|
|
|
|
Jotunn.Logger.LogInfo(
|
|
$"[Skeleton] source rest: pos={bone.localPosition:F4} " +
|
|
$"rot={bone.localRotation.eulerAngles:F2} scale={bone.localScale:F3}");
|
|
|
|
if (playerEquivalent != null)
|
|
{
|
|
Jotunn.Logger.LogInfo(
|
|
$"[Skeleton] player rest: pos={playerEquivalent.localPosition:F4} " +
|
|
$"rot={playerEquivalent.localRotation.eulerAngles:F2} scale={playerEquivalent.localScale:F3}");
|
|
}
|
|
}
|
|
}
|
|
|
|
private static Transform FindBoneByName(Transform[] bones, string skelBoneName)
|
|
{
|
|
// Exact match first
|
|
foreach (Transform b in bones)
|
|
{
|
|
if (b != null && b.name == skelBoneName) return b;
|
|
}
|
|
|
|
// Fuzzy match
|
|
string sName = skelBoneName.ToLower().Replace("skeleton_", "").Replace("skel_", "").Replace(" skeleton", "");
|
|
|
|
// Some specific Valheim mappings if needed
|
|
if (sName == "pelvis") sName = "hips";
|
|
if (sName == "clavicle.l") sName = "leftshoulder";
|
|
if (sName == "clavicle.r") sName = "rightshoulder";
|
|
if (sName == "upperarm.l") sName = "leftarm";
|
|
if (sName == "upperarm.r") sName = "rightarm";
|
|
if (sName == "lowerarm.l") sName = "leftforearm";
|
|
if (sName == "lowerarm.r") sName = "rightforearm";
|
|
if (sName == "thigh.l") sName = "leftupleg";
|
|
if (sName == "thigh.r") sName = "rightupleg";
|
|
if (sName == "calf.l") sName = "leftleg";
|
|
if (sName == "calf.r") sName = "rightleg";
|
|
|
|
foreach (Transform b in bones)
|
|
{
|
|
if (b != null)
|
|
{
|
|
string pName = b.name.ToLower();
|
|
if (pName == sName || pName.Contains(sName) || sName.Contains(pName))
|
|
{
|
|
return b;
|
|
}
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Character), "Damage")]
|
|
public static class Character_Damage_Patch
|
|
{
|
|
private static float lastStunTime = 0f;
|
|
|
|
public static bool Prefix(Character __instance, HitData hit)
|
|
{
|
|
if (Player.m_localPlayer == null) return true;
|
|
|
|
int state = BossProgressionManager.GetCurrentProgressionState();
|
|
var rules = SkeletonProgression.GetRules(state);
|
|
|
|
// Auto-Resurrect check
|
|
if (__instance == Player.m_localPlayer && SkeletonRace.IsSkeleton() && rules.AutoResurrect)
|
|
{
|
|
if (hit.GetTotalDamage() >= __instance.GetHealth())
|
|
{
|
|
if (!Player.m_localPlayer.GetSEMan().HaveStatusEffect("SE_SkeletonResurrectCooldown".GetStableHashCode()))
|
|
{
|
|
// Cancel death!
|
|
Player.m_localPlayer.Heal(Player.m_localPlayer.GetMaxHealth(), true);
|
|
Player.m_localPlayer.GetSEMan().AddStatusEffect("SE_SkeletonResurrectCooldown".GetStableHashCode(), true);
|
|
|
|
// Spawn VFX
|
|
GameObject vfx = PrefabManager.Cache.GetPrefab<GameObject>("vfx_skeleton_spawn") ??
|
|
PrefabManager.Cache.GetPrefab<GameObject>("vfx_bloodmagic_aoe");
|
|
if (vfx != null)
|
|
{
|
|
UnityEngine.Object.Instantiate(vfx, Player.m_localPlayer.transform.position, Quaternion.identity);
|
|
}
|
|
|
|
Player.m_localPlayer.Message(MessageHud.MessageType.Center, "You have been resurrected by dark magic!");
|
|
return false; // Skip applying this lethal damage
|
|
}
|
|
}
|
|
}
|
|
|
|
// Outgoing damage (Lifesteal, Poison, Stun)
|
|
Character attacker = hit.GetAttacker();
|
|
if (attacker != null && attacker == Player.m_localPlayer && SkeletonRace.IsSkeleton())
|
|
{
|
|
// Auto Stun
|
|
if (rules.AutoStunFirstHit && Time.time - lastStunTime > 5f)
|
|
{
|
|
hit.m_staggerMultiplier = 100f; // Force stagger
|
|
lastStunTime = Time.time;
|
|
}
|
|
|
|
// Poison Attacks
|
|
if (rules.PoisonAttacks)
|
|
{
|
|
hit.m_damage.m_poison += 20f; // Add flat 20 poison damage
|
|
}
|
|
|
|
// Lifesteal
|
|
if (rules.LifestealPercent > 0f)
|
|
{
|
|
float physDamage = hit.m_damage.m_blunt + hit.m_damage.m_slash + hit.m_damage.m_pierce;
|
|
if (physDamage > 0)
|
|
{
|
|
float healAmount = physDamage * rules.LifestealPercent;
|
|
Player.m_localPlayer.Heal(healAmount, true);
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Character), "OnDeath")]
|
|
public static class Character_OnDeath_Patch
|
|
{
|
|
public static System.Collections.Generic.List<Character> activeMinions = new System.Collections.Generic.List<Character>();
|
|
|
|
public static void Prefix(Character __instance)
|
|
{
|
|
if (Player.m_localPlayer == null || !SkeletonRace.IsSkeleton()) return;
|
|
|
|
HitData lastHit = HarmonyLib.Traverse.Create(__instance).Field("m_lastHit").GetValue<HitData>();
|
|
if (lastHit != null && lastHit.GetAttacker() == Player.m_localPlayer)
|
|
{
|
|
int state = BossProgressionManager.GetCurrentProgressionState();
|
|
var rules = SkeletonProgression.GetRules(state);
|
|
|
|
if (rules.SummonOnKill && !string.IsNullOrEmpty(rules.SummonPrefab))
|
|
{
|
|
// Clean up dead minions
|
|
activeMinions.RemoveAll(m => m == null || m.IsDead());
|
|
|
|
if (activeMinions.Count < rules.MaxSummons)
|
|
{
|
|
GameObject minionPrefab = PrefabManager.Cache.GetPrefab<GameObject>(rules.SummonPrefab);
|
|
if (minionPrefab != null)
|
|
{
|
|
GameObject minion = UnityEngine.Object.Instantiate(minionPrefab, __instance.transform.position, Quaternion.identity);
|
|
Character minionChar = minion.GetComponent<Character>();
|
|
|
|
if (minionChar != null)
|
|
{
|
|
// Make it friendly
|
|
minionChar.m_faction = Character.Faction.Players;
|
|
BaseAI ai = minion.GetComponent<BaseAI>();
|
|
if (ai != null)
|
|
{
|
|
MonsterAI monsterAI = minion.GetComponent<MonsterAI>();
|
|
if (monsterAI != null)
|
|
{
|
|
monsterAI.SetFollowTarget(Player.m_localPlayer.gameObject);
|
|
}
|
|
}
|
|
activeMinions.Add(minionChar);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
[HarmonyPatch(typeof(BaseAI), "IsEnemy", typeof(Character), typeof(Character))]
|
|
public static class BaseAI_IsEnemy_Patch
|
|
{
|
|
public static void Postfix(Character a, Character b, ref bool __result)
|
|
{
|
|
if (!__result || !SkeletonRace.IsSkeleton() || Player.m_localPlayer == null) return;
|
|
|
|
Character playerChar = Player.m_localPlayer;
|
|
Character otherChar = null;
|
|
|
|
if (a == playerChar) otherChar = b;
|
|
else if (b == playerChar) otherChar = a;
|
|
|
|
if (otherChar != null)
|
|
{
|
|
string name = otherChar.gameObject.name.Replace("(Clone)", "").ToLower();
|
|
if (name == "skeleton" ||
|
|
name == "skeleton_noarcher" ||
|
|
name == "skeleton_poison" ||
|
|
name == "skeleton_friendly" ||
|
|
name.StartsWith("draugr") ||
|
|
name == "ghost" ||
|
|
name == "wraith")
|
|
{
|
|
__result = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|