Skip to content

Fix 3d Model Not Changing When Changing Weapons #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LokiusV merged 5 commits into from
Feb 3, 2026
Merged

Fix 3d Model Not Changing When Changing Weapons #15

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcb286a
Change 3d model when changing weapons.
stefanmielke Jan 22, 2026
d542f05
Fix loading weapon state when loading the game.
stefanmielke Jan 22, 2026
417db14
Remove incorrect message.
stefanmielke Jan 22, 2026
e58c346
Fix merge issue.
stefanmielke Jan 22, 2026
487dd78
Fix multiple hits on enemies.
stefanmielke Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions DFUVR/Plugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,33 +1017,51 @@ static void Postfix(WeaponManager __instance)
[HarmonyPatch(typeof(WeaponManager), "ToggleSheath")]
public class CorrectWeaponPatch : MonoBehaviour
{
[HarmonyPrefix]
static void Prefix(WeaponManager __instance)
[HarmonyPostfix]
internal static void Postfix(WeaponManager __instance)
{
if (Var.weaponObject != null)
Destroy(Var.weaponObject);

if (__instance.ScreenWeapon == null)
DaggerfallUnityItem rightHandItem = GameManager.Instance.PlayerEntity.ItemEquipTable.GetItem(EquipSlots.RightHand);
//DaggerfallUnityItem daggerfallUnityItem = playerEntity.ItemEquipTable.GetItem(EquipSlots.LeftHand);

if (rightHandItem == null)
{
Var.currentWeaponName = null;

Var.sheathObject.GetComponent<MeshRenderer>().enabled = true;
Hands.rHand.SetActive(true);
Hands.lHand.SetActive(true);
return;
}

Var.currentWeaponName = __instance.ScreenWeapon.SpecificWeapon?.LongName ?? "";
Var.currentWeaponName = rightHandItem.LongName ?? "";

HandObject currentHandObject = null;
if (__instance.ScreenWeapon.WeaponType != WeaponTypes.Bow && Var.handObjectsByName.ContainsKey(Var.currentWeaponName))
if (rightHandItem.GetWeaponType() != WeaponTypes.Bow && Var.handObjectsByName.ContainsKey(Var.currentWeaponName))
currentHandObject = Var.handObjectsByName[Var.currentWeaponName];
else
currentHandObject = Var.handObjects[__instance.ScreenWeapon.WeaponType];
currentHandObject = Var.handObjects[rightHandItem.GetWeaponType()];

GameObject tempObject = currentHandObject.gameObject;

Var.weaponObject = Instantiate(tempObject);
Var.weaponObject.GetComponent<Collider>().enabled = true;

// if it is unsheathing
if (__instance.Sheathed)
{
Var.weaponObject.GetComponent<Collider>().enabled = false;
Var.weaponObject.transform.SetParent(Var.sheathObject.transform);

Var.weaponObject.transform.localPosition = currentHandObject.sheatedPositionOffset;
Var.weaponObject.transform.localRotation = currentHandObject.sheatedRotationOffset;
Var.sheathObject.GetComponent<MeshRenderer>().enabled = currentHandObject.renderSheated;

Hands.rHand.SetActive(true);
Hands.lHand.SetActive(true);
}
else
{
Var.sheathObject.GetComponent<MeshRenderer>().enabled = true;

Expand All @@ -1059,18 +1077,18 @@ static void Prefix(WeaponManager __instance)
Hands.rHand.SetActive(false);
Hands.lHand.SetActive(false);
}
else
{
Var.weaponObject.GetComponent<Collider>().enabled = false;
Var.weaponObject.transform.SetParent(Var.sheathObject.transform);

Var.weaponObject.transform.localPosition = currentHandObject.sheatedPositionOffset;
Var.weaponObject.transform.localRotation = currentHandObject.sheatedRotationOffset;
Var.sheathObject.GetComponent<MeshRenderer>().enabled = currentHandObject.renderSheated;
}
}

Hands.rHand.SetActive(true);
Hands.lHand.SetActive(true);
}
[HarmonyPatch(typeof(WeaponManager), "ApplyWeapon")]
public class ApplyWeaponPatch : MonoBehaviour
{
[HarmonyPostfix]
static void Postfix(WeaponManager __instance)
{
DaggerfallUnityItem rightHandItem = GameManager.Instance.PlayerEntity.ItemEquipTable.GetItem(EquipSlots.RightHand);
if (rightHandItem == null || rightHandItem.LongName != Var.currentWeaponName)
CorrectWeaponPatch.Postfix(__instance);
}
}

Expand Down