Skip to content

Commit d50a05f

Browse files
committed
mech: Fix coil descriptions.
1 parent a984b59 commit d50a05f

File tree

3 files changed

+55
-43
lines changed

3 files changed

+55
-43
lines changed
Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
// Visual Pinball Engine
2-
// Copyright (C) 2021 freezy and VPE Team
3-
//
4-
// This program is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
//
9-
// This program is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
//
14-
// You should have received a copy of the GNU General Public License
15-
// along with this program. If not, see <https://www.gnu.org/licenses/>.
16-
17-
// ReSharper disable UnusedType.Global
18-
19-
using UnityEngine;
20-
using VisualPinball.Unity.Editor;
21-
22-
namespace VisualPinball.Engine.PinMAME.Editor
23-
{
24-
public class PinMameIcons : IIconLookup
25-
{
26-
public Texture2D Lookup<T>(T mb, IconSize size = IconSize.Large, IconColor color = IconColor.Gray) where T : class
27-
{
28-
return mb switch {
29-
PinMameMechComponent _ => Icons.MechPinMame(size, color),
30-
_ => null
31-
};
32-
}
33-
34-
public void DisableGizmoIcons()
35-
{
36-
Icons.DisableGizmo<PinMameMechComponent>();
37-
}
38-
}
39-
}
1+
// Visual Pinball Engine
2+
// Copyright (C) 2021 freezy and VPE Team
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU General Public License
15+
// along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
17+
// ReSharper disable UnusedType.Global
18+
19+
using UnityEngine;
20+
using VisualPinball.Unity.Editor;
21+
22+
namespace VisualPinball.Engine.PinMAME.Editor
23+
{
24+
public class PinMameIcons : IIconLookup
25+
{
26+
public Texture2D Lookup<T>(T mb, IconSize size = IconSize.Large, IconColor color = IconColor.Gray) where T : class
27+
{
28+
return mb switch {
29+
PinMameMechComponent _ => Icons.MechPinMame(size, color),
30+
_ => null
31+
};
32+
}
33+
34+
public void DisableGizmoIcons()
35+
{
36+
Icons.DisableGizmo<PinMameMechComponent>();
37+
}
38+
}
39+
}

VisualPinball.Engine.PinMAME.Unity/Editor/PinMameMechInspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public override void OnInspectorGUI()
7070
PropertyField(_resultByLengthProperty);
7171
PropertyField(_accelerationProperty);
7272
PropertyField(_retardationProperty);
73-
PropertyField(_marksProperty);
73+
PropertyField(_marksProperty, "Switches");
7474

7575
base.OnInspectorGUI();
7676

VisualPinball.Engine.PinMAME.Unity/Runtime/PinMameMechComponent.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,26 @@ public IEnumerable<GamelogicEngineCoil> AvailableCoils {
165165
switch (Type)
166166
{
167167
case PinMameMechType.OneSolenoid:
168+
return new[] { new GamelogicEngineCoil(_solenoid1) { Description = "Motor Power" } };
168169
case PinMameMechType.OneDirectionalSolenoid:
169-
return new[] { new GamelogicEngineCoil(_solenoid1) { Description = "Mech Solenoid" } };
170+
return new[] {
171+
new GamelogicEngineCoil(_solenoid1) { Description = "Motor Power" },
172+
new GamelogicEngineCoil(_solenoid2) { Description = "Motor Direction" },
173+
};
170174
case PinMameMechType.TwoDirectionalSolenoids:
175+
return new[] {
176+
new GamelogicEngineCoil(_solenoid1) { Description = "Motor Clockwise" },
177+
new GamelogicEngineCoil(_solenoid2) { Description = "Motor Counter-Clockwise" },
178+
};
179+
171180
case PinMameMechType.TwoStepperSolenoids:
181+
return new[] {
182+
new GamelogicEngineCoil(_solenoid1) { Description = "Stepper 1" },
183+
new GamelogicEngineCoil(_solenoid2) { Description = "Stepper 2" },
184+
};
172185
case PinMameMechType.FourStepperSolenoids:
173186
return new[] {
174-
new GamelogicEngineCoil(_solenoid1) { Description = "Mech Solenoid 1" },
175-
new GamelogicEngineCoil(_solenoid2) { Description = "Mech Solenoid 2" },
187+
new GamelogicEngineCoil(_solenoid1) { Description = "First Stepper" },
176188
};
177189
default:
178190
throw new ArgumentOutOfRangeException();

0 commit comments

Comments
 (0)