fix: wrong selecting variables on hasItem and freeSlots (#1830)

WeylonSantana · web-flow · commit 7fbb1268bca2 · 2023-07-13T10:04:15.000-04:00
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ConditionalBranch.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_ConditionalBranch.cs
@@ -1453,17 +1453,17 @@ private void SaveFormValues(HasItemCondition condition)
             if (rdoInvPlayerVariable.Checked)
             {
                 condition.VariableType = VariableType.PlayerVariable;
-                condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);
+                condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);
             }
             else if (rdoInvGlobalVariable.Checked)
             {
                 condition.VariableType = VariableType.ServerVariable;
-                condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);
+                condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);
             }
             else if (rdoInvGuildVariable.Checked)
             {
                 condition.VariableType = VariableType.GuildVariable;
-                condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex);
+                condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);
             }
             condition.UseVariable = !rdoManual.Checked;
             condition.CheckBank = chkBank.Checked;
@@ -1565,17 +1565,17 @@ private void SaveFormValues(HasFreeInventorySlots condition)
             if (rdoInvPlayerVariable.Checked)
             {
                 condition.VariableType = VariableType.PlayerVariable;
-                condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);
+                condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);
             }
             else if (rdoInvGlobalVariable.Checked)
             {
                 condition.VariableType = VariableType.ServerVariable;
-                condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);
+                condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);
             }
             else if (rdoInvGuildVariable.Checked)
             {
                 condition.VariableType = VariableType.GuildVariable;
-                condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex);
+                condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);
             }
             condition.UseVariable = !rdoManual.Checked;
         }

Original file line number	Diff line number	Diff line change
`@@ -1453,17 +1453,17 @@ private void SaveFormValues(HasItemCondition condition)`
`1453`	`1453`	`if (rdoInvPlayerVariable.Checked)`
`1454`	`1454`	`{`
`1455`	`1455`	`condition.VariableType = VariableType.PlayerVariable;`
`1456`		`- condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);`
	`1456`	`+ condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);`
`1457`	`1457`	`}`
`1458`	`1458`	`else if (rdoInvGlobalVariable.Checked)`
`1459`	`1459`	`{`
`1460`	`1460`	`condition.VariableType = VariableType.ServerVariable;`
`1461`		`- condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);`
	`1461`	`+ condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);`
`1462`	`1462`	`}`
`1463`	`1463`	`else if (rdoInvGuildVariable.Checked)`
`1464`	`1464`	`{`
`1465`	`1465`	`condition.VariableType = VariableType.GuildVariable;`
`1466`		`- condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex);`
	`1466`	`+ condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);`
`1467`	`1467`	`}`
`1468`	`1468`	`condition.UseVariable = !rdoManual.Checked;`
`1469`	`1469`	`condition.CheckBank = chkBank.Checked;`
`@@ -1565,17 +1565,17 @@ private void SaveFormValues(HasFreeInventorySlots condition)`
`1565`	`1565`	`if (rdoInvPlayerVariable.Checked)`
`1566`	`1566`	`{`
`1567`	`1567`	`condition.VariableType = VariableType.PlayerVariable;`
`1568`		`- condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);`
	`1568`	`+ condition.VariableId = PlayerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);`
`1569`	`1569`	`}`
`1570`	`1570`	`else if (rdoInvGlobalVariable.Checked)`
`1571`	`1571`	`{`
`1572`	`1572`	`condition.VariableType = VariableType.ServerVariable;`
`1573`		`- condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex);`
	`1573`	`+ condition.VariableId = ServerVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);`
`1574`	`1574`	`}`
`1575`	`1575`	`else if (rdoInvGuildVariable.Checked)`
`1576`	`1576`	`{`
`1577`	`1577`	`condition.VariableType = VariableType.GuildVariable;`
`1578`		`- condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex);`
	`1578`	`+ condition.VariableId = GuildVariableBase.IdFromList(cmbInvVariable.SelectedIndex, VariableDataType.Integer);`
`1579`	`1579`	`}`
`1580`	`1580`	`condition.UseVariable = !rdoManual.Checked;`
`1581`	`1581`	`}`