Skip to content

Commit

Permalink
remove dumb theme stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed Dec 6, 2018
1 parent 49e07ab commit 2ca53bc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 951 deletions.
206 changes: 0 additions & 206 deletions Themes/Til Death/metrics.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,6 @@ ScreenHeight=480
# and double before each game
AutoSetStyle=true

[StepsDisplayEvaluation]
Fallback="StepsDisplay"

MeterX=-20
MeterY=-50
MeterOnCommand=shadowlength,0;halign,1;

DescriptionX=-70
DescriptionY=-50
DescriptionOnCommand=shadowlength,0;uppercase,true;zoom,0.625;halign,1;maxwidth,220

AutogenSetCommand=

[GameState]
#Prevent 2P Side/Versus because then everything will mess up. This theme is strictly for 1P only. -Misterkister
AllowLateJoin=false
Expand Down Expand Up @@ -103,13 +90,6 @@ NumberMaxZoomAt=100
LabelMinZoom=0.75*0.75
LabelMaxZoom=0.75*0.75

# No more of this pulse shit
PulseCommand=
PulseLabelCommand=

# pointless to keep it here - moved to the luas
#NumberOnCommand=y,20;x,24;halign,1;valign,1;skewx,-0.125;zoom,0.5;
#LabelOnCommand=xy,30,20;zoom,0.6;diffusebottomedge,color("0.75,0.75,0.75,1");halign,0;valign,1

[ScreenSelectPlayMode]
#Normal Mode only for now
Expand Down Expand Up @@ -202,23 +182,6 @@ CodePrevRate="@Select-EffectUp"
CodeNextScore="EffectDown"
CodePrevScore="EffectUp"

#index should be = 0 but banner loads the number before the value updates for w/e reason so it's 4.
#BannerX=capWideScale(get43size(192),192) + 10
#BannerY=60+capWideScale(get43size(60),60)
BannerOnCommand=visible,false;
#BannerOnCommand=scaletoclipped,capWideScale(get43size(384),384),capWideScale(get43size(120),120);draworder,-1;bouncebegin,0.2;xy,(capWideScale(get43size(192),192))+10,60+capWideScale(get43size(60),60);visible,false;
#BannerOffCommand=bouncebegin,0.2;xy,(capWideScale(get43size(192),192))+10-500,60+capWideScale(get43size(60),60);
#BannerCodeMessageCommand=%function(self) \
# self:finishtweening() \
# if getTabIndex() == getMaxAvailIndex()-1 then \
# self:bouncebegin(0.2); \
# self:xy((capWideScale(get43size(192),192))+10,60+capWideScale(get43size(60),60)); \
# else \
# self:bouncebegin(0.2); \
# self:xy((capWideScale(get43size(192),192))+10-500,60+capWideScale(get43size(60),60)); \
# end; \
#end; \

# moved to musicselect decorations/wifetwirl
ShowBPMDisplay=false
ShowBPMLabel=false
Expand Down Expand Up @@ -526,27 +489,13 @@ CodeNextJudge="EffectUp"
CodePrevJudge="EffectDown"
CodeToggleHands="MenuDown"

# banner
LargeBannerX=SCREEN_CENTER_X
LargeBannerY=88
LargeBannerOnCommand=zoomto,capWideScale(get43size(256),256)*1.35,capWideScale(get43size(80),80)*1.35
LargeBannerOffCommand=

LargeBannerFrameOnCommand=visible,true


# GraphDisplay
ShowGraphDisplay=true
#~~~~~~~~~~~~~~#
GraphDisplayP1X=SCREEN_CENTER_X*0.35
GraphDisplayP1Y=SCREEN_TOP+80
GraphDisplayP1OnCommand=
GraphDisplayP1OffCommand=
#~~~~~~~~~~~~~~#
GraphDisplayP2X=SCREEN_CENTER_X*1.65
GraphDisplayP2Y=SCREEN_TOP+80
GraphDisplayP2OnCommand=
GraphDisplayP2OffCommand=

# ComboGraph
ShowComboGraph=true
Expand All @@ -555,11 +504,6 @@ ComboGraphP1X=SCREEN_CENTER_X*0.35
ComboGraphP1Y=SCREEN_TOP+120+6
ComboGraphP1OnCommand=
ComboGraphP1OffCommand=
#~~~~~~~~~~~~~~#
ComboGraphP2X=SCREEN_CENTER_X*1.65
ComboGraphP2Y=SCREEN_TOP+120+6
ComboGraphP2OnCommand=
ComboGraphP2OffCommand=

