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

chummer5a · Nov 22, 2015 · 22f5e7c · 22f5e7c
2 parents 6918733 + 2fcea07
commit 22f5e7c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Chummer/Character Creation/frmCreate.cs b/Chummer/Character Creation/frmCreate.cs
@@ -1751,8 +1751,8 @@ private void objCharacter_MAGEnabledChanged(object sender)
                 nudMAG.Minimum = _objCharacter.MAG.MetatypeMinimum;
                 nudMAG.Maximum = _objCharacter.MAG.MetatypeMaximum + intEssenceLoss;
 
-                // If the character is being build with Karma, show the Initiation Tab.
-                if (_objCharacter.BuildMethod == CharacterBuildMethod.Karma)
+                // If the character options permit initiation in create mode, show the Initiation page.
+                if (_objOptions.AllowInitiationInCreateMode)
                 {
                     nudKMAG.Maximum = _objCharacter.MAG.MetatypeMaximum + intEssenceLoss;
                     if (!tabCharacterTabs.TabPages.Contains(tabInitiation))
@@ -1832,8 +1832,8 @@ private void objCharacter_RESEnabledChanged(object sender)
                 nudRES.Minimum = _objCharacter.RES.MetatypeMinimum;
                 nudRES.Maximum = _objCharacter.RES.MetatypeMaximum + intEssenceLoss;
 
-                // If the character is being build with Karma, show the Initiation Tab.
-                if (_objCharacter.BuildMethod == CharacterBuildMethod.Karma)
+                // If the character options permit submersion in create mode, show the Initiation page.
+                if (_objOptions.AllowInitiationInCreateMode)
                 {
                     nudKRES.Maximum = _objCharacter.RES.MetatypeMaximum + intEssenceLoss;
                     if (!tabCharacterTabs.TabPages.Contains(tabInitiation))
@@ -8130,7 +8130,7 @@ private void cmdDeleteQuality_Click(object sender, EventArgs e)
             {
                 // Look up the cost of the Quality.
                 XmlNode objXmlMetatypeQuality = objXmlDocument.SelectSingleNode("/chummer/qualities/quality[name = \"" + objQuality.Name + "\"]");
-                int intBP = Convert.ToInt32(objXmlMetatypeQuality["bp"].InnerText) * -1;
+                int intBP = Convert.ToInt32(objXmlMetatypeQuality["karma"].InnerText) * -1;
                 int intShowBP = intBP;
                 if (_objCharacter.BuildMethod == CharacterBuildMethod.Karma)
                     intShowBP *= _objOptions.KarmaQuality;

diff --git a/Chummer/data/cyberware.xml b/Chummer/data/cyberware.xml
@@ -2465,6 +2465,9 @@
 			<name>Liminal Body, Centaur</name>
 			<category>Cyberlimb</category>
 			<ess>3</ess>
+      <subsystems>
+        <subsystem>Cyberlimb</subsystem>
+      </subsystems>
 			<capacity>80</capacity>
 			<avail>12</avail>
 			<cost>80000</cost>

diff --git a/Chummer/frmCareer.cs b/Chummer/frmCareer.cs
@@ -8571,7 +8571,7 @@ private void cmdDeleteQuality_Click(object sender, EventArgs e)
 			{
 				// Look up the cost of the Quality.
 				XmlNode objXmlMetatypeQuality = objXmlDocument.SelectSingleNode("/chummer/qualities/quality[name = \"" + objQuality.Name + "\"]");
-				int intBP = Convert.ToInt32(objXmlMetatypeQuality["bp"].InnerText) * -2;
+				int intBP = Convert.ToInt32(objXmlMetatypeQuality["karma"].InnerText) * -2;
 				int intShowBP = intBP * _objOptions.KarmaQuality;
 				string strBP = intShowBP.ToString() + " " + LanguageManager.Instance.GetString("String_Karma");