Merge branch 'main' into localisation-turkish
This commit is contained in:
commit
4e596cda73
5 changed files with 27 additions and 6 deletions
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "RacesOfValheim",
|
||||
"description": "A Valheim mod that adds ten custom playable races (Aswid, Draugh, Dvergar, Fenrir, Furling, Skadi, Skeleton, Sverm, Trenta, Trol) each with unique abilities, traits, race stations and a deep boss-driven progression system.",
|
||||
"version_number": "1.5.11",
|
||||
"version_number": "1.5.12",
|
||||
"website_url": "",
|
||||
"dependencies": [
|
||||
"denikson-BepInExPack_Valheim-5.4.2333",
|
||||
|
|
|
|||
|
|
@ -33,6 +33,11 @@ namespace RacesOfValheim
|
|||
}
|
||||
|
||||
private readonly List<HiddenRenderer> m_hidden = new List<HiddenRenderer>();
|
||||
|
||||
// What we hid, kept apart from forceRenderingOff. Other mods write that flag too: Valkyr
|
||||
// sets its hair's forceRenderingOff on every visual update, so the flag alone made the
|
||||
// rescan record the hair a second time, already disabled, and the revert left it off.
|
||||
private readonly HashSet<Renderer> m_tracked = new HashSet<Renderer>();
|
||||
private float m_nextRescan;
|
||||
private float m_nextLog;
|
||||
private string m_context = "";
|
||||
|
|
@ -107,8 +112,20 @@ namespace RacesOfValheim
|
|||
// the cape along with the body mesh itself.
|
||||
foreach (Renderer r in GetComponentsInChildren<Renderer>(true))
|
||||
{
|
||||
if (r == null || r.forceRenderingOff) continue; // already ours
|
||||
if (r == null) continue;
|
||||
|
||||
if (m_tracked.Contains(r))
|
||||
{
|
||||
// Already ours: re-assert in case another mod cleared the flag.
|
||||
r.forceRenderingOff = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Hidden by someone else (Valkyr hides the vanilla body and hair this way): leave
|
||||
// it to them, or the revert would show it.
|
||||
if (r.forceRenderingOff) continue;
|
||||
|
||||
m_tracked.Add(r);
|
||||
m_hidden.Add(new HiddenRenderer { Renderer = r, WasEnabled = r.enabled });
|
||||
r.enabled = false;
|
||||
r.forceRenderingOff = true;
|
||||
|
|
@ -132,6 +149,7 @@ namespace RacesOfValheim
|
|||
}
|
||||
|
||||
m_hidden.Clear();
|
||||
m_tracked.Clear();
|
||||
enabled = false;
|
||||
return restored;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ namespace RacesOfValheim
|
|||
{
|
||||
public const string PluginGUID = "com.nandor.racesofvalheim";
|
||||
public const string PluginName = "Races Of Valheim";
|
||||
public const string PluginVersion = "1.5.11";
|
||||
public const string PluginVersion = "1.5.12";
|
||||
|
||||
private readonly Harmony harmony = new Harmony(PluginGUID);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue