Skip to content

Commit cce07b2

Browse files
poco0317poco0317
authored
Merge pull request #26 from poco0317/master
Prepare for v2.2.3 release - Compatibility with Etterna 0.68.1
2 parents c76a663 + 9bb629e commit cce07b2

File tree

16 files changed

+837
-374
lines changed

16 files changed

+837
-374
lines changed

‎BGAnimations/ScreenColorEdit overlay.lua‎

Lines changed: 651 additions & 107 deletions
Large diffs are not rendered by default.

‎BGAnimations/ScreenEvaluation decorations/default.lua‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ local frameY = 150
1010
local frameWidth = SCREEN_CENTER_X-WideScale(get43size(40),40)
1111
local frameHeight = 300
1212
local rate = getCurRate()
13-
local judge = GetTimingDifficulty()
13+
local judge = (PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())
1414
local offsetIndex
1515

1616
-- Reset preview music starting point since song was finished.
@@ -30,6 +30,7 @@ local showScoreboardOnSimple = themeConfig:get_data().global.ShowScoreboardOnSim
3030
local offsetY2 = 0
3131
local offsetWidth2 = 0
3232
local offsetHeight2 = 0
33+
local offsetisLocal
3334

3435
local function scroller(event)
3536
if event.type == "InputEventType_FirstPress" then
@@ -96,7 +97,7 @@ local function oldEvalStuff()
9697
rescoredPercentage = getRescoredWifeJudge(dvt, judge, totalHolds - holdsHit, minesHit, totalTaps)
9798
end
9899
if params.Name == "ResetJudge" then
99-
judge = enabledCustomWindows and 0 or GetTimingDifficulty()
100+
judge = enabledCustomWindows and 0 or (PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())
100101
self:GetParent():playcommand("ResetJudge")
101102
elseif params.Name ~= "ToggleHands" then
102103
self:GetParent():playcommand("SetJudge", params)
@@ -687,10 +688,15 @@ local function oldEvalStuff()
687688
self:playcommand("Set")
688689
end,
689690
SetCommand = function(self)
690-
self:settext(THEME:GetString("ScreenEvaluation","CategoryClearType"))
691+
if PREFSMAN:GetPreference("SortBySSRNormPercent") then
692+
self:settextf("%s (J4)", THEME:GetString("ScreenEvaluation", "CategoryClearType"))
693+
else
694+
self:settext(THEME:GetString("ScreenEvaluation","CategoryClearType"))
695+
end
691696
end,
692697
SetJudgeCommand = function(self)
693-
self:settextf("%s (J%d)", THEME:GetString("ScreenEvaluation", "CategoryClearType"), GetTimingDifficulty())
698+
local jdg = (PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())
699+
self:settextf("%s (J%d)", THEME:GetString("ScreenEvaluation", "CategoryClearType"), jdg)
694700
end,
695701
ResetJudgeCommand = function(self)
696702
self:playcommand("Set")
@@ -767,10 +773,15 @@ local function oldEvalStuff()
767773
self:playcommand("Set")
768774
end,
769775
SetCommand = function(self)
770-
self:settextf("%s - %s",THEME:GetString("ScreenEvaluation","CategoryScore"),getScoreTypeText(1))
776+
if PREFSMAN:GetPreference("SortBySSRNormPercent") then
777+
self:settextf("%s - %s J4", THEME:GetString("ScreenEvaluation","CategoryScore"), getScoreTypeText(1))
778+
else
779+
self:settextf("%s - %s", THEME:GetString("ScreenEvaluation","CategoryScore"), getScoreTypeText(1))
780+
end
771781
end,
772782
SetJudgeCommand = function(self)
773-
self:settextf("%s - %s J%d", THEME:GetString("ScreenEvaluation", "CategoryScore"), getScoreTypeText(1), GetTimingDifficulty())
783+
local jdg = (PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())
784+
self:settextf("%s - %s J%d", THEME:GetString("ScreenEvaluation", "CategoryScore"), getScoreTypeText(1), jdg)
774785
end,
775786
ResetJudgeCommand = function(self)
776787
self:playcommand("Set")
@@ -1280,7 +1291,6 @@ local function oldEvalStuff()
12801291

