actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various theme changes by Midiman and myself.

Browse Source
This commit is contained in:
AJ Kelly
2010-02-17 19:47:36 -06:00
parent 4791b411d1
commit dfc5f53134
36 changed files with 314 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Graphics/ScreenSelectMaster scroll.lua
+1 -1
View File
@@ -3,7 +3,7 @@ local gc = Var("GameCommand");
local t = Def.ActorFrame {};
t[#t+1] = LoadFont("Common Normal") .. {
Text=gc:GetName() .. "\n" .. gc:GetText();
Text=gc:GetName();
};
t.GainFocusCommand=cmd(visible,true);
Themes/_fallback/Languages/en.ini
+2
View File
@@ -2122,6 +2122,8 @@ HeaderText=Test Input
HeaderText=!
[ScreenOptionsManageProfiles]
HeaderText=Profiles
[ScreenOptionsSystemDirection]
HeaderText=System Direction
[ScreenOptionsUI]
HeaderText=UI
[ScreenOptionsArcade]
Themes/_fallback/Scripts/02 Actor.lua
+11 -13
View File
@@ -72,7 +72,17 @@ local SmoothBezier =
function Actor:smooth(t)
self:tween( t, "TweenType_Bezier", SmoothBezier );
end
-- SSC Additions
local DropBezier =
{
0 , 0,
1/3 , 1,
2/3 , 0.5,
1 , 1,
}
function Actor:drop(t)
self:tween( t, "TweenType_Bezier", DropBezier );
end
-- Hide if b is true, but don't unhide if b is false.
function Actor:hide_if(b)
if b then
@@ -135,18 +145,6 @@ function Actor:Center()
self:y(SCREEN_CENTER_Y);
end;
-- SSC Additions
local DropBezier =
{
0 , 0,
8/16 , 1,
12/16 , 0.5,
16/16 , 1,
}
function Actor:drop(t)
self:tween( t, "TweenType_Bezier", DropBezier );
end
-- (c) 2006 Glenn Maynard
-- All rights reserved.
--
Themes/_fallback/Scripts/02 Colors.lua
+14 -14
View File
@@ -5,26 +5,26 @@ Colors = {
-- UI Colors
-- These colors are common to the theme interface and should be used
-- often to make use of these efficiently.
Enabled = nilColor,
Disabled = nilColor,
Focused = nilColor,
Outline = nilColor,
Shadow = nilColor,
Important = nilColor,
Reward = nilColor,
Enabled = nilColor,
Disabled = nilColor,
Focused = nilColor,
Outline = nilColor,
Shadow = nilColor,
Important = nilColor,
Reward = nilColor,
Special = color("#f7941d"),
-- Global Colors
-- These colors are usually tied to colors that shouldn't change that
-- much throughout themes, but should be easily accessible.
-- ( Do note that I want to remove '*Color' entirely, it'll look neater )
Player = {
Player = {
P1 = color("#ef403d"),
P2 = color("#0089cf"),
},
Difficulty = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very
useful in some cases, especially to apply new colors for
stuff you couldn't before ]]
Difficulty = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very useful
in some cases, especially to apply new colors for stuff you
couldn't before. (huh? -aj) ]]
Beginner = color("#ff32f8"), -- light cyan
Easy = color("#2cff00"), -- green
Medium = color("#fee600"), -- yellow
@@ -33,8 +33,8 @@ Colors = {
Edit = color("0.8,0.8,0.8,1"), -- gray
Couple = color("#ed0972"), -- hot pink
Routine = color("#ff9a00"), -- orange
--[[ These are for courses, so let's slap them here incase someone
you wanted to use Difficulty in Course and Step regions ]]
--[[ These are for courses, so let's slap them here in case someone
wanted to use Difficulty in Course and Step regions. ]]
Difficulty_Beginner = color("0.0,0.9,1.0,1"), -- purple
Difficulty_Easy = color("0.9,0.9,0.0,1"), -- green
Difficulty_Medium = color("1.0,0.1,0.1,1"), -- yellow
Themes/_fallback/Scripts/02 Sprite.lua
+9 -5
View File
@@ -1,10 +1,14 @@
function Sprite:LoadFromSongBanner(song)
local Path = song:GetBannerPath()
if not Path then
Path = THEME:GetPathG("Common","fallback banner")
end
if song then
local Path = song:GetBannerPath()
if not Path then
Path = THEME:GetPathG("Common","fallback banner")
end
self:LoadBanner( Path )
self:LoadBanner( Path )
else
self:LoadBanner( THEME:GetPathG("Common","fallback banner") )
end;
end
function Sprite:LoadFromSongBackground(song)
Themes/_fallback/Scripts/03 CustomSpeedMods.lua
+1 -1
View File
@@ -278,7 +278,7 @@ function SpeedMods()
end;
--[[
Copyright © 2008-2009 AJ Kelly/KKI Labs.
Copyright © 2008-2009 AJ Kelly/KKI Labs.
Use freely, so long this notice and the above documentation remains.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
Themes/_fallback/Scripts/03 ProductivityHelpers.lua
+6 -117
View File
@@ -121,6 +121,12 @@ function tobool(v)
end;
function pname(pn) return ToEnumShortString(pn); end;
-- from http://ardoris.wordpress.com/2008/11/07/rounding-to-a-certain-number-of-decimal-places-in-lua/
function round(what, precision)
return math.floor(what*math.pow(10,precision)+0.5) / math.pow(10,precision)
end
--[[ end helper functions ]]
-- this code is in the public domain.
@@ -161,121 +167,4 @@ function ComboMaintain()
para = "TapNoteScore_W4",
};
return Maintain[sGame]
end;
function ComboPerRow()
sGame = GAMESTATE:GetCurrentGame():GetName();
if sGame == "pump" then
return true;
elseif GAMESTATE:GetPlayMode() == "PlayMode_Oni" then
return true;
else return false;
end;
end;
function HitCombo()
sGame = GAMESTATE:GetCurrentGame():GetName();
local Combo = {
dance = "2",
pump = "4",
beat = "2",
kb7 = "2",
para = "2",
};
return Combo[sGame]
end;
function MissCombo()
sGame = GAMESTATE:GetCurrentGame():GetName();
local Combo = {
dance = "2",
pump = "4",
beat = "",
kb7 = "",
para = "",
};
return Combo[sGame]
end;
function FailCombo() -- The combo that causes game failure.
sGame = GAMESTATE:GetCurrentGame():GetName();
local Combo = {
dance = "30", -- ITG/Pump Pro does it this way.
pump = "51",
beat = "-1",
kb7 = "-1",
para = "-1",
};
return Combo[sGame]
end;
-- todo: use tables for some of these -aj
function HoldTiming()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return 0;
else return PREFSMAN:GetPreference("TimingWindowSecondsHold");
end;
end;
function HoldJudgmentFail()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return cmd();
else return cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0);
end;
end;
function HoldJudgmentPass()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return cmd();
else return cmd(finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0);
end;
end;
function HoldHeadStep()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return false;
else return true;
end;
end;
function InitialHoldLife()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return 0.05;
else return 1;
end;
end;
function MaxHoldLife()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return 0.05;
else return 1;
end;
end;
function ImmediateHoldLetGo()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return false;
else return true;
end;
end;
function RollBodyIncrementsCombo()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return false;
else return true;
end;
end;
function CheckpointsTapsSeparateJudgment()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return false;
else return true;
end;
end;
function ScoreMissedHoldsAndRolls()
if GAMESTATE:GetCurrentGame():GetName() == "pump" then
return false;
else return true;
end;
end;
Themes/_fallback/Sounds/ScreenGameplay battle trick level1.redir
+1
View File
@@ -0,0 +1 @@
_silent
Themes/_fallback/Sounds/ScreenGameplay battle trick level2.redir
+1
View File
@@ -0,0 +1 @@
_silent
Themes/_fallback/Sounds/ScreenGameplay battle trick level3.redir
+1
View File
@@ -0,0 +1 @@
_silent
Themes/_fallback/metrics.ini
+85 -37
View File
@@ -34,9 +34,6 @@ PercentScoreDecimalPlaces=2
ColorP1Command=diffuse,PlayerColor(PLAYER_1)
ColorP2Command=diffuse,PlayerColor(PLAYER_2)
[Preferences]
TimingWindowSecondsHold=HoldTiming()
# 02 #
[LightsManager]
GameButtonsToShow=""
@@ -58,7 +55,6 @@ ExtraStage2DifficultyMax=8
UseUnlockColor=false
UsePreferredSortColor=false
MoveUnlocksToBottomOfPreferredSort=false
#
# Lots of themes want more than one group color, so let them have this.
SongGroupColor1=color("#00aeef") -- blue
SongGroupColor2=color("#00aeef") -- blue
@@ -171,6 +167,7 @@ MeterWidth=0.0
MeterHeight=0.0
[Combo]
ShowComboAt=2
NumberMinZoom=0.8
NumberMaxZoom=1
@@ -182,8 +179,8 @@ LabelOnCommand=x,6;y,22;shadowlength,1;horizalign,left;vertalign,bottom
[HoldJudgment]
# !!! #
HoldJudgmentLetGoCommand=HoldJudgmentFail()
HoldJudgmentHeldCommand=HoldJudgmentPass()
HoldJudgmentLetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
[HelpDisplay]
TipShowTime=4
@@ -245,23 +242,22 @@ ComboScoreBonusValue=+1000
ComboMultiplier=0.0
DoubleNoteScoreMultiplier=1.0
TripleNoteScoreMultiplier=1.0
QuadOrHigherNoteScoreMultiplier=1.0
DoubleNoteScoreMultiplier=2.0
TripleNoteScoreMultiplier=3.0
QuadOrHigherNoteScoreMultiplier=4.0
PointsW1=+1000
PointsW2=+1000
PointsW3=+500
PointsW4=+100
PointsW5=-200
PointsMiss=-500
PointsHitMine=-500
PointsCheckpointHit=+1000
PointsCheckpointMiss=-200
PointsW1=+50
PointsW2=+20
PointsW3=+10
PointsW4=+5
PointsW5=0
PointsMiss=-5
PointsHitMine=-5
PointsCheckpointHit=+5
PointsCheckpointMiss=-5
PointsNone=0
PointsHoldHeld=+1000
PointsHoldLetGo=-500
PointsHoldHeld=+5
PointsHoldLetGo=-5
[DifficultyList]
CapitalizeDifficultyNames=false
#
@@ -278,7 +274,7 @@ BannerResetFadeCommand=diffusealpha,1
[Gameplay]
# todo: make some of these play nice with other gametypes
ComboIsPerRow=ComboPerRow()
ComboIsPerRow=GAMESTATE:GetPlayMode() == "PlayMode_Oni"
MinScoreToContinueCombo=ComboContinue()
MinScoreToMaintainCombo=ComboMaintain()
ToastyTriggersAt=250
@@ -580,7 +576,8 @@ SectionColor1=color("1,1,1,1")
SongRealExtraColor=color("1,0,0,1")
SortMenuColor=color("1,1,1,1")
SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" }
SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" }
# SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" }
#
ShowRoulette=true
ShowRandom=false
@@ -589,7 +586,8 @@ ShowPortal=false
MostPlayedSongsToShow=30
RecentSongsToShow=30
#
ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent,NormalMode,BattleMode"
ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent"
# ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent,NormalMode,BattleMode"
ChoicePreferred="sort,Preferred"
ChoiceGroup="sort,Group"
ChoiceTitle="sort,Title"
@@ -609,7 +607,7 @@ ChoiceDoubleChallengeMeter="sort,DoubleChallengeMeter"
ChoiceLength="sort,Length"
ChoiceRecent="sort,Recent"
ChoiceNormalMode="playmode,regular"
ChoiceBattleMode="playmode,regular"
ChoiceBattleMode="playmode,battle"
UseEasyMarkerFlag=false
#
@@ -675,6 +673,9 @@ BarMeasureAlpha=1
Bar4thAlpha=1
Bar8thAlpha=1
Bar16thAlpha=1
#
RoutineNoteSkinP1=default
RoutineNoteSkinP2=default
[PlayerStageStats]
NumGradeTiersUsed=6
@@ -719,16 +720,16 @@ TapJudgmentsUnderField=false
HoldJudgmentsUnderField=false
ComboUnderField=true
PenalizeTapScoreNone=false
JudgeHoldNotesOnSameRowTogether=(GAMESTATE:GetCurrentGame():GetName() == "pump")
JudgeHoldNotesOnSameRowTogether=false
HoldCheckpoints=(GAMESTATE:GetCurrentGame():GetName() == "pump")
ImmediateHoldLetGo=ImmediateHoldLetGo()
RequireStepOnHoldHeads=HoldHeadStep()
CheckpointsUseTimeSignatures=(GAMESTATE:GetCurrentGame():GetName() == "pump")
InitialHoldLife=InitialHoldLife()
MaxHoldLife=MaxHoldLife()
RollBodyIncrementsCombo=RollBodyIncrementsCombo()
CheckpointsTapsSeparateJudgment=CheckpointsTapsSeparateJudgment()
ScoreMissedHoldsAndRolls=ScoreMissedHoldsAndRolls()
ImmediateHoldLetGo=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
RequireStepOnHoldHeads=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
CheckpointsUseTimeSignatures=false
InitialHoldLife=1
MaxHoldLife=1
RollBodyIncrementsCombo=true
CheckpointsTapsSeparateJudgment=true
ScoreMissedHoldsAndRolls=(GAMESTATE:GetCurrentGame():GetName() == "pump") and false or true
[Profile]
ShowCoinData=true
@@ -959,6 +960,7 @@ SkipWidth=190
SkipSpacingY=14
#
[ScreenWithMenuElements]
Class="ScreenWithMenuElements"
Fallback="Screen"
#
TimerSeconds=-1
@@ -1174,12 +1176,23 @@ DefaultChoice="1"
Choice1="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
Choice2="screen,ScreenNetworkOptions;text,Play Online"
Choice3="screen,ScreenSelectGame;text,Select Game"
Choice4="screen,ScreenOptionsService;text,Options"
Choice4="screen,ScreenOptionsSystemDirection;text,Options"
Choice5="screen,ScreenOptionsEdit;text,Edit/Share"
Choice6="screen,ScreenJukeboxMenu;text,Jukebox"
Choice7="screen,ScreenExit;text,Exit"
Choice8="screen,ScreenTest;text,Sandbox"
Choice9="screen,ScreenQuickSetupOverview;text,Setup"
# Aliases for the future.
ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
ChoiceGameStart="applydefaultoptions;screen,ScreenProfileLoad;text,Game Start"
ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online"
ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game"
ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options"
ChoiceEdit="screen,ScreenOptionsEdit;text,Edit/Share"
ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox"
ChoiceSandbox="screen,ScreenTest;text,Sandbox"
ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
ChoiceExit="screen,ScreenExit;text,Exit"
#
AllowRepeatingInput=true
ShowCursor=false
@@ -1854,6 +1867,7 @@ ScoreDisplay,2="mod,subtractscore;name,Subtract"
ScoreDisplay,3="mod,averagescore;name,Average"
# Song options
# LifeType="3;together"
LifeType=(GAMESTATE:IsCourseMode() and 3 or 2)..";together"
LifeTypeDefault=""
LifeType,1="mod,bar;name,Bar"
@@ -2121,6 +2135,34 @@ PrevScreen="ScreenOptionsService"
[DeviceList]
DeviceListOnCommand=zoom,1;shadowlength,1
[ScreenOptionsSystemDirection]
Fallback="ScreenOptionsServiceChild"
PrevScreen=Branch.TitleMenu
NextScreen=Branch.TitleMenu
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22"
Line1="conf,Windowed"
Line2="conf,DisplayResolution"
Line3="conf,DisplayAspectRatio"
Line4="conf,HighResolutionTextures"
Line5="conf,Vsync"
Line6="conf,SoundVolume"
Line7="conf,TimingWindowScale"
Line8="conf,LifeDifficulty"
Line9="conf,AllowW1"
Line10="conf,AutogenSteps"
Line11="conf,ShowBanners"
Line12="conf,ShowCaution"
Line13="conf,ShowInstructions"
Line14="conf,ShowDanger"
Line15="conf,ShowSongOptions"
Line16="conf,EasterEggs"
Line17="conf,Theme"
Line18="conf,DefaultNoteskin"
Line19="conf,PercentageScoring"
Line20="conf,BGBrightness"
Line21="conf,Center1Player"
Line22="conf,EventMode"
[ScreenOptionsGraphicsSound]
Fallback="ScreenOptionsServiceChild"
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20"
@@ -2337,6 +2379,7 @@ Fallback="ScreenWithMenuElements"
AllowOperatorMenuButton=false
[ScreenAttract]
Class="ScreenAttract"
Fallback="ScreenWithMenuElementsBlank"
#
StartScreen=""
@@ -2503,7 +2546,7 @@ PlayerInitCommand=y,SCREEN_CENTER_Y;zoom,(THEME:GetMetric("Common","ScreenHeight
StartGivesUp=true
BackGivesUp=false
#
FailOnMissCombo=FailCombo()
FailOnMissCombo=-1
GivingUpGoesToPrevScreen=false
GivingUpGoesToNextScreen=false
#
@@ -2551,6 +2594,11 @@ ActiveAttackListP2Y=
ActiveAttackListP2OnCommand=visible,false
ActiveAttackListP2OffCommand=
#
CombinedLifeX=SCREEN_CENTER_X
CombinedLifeY=SCREEN_CENTER_Y
CombinedLifeOnCommand=visible,false
CombinedLifeOffCommand=
#
LifeP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
LifeP1Y=SCREEN_TOP+24
LifeP1OnCommand=
@@ -3295,4 +3343,4 @@ UsersBG2OffCommand=
UserDX=0
UserDY=24
UserOnCommand=
UserOffCommand=
UserOffCommand=