[ScreenNetEvaluation]
# judge changer listener i guess
Expand All @@ -573,119 +517,6 @@ CodeToggleHands="MenuDown"
Class="ScreenNetEvaluation"
Fallback="ScreenEvaluationNormal"
NextScreen="ScreenNetProfileSave"
User1X=SCREEN_CENTER_X*0.35
User1Y=SCREEN_CENTER_Y-160
User1OnCommand=
User1OffCommand=

UsersBG1X=SCREEN_CENTER_X*0.35
UsersBG1Y=SCREEN_CENTER_Y*0.975
UsersBG1OnCommand=
UsersBG1OffCommand=

User2X=SCREEN_CENTER_X*1.65
User2Y=SCREEN_CENTER_Y-160
User2OnCommand=
User2OffCommand=

UsersBG2X=SCREEN_CENTER_X*1.65
UsersBG2Y=SCREEN_CENTER_Y*0.975
UsersBG2OnCommand=
UsersBG2OffCommand=

UserDeSelCommand=zoomx,1.0;zoomy,1.0;linear,0.1;zoomx,0.5;zoomy,0.5
UserSelCommand=zoomx,0.5;zoomy,0.5;linear,0.1;zoomx,1.0;zoomy,1.0


UserTier02OrBetterCommand=rainbowscroll,true

UserDX=0
UserDY=24
UserOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomx,0.5;zoomy,0.5
UserOffCommand=zoomx,0.5;zoomy,0.5;linear,0.5;zoomx,0.0;zoomy,0.0

ShowJudgmentLineMaxCombo=false
MaxComboNumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+360),SCREEN_CENTER_X+320))
MaxComboNumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+40),SCREEN_CENTER_Y-30))
MaxComboNumberP1OnCommand=visible,false;zoom,0.55;
MaxComboNumberP1OffCommand=

ShowGradeArea=false
GradeP1X=(capWideScale(get43size(SCREEN_CENTER_X+90),SCREEN_CENTER_X))
GradeP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+48),SCREEN_CENTER_Y-24))
GradeP1OnCommand=visible,false;zoom,0.8;
GradeP1OffCommand=

GradeFrameP1X=SCREEN_CENTER_X-220
GradeFrameP1Y=SCREEN_TOP+80
GradeFrameP1OnCommand=visible,false;
GradeFrameP1OffCommand=

ShowJudgmentLineW1=false
W1NumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+160),SCREEN_CENTER_X+60))
W1NumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+71),SCREEN_CENTER_Y-6))
W1NumberP1OnCommand=zoom,0.55;
W1NumberP1OffCommand=

ShowJudgmentLineW2=false
W2NumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+160),SCREEN_CENTER_X+60))
W2NumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+94),SCREEN_CENTER_Y+12))
W2NumberP1OnCommand=visible,false;zoom,0.55;
W2NumberP1OffCommand=

ShowJudgmentLineW3=false
W3NumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+160),SCREEN_CENTER_X+60))
W3NumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+117),SCREEN_CENTER_Y+30))
W3NumberP1OnCommand=visible,false;zoom,0.55;
W3NumberP1OffCommand=

ShowJudgmentLineW4=false
W4NumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+400),SCREEN_CENTER_X+230))
W4NumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+71),SCREEN_CENTER_Y-6))
W4NumberP1OnCommand=visible,false;zoom,0.55;
W4NumberP1OffCommand=

ShowJudgmentLineW5=false
W5NumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+400),SCREEN_CENTER_X+230))
W5NumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+94),SCREEN_CENTER_Y+12))
W5NumberP1OnCommand=visible,false;zoom,0.55;
W5NumberP1OffCommand=

ShowJudgmentLineMiss=false
MissNumberP1X=(capWideScale(get43size(SCREEN_CENTER_X+400),SCREEN_CENTER_X+230))
MissNumberP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+117),SCREEN_CENTER_Y+30))
MissNumberP1OnCommand=visible,false;zoom,0.55;
MissNumberP1OffCommand=

PlayerOptionsP1X=(capWideScale(get43size(SCREEN_CENTER_X+270),SCREEN_CENTER_X+130))
PlayerOptionsP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+143),SCREEN_CENTER_Y+48))
PlayerOptionsP1OnCommand=visible,false;zoom,0.3;shadowlength,1
PlayerOptionsP1OffCommand=

PlayerOptionsP2X=SCREEN_CENTER_X-64
PlayerOptionsP2Y=SCREEN_TOP+407
PlayerOptionsP2OnCommand=visible,false;zoom,0.3;shadowlength,1
PlayerOptionsP2OffCommand=



