Remove AllowW1

this option was made for simulation of old ddr that didnt have marvs

Themes/_fallback/Languages/de.ini

@@ -318,7 +318,6 @@ Not Supported=Modus nicht unterstützt währenddem das Netzwerk benutzt wird.
 Accel=Beschleunige, Entschleunige, oder passe die Pfeilgeschwindigkeit anderweitig an.
 AllowExtraStage=When enabled (and Event Mode isn't on), allows the player to earn extra stages after completing certain requirements.
 AllowSongDeletion=Allow players to permanently delete songs from the system by pressing Ctrl+Backspace when browsing the music wheel.
-AllowW1=Enable or disable fantastic judgment.  NEVER - never show Fantastic, ALWAYS - all modes of play.
 AllowMultipleHighScoreWithSameName=If turned off, only the highest score with a given name will be saved. If turned on, it will allow mutliple high scores with a given name to be saved.
 AllowMultipleToasties=Allow multiple toasties to be shown in one song.
 Announcer=Choose from this list of installed announcer packs.
@@ -914,7 +913,6 @@ Air=Luft
 All timing=All timing
 AllowExtraStage=Extra Stufe erlauben
 AllowSongDeletion=Lieder- löschung erlauben
-AllowW1=Fantastisches Timing
 AllowMultipleHighScoreWithSameName=Competitiver Modus
 AllowMultipleToasties=Extra Toast
 Alter=Alter

Themes/_fallback/Languages/en.ini

@@ -370,7 +370,6 @@ Accel=Accelerate, Decelerate or otherwise adjust the arrow speed.
 AllowExtraStage=When enabled (and Event Mode isn't on), allows the player to earn extra stages after completing certain requirements.
 AllowHoldForOptions=If set to double tap, holding start when selecting a song will not go to the options screen.
 AllowSongDeletion=Allow players to permanently delete songs from the system by pressing Ctrl+Backspace when browsing the music wheel.
-AllowW1=Enable or disable the marvelous judgment in gameplay.
 AllowMultipleHighScoreWithSameName=If turned off, only the highest score with a given name will be saved. If turned on, it will allow mutliple high scores with a given name to be saved.
 AllowMultipleToasties=Allow multiple toasties to be shown in one song.
 Announcer=Choose from this list of installed announcer packs.
@@ -966,7 +965,6 @@ All timing=All timing
 AllowExtraStage=Allow Extra Stage
 AllowHoldForOptions=Allow Hold For Options
 AllowSongDeletion=Allow Song Deletion
-AllowW1=Fantastic Timing
 AllowMultipleHighScoreWithSameName=Competitive Mode
 AllowMultipleToasties=Extra Toast
 Alter=Alter

Themes/_fallback/Languages/es.ini

@@ -316,7 +316,6 @@ Not Supported=No soportado en red.
 Accel=Acelera, desacelera o ajusta la velocidad de las flechas.
 AllowExtraStage=Si está activado (y el modo Evento está desactivado), el jugador puede participar en fases extra tras completar ciertos requisitos.
 AllowSongDeletion=Permite que los jugadores eliminen canciones del sistema pulsando Ctrl+Retroceso en la ruleta de música.
-AllowW1=Activa o desactiva el juicio fantástico. NUNCA: no muestra Fantásticos.\nSOLO CURSOS: solo durante Sin parar y Oni. SIEMPRE: en todos los modos.
 Announcer=Escoge un comentarista de entre los instalados.
 Appearance=Apariencia
 Appearance Options=Cambia el tema, el comentarista y otras opciones de estilo.
@@ -899,7 +898,6 @@ Accel=Aceleración
 Add/Edit Background Change=Añadir/Editar cambio de fondo
 Air=Aire
 AllowExtraStage=Permitir fases extra
-AllowW1=Sincron. fantástica
 Alter=Alterar
 Announcer=Comentarista
 Appearance=Apariencia

Themes/_fallback/Languages/fr.ini

@@ -316,7 +316,6 @@ Not Supported=Mode not supported while networked.
 [OptionExplanations]
 Accel=Accélère, Ralenti ou ajuste la vitesse des flèches.
 AllowExtraStage=Quand activé (et hors Mode Évènement), Permet le joueur de gagner des stages supplémentaires après avoir complété certain critères.
-AllowW1=Active ou désactive le jugement Fantastique.  JAMAIS - Ne jamais montrer Fantastique, PARCOURS SEULEMENT - Seulement dans les modes Sans Arrêt/Oni, TOUJOURS - Tout les modes de jeu.
 AllowMultipleHighScoreWithSameName=Si Non, seulement le plus haut score d'un même nom va être sauvegardé. Si Oui, permet de sauvegarder plusieurs haut scores d'un même nom.
 AllowSongDeletion=Permettre au joueurs d'effacer définitivement du système des chansons. Peser Ctrl+Retour arrière en étant sur la roue de musique.
 Announcer=Choisi depuis cette liste de packs d'annonceur installés.
@@ -398,7 +397,7 @@ InputDebounceTime=Time that a panel takes to depress.  Use this to deal with gho
 Insert=Insert
 Insert Credit=Insert Credit
 Invalid=Invalid row definition.
-Key Joy Mappings=Assigne des touches et boutons de joystick à des fonctions de jeu. 
+Key Joy Mappings=Assigne des touches et boutons de joystick à des fonctions de jeu.
 Language=Choisissez votre langue.
 LifeDifficulty=Increase this value to cause your life meter to drain faster and refill slower.
 LifeType=LifeType
@@ -896,20 +895,20 @@ Off=Off
 # Main Options Menu
 Calibrate Machine Sync=Calibrer la synchronisaton
 Select Game=Choisir le Jeu
-Key Joy Mappings=Config boutton/Joystick 
+Key Joy Mappings=Config boutton/Joystick
 InputOptions=Options de Saisie
 Display Options=Options d'Affichage
 Reload Songs=Recharger les Chansons & Parcours
-Arcade Options=Options d'Arcade 
+Arcade Options=Options d'Arcade
 Appearance Options=Options Apparence
-Theme Options=Options de Thème 
+Theme Options=Options de Thème
 Set BG Fit Mode=Set BG Fit Mode
-Graphics/Sound Options=Options Graphiques/Son 
+Graphics/Sound Options=Options Graphiques/Son
 Profiles=Profiles
 Network Options=Options Réseau
 UI Options=Options IU
-Advanced Options=Options Avancées 
-StepMania Credits=Crédits StepMania 
+Advanced Options=Options Avancées
+StepMania Credits=Crédits StepMania
 Exit=Quitter
 # Select Game
 Game=Jeu
@@ -919,7 +918,7 @@ CoinMode=Mode  Jeton
 SongsPerPlay=Chansons Par Partie
 CoinsPerCredit=Jetons Par Crédit
 Premium=Premium
-EventMode=Mode Évènement 
+EventMode=Mode Évènement
 AllowMultipleHighScoreWithSameName=Mode Compétition
 ComboContinuesBetweenSongs=Continuer le Combo
 FailOffForFirstStageEasy=1er Stage Facile
@@ -940,16 +939,16 @@ DefaultNoteSkin=NoteSkin par défaut
 PercentageScoring=Score en %
 RandomBackgroundMode=Mode Fond Aléatoire
 BGBrightness=Luminosité
-BackgroundFitMode=Ajustement de Fond 
+BackgroundFitMode=Ajustement de Fond
 ShowBeginnerHelper=Aide pour Débutant
 NumBackgrounds=# de Fonds Aléatoires
 # Graphics/Sound Options
 Windowed=Mode d'Affichage
 DisplayResolution=Résolution
 DisplayAspectRatio=Format de l'Image
 DisplayColorDepth=Couleurs
-HighResolutionTextures=Textures Haute-Rés 
-MaxTextureResolution=Résolution de Texture 
+HighResolutionTextures=Textures Haute-Rés
+MaxTextureResolution=Résolution de Texture
 TextureColorDepth=Couleurs de Texture
 MovieColorDepth=Couleurs de Vidéo
 SmoothLines=SmoothLines
@@ -987,7 +986,6 @@ LifeDifficulty=Difficulté de Vie
 DefaultFailType=Default Fail Type
 Speed Increment=P'tite Vitesse
 Speed Increment Large=Grande Vitesse
-AllowW1=Timing Fantastique
 HiddenSongs=Chansons Cachées
 EasterEggs=Oeufs de Pâque
 UseUnlockSystem=Déverrouiller le Système
@@ -1023,7 +1021,7 @@ Persp=Perspective
 Assist=Assistance
 Rate=Rythme
 AutoAdjust=Auto Ajuste
-EditorShowBGChangesPlay=Montrer le Fond 
+EditorShowBGChangesPlay=Montrer le Fond
 ScreenFilter=Filtre d'Écran
 EditRecordModeLeadIn=Débuter après ...
 #Editor Menu (with Esc)
@@ -1368,12 +1366,12 @@ Enter room name=Nom de la salle
 Empty=- VIDE -
 
 [RoomInfoDisplay]
-Last Round Info:=Info de dernière Round: 
-Room Name:=Nom: 
-Room Description:=Description: 
-Song Title:=Titre: 
-Song Subtitle:=Sous-titre: 
-Song Artist:=Artiste: 
+Last Round Info:=Info de dernière Round:
+Room Name:=Nom:
+Room Description:=Description:
+Song Title:=Titre:
+Song Subtitle:=Sous-titre:
+Song Artist:=Artiste:
 Players=Joueurs
 
 [SMPackageUtil]
@@ -1889,17 +1887,17 @@ secondary=Secondaire
 Backspace=Retour Arrière
 Cancel=Annuler
 Done=Terminé
-HeaderText= 
+HeaderText=
 Space=Espace
 "%s" is an invalid floating point value.="%s" is an invalid floating point value.
 AnswerCaret=_
-AnswerBlank= 
+AnswerBlank=
 
 [ScreenTitleMenu]
 # Old 3.9 Strings
 %d songs in %d groups=%d Chansons dans %d Groupes
 %d courses in %d groups=%d Parcours dans %d Groupes
-%d unlocks=%d Débloquable 
+%d unlocks=%d Débloquable
 # New Default Strings
 Gametype:=Type de jeu:
 Difficulty:=Difficulté:
@@ -2544,7 +2542,7 @@ HeaderText=Profiles
 [ScreenOptionsSystemDirection]
 HeaderText=Direction du Système
 [ScreenOptionsUI]
-HeaderText=IU 
+HeaderText=IU
 [ScreenOptionsArcade]
 HeaderText=Arcade
 [ScreenOptionsInput]

Themes/_fallback/Languages/ja.ini

@@ -509,7 +509,6 @@ ShowSongOptions=プレイオプション画面への移行の仕方を設定し
 
 //メニュー→オプション→アドバンスド
 AllowSongDeletion=ミュージックホイールでCtrl+Backspaceキーを押すと選択中の曲が削除できるようになります。\n復元はできないので削除は慎重に行ってください。
-AllowW1=Fantastic判定の使用範囲を設定します。NEVERでは出なくなります。\nCOURSES ONLYではExtendedモードかOniモードのみで出ます。\nALWAYSではどのモードでも出ます。
 AutogenGroupCourses=OnにするとExtendedモードとEndlessモードのコースが自動生成されます。
 AutogenSteps=Onにすると他のゲームモードやスタイルから譜面が自動生成されます。
 AxisFix=Onにすると方向キーを軸に割り当てるアダプタへの対応策を行います。\nMac OS XおよびLinux Joystickドライバは未対応です。

Themes/_fallback/Languages/nl.ini

@@ -319,7 +319,6 @@ Advanced Options=Verander geavanceerde opties zoals de puntentelling, de nauwkeu
 AllowExtraStage=Als dit aan staat (en Evenement Mode uit staat) kunnen spelers extra nummers verdienen na voldaan te hebben aan bepaalde voorwaarden.
 AllowSongDeletion=Sta spelers toe permanent nummers van het systeem te verwijderen door op Ctrl+Backspace te drukken tijdens het browsen van het muziekwiel.
 AllowMultipleHighScoreWithSameName=Wanneer uitgeschakeld, wordt alleen de hoogste score met een gegeven naam opgeslagen. Wanneer ingeschakeld, worden meerdere high scores met een gegeven naam opgeslagen.
-AllowW1=Zet de fantastische waardering aan/uit. NOOIT - laat nooit de fantastische waardering zien, ALTIJD - bij alle modi.
 Announcer=Kies uit deze lijst van geïnstalleerde omroeper pakketten.
 Appearance Options=Verander het thema, de omroeper en andere stijlopties.
 Appearance=Uiterlijk
@@ -902,7 +901,6 @@ Air=Lucht
 AllowExtraStage=Laat extra nummers toe
 AllowSongDeletion=Sta het verwijderen van nummers toe
 AllowMultipleHighScoreWithSameName=Competitief Mode
-AllowW1=Fantastische Timing
 Alter=Wijzig
 Announcer=Omroeper
 Appearance Options=Opties voor het uiterlijk

Themes/_fallback/Languages/pl.ini

@@ -318,7 +318,6 @@ Not Supported=Tryb nie działa w trakcie gry sieciowej.
 Accel=Przyśpieszanie, Spowolnienie lub innymi słowy ustawienie prędkości strzałek.
 AllowExtraStage=Włączony (nawet w trybie Impreza), pozwala by gracz mógł zdobyć możliwość zagrania dodatkowej piosenki po spełnieniu pewnych określonych wymagań.
 AllowMultipleHighScoreWithSameName=Jeżeli włączona, tylko najwyższy wynik danej nazwy zostanie zapisany. Jeżeli wyłączona, pozwoli by wiele wysokich wyników danej nazwy zostało zapisanych.
-AllowW1=Włącza/wyłącza ocenę Fantastic.  NIGDY - ocena wyłączona w każdym trybie, TYLKO MARATONY - użycie tylko podczas maratonów, ZAWSZE - działa w każdym trybie gry.
 Announcer=Umożliwia wybór Komentatora.
 Appearance=Wygląd
 Appearance Options=Zmiana/wybór motywu graficznego, komentatora, innych opcji stylu.

Themes/_fallback/Languages/zh.ini

@@ -358,7 +358,6 @@ Accel=選擇加速, 減速或是其他調整按鍵速度的特效.
 AllowExtraStage=當選擇為開而且活動模式沒有開啟時, 滿足一定條件會讓玩家進入額外關卡.
 AllowHoldForOptions=如果設定為雙擊, 在選歌界面長按 <開始> 不會進入歌曲選項.
 AllowSongDeletion=允許玩家在選曲模式用 Ctrl + Backspace 永久刪除目前選擇的歌曲.
-AllowW1=選擇Marvelous判定的使用範圍.
 AllowMultipleHighScoreWithSameName=是否記錄一個名稱內多個最高分.
 AllowMultipleToasties=是否在一首歌曲內多次顯示彩蛋.
 Announcer=主持人的選擇, 需要主持人專用的安裝包.
@@ -952,7 +951,6 @@ All timing=全部時點
 AllowExtraStage=添加格外關卡
 AllowHoldForOptions=長按進入 歌曲選項
 AllowSongDeletion=允許歌曲刪除
-AllowW1=Marvelous判定
 AllowMultipleHighScoreWithSameName=競爭模式
 AllowMultipleToasties=額外彩蛋
 Alter=修改

Themes/_fallback/base._ini

@@ -1986,7 +1986,7 @@ AllTimeY=110
 AllTimeOnCommand=zoom,0.7;diffuseshift;effectcolor1,0.5,0.5,0.5,1
 TitleX=SCREEN_CENTER_X
 TitleY=140
-TitleOnCommand=zoom,0.8 
+TitleOnCommand=zoom,0.8
 DataX=0
 DataY=SCREEN_CENTER_Y+16
 DataOnCommand=
@@ -2425,7 +2425,7 @@ IdleTimeoutSeconds=0
 
 [ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
-LineNames="1,2,3,4,5,6,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32"
+LineNames="1,2,3,4,5,6,8,9,10,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32"
 Line1="conf,MenuTimer"
 Line2="conf,ScoringType"
 Line3="conf,TimingWindowScale"
@@ -2435,7 +2435,6 @@ Line6="conf,ProgressiveStageLifebar"
 Line8="conf,DefaultFailType"
 Line9="conf,ShowSongOptions"
 Line10="conf,GetRankingName"
-Line11="conf,AllowW1"
 Line12="conf,Center1Player"
 Line13="conf,HiddenSongs"
 Line14="conf,EasterEggs"

Themes/_fallback/metrics.ini

@@ -2218,7 +2218,7 @@ PrevScreen="ScreenOptionsInputSub"
 Fallback="ScreenOptionsServiceChild"
 PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
-LineNames="1,2,3,4,5,FNR,6,7,8,9,FA,12,13,14,15,16,17,18,20,21"
+LineNames="1,2,3,4,5,FNR,6,7,8,FA,12,13,14,15,16,17,18,20,21"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
 Line3="conf,DisplayAspectRatio"
@@ -2228,7 +2228,6 @@ LineFNR="conf,FastNoteRendering"
 Line6="conf,SoundVolume"
 Line7="conf,TimingWindowScale"
 Line8="conf,LifeDifficulty"
-Line9="conf,AllowW1"
 LineFA="conf,DefaultFailType"
 Line12="conf,ShowCaution"
 Line13="conf,ShowInstructions"
@@ -2271,14 +2270,13 @@ Line20="conf,VisualDelaySeconds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="3,4,SI,SM,HN,11,SSR,14,30,OsuLifts,ReplayMods,PR"
+LineNames="3,4,SI,SM,HN,SSR,14,30,OsuLifts,ReplayMods,PR"
 #LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
 Line4="conf,LifeDifficulty"
 LineSI="lua,SpeedModIncSize()"
 LineSM="lua,SpeedModIncLarge()"
 LineHN="conf,MinTNSToHideNotes"
-Line11="conf,AllowW1"
 LineSSR="conf,SortBySSRNormPercent"
 Line14="conf,EasterEggs"
 Line30="conf,FastLoad"

src/Etterna/Actor/Gameplay/Player.cpp

@@ -2041,7 +2041,7 @@ Player::Step(int col,
 
 	// if the nerv is too small, dont optimize
 	auto skipstart = nerv.size() > 10 ? nerv[10] : iSongRow + 1;
-	
+
 	if (iSongRow < skipstart || iSongRow > static_cast<int>(nerv.size()) - 10) {
 		iStepSearchRows =
 		  max(BeatToNoteRow(m_Timing->GetBeatFromElapsedTime(
@@ -2319,9 +2319,6 @@ Player::Step(int col,
 
 		// Do game-specific and mode-specific score mapping.
 		score = GAMESTATE->GetCurrentGame()->MapTapNoteScore(score);
-		if (score == TNS_W1 && !GAMESTATE->ShowW1()) {
-			score = TNS_W2;
-		}
 
 		if (score != TNS_None) {
 			pTN->result.tns = score;

src/Etterna/Actor/Gameplay/PlayerReplay.cpp

@@ -550,7 +550,7 @@ PlayerReplay::Step(int col,
 	// Check for tap
 	int iStepSearchRows;
 	static const auto StepSearchDistance = GetMaxStepDistanceSeconds();
-	
+
 	// if the nerv is too small, dont optimize
 	auto skipstart = nerv.size() > 10 ? nerv[10] : iSongRow + 1;
 
@@ -692,8 +692,6 @@ PlayerReplay::Step(int col,
 
 		// Do game-specific and mode-specific score mapping.
 		score = GAMESTATE->GetCurrentGame()->MapTapNoteScore(score);
-		if (score == TNS_W1 && !GAMESTATE->ShowW1())
-			score = TNS_W2;
 
 		if (score != TNS_None) {
 			pTN->result.tns = score;

src/Etterna/Models/ScoreKeepers/ScoreKeeperNormal.cpp

@@ -272,7 +272,7 @@ ScoreKeeperNormal::AddScoreInternal(TapNoteScore score)
 				p = 10;
 				break;
 			case TNS_W2:
-				p = GAMESTATE->ShowW1() ? 9 : 10;
+				p = 9;
 				break;
 			case TNS_W3:
 				p = 5;
@@ -784,8 +784,6 @@ ScoreKeeperNormal::HoldNoteScoreToGradePoints(HoldNoteScore hns) const
 int
 ScoreKeeperNormal::TapNoteScoreToDancePoints(TapNoteScore tns, bool bBeginner)
 {
-	if (!GAMESTATE->ShowW1() && tns == TNS_W1)
-		tns = TNS_W2;
 
 	/* This is used for Oni percentage displays. Grading values are currently in
 	 * StageStats::GetGrade. */
@@ -851,8 +849,6 @@ ScoreKeeperNormal::HoldNoteScoreToDancePoints(HoldNoteScore hns, bool bBeginner)
 int
 ScoreKeeperNormal::TapNoteScoreToGradePoints(TapNoteScore tns, bool bBeginner)
 {
-	if (!GAMESTATE->ShowW1() && tns == TNS_W1)
-		tns = TNS_W2;
 
 	/* This is used for Oni percentage displays. Grading values are currently in
 	 * StageStats::GetGrade. */

src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp

@@ -849,7 +849,6 @@ InitializeConfOptions()
 	ADD(ConfOption("Center1Player", MovePref<bool>, "Off", "On"));
 	ADD(ConfOption("EasterEggs", MovePref<bool>, "Off", "On"));
 	// W1 is Fantastic Timing
-	ADD(ConfOption("AllowW1", MovePref<AllowW1>, "Never", "Always"));
 	ADD(ConfOption("SortBySSRNormPercent", MovePref<bool>, "Off", "On"));
 	ADD(ConfOption("UseMidGrades", MovePref<bool>, "Off", "On"));