Skip to content

Commit 7e73892

Browse files
kyzentunkyzentun
committed
Moved LifeType, DrainType, and BatteryLives from Song Options to Player Options. Added ScreenGameplay:FailFadeRemovePlayer lua function.
1 parent 6aad3c8 commit 7e73892

19 files changed

+428
-380
lines changed

‎Docs/Changelog_sm5.txt

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ StepMania current development
1414
P2's lifemeter. Use LifeMeterChangedP2. "Life" and "StepsSecond" are passed
1515
in the params table for the message.
1616
* [LifeMeterBattery] CourseSongRewardLives metric added.
17+
* [LifeMeter] LifeType, DrainType, and BatteryLives moved to PlayerOptions so
18+
the players can have different settings.
1719

1820
2013/10/09
1921
----------

‎Docs/Luadoc/Lua.xml

+79-78
Original file line numberDiff line numberDiff line change
@@ -999,98 +999,101 @@
999999
<Function name='GetStepsQueueWrapped'/>
10001000
</Class>
10011001
<Class name='PlayerOptions'>
1002-
<Function name='IsEasierForSongAndSteps'/>
1003-
<Function name='IsEasierForCourseAndTrail'/>
1004-
<Function name='TimeSpacing'/>
1005-
<Function name='MaxScrollBPM'/>
1006-
<Function name='ScrollSpeed'/>
1007-
<Function name='ScrollBPM'/>
1002+
<Function name='Alternate'/>
1003+
<Function name='AttackMines'/>
1004+
<Function name='Backwards'/>
1005+
<Function name='BatteryLives'/>
1006+
<Function name='Beat'/>
1007+
<Function name='Big'/>
1008+
<Function name='Blind'/>
1009+
<Function name='Blink'/>
1010+
<Function name='Boomerang'/>
10081011
<Function name='Boost'/>
1012+
<Function name='BMRize'/>
10091013
<Function name='Brake'/>
1010-
<Function name='Wave'/>
1011-
<Function name='Expand'/>
1012-
<Function name='Boomerang'/>
1013-
<Function name='Drunk'/>
1014-
<Function name='Dizzy'/>
1014+
<Function name='Bumpy'/>
1015+
<Function name='Centered'/>
1016+
<Function name='CMod'/>
10151017
<Function name='Confusion'/>
1016-
<Function name='Mini'/>
1017-
<Function name='Tiny'/>
1018+
<Function name='Cover'/>
1019+
<Function name='Cross'/>
1020+
<Function name='Dark'/>
1021+
<Function name='Dizzy'/>
1022+
<Function name='Distant'/>
1023+
<Function name='DrainSetting'/>
1024+
<Function name='Drunk'/>
1025+
<Function name='Echo'/>
1026+
<Function name='Expand'/>
1027+
<Function name='FailSetting'/>
10181028
<Function name='Flip'/>
1019-
<Function name='Invert'/>
1020-
<Function name='Tornado'/>
1021-
<Function name='Tipsy'/>
1022-
<Function name='Bumpy'/>
1023-
<Function name='Beat'/>
1024-
<Function name='Xmode'/>
1025-
<Function name='Twirl'/>
1026-
<Function name='Roll'/>
1029+
<Function name='Floored'/>
1030+
<Function name='GetReversePercentForColumn'/>
1031+
<Function name='GetStepAttacks'/>
1032+
<Function name='IsEasierForSongAndSteps'/>
1033+
<Function name='IsEasierForCourseAndTrail'/>
1034+
<Function name='Incoming'/>
1035+
<Function name='Hallway'/>
10271036
<Function name='Hidden'/>
10281037
<Function name='HiddenOffset'/>
1029-
<Function name='Sudden'/>
1030-
<Function name='SuddenOffset'/>
1031-
<Function name='Stealth'/>
1032-
<Function name='Blink'/>
1033-
<Function name='RandomVanish'/>
1034-
<Function name='Reverse'/>
1035-
<Function name='Split'/>
1036-
<Function name='Alternate'/>
1037-
<Function name='Cross'/>
1038-
<Function name='Centered'/>
1039-
<Function name='Dark'/>
1040-
<Function name='Blind'/>
1041-
<Function name='Cover'/>
1042-
<Function name='RandAttack'/>
1043-
<Function name='NoAttack'/>
1044-
<Function name='PlayerAutoPlay'/>
1045-
<Function name='Tilt'/>
1046-
<Function name='Skew'/>
1047-
<Function name='Passmark'/>
1048-
<Function name='RandomSpeed'/>
1049-
<Function name='TurnNone'/>
1050-
<Function name='Mirror'/>
1051-
<Function name='Backwards'/>
1038+
<Function name='HoldRolls'/>
1039+
<Function name='Invert'/>
10521040
<Function name='Left'/>
1053-
<Function name='Right'/>
1054-
<Function name='Shuffle'/>
1055-
<Function name='SoftShuffle'/>
1056-
<Function name='SuperShuffle'/>
1057-
<Function name='NoHolds'/>
1058-
<Function name='NoRolls'/>
1059-
<Function name='NoMines'/>
1041+
<Function name='LifeSetting'/>
10601042
<Function name='Little'/>
1061-
<Function name='Wide'/>
1062-
<Function name='Big'/>
1063-
<Function name='Quick'/>
1064-
<Function name='BMRize'/>
1065-
<Function name='Skippy'/>
1043+
<Function name='MaxScrollBPM'/>
10661044
<Function name='Mines'/>
1067-
<Function name='AttackMines'/>
1068-
<Function name='Echo'/>
1069-
<Function name='Stomp'/>
1070-
<Function name='Planted'/>
1071-
<Function name='Floored'/>
1072-
<Function name='Twister'/>
1073-
<Function name='HoldRolls'/>
1074-
<Function name='NoJumps'/>
1045+
<Function name='Mini'/>
1046+
<Function name='Mirror'/>
1047+
<Function name='MMod'/>
1048+
<Function name='MuteOnError'/>
1049+
<Function name='NoAttack'/>
1050+
<Function name='NoFakes'/>
10751051
<Function name='NoHands'/>
1052+
<Function name='NoHolds'/>
1053+
<Function name='NoJumps'/>
10761054
<Function name='NoLifts'/>
1077-
<Function name='NoFakes'/>
1055+
<Function name='NoMines'/>
10781056
<Function name='NoQuads'/>
1057+
<Function name='NoRolls'/>
10791058
<Function name='NoStretch'/>
1080-
<Function name='MuteOnError'/>
10811059
<Function name='NoteSkin'/>
1082-
<Function name='FailSetting'/>
1083-
<Function name='CMod'/>
1084-
<Function name='XMod'/>
1085-
<Function name='MMod'/>
10861060
<Function name='Overhead'/>
1087-
<Function name='Incoming'/>
1061+
<Function name='Passmark'/>
1062+
<Function name='Planted'/>
1063+
<Function name='PlayerAutoPlay'/>
1064+
<Function name='Quick'/>
1065+
<Function name='RandAttack'/>
1066+
<Function name='RandomSpeed'/>
1067+
<Function name='RandomVanish'/>
1068+
<Function name='Reverse'/>
1069+
<Function name='Right'/>
1070+
<Function name='Roll'/>
1071+
<Function name='ScrollBPM'/>
1072+
<Function name='ScrollSpeed'/>
1073+
<Function name='Shuffle'/>
1074+
<Function name='Skew'/>
1075+
<Function name='Skippy'/>
1076+
<Function name='SoftShuffle'/>
10881077
<Function name='Space'/>
1089-
<Function name='Hallway'/>
1090-
<Function name='Distant'/>
1078+
<Function name='Split'/>
1079+
<Function name='Stealth'/>
1080+
<Function name='Stomp'/>
1081+
<Function name='Sudden'/>
1082+
<Function name='SuddenOffset'/>
1083+
<Function name='SuperShuffle'/>
1084+
<Function name='TimeSpacing'/>
1085+
<Function name='Tilt'/>
1086+
<Function name='Tiny'/>
1087+
<Function name='Tipsy'/>
1088+
<Function name='Tornado'/>
1089+
<Function name='TurnNone'/>
1090+
<Function name='Twirl'/>
1091+
<Function name='Twister'/>
10911092
<Function name='UsingReverse'/>
1092-
<Function name='GetReversePercentForColumn'/>
1093-
<Function name='GetStepAttacks'/>
1093+
<Function name='Wave'/>
1094+
<Function name='Wide'/>
1095+
<Function name='XMod'/>
1096+
<Function name='Xmode'/>
10941097
</Class>
10951098
<Class name='PlayerStageStats'>
10961099
<Function name='FailPlayer'/>
@@ -1323,6 +1326,7 @@
13231326
</Class>
13241327
<Class base='ScreenWithMenuElements' name='ScreenGameplay'>
13251328
<Function name='Center1Player'/>
1329+
<Function name='FailFadeRemovePlayer'/>
13261330
<Function name='GetDummyPlayerInfo'/>
13271331
<Function name='GetHasteRate'/>
13281332
<Function name='GetLifeMeter'/>
@@ -1513,10 +1517,7 @@
15131517
<Function name='AssistClap'/>
15141518
<Function name='AssistMetronome'/>
15151519
<Function name='AutosyncSetting'/>
1516-
<Function name='BatteryLives'/>
1517-
<Function name='DrainSetting'/>
15181520
<Function name='Haste'/>
1519-
<Function name='LifeSetting'/>
15201521
<Function name='MusicRate'/>
15211522
<Function name='RandomBGOnly'/>
15221523
<Function name='SaveReplay'/>

0 commit comments

Comments
 (0)