ShowStepsDisplay=false
#~~~~~~~~~~~~~~~#
StepsDisplayP1X=(capWideScale(get43size(SCREEN_CENTER_X+200),SCREEN_CENTER_X+170))
StepsDisplayP1Y=(capWideScale(get43size(SCREEN_CENTER_Y+55),SCREEN_CENTER_Y+18))
StepsDisplayP1OnCommand=visible,false;
StepsDisplayP1OffCommand=
#~~~~~~~~~~~~~~#
StepsDisplayP2X=SCREEN_CENTER_X*-5
StepsDisplayP2Y=SCREEN_CENTER_Y*-5
StepsDisplayP2OnCommand=visible,false;
StepsDisplayP2OffCommand=

# detail area
ShowDetailArea=false

# labels are made elsewhere.
ShowSharedJudgmentLineLabels=false

[LifeMeterBar]
# control over the _actual_ graphic of the bar is handled under [StreamDisplay]
Expand Down Expand Up @@ -833,43 +664,6 @@ LineMeasureLines="lua,MeasureLines()"
Fallback="ScreenTextEntry"


[ScreenNetSelectBase]
ChatInputBoxX=SCREEN_CENTER_X
ChatInputBoxY=SCREEN_CENTER_Y+112
ChatInputBoxOnCommand=bounceend,0.5;diffusealpha,1
ChatInputBoxOffCommand=bouncebegin,0.5;zoomy,0
ChatInputBoxWidth=SCREEN_CENTER_X*0.9
ChatInputBoxHeight=30
#--#
ChatInputX=20
ChatInputY=380
ChatTextInputWidth=SCREEN_CENTER_X*1.8
ChatTextInputHeight=30
ChatInputOnCommand=zoom,0.5;halign,0;valign,0
ChatInputOffCommand=
#====#
ChatOutputBoxX=20
ChatOutputBoxY=400
ChatOutputBoxOnCommand=visible,true;diffusealpha,1;diffuse,color("#FFFFFF")
ChatOutputBoxOffCommand=
ChatOutputBoxWidth=300
ChatOutputBoxHeight=SCREEN_CENTER_Y*0.875
#--#
ChatOutputX=20
ChatOutputY=200
ChatTextOutputWidth=SCREEN_CENTER_X*1.8*(0.5/0.32)
ChatOutputLines=18
ChatOutputOnCommand=zoom,0.32;halign,0;valign,0
ChatOutputOffCommand=

UsersX=20
UsersY=SCREEN_BOTTOM-80
UserSpacingX=64
UserSpacingY=10
UserLine2Y=10
UsersOnCommand=draworder,2;zoom,0.4
UsersOffCommand=linear,0.5;zoom,0

[ScreenNetSelectMusic]
MusicWheelType="OnlineMusicWheel"
MusicWheelX=SCREEN_WIDTH-(capWideScale(get43size(350),350))
Expand Down
62 changes: 1 addition & 61 deletions Themes/_fallback/BGAnimations/ScreenSystemLayer error.lua
Original file line number Diff line number Diff line change
@@ -1,61 +1 @@
-- If you are a common themer, DO NOT INCLUDE THIS FILE IN YOUR THEME.
-- This layer is purely for error reporting, so that you can see errors on screen easily while running Etterna.
-- If you include this file in your theme, you will not benefit from any improvements in error reporting.
-- If you want to adjust how long errors stay on screen for, call the "SetErrorMessageTime" function. (see usage notes in comments above that function)

local line_height = 12 -- A good line height for Common Normal at .5 zoom.

local min_message_time = {show = 1, hide = .03125}
local default_message_time = {show = 4, hide = .125}
local message_time = {}
for k, v in pairs(default_message_time) do
message_time[k] = v
end

-- Example usage:
-- "SetErrorMessageTime('show' 5)" sets errors to show for 5 seconds before beginning to hide.
-- "SetErrorMessageTime('hide' .5)" sets errors to hide one error every .5 seconds after the show time has passed.
function SetErrorMessageTime(which, t)
if not min_message_time[which] then
MESSAGEMAN:Broadcast(
"ScriptError",
{
Message = "Attempted to set invalid overlay message time field: " .. tostring(which)
}
)
return
end
if t < min_message_time[which] then
MESSAGEMAN:Broadcast(
"ScriptError",
{
Message = "Attempted to set overlay message " ..
which .. " time to below minimum of " .. min_message_time[which] .. "."
}
)
return
end
message_time[which] = t
end

function GetErrorMessageTime(which)
return message_time[which]
end

function GetErrorMessageTimeMin(which)
return min_message_time[which]
end

function GetErrorMessageTimeDefault(which)
return default_message_time[which]
end

local log_args = {
Name = "ScriptError",
ReplaceLinesWhenHidden = true,
IgnoreIdentical = true,
Times = message_time,
Font = "Common Error"
}

return Def.LogDisplay(log_args)
--die
Loading

0 comments on commit 2ca53bc

Please sign in to comment.