diff --git a/Assets/Judgements/Judgment Normal 2x6.png b/Assets/Judgments/Judgment Normal 2x6.png similarity index 100% rename from Assets/Judgements/Judgment Normal 2x6.png rename to Assets/Judgments/Judgment Normal 2x6.png diff --git a/Assets/Judgements/default 1x6.png b/Assets/Judgments/default 1x6.png similarity index 100% rename from Assets/Judgements/default 1x6.png rename to Assets/Judgments/default 1x6.png diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua index 5f1269b09e..8021de98db 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua @@ -508,7 +508,7 @@ local alpha = 0.07 -- ewma alpha local avg local lastAvg --- Makes the error bars. They position themselves relative to the center of the screen based on your dv and diffuse to your judgement value before disappating or refreshing +-- Makes the error bars. They position themselves relative to the center of the screen based on your dv and diffuse to your judgment value before disappating or refreshing -- Should eventually be handled by the game itself to optimize performance function smeltErrorBar(index) return Def.Quad { diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/messagebox.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/messagebox.lua index ffe43c0eca..a3cf1e3859 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/messagebox.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/messagebox.lua @@ -40,8 +40,8 @@ return Def.ActorFrame { "Enable AutoplayCPU with shift+f8\n", "Press keys to toggle active elements", "Right click cancels any active element\n", - "1: Judgement Text Position", - "2: Judgement Text Size", + "1: Judgment Text Position", + "2: Judgment Text Size", "3: Combo Text Position", "4: Combo Text Size", "5: Error Bar Text Position", diff --git a/Themes/Til Death/Graphics/Player judgment/default.lua b/Themes/Til Death/Graphics/Player judgment/default.lua index d4691aea1b..a5247ead2b 100644 --- a/Themes/Til Death/Graphics/Player judgment/default.lua +++ b/Themes/Til Death/Graphics/Player judgment/default.lua @@ -32,7 +32,7 @@ end local t = Def.ActorFrame { Def.Sprite { - Texture = "../../../../" .. getAssetPath("judgement"), + Texture = "../../../../" .. getAssetPath("judgment"), Name = "Judgment", InitCommand = function(self) self:pause():visible(false):xy(MovableValues.JudgeX, MovableValues.JudgeY) diff --git a/Themes/_fallback/Graphics/Player judgment/default.lua b/Themes/_fallback/Graphics/Player judgment/default.lua index 67bf8c393b..c3732fc64b 100644 --- a/Themes/_fallback/Graphics/Player judgment/default.lua +++ b/Themes/_fallback/Graphics/Player judgment/default.lua @@ -31,10 +31,10 @@ local t = Def.ActorFrame {} t[#t + 1] = Def.ActorFrame { Def.Sprite { - Texture = "../../../../" .. getAssetPath("judgement"), + Texture = "../../../../" .. getAssetPath("judgment"), Name = "Judgment", InitCommand = function(self) - SCREENMAN:SystemMessage(getAssetPath("judgement")) + SCREENMAN:SystemMessage(getAssetPath("judgment")) self:pause():visible(false) end, OnCommand = THEME:GetMetric("Judgment", "JudgmentOnCommand"), diff --git a/Themes/_fallback/Languages/de.ini b/Themes/_fallback/Languages/de.ini index 906675e8f5..161d91d10b 100644 --- a/Themes/_fallback/Languages/de.ini +++ b/Themes/_fallback/Languages/de.ini @@ -318,7 +318,7 @@ 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 judgement. NEVER - never show Fantastic, ALWAYS - all modes of play. +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. @@ -395,7 +395,7 @@ Game=Ändere den momentanen Spieltyp mit dieser Option. GetRankingName=Determines if name entry should never be shown, always be shown, or shown when the course is listed on the high scores screen. Graphics/Sound Options=Ändere Vollbild-, Auflösung- und Sound-Optionen. Group= -HarshHotLifePenalty=If the life bar is full, and this is on, then a bad judgement means losing at least 10% of full life. +HarshHotLifePenalty=If the life bar is full, and this is on, then a bad judgment means losing at least 10% of full life. HiddenSongs=Some songs are only playable during Oni courses and with roulette. Leave this &oq;OFF&cq; to always display all songs. Hide=Hide Holds=Holds diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 2e9e61708e..622ca67971 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -328,7 +328,7 @@ 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 judgement in gameplay. +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. @@ -403,7 +403,7 @@ Get a better editor= Download Arrow Vortex, a powerful and flexible standalone e GetRankingName=Determines if name entry should never be shown, always be shown, or shown when the course is listed on the high scores screen. Graphics/Sound Options=Change full screen, resolution, and sound options. Group= -HarshHotLifePenalty=If the life bar is full, and this is on, then a bad judgement means losing at least 10% of full life. +HarshHotLifePenalty=If the life bar is full, and this is on, then a bad judgment means losing at least 10% of full life. HiddenSongs=Some songs are only playable during Oni courses and with roulette. Leave this &oq;OFF&cq; to always display all songs. Hide=Hide Holds=Holds diff --git a/Themes/_fallback/Scripts/11 AssetsConfig.lua b/Themes/_fallback/Scripts/11 AssetsConfig.lua index 073315db2c..ae55d9975f 100644 --- a/Themes/_fallback/Scripts/11 AssetsConfig.lua +++ b/Themes/_fallback/Scripts/11 AssetsConfig.lua @@ -2,8 +2,8 @@ local defaultConfig = { avatar = { default = "Assets/Avatars/_fallback.png" }, - judgement = { - default = "Assets/Judgements/default 1x6.png" + judgment = { + default = "Assets/Judgments/default 1x6.png" }, toasty = { default = "Assets/Toasties/default" @@ -13,7 +13,7 @@ local defaultConfig = { assetsFolder = "Assets/" assetFolders = { avatar = assetsFolder .. "Avatars/", - judgement = assetsFolder .. "Judgements/", + judgment = assetsFolder .. "Judgments/", toasty = assetsFolder .. "Toasties/" }