Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/chummer5a/chummer5a

  • Loading branch information...
chummer5a committed Aug 9, 2019
2 parents f8d626c + 8e12157 commit aad398aecf632f80e5f120bf2606920e84221659
Showing with 1,527 additions and 1,077 deletions.
  1. +1 −1 Chummer/Backend/Debugging/CrashHandler.cs
  2. +3 −3 Chummer/Backend/Equipment/Cyberware.cs
  3. +1 −1 Chummer/Backend/Equipment/Gear.cs
  4. +1 −1 Chummer/Backend/Equipment/Lifestyle.cs
  5. +4 −4 Chummer/Backend/Equipment/Weapon.cs
  6. +1 −1 Chummer/Backend/Extensions/WinFormsExtensions.cs
  7. +11 −11 Chummer/Backend/Shared Methods/CharacterShared.cs
  8. +12 −12 Chummer/Backend/Shared Methods/SelectionShared.cs
  9. +2 −2 Chummer/Backend/Uniques/Contact.cs
  10. +2 −2 Chummer/Backend/Uniques/InitiationGrade.cs
  11. +1 −1 Chummer/Backend/Uniques/LimitModifier.cs
  12. +1 −1 Chummer/Backend/Uniques/MartialArt.cs
  13. +6 −3 Chummer/Backend/Uniques/Quality.cs
  14. +3 −3 Chummer/Backend/Uniques/Spirit.cs
  15. +103 −67 Chummer/Character Creation/frmCreate.Designer.cs
  16. +127 −100 Chummer/Character Creation/frmCreate.cs
  17. +2 −2 Chummer/Character Creation/frmKarmaMetatype.cs
  18. +6 −6 Chummer/Character Creation/frmPriorityMetatype.cs
  19. +7 −7 Chummer/Classes/AddImprovementCollection.cs
  20. +6 −6 Chummer/Classes/CharacterOptions.cs
  21. +20 −14 Chummer/Classes/clsCharacter.cs
  22. +1 −1 Chummer/Classes/clsCrashReportData.cs
  23. +2 −2 Chummer/Classes/clsLanguageManager.cs
  24. +1 −1 Chummer/Classes/clsOptions.cs
  25. +1 −1 Chummer/Classes/clsUtils.cs
  26. +4 −4 Chummer/Classes/clsXmlManager.cs
  27. +1 −1 Chummer/Controls/ContactControl.cs
  28. +19 −19 Chummer/Controls/InitiativeUserControl.cs
  29. +1 −1 Chummer/Controls/PetControl.cs
  30. +3 −3 Chummer/Controls/SpiritControl.cs
  31. +35 −35 Chummer/Omae/frmOmae.cs
  32. +1 −1 Chummer/Omae/frmOmaeCompress.cs
  33. +9 −9 Chummer/Omae/frmOmaeUpload.cs
  34. +8 −8 Chummer/Omae/frmOmaeUploadData.cs
  35. +8 −8 Chummer/Omae/frmOmaeUploadLanguage.cs
  36. +8 −8 Chummer/Omae/frmOmaeUploadSheet.cs
  37. +9 −9 Chummer/Program.cs
  38. +2 −2 Chummer/Selection Forms/frmSelectCyberware.cs
  39. +1 −1 Chummer/Selection Forms/frmSelectLifestyle.cs
  40. +2 −2 Chummer/Selection Forms/frmSelectLifestyleAdvanced.cs
  41. +3 −3 Chummer/Selection Forms/frmSelectLifestyleQuality.cs
  42. +5 −2 Chummer/Selection Forms/frmSelectQuality.cs
  43. +1 −1 Chummer/Selection Forms/frmSelectSkill.cs
  44. +3 −3 Chummer/Selection Forms/frmSelectSpell.cs
  45. +1 −1 Chummer/Selection Forms/frmSelectText.cs
  46. +3 −3 Chummer/UI/Attributes/AttributeControl.cs
  47. +1 −1 Chummer/UI/Shared/LimitTabUserControl.cs
  48. +39 −39 Chummer/UI/Shared/VehiclesTabUserControl.cs
  49. +1 −1 Chummer/UI/Skills/SkillsTabUserControl.cs
  50. +4 −4 Chummer/Utilities/frmHeroLabImporter.cs
  51. +15 −15 Chummer/Utilities/frmUpdate.cs
  52. +2 −0 Chummer/changelog.txt
  53. +5 −0 Chummer/data/books.xml
  54. +2 −0 Chummer/data/gear.xml
  55. +3 −1 Chummer/data/powers.xml
  56. +24 −0 Chummer/data/weapons.xml
  57. +156 −159 Chummer/frmCareer.cs
  58. +53 −9 Chummer/frmChummerMain.cs
  59. +5 −5 Chummer/frmCreateCustomDrug.cs
  60. +7 −7 Chummer/frmCreateCyberwareSuite.cs
  61. +2 −2 Chummer/frmCreateImprovement.cs
  62. +7 −7 Chummer/frmCreatePACKSKit.cs
  63. +1 −1 Chummer/frmCreateSpell.cs
  64. +2 −2 Chummer/frmCreateWeaponMount.cs
  65. +1 −1 Chummer/frmExpense.cs
  66. +1 −1 Chummer/frmHistory.cs
  67. +5 −5 Chummer/frmOptions.cs
  68. +8 −8 Chummer/frmViewer.cs
  69. +4 −0 Chummer/lang/de-de.xml
  70. +49 −1 Chummer/lang/de-de_data.xml
  71. +38 −30 ChummerHub.Client/Backend/PluginHandler.cs
  72. +12 −9 ChummerHub.Client/Backend/Utils.cs
  73. +133 −80 ChummerHub.Client/Model/CharacterExtended.cs
  74. +1 −1 ChummerHub.Client/Model/SINnerVisibility.cs
  75. +15 −15 ChummerHub.Client/UI/ucSINnerGroupSearch.cs
  76. +52 −19 ChummerHub.Client/UI/ucSINnerResponseUI.Designer.cs
  77. +1 −0 ChummerHub.Client/UI/ucSINnerResponseUI.cs
  78. +29 −11 ChummerHub.Client/UI/ucSINnerShare.Designer.cs
  79. +145 −106 ChummerHub.Client/UI/ucSINnerShare.cs
  80. +2 −2 ChummerHub.Client/UI/ucSINnerVisibility.cs
  81. +1 −1 ChummerHub.Client/UI/ucSINnersBasic.cs
  82. +93 −65 ChummerHub.Client/UI/ucSINnersOptions.Designer.cs
  83. +20 −20 ChummerHub.Client/UI/ucSINnersOptions.cs
  84. +6 −6 ChummerHub/ChummerHub.csproj
  85. +28 −0 ChummerHub/ChummerHub.xml
  86. +9 −0 ChummerHub/Controllers/HomeController.cs
  87. +38 −32 ChummerHub/Controllers/V1/SINnerController.cs
  88. +4 −3 ChummerHub/Controllers/V1/SINnerGroupController.cs
  89. +8 −1 ChummerHub/Models/V1/SINnerUserRight.cs
  90. +17 −17 ChummerHub/Services/Application Insights/GroupNotFoundFilter.cs
  91. +25 −12 ChummerHub/Services/Application Insights/MyTelemetryInitializer.cs
  92. +1 −1 TextblockConverter/MainWindow.xaml.cs
