|
1 | 1 | using System; |
| 2 | +using System.Collections.Generic; |
2 | 3 | using System.Windows.Forms; |
3 | 4 |
|
4 | 5 | using Intersect.Editor.Localization; |
@@ -266,16 +267,26 @@ private void TryLoadNumericMod(GameObjects.Events.VariableMod variableMod) |
266 | 267 | return; |
267 | 268 | } |
268 | 269 |
|
269 | | - if (integerMod.DuplicateVariableId == Guid.Empty && integerMod.ModType < VariableMod.DupPlayerVar) |
270 | | - { |
271 | | - nudNumericValue.Value = integerMod.Value; |
272 | | - ResetSettingVariableSelection(); |
273 | | - } |
274 | | - else |
275 | | - { |
276 | | - rdoVariableValue.Checked = true; |
277 | | - mSettingVariableId = integerMod.DuplicateVariableId; |
278 | | - mSettingVariableType = integerMod.ModType.GetRelatedVariableType(); |
| 270 | + switch (integerMod.ModType) |
| 271 | + { |
| 272 | + case VariableMod.Set: |
| 273 | + case VariableMod.Add: |
| 274 | + case VariableMod.Subtract: |
| 275 | + case VariableMod.Multiply: |
| 276 | + case VariableMod.Divide: |
| 277 | + case VariableMod.LeftShift: |
| 278 | + case VariableMod.RightShift: |
| 279 | + case VariableMod.Random: |
| 280 | + case VariableMod.SystemTime: |
| 281 | + nudNumericValue.Value = integerMod.Value; |
| 282 | + ResetSettingVariableSelection(); |
| 283 | + break; |
| 284 | + |
| 285 | + default: |
| 286 | + rdoVariableValue.Checked = true; |
| 287 | + mSettingVariableId = integerMod.DuplicateVariableId; |
| 288 | + mSettingVariableType = integerMod.ModType.GetRelatedVariableType(); |
| 289 | + break; |
279 | 290 | } |
280 | 291 |
|
281 | 292 | optNumericSet.Checked = VariableModUtils.SetMods.Contains(integerMod.ModType); |
@@ -383,6 +394,10 @@ private IntegerVariableMod GetNumericVariableMod() |
383 | 394 | { |
384 | 395 | mod.ModType = VariableMod.LeftShift; |
385 | 396 | } |
| 397 | + else if (optNumericRightShift.Checked && optNumericStaticVal.Checked) |
| 398 | + { |
| 399 | + mod.ModType = VariableMod.RightShift; |
| 400 | + } |
386 | 401 | else if (optNumericRandom.Checked) |
387 | 402 | { |
388 | 403 | mod.ModType = VariableMod.Random; |
|
0 commit comments