Skip to content

Commit 75afe0d

Browse files
committed
sys80: add left and right advance buttons.
1 parent 8d635d8 commit 75afe0d

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

VisualPinball.Engine.PinMAME/Games/Rock.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System;
2020
using VisualPinball.Engine.Game.Engines;
2121
using VisualPinball.Engine.PinMAME.MPUs;
22+
using VisualPinball.Engine.Common;
2223

2324
namespace VisualPinball.Engine.PinMAME.Games
2425
{
@@ -41,7 +42,7 @@ public class Rock : System80
4142
protected override GamelogicEngineSwitch[] Switches { get; } = {
4243
new GamelogicEngineSwitch("40") { Description = "#1 Drop Target (Upper)" },
4344
new GamelogicEngineSwitch("41") { Description = "10 Point (2)" },
44-
new GamelogicEngineSwitch("42") { Description = "Right Flipper (Lower)" },
45+
new GamelogicEngineSwitch("42") { Description = "Right Flipper (Lower)", DeviceHint = "^LowerRightFlipper$" },
4546
new GamelogicEngineSwitch("43") { Description = "Rollunder" },
4647
new GamelogicEngineSwitch("44") { Description = "Right Outside Rollover" },
4748
new GamelogicEngineSwitch("45") { Description = "Right Spinner (with Bracket)" },
@@ -70,6 +71,7 @@ public class Rock : System80
7071
};
7172

7273
public override GamelogicEngineLamp[] AvailableLamps { get; } = {
74+
new GamelogicEngineLamp("01") { Description = "Lamp Group 1" },
7375
new GamelogicEngineLamp("03") { Description = "Shoot Again" },
7476
new GamelogicEngineLamp("05") { Description = "#1 Drop Target (Upper)" },
7577
new GamelogicEngineLamp("06") { Description = "#2 Drop Target (Upper)" },
@@ -78,6 +80,8 @@ public class Rock : System80
7880
new GamelogicEngineLamp("09") { Description = "Level 1" },
7981
new GamelogicEngineLamp("10") { Description = "Level 2" },
8082
new GamelogicEngineLamp("11") { Description = "Level 3" },
83+
new GamelogicEngineLamp("12") { Description = "Lamp Group 12" },
84+
new GamelogicEngineLamp("13") { Description = "Lamp Group 13" },
8185
new GamelogicEngineLamp("14") { Description = "#1 Drop Target (Lower)" },
8286
new GamelogicEngineLamp("15") { Description = "#2 Drop Target (Lower)" },
8387
new GamelogicEngineLamp("16") { Description = "#3 Drop Target (Lower)" },

VisualPinball.Engine.PinMAME/MPUs/System80.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,17 @@ public abstract class System80 : PinMameGame
3030
protected abstract GamelogicEngineSwitch[] Switches { get; }
3131

3232
private readonly GamelogicEngineSwitch[] _switches = {
33-
new GamelogicEngineSwitch(SwSelfTest, 7) {Description = "Self Test", InputActionHint = InputConstants.ActionSelfTest },
34-
new GamelogicEngineSwitch(SwStartButton, 47) {Description = "Start Button", InputActionHint = InputConstants.ActionStartGame, InputMapHint = InputConstants.MapCabinetSwitches },
35-
new GamelogicEngineSwitch(SwTilt, 57) {Description = "Tilt" },
36-
new GamelogicEngineSwitch(SwSlamTilt, -1) {Description = "Slam Tilt", InputActionHint = InputConstants.ActionSlamTilt, InputMapHint = InputConstants.MapCabinetSwitches },
37-
new GamelogicEngineSwitch(SwCoin1, 17) {Description = "Coin Button 1", InputActionHint = InputConstants.ActionInsertCoin1, InputMapHint = InputConstants.MapCabinetSwitches },
38-
new GamelogicEngineSwitch(SwCoin2, 27) {Description = "Coin Button 2", InputActionHint = InputConstants.ActionInsertCoin2, InputMapHint = InputConstants.MapCabinetSwitches },
39-
new GamelogicEngineSwitch(SwCoin3, 37) {Description = "Coin Button 3", InputActionHint = InputConstants.ActionInsertCoin3, InputMapHint = InputConstants.MapCabinetSwitches },
40-
new GamelogicEngineSwitch(SwFlipperLowerRight, 112) {Description = "Lower Right Flipper", InputActionHint = InputConstants.ActionRightFlipper, InputMapHint = InputConstants.MapCabinetSwitches },
41-
new GamelogicEngineSwitch(SwFlipperLowerLeft, 114) {Description = "Lower Left Flipper", InputActionHint = InputConstants.ActionLeftFlipper, InputMapHint = InputConstants.MapCabinetSwitches },
33+
new GamelogicEngineSwitch(SwSelfTest, 7) { Description = "Self Test", InputActionHint = InputConstants.ActionSelfTest },
34+
new GamelogicEngineSwitch(SwStartButton, 47) { Description = "Start Button", InputActionHint = InputConstants.ActionStartGame, InputMapHint = InputConstants.MapCabinetSwitches },
35+
new GamelogicEngineSwitch(SwTilt, 57) { Description = "Tilt" },
36+
new GamelogicEngineSwitch(SwSlamTilt, -1) { Description = "Slam Tilt", InputActionHint = InputConstants.ActionSlamTilt, InputMapHint = InputConstants.MapCabinetSwitches },
37+
new GamelogicEngineSwitch(SwCoin1, 17) { Description = "Coin Button 1", InputActionHint = InputConstants.ActionInsertCoin1, InputMapHint = InputConstants.MapCabinetSwitches },
38+
new GamelogicEngineSwitch(SwCoin2, 27) { Description = "Coin Button 2", InputActionHint = InputConstants.ActionInsertCoin2, InputMapHint = InputConstants.MapCabinetSwitches },
39+
new GamelogicEngineSwitch(SwCoin3, 37) { Description = "Coin Button 3", InputActionHint = InputConstants.ActionInsertCoin3, InputMapHint = InputConstants.MapCabinetSwitches },
40+
new GamelogicEngineSwitch(SwFlipperLowerRight, 112) { Description = "Lower Right Flipper", InputActionHint = InputConstants.ActionRightFlipper, InputMapHint = InputConstants.MapCabinetSwitches },
41+
new GamelogicEngineSwitch(SwFlipperLowerLeft, 114) { Description = "Lower Left Flipper", InputActionHint = InputConstants.ActionLeftFlipper, InputMapHint = InputConstants.MapCabinetSwitches },
42+
new GamelogicEngineSwitch(SwLeftAdvance, 6) { Description = "Left Advance", InputActionHint = InputConstants.ActionLeftAdvance, InputMapHint = InputConstants.MapCabinetSwitches },
43+
new GamelogicEngineSwitch(SwRightAdvance, 16) { Description = "Right Advance", InputActionHint = InputConstants.ActionRightAdvance, InputMapHint = InputConstants.MapCabinetSwitches },
4244
};
4345

4446
private readonly GamelogicEngineCoil[] _coils = {

VisualPinball.Engine.PinMAME/PinMameGame.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public abstract class PinMameGame
4444
public const string SwTilt = "s_tilt";
4545
public const string SwBallRollTilt = "s_ball_roll_tilt";
4646
public const string SwSlamTilt = "s_slam_tilt";
47-
public const string SwStartButton = "s_start_button";
47+
public const string SwStartButton = "s_start_button";
48+
public const string SwLeftAdvance = "s_left_advance";
49+
public const string SwRightAdvance = "s_right_advance";
4850

4951
public const string CoilGameOn = "c_game_on";
5052
public const string CoilFlipperLowerRight = "c_flipper_lower_right";

0 commit comments

Comments
 (0)