@@ -222,7 +222,7 @@ public static void WebMiniDumpHandler(Exception ex)
}
catch(Exception nex)
{
MessageBox.Show("Failed to create crash report." + Environment.NewLine +
Program.MainForm.ShowMessageBox("Failed to create crash report." + Environment.NewLine +
"Here is some information to help the developers figure out why:" + Environment.NewLine + nex + Environment.NewLine + "Crash information:" + Environment.NewLine + ex);
}
}
@@ -4208,7 +4208,7 @@ public bool Remove(Character characterObject, bool blnConfirmDelete = true)
{
if (Capacity == "[*]" && Parent != null && (!characterObject.IgnoreRules || characterObject.Created))
{
MessageBox.Show(LanguageManager.GetString("Message_CannotRemoveCyberware", GlobalOptions.Language),
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_CannotRemoveCyberware", GlobalOptions.Language),
LanguageManager.GetString("MessageTitle_CannotRemoveCyberware", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);
return false;
@@ -4319,7 +4319,7 @@ public bool Purchase(XmlNode objNode, Improvement.ImprovementSource objImproveme

if (decCost > _objCharacter.Nuyen)
{
MessageBox.Show(LanguageManager.GetString("Message_NotEnoughNuyen", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_NotEnoughNuyen", GlobalOptions.Language), MessageBoxButtons.OK,
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_NotEnoughNuyen", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_NotEnoughNuyen", GlobalOptions.Language), MessageBoxButtons.OK,
MessageBoxIcon.Information);
return false;
}
@@ -4392,7 +4392,7 @@ public void Upgrade(Character characterObject, Grade objGrade, int intRating, de

if (newCost > characterObject.Nuyen)
{
MessageBox.Show(LanguageManager.GetString("Message_NotEnoughNuyen", GlobalOptions.Language),
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_NotEnoughNuyen", GlobalOptions.Language),
LanguageManager.GetString("MessageTitle_NotEnoughNuyen", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);

@@ -2915,7 +2915,7 @@ public bool RefreshSingleFocusRating(TreeView treFoci, int intNewRating)

if (intFociTotal + intNewRating > intMaxFocusTotal && !_objCharacter.IgnoreRules)
{
MessageBox.Show(LanguageManager.GetString("Message_FocusMaximumForce", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_FocusMaximum", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_FocusMaximumForce", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_FocusMaximum", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
return false;
}
}
@@ -1039,7 +1039,7 @@ public void IncrementMonths(Character CharacterObject)
decimal decAmount = TotalMonthlyCost;
if (decAmount > CharacterObject.Nuyen)
{
MessageBox.Show(LanguageManager.GetString("Message_NotEnoughNuyen", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_NotEnoughNuyen", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_NotEnoughNuyen", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_NotEnoughNuyen", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}

@@ -4883,7 +4883,7 @@ public void Reload(IList<Gear> lstGears, TreeView treGearView)
// Make sure the character has some form of Ammunition for this Weapon.
if (lstAmmo.Count == 0)
{
MessageBox.Show(string.Format(LanguageManager.GetString("Message_OutOfAmmoType", GlobalOptions.Language), DisplayAmmoCategory(GlobalOptions.Language)),
Program.MainForm.ShowMessageBox(string.Format(LanguageManager.GetString("Message_OutOfAmmoType", GlobalOptions.Language), DisplayAmmoCategory(GlobalOptions.Language)),
LanguageManager.GetString("MessageTitle_OutOfAmmo", GlobalOptions.Language), MessageBoxButtons.OK,
MessageBoxIcon.Exclamation);
return;
@@ -5544,7 +5544,7 @@ private bool CanBeRemoved()
// Cyberweapons cannot be removed through here and must be done by removing the piece of Cyberware.
if (Cyberware)
{
MessageBox.Show(
Program.MainForm.ShowMessageBox(
LanguageManager.GetString("Message_CannotRemoveCyberweapon", GlobalOptions.Language),
LanguageManager.GetString("MessageTitle_CannotRemoveCyberweapon", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -5554,7 +5554,7 @@ private bool CanBeRemoved()
// Qualities cannot be removed through here and must be done by removing the piece of Cyberware.
if (Category.StartsWith("Quality"))
{
MessageBox.Show(
Program.MainForm.ShowMessageBox(
LanguageManager.GetString("Message_CannotRemoveQualityWeapon", GlobalOptions.Language),
LanguageManager.GetString("MessageTitle_CannotRemoveQualityWeapon", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -5566,7 +5566,7 @@ private bool CanBeRemoved()
string message = LanguageManager.GetString(
ParentVehicle != null ? "Message_CannotRemoveGearWeaponVehicle" : "Message_CannotRemoveGearWeapon",
GlobalOptions.Language);
MessageBox.Show(message,
Program.MainForm.ShowMessageBox(message,
LanguageManager.GetString("MessageTitle_CannotRemoveGearWeapon", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);
return false;
@@ -62,7 +62,7 @@ public static void DoThreadSafe(this Control objControl, Action funcToRun)
{
Log.Error(e);
#if DEBUG
MessageBox.Show(e.ToString());
Program.MainForm.ShowMessageBox(e.ToString());
#endif
}
}
@@ -162,7 +162,7 @@ protected void AutoSaveCharacter()
catch (UnauthorizedAccessException)
{
Cursor = Cursors.Default;
MessageBox.Show(LanguageManager.GetString("Message_Insufficient_Permissions_Warning", GlobalOptions.Language));
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_Insufficient_Permissions_Warning", GlobalOptions.Language));
AutosaveStopWatch.Restart();
return;
}
@@ -200,7 +200,7 @@ protected void UpdateLimitModifier(TreeView treLimit)
//If the LimitModifier couldn't be found (Ie it comes from an Improvement or the user hasn't properly selected a treenode, fail out early.
if (objLimitModifier == null)
{
MessageBox.Show(LanguageManager.GetString("Warning_NoLimitFound", GlobalOptions.Language));
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Warning_NoLimitFound", GlobalOptions.Language));
return;
}
using (frmSelectLimitModifier frmPickLimitModifier = new frmSelectLimitModifier(objLimitModifier, "Physical", "Mental", "Social"))
@@ -3730,7 +3730,7 @@ public void RefreshFociFromGear(TreeView treFoci, ContextMenuStrip cmsFocus, Not
objNode.Checked = false;
if (!blnWarned)
{
MessageBox.Show(LanguageManager.GetString("Message_FocusMaximumForce", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_FocusMaximum", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_FocusMaximumForce", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_FocusMaximum", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
blnWarned = true;
break;
}
@@ -3896,7 +3896,7 @@ public void RefreshFociFromGear(TreeView treFoci, ContextMenuStrip cmsFocus, Not
objNode.Checked = false;
if (!blnWarned)
{
MessageBox.Show(LanguageManager.GetString("Message_FocusMaximumForce", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_FocusMaximum", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_FocusMaximumForce", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_FocusMaximum", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
blnWarned = true;
break;
}
@@ -5464,7 +5464,7 @@ protected void EnemyChanged(object sender, TextEventArgs e)

if (intBPUsed < (intEnemyMax * -1) && !CharacterObject.IgnoreRules)
{
MessageBox.Show(string.Format(LanguageManager.GetString("Message_EnemyLimit", GlobalOptions.Language), strEnemyPoints),
Program.MainForm.ShowMessageBox(string.Format(LanguageManager.GetString("Message_EnemyLimit", GlobalOptions.Language), strEnemyPoints),
LanguageManager.GetString("MessageTitle_EnemyLimit", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Contact objSenderContact = objSenderControl?.ContactObject;
if (objSenderContact != null)
@@ -5488,7 +5488,7 @@ protected void EnemyChanged(object sender, TextEventArgs e)
{
if (intBPUsed + intNegativeQualityBP < (intQualityMax * -1) && !CharacterObject.IgnoreRules)
{
MessageBox.Show(string.Format(LanguageManager.GetString("Message_NegativeQualityLimit", GlobalOptions.Language), strQualityPoints),
Program.MainForm.ShowMessageBox(string.Format(LanguageManager.GetString("Message_NegativeQualityLimit", GlobalOptions.Language), strQualityPoints),
LanguageManager.GetString("MessageTitle_NegativeQualityLimit", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Contact objSenderContact = objSenderControl?.ContactObject;
if (objSenderContact != null)
@@ -5553,12 +5553,12 @@ protected void AddContactsFromFile()
}
catch (IOException ex)
{
MessageBox.Show(ex.ToString());
Program.MainForm.ShowMessageBox(ex.ToString());
return;
}
catch (XmlException ex)
{
MessageBox.Show(ex.ToString());
Program.MainForm.ShowMessageBox(ex.ToString());
return;
}

@@ -5781,7 +5781,7 @@ protected void AddSpirit()
// The number of bound Spirits cannot exeed the character's CHA.
if (!CharacterObject.IgnoreRules && CharacterObject.Spirits.Count(x => x.EntityType == SpiritType.Spirit) >= CharacterObject.CHA.Value)
{
MessageBox.Show(LanguageManager.GetString("Message_BoundSpiritLimit", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_BoundSpiritLimit", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_BoundSpiritLimit", GlobalOptions.Language), LanguageManager.GetString("MessageTitle_BoundSpiritLimit", GlobalOptions.Language), MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}

@@ -5802,7 +5802,7 @@ protected void AddSprite()
if (CharacterObject.Created && CharacterObject.Spirits.Count(x => x.EntityType == SpiritType.Sprite && !x.Bound && !x.Fettered) > 0)
{
// Once created, new sprites are added as Unbound first. We're not permitted to have more than 1 at a time.
MessageBox.Show(LanguageManager.GetString("Message_UnregisteredSpriteLimit", GlobalOptions.Language),
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_UnregisteredSpriteLimit", GlobalOptions.Language),
LanguageManager.GetString("MessageTitle_UnregisteredSpriteLimit", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
@@ -5814,7 +5814,7 @@ protected void AddSprite()
CharacterObject.Spirits.Count(x => x.EntityType == SpiritType.Sprite && x.Bound) >=
CharacterObject.LOG.TotalValue)
{
MessageBox.Show(LanguageManager.GetString("Message_RegisteredSpriteLimit", GlobalOptions.Language),
Program.MainForm.ShowMessageBox(LanguageManager.GetString("Message_RegisteredSpriteLimit", GlobalOptions.Language),
LanguageManager.GetString("MessageTitle_RegisteredSpriteLimit", GlobalOptions.Language),
MessageBoxButtons.OK, MessageBoxIcon.Information);
return;

0 comments on commit aad398a

Please sign in to comment.
You can’t perform that action at this time.