UI: made metamods 3 lines

TaroNuke · Apr 20, 2021 · 95d4773 · 95d4773
1 parent 4470f70
commit 95d4773
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/Languages/english.ini b/Languages/english.ini
@@ -152,6 +152,7 @@ Handicap2=Removes notes.  Using these may invalidate a high score.
 Hide=Adjust the visibility of the targets.
 MetaMods1=Apply mods that is not affected by mods in the chart.
 MetaMods2=Apply mods that is not affected by mods in the chart.
+MetaMods3=Apply mods that is not affected by mods in the chart.
 Persp=Change the viewing angle of the arrow stream.
 Perspective=Change the viewing angle of the arrow stream.
 Steps=Adjust the difficulty of the steps.
@@ -287,6 +288,7 @@ Mini=Mini
 Appearance=Fade
 MetaMods1=MetaMods 1
 MetaMods2=MetaMods 2
+MetaMods3=MetaMods 3
 Turn=Turn
 InsertTaps=Insert
 InsertOther=Other

diff --git a/Scripts/Mods.lua b/Scripts/Mods.lua
@@ -114,7 +114,7 @@
 -- These will be the option rows available on the [nth] option screen. The 'NextScreen' row will be automatically added as long as there is more than 1 option screen.
 	playerOptions = {}
 	playerOptions[1] = { 'SpeedType','SpeedNumber','Mini','Perspective','NoteSkin','Turn','LifeBar','Compare','Rate' }
-	playerOptions[2] = { 'MetaMods1','MetaMods2','Turn','Accel','Scroll','Effect','Appearance','Handicap','InsertTaps','InsertOther','Hide','Ghost' }
+	playerOptions[2] = { 'MetaMods1','MetaMods2','MetaMods3','Turn','Accel','Scroll','Effect','Appearance','Handicap','InsertTaps','InsertOther','Hide','Ghost' }
 	playerOptions.Edit = { 'SpeedType','SpeedNumber','Mini','Perspective','NoteSkin','Turn' }
 	ShowAllInRow = false
 
@@ -817,14 +817,19 @@ extraSpeed = { "0", "+C10", "+C20", "+C30", "+C40", "+C50", "+C60", "+C70", "+C8
 
 metaModsRows = {
 	{
-		modlist = {'MetaFlip', 'MetaInvert', 'MetaVideogames', 'MetaMonocolumn', 'MetaReverse'},
-		default = 'no metaflip, no metainvert, no metavideogames, no metamonocolumn, no metareverse',
-		mods = {'metaflip', 'metainvert', 'metavideogames', 'metamonocolumn', 'metareverse'}
+		modlist = {'MetaFlip', 'MetaInvert', 'MetaVideogames', 'MetaMonocolumn'},
+		default = 'no metaflip, no metainvert, no metavideogames, no metamonocolumn',
+		mods = {'metaflip', 'metainvert', 'metavideogames', 'metamonocolumn'}
 	},
 	{
-		modlist = {'MetaDizzy', 'MetaOrient', 'MetaBrake', 'MetaHidden', '50% MetaStealth'},
-		default = 'no metadizzy, no metaorient, no metabrake, no metahidden, no metastealth',
-		mods = {'metadizzy', 'metaorient', 'metabrake', 'metahidden', '50% metastealth'}
+		modlist = {'MetaReverse', 'MetaDizzy', 'MetaOrient', 'MetaBrake'},
+		default = 'no metareverse, no metadizzy, no metaorient, no metabrake',
+		mods = {'metareverse', 'metadizzy', 'metaorient', 'metabrake'}
+	},
+	{
+		modlist = {'MetaHidden', '50% MetaStealth'},
+		default = 'no metahidden, no metastealth',
+		mods = {'metahidden', '50% metastealth'}
 	}
 }
 
@@ -872,6 +877,7 @@ ModsMaster.Mini =			{ float = true }
 
 ModsMaster.MetaMods1 = 		{ fnctn = 'MetaMods1' }
 ModsMaster.MetaMods2 = 		{ fnctn = 'MetaMods2' }
+ModsMaster.MetaMods3 = 		{ fnctn = 'MetaMods3' }
 ModsMaster.SpeedType =		{ fnctn = 'SpeedType' }
 ModsMaster.SpeedNumber =	{ fnctn = 'SpeedNumber' }
 ModsMaster.Next =			{ fnctn = 'NextScreenOption' }
@@ -1089,6 +1095,10 @@ function MetaMods2( s )
 	return MetaMods( s, 2 )
 end
 
+function MetaMods3( s )
+	return MetaMods( s, 3 )
+end
+
 function NextScreenOption()
 	local t = OptionRowBase('Next Screen',{'Gameplay','Select Music','More Options'})
 	t.OneChoiceForAllPlayers = true

diff --git a/Scripts/Theme.lua b/Scripts/Theme.lua
@@ -14,7 +14,7 @@ rateModsFree = { "1.0x", "1.1x", "1.2x", "1.3x", "1.4x", "1.5x", "1.6x", "1.7x",
 screenList = { Gameplay = 'ScreenStage' , SelectMusic = 'ScreenSelectMusic' , PlayerOptions = 'ScreenPlayerOptions' , TitleMenu = ScreenTitleBranch  , NameEntry = 'ScreenNameEntryTraditional' , Evaluation = SelectEvaluationScreen , Summary = 'Summary' , Ending = SelectEndingScreen }
 
 playerOptions[1] = { 'SpeedType','SpeedNumber','Mini','Perspective','NoteSkin','Turn','JudgmentFont','Voice','Rate' }
-playerOptions[2] = { 'MetaMods1','MetaMods2','Accel','Scroll','Effect','Appearance','Handicap','InsertTaps','InsertOther','Hide','Ghost','Compare','Measure','LifeBar' }
+playerOptions[2] = { 'MetaMods1','MetaMods2','MetaMods3','Accel','Scroll','Effect','Appearance','Handicap','InsertTaps','InsertOther','Hide','Ghost','Compare','Measure','LifeBar' }
 
 function CompareTextFormat(self,n) self:zoom(.3) end -- This is added on top of the base positioning etc.