Skip to content

Commit 1a7d204

Browse files
committed
fix: API changes from prefab refactoring.
1 parent 7882911 commit 1a7d204

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

VisualPinball.Engine.Mpf.Unity/Runtime/MpfExtensions.cs

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Mpf.Vpe;
1616
using VisualPinball.Engine.Common;
1717
using VisualPinball.Engine.Game.Engines;
18+
using VisualPinball.Unity;
1819

1920
namespace VisualPinball.Engine.Mpf.Unity
2021
{
@@ -64,31 +65,28 @@ public static IEnumerable<GamelogicEngineSwitch> GetSwitches(this MachineDescrip
6465

6566
public static IEnumerable<GamelogicEngineCoil> GetCoils(this MachineDescription md)
6667
{
67-
var leftFlipperCoil = string.Empty;
68-
var rightFlipperCoil = string.Empty;
69-
var leftFlipperHoldCoil = string.Empty;
70-
var rightFlipperHoldCoil = string.Empty;
71-
7268
var coils = md.Coils.Select(coil => {
7369
var gleCoil = new GamelogicEngineCoil(coil.Name, int.Parse(coil.HardwareNumber));
7470

7571
if (Regex.Match(coil.Name, "(l(eft)?_?flipper|flipper_?l(eft)?_?(main)?)$", RegexOptions.IgnoreCase).Success) {
7672
gleCoil.Description = "Left Flipper";
77-
gleCoil.PlayfieldItemHint = "^(LeftFlipper|LFlipper|FlipperLeft|FlipperL)$";
78-
leftFlipperCoil = coil.Name;
73+
gleCoil.DeviceHint = "^(LeftFlipper|LFlipper|FlipperLeft|FlipperL)$";
74+
gleCoil.DeviceItemHint = FlipperAuthoring.MainCoilItem;
7975

8076
} else if (Regex.Match(coil.Name, "(l(eft)?_?flipper|flipper_?l(eft)?)_?hold$", RegexOptions.IgnoreCase).Success) {
81-
gleCoil.Description = "Left Flipper (hold)";
82-
leftFlipperHoldCoil = coil.Name;
77+
gleCoil.Description = "Left Flipper (Hold)";
78+
gleCoil.DeviceHint = "^(LeftFlipper|LFlipper|FlipperLeft|FlipperL)$";
79+
gleCoil.DeviceItemHint = FlipperAuthoring.HoldCoilItem;
8380

8481
} else if (Regex.Match(coil.Name, "(r(ight)?_?flipper|flipper_?r(ight)?_?(main)?)$", RegexOptions.IgnoreCase).Success) {
8582
gleCoil.Description = "Right Flipper";
86-
gleCoil.PlayfieldItemHint = "^(RightFlipper|RFlipper|FlipperRight|FlipperR)$";
87-
rightFlipperCoil = coil.Name;
83+
gleCoil.DeviceHint = "^(RightFlipper|RFlipper|FlipperRight|FlipperR)$";
84+
gleCoil.DeviceItemHint = FlipperAuthoring.HoldCoilItem;
8885

8986
} else if (Regex.Match(coil.Name, "(r(ight)?_?flipper|flipper_?r(ight)?)_?hold$", RegexOptions.IgnoreCase).Success) {
90-
gleCoil.Description = "Right Flipper (hold)";
91-
rightFlipperHoldCoil = coil.Name;
87+
gleCoil.Description = "Right Flipper (Hold)";
88+
gleCoil.DeviceHint = "^(RightFlipper|RFlipper|FlipperRight|FlipperR)$";
89+
gleCoil.DeviceItemHint = FlipperAuthoring.MainCoilItem;
9290

9391
} else if (Regex.Match(coil.Name, "trough_?eject", RegexOptions.IgnoreCase).Success) {
9492
gleCoil.Description = "Trough Eject";
@@ -99,14 +97,6 @@ public static IEnumerable<GamelogicEngineCoil> GetCoils(this MachineDescription
9997
return gleCoil;
10098
}).ToArray();
10199

102-
foreach (var coil in coils) {
103-
if (coil.Id == leftFlipperHoldCoil) {
104-
coil.MainCoilIdOfHoldCoil = leftFlipperCoil;
105-
} else if (coil.Id == rightFlipperHoldCoil) {
106-
coil.MainCoilIdOfHoldCoil = rightFlipperCoil;
107-
}
108-
}
109-
110100
return coils;
111101
}
112102

0 commit comments

Comments
 (0)