Skip to content

Commit

Permalink
- Fixed an issue that prevented the Enable/Disable Sourcebook button …
Browse files Browse the repository at this point in the history
…from actually changing the settings.

- Fixed an issue with the display of calculated Limit modifiers. Fixes #1175.
  • Loading branch information
chummer5a committed Oct 23, 2016
1 parent ded6308 commit 9859a74
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Chummer/UI/Shared/CharacterShared.cs
Expand Up @@ -258,17 +258,17 @@ protected void RefreshLimits(Label lblPhysical, Label lblMental, Label lblSocial
{
lblPhysical.Text = _objCharacter.LimitPhysical.ToString();
string strPhysical = string.Format("({0} [{1}] * 2) + {2} [{3}] + {4} [{5}] / 3", LanguageManager.Instance.GetString("String_AttributeSTRShort"), _objCharacter.STR.TotalValue.ToString(), LanguageManager.Instance.GetString("String_AttributeBODShort"), _objCharacter.BOD.TotalValue.ToString(), LanguageManager.Instance.GetString("String_AttributeREAShort"), _objCharacter.REA.TotalValue.ToString());
strPhysical = _objCharacter.Improvements.Where(objImprovement => objImprovement.Enabled && objImprovement.ImproveType == Improvement.ImprovementType.PhysicalLimit).Aggregate(strPhysical, (current, objImprovement) => current + (" + " + _objCharacter.GetObjectName(objImprovement) + " (" + (objImprovement.Rating) + ")"));
strPhysical = _objCharacter.Improvements.Where(objImprovement => objImprovement.Enabled && objImprovement.ImproveType == Improvement.ImprovementType.PhysicalLimit).Aggregate(strPhysical, (current, objImprovement) => current + (" + " + _objCharacter.GetObjectName(objImprovement) + " (" + (objImprovement.Value) + ")"));
tipTooltip.SetToolTip(lblPhysical, strPhysical);

lblMental.Text = _objCharacter.LimitMental.ToString();
string strMental = string.Format("({0} [{1}] * 2) + {2} [{3}] + {4} [{5}] / 3", LanguageManager.Instance.GetString("String_AttributeLOGShort"), _objCharacter.LOG.TotalValue.ToString(), LanguageManager.Instance.GetString("String_AttributeINTShort"), _objCharacter.INT.TotalValue.ToString(), LanguageManager.Instance.GetString("String_AttributeWILShort"), _objCharacter.WIL.TotalValue.ToString());
strMental = _objCharacter.Improvements.Where(objImprovement => objImprovement.Enabled && objImprovement.ImproveType == Improvement.ImprovementType.MentalLimit).Aggregate(strMental, (current, objImprovement) => current + (" + " + _objCharacter.GetObjectName(objImprovement) + " (" + (objImprovement.Rating) + ")"));
strMental = _objCharacter.Improvements.Where(objImprovement => objImprovement.Enabled && objImprovement.ImproveType == Improvement.ImprovementType.MentalLimit).Aggregate(strMental, (current, objImprovement) => current + (" + " + _objCharacter.GetObjectName(objImprovement) + " (" + (objImprovement.Value) + ")"));
tipTooltip.SetToolTip(lblMental, strMental);

lblSocial.Text = _objCharacter.LimitSocial.ToString();
string strSocial = string.Format("({0} [{1}] * 2) + {2} [{3}] + {4} [{5}] / 3", LanguageManager.Instance.GetString("String_AttributeCHAShort"), _objCharacter.CHA.TotalValue.ToString(), LanguageManager.Instance.GetString("String_AttributeWILShort"), _objCharacter.WIL.TotalValue.ToString(), LanguageManager.Instance.GetString("String_AttributeESSShort"), _objCharacter.Essence.ToString());
strSocial = _objCharacter.Improvements.Where(objImprovement => objImprovement.Enabled && objImprovement.ImproveType == Improvement.ImprovementType.SocialLimit).Aggregate(strSocial, (current, objImprovement) => current + (" + " + _objCharacter.GetObjectName(objImprovement) + " (" + (objImprovement.Rating) + ")"));
strSocial = _objCharacter.Improvements.Where(objImprovement => objImprovement.Enabled && objImprovement.ImproveType == Improvement.ImprovementType.SocialLimit).Aggregate(strSocial, (current, objImprovement) => current + (" + " + _objCharacter.GetObjectName(objImprovement) + " (" + (objImprovement.Value) + ")"));
tipTooltip.SetToolTip(lblSocial, strSocial);

lblAstral.Text = _objCharacter.LimitAstral.ToString();
Expand Down
2 changes: 2 additions & 0 deletions Chummer/changelog.txt
Expand Up @@ -4,6 +4,8 @@ Application Changes:

- Fixed an issue that prevented characters in karmagen from unlocking special attributes by taking the relevant qualities.
- Renamed the addattribute improvement to enableattribute.
- Fixed an issue that prevented the Enable/Disable Sourcebook button from actually changing the settings.
- Fixed an issue with the display of calculated Limit modifiers. Fixes #1175.

Data Changes:

Expand Down
1 change: 1 addition & 0 deletions Chummer/frmOptions.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9859a74

Please sign in to comment.