12811292
local lbActor
12821293
local offsetScoreID
1283-
local offsetisLocal
12841294
local currentCountry = "Global"
12851295
local scoresPerPage = 5
12861296
local maxPages = math.ceil(#hsTable/scoresPerPage)

‎BGAnimations/ScreenSelectMusic overlay/currentsort.lua‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ local wheel
1414
local song
1515
local released = false
1616
local goneOff = false
17+
local instantSearch = themeConfig:get_data().global.InstantSearch
1718

1819
local sortTable = {
1920
SortOrder_Preferred = 'Preferred',
@@ -79,6 +80,9 @@ local function searchInput(event)
7980
MESSAGEMAN:Broadcast("EndSearch")
8081

8182
elseif event.button == "Start" then
83+
if not instantSearch then
84+
wheel:SongSearch(searchstring)
85+
end
8286
MESSAGEMAN:Broadcast("EndSearch")
8387

8488
elseif event.button == "MenuLeft" then
@@ -115,7 +119,11 @@ local function searchInput(event)
115119
end
116120
end
117121
if lastsearchstring ~= searchstring then
118-
wheel:SongSearch(searchstring)
122+
if instantSearch then
123+
wheel:SongSearch(searchstring)
124+
else
125+
sortText:playcommand("SetSortOrder")
126+
end
119127
lastsearchstring = searchstring
120128
GHETTOGAMESTATE:setMusicSearch(searchstring)
121129
end
@@ -207,6 +215,7 @@ t[#t+1] = LoadFont("Common Normal") .. {
207215
self:zoom(0.45)
208216
self:diffuse(color(colorConfig:get_data().main.headerFrameText))
209217
self:maxwidth((frameWidth-40)/0.45)
218+
sortText = self
210219
end,
211220
SortOrderChangedMessageCommand = function(self)
212221
self:queuecommand("SetSortOrder")

‎BGAnimations/ScreenSelectMusic overlay/net/currentsort.lua‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ local wheel
1414
local song
1515
local released = false
1616
local goneOff = false
17+
local instantSearch = themeConfig:get_data().global.InstantSearch
1718

1819
local sortTable = {
1920
SortOrder_Preferred = 'Preferred',
@@ -79,6 +80,9 @@ local function searchInput(event)
7980
MESSAGEMAN:Broadcast("EndSearch")
8081

8182
elseif event.button == "Start" then
83+
if not instantSearch then
84+
wheel:SongSearch(searchstring)
85+
end
8286
MESSAGEMAN:Broadcast("EndSearch")
8387

8488
elseif event.button == "MenuLeft" then
@@ -115,7 +119,11 @@ local function searchInput(event)
115119
end
116120
end
117121
if lastsearchstring ~= searchstring then
118-
wheel:SongSearch(searchstring)
122+
if instantSearch then
123+
wheel:SongSearch(searchstring)
124+
else
125+
sortText:playcommand("SetSortOrder")
126+
end
119127
lastsearchstring = searchstring
120128
GHETTOGAMESTATE:setMusicSearch(searchstring)
121129
end
@@ -207,6 +215,7 @@ t[#t+1] = LoadFont("Common Normal") .. {
207215
self:zoom(0.45)
208216
self:diffuse(color(colorConfig:get_data().main.headerFrameText))
209217
self:maxwidth((frameWidth-40)/0.45)
218+
sortText = self
210219
end,
211220
SortOrderChangedMessageCommand = function(self)
212221
self:queuecommand("SetSortOrder")

‎Graphics/OffsetGraph.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local dotHeight = 2
77
-- shamelessly lifted straight from Til Death in Etterna .64:
88
local judges = {"marv", "perf", "great", "good", "boo", "miss"}
99
local tst = ms.JudgeScalers
10-
local judge = GetTimingDifficulty()
10+
local judge = (PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())
1111
local tso = tst[judge]
1212

1313
local enabledCustomWindows = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).CustomEvaluationWindowTimings
@@ -95,8 +95,8 @@ local t = Def.ActorFrame{
9595
end
9696
end
9797
if params.Name == "ResetJudge" then
98-
judge = enabledCustomWindows and 0 or GetTimingDifficulty()
99-
tso = tst[GetTimingDifficulty()]
98+
judge = enabledCustomWindows and 0 or (PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())
99+
tso = tst[(PREFSMAN:GetPreference("SortBySSRNormPercent") and 4 or GetTimingDifficulty())]
100100
end
101101
if params.Name ~= "ResetJudge" and params.Name ~= "PrevJudge" and params.Name ~= "NextJudge" and params.Name ~= "ToggleHands" then return end
102102
maxOffset = (enabledCustomWindows and judge ~= 0) and customWindow.judgeWindows.boo or math.max(180, 180 * tso)

‎Graphics/_thick circle (doubleres).png‎

722 Bytes
Loading

‎Graphics/color_hsv.png‎

6.11 KB
Loading

‎Graphics/color_sat_overlay.png‎

37.9 KB
Loading

‎Languages/en.ini‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ TargetTrackerMode = Target Tracker Mode
137137
Leaderboard = Gameplay Leaderboard
138138
LeaderboardSlots = Leaderboard Slots
139139
AnimatedLeaderboard = Leaderboard Animations
140+
InstantSearch=Instant Search
140141

141142

142143
[OptionExplanations]
@@ -176,6 +177,7 @@ DisplayMean = Show your current tap mean.
176177
TargetTracker = Toggle a tracker that shows your current difference in Wifepoints and Percent against a PB or Goal.
177178
TargetGoal = Define a goal percentage for the Target Tracker.
178179
TargetTrackerMode = Set the mode for the Target Tracker. Set Percent uses the goal percentage. Personal Best uses your current rate PB.
180+
InstantSearch=Turn this on to have the Song Wheel update for every letter you put into the song search. If you lag when searching, turn this off.
179181
180182
[OptionTitles]
181183
JudgeType=Judge Count
@@ -321,25 +323,25 @@ PacemakerCurrent=Pacemaker Current (unused)
321323
PacemakerTarget=Pacemaker Target (unused)
322324
ScreenFilter=Notefield Filter Color
323325
324-
grade=Grade
326+
grades=Grade
325327
Grade_Failed=Failed
326328
Grade_None=None
327-
Grade_Tier01=AAAA
328-
Grade_Tier02=AAA
329-
Grade_Tier03=AA
330-
Grade_Tier04=A
331-
Grade_Tier05=B
332-
Grade_Tier06=C
333-
Grade_Tier07=D
334-
Grade_Tier08=Grade_Tier08
335-
Grade_Tier09=Grade_Tier09
336-
Grade_Tier10=Grade_Tier10
337-
Grade_Tier11=Grade_Tier11
338-
Grade_Tier12=Grade_Tier12
339-
Grade_Tier13=Grade_Tier13
340-
Grade_Tier14=Grade_Tier14
341-
Grade_Tier15=Grade_Tier15
342-
Grade_Tier16=Grade_Tier16
329+
Grade_Tier01=AAAAA
330+
Grade_Tier02=AAAA:
331+
Grade_Tier03=AAAA.
332+
Grade_Tier04=AAAA
333+
Grade_Tier05=AAA:
334+
Grade_Tier06=AAA.
335+
Grade_Tier07=AAA
336+
Grade_Tier08=AA:
337+
Grade_Tier09=AA.
338+
Grade_Tier10=AA
339+
Grade_Tier11=A:
340+
Grade_Tier12=A.
341+
Grade_Tier13=A
342+
Grade_Tier14=B
343+
Grade_Tier15=C
344+
Grade_Tier16=D
343345
Grade_Tier17=Grade_Tier17
344346
345347
judgment=Judgments
@@ -403,6 +405,15 @@ ultramarathon=Ultramarathon
403405
404406
[ScreenColorEdit]
405407
HeaderText=Color Config
408+
Description=Press <Enter> to confirm a typed color. Use <Left/Right> to move the cursor\nUse <Backspace> and <Delete> to reset characters\nPress <Enter> after confirming or after clicking to save and exit\nPress <Esc> to exit without saving
409+
AboutToSave=ABOUT TO SAVE
410+
ManualEntry=Manual Entry
411+
Hexadecimal=Hex
412+
RedGreenBlueAlpha=RGBA
413+
Saturation=Sat
414+
Alpha=Alpha
415+
DefaultDescription=Press <CTRL + Delete> to select the default color\nPress <ALT + Delete> to undo changes
416+
406417
407418
Description1=This will change the color
408419
Description2=Press <Left>/<Right> to move cursor, <Up>/<Down> to change value.\nPress <Start> to confirm and <Back> to exit.\nPlease reload metrics after changing colors as some colors will not update unless you do so.

‎Scripts/00 ThemeInfo.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
-- theme identification file
22

33
themeInfo = {
4-
Name = "spawncamping-wallhack (etterna .67.1)",
5-
Version = "2.2.2", -- a.b.c, a for complete overhauls, b for major releases, c for minor additions/bugfix.
6-
Date = "20200108",
4+
Name = "spawncamping-wallhack (etterna .68.1)",
5+
Version = "2.2.3", -- a.b.c, a for complete overhauls, b for major releases, c for minor additions/bugfix.
6+
Date = "20200225",
77
}
88

99
function getThemeName()

0 commit comments

Comments
 (0)