Skip to content

Fix leather weight formula for correct gauntlet weight #2747

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

Open
TwelveEyes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix leather weight formula for correct gauntlet weight #2747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions Assets/Scripts/Game/Items/ItemBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ public static DaggerfallUnityItem CreateRandomWeapon(int playerLevel)
newItem = new DaggerfallUnityItem(ItemGroups.Weapons, groupIndex);
else
newItem = CreateItem(ItemGroups.Weapons, customItemTemplates[groupIndex - enumArray.Length]);

// Random weapon material
WeaponMaterialTypes material = FormulaHelper.RandomMaterial(playerLevel);

Expand Down Expand Up @@ -491,7 +491,11 @@ public static void ApplyArmorMaterial(DaggerfallUnityItem armor, ArmorMaterialTy

if (armor.nativeMaterialValue == (int)ArmorMaterialTypes.Leather)
{
armor.weightInKg /= 2;
// Formula provided by Erisceres
// S_w = INT(B_w * 4) scaled weight
// A_w = S_w / 2 adjusted weight
// F_w = Mathf.Round(A_w) / 4 final weight
armor.weightInKg = Mathf.Round((int)(armor.weightInKg * 4) / 2) / 4;
}
else if (armor.nativeMaterialValue == (int)ArmorMaterialTypes.Chain)
{
Expand Down