diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 3b35cfac8a..33a48dcacd 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -13,6 +13,12 @@ StepMania 5.0 Preview 3 | 20110??? * [LifeMeterBattery] Added LostLife param to LifeChanged message. [AJ] * [LifeMeterBattery] Converted LifeMeterBattery lives to an AutoActor. [AJ] * [TimingData] Add HasDelays() Lua binding; HasStops() now only checks stops. [AJ] +* [GameState, SongUtil] Fix Issue 263 by not charging 2x stages for doubles when + not using joint premium. [AJ] +* [BeginnerHelper] Made BeginnerHelper run the OnCommand. [AJ] +* [GameState] add GetExpandedSectionName() Lua binding. [AJ] +* [ScreenSelectMusic] Added IdleCommentSeconds metric and + "ScreenSelectMusic IdleComment" announcer sound. [AJ] 2011/08/06 ---------- diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 1-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 1-stroke] 8x8 (doubleres).png index dc6fd4c950..5bb2d78ca8 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 1-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 1-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 10] 2x1 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 10] 2x1 (doubleres).png index 6d3ba64e53..21fa97d445 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 10] 2x1 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 10] 2x1 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 1] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 1] 8x8 (doubleres).png index 4158483415..ca6be7725b 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 1] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 1] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 2-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 2-stroke] 8x8 (doubleres).png index 246065ac46..67478afef6 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 2-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 2-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 2] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 2] 8x8 (doubleres).png index 236c2fcc7c..ea81ddabd0 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 2] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 2] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 3-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 3-stroke] 8x8 (doubleres).png index d6a367d091..25afc9ae67 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 3-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 3-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 3] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 3] 8x8 (doubleres).png index 91e8d0a5c4..cee970c4ef 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 3] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 3] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 4-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 4-stroke] 8x8 (doubleres).png index d90985e7e6..c8c8777a5c 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 4-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 4-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 4] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 4] 8x8 (doubleres).png index eafb086f6b..2332e1caf7 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 4] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 4] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 5-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 5-stroke] 8x8 (doubleres).png index 069eb81db2..bfdb96d6b6 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 5-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 5-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 5] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 5] 8x8 (doubleres).png index 8c40d2adb2..c1147fc3d8 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 5] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 5] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 6-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 6-stroke] 8x8 (doubleres).png index f3654b5a01..36f2c6f914 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 6-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 6-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 6] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 6] 8x8 (doubleres).png index 0104c8e4f8..e47895455c 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 6] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 6] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 7-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 7-stroke] 8x8 (doubleres).png index 7fb83c3bad..fcae91ce52 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 7-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 7-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 7] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 7] 8x8 (doubleres).png index f54e6c9691..d4ef991b54 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 7] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 7] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 8-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 8-stroke] 8x8 (doubleres).png index 0d03515d65..a1f2776e44 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 8-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 8-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 8] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 8] 8x8 (doubleres).png index 61192fbb62..9449861929 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 8] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 8] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 9-stroke] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 9-stroke] 8x8 (doubleres).png index 9970f68791..10f0f6c4bd 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 9-stroke] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 9-stroke] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji 9] 8x8 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji 9] 8x8 (doubleres).png index d6f8e575a9..7ea1e163c9 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji 9] 8x8 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji 9] 8x8 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1-stroke] 32x32 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1-stroke] 32x32 (doubleres).png index afe28378ba..848522086b 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1-stroke] 32x32 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1-stroke] 32x32 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1] 32x32 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1] 32x32 (doubleres).png index 08861ba180..c97de850ba 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1] 32x32 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji-jis1] 32x32 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji-regular-stroke] 32x61 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji-regular-stroke] 32x61 (doubleres).png index ec9e30f473..fca12e7eb0 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji-regular-stroke] 32x61 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji-regular-stroke] 32x61 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [kanji-regular] 32x61 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [kanji-regular] 32x61 (doubleres).png index c105fcd1c2..935606b946 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [kanji-regular] 32x61 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [kanji-regular] 32x61 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [main] 16x16 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [main] 16x16 (doubleres).png index 7c1d06133d..be683ca4ac 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [main] 16x16 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [main] 16x16 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [symbol-stroke] 26x3 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [symbol-stroke] 26x3 (doubleres).png index 7591eca1a3..1184854896 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [symbol-stroke] 26x3 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [symbol-stroke] 26x3 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/_japanese 24px [symbol] 26x3 (doubleres).png b/Themes/_fallback/Fonts/_japanese 24px [symbol] 26x3 (doubleres).png index 984aa3716f..018c5b33a8 100644 Binary files a/Themes/_fallback/Fonts/_japanese 24px [symbol] 26x3 (doubleres).png and b/Themes/_fallback/Fonts/_japanese 24px [symbol] 26x3 (doubleres).png differ diff --git a/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png b/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png index fae305f37f..4ee606e312 100644 Binary files a/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png and b/Themes/_fallback/Fonts/frutiger 24px [polish-stroke] 8x2.png differ diff --git a/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png b/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png index 0ed3c843c3..3c52a148a7 100644 Binary files a/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png and b/Themes/_fallback/Fonts/frutiger 24px [polish] 8x2.png differ diff --git a/Themes/_fallback/Fonts/frutiger 24px.ini b/Themes/_fallback/Fonts/frutiger 24px.ini index 988bc39672..c0223c6739 100644 --- a/Themes/_fallback/Fonts/frutiger 24px.ini +++ b/Themes/_fallback/Fonts/frutiger 24px.ini @@ -395,7 +395,8 @@ AdvanceExtraPixels=0 [polish] Baseline=23 Top=6 - +DrawExtraPixelsLeft=2 +DrawExtraPixelsRight=2 line 0=ĄĆĘŁŃŚŹŻ line 1=ąćęłńśźż diff --git a/Themes/_fallback/Graphics/BeginnerHelper background.redir b/Themes/_fallback/Graphics/BeginnerHelper background.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/BeginnerHelper background.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/BeginnerHelper flash.redir b/Themes/_fallback/Graphics/BeginnerHelper flash.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/BeginnerHelper flash.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir b/Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/BeginnerHelper stepcircle.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 4c51e8c250..9ba22ad476 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -230,14 +230,14 @@ ScrollSortOrder=false ScrollSpeedDivisor=2 [BeginnerHelper] -HelperX=SCREEN_CENTER_X -HelperY=SCREEN_CENTER_Y+80 +HelperX=0 +HelperY=SCREEN_CENTER_Y-80 # All X,Y coordinates are relative to the HelperX,Y -Player1X=-125 +Player1X=-(SCREEN_CENTER_X/2) PlayerP1OnCommand=halign,0;rotationx,40;zoom,20 -Player2X=195 -PlayerP2OnCommand=halign,0;rotationx,40;zoom,20 +Player2X=(SCREEN_CENTER_X/2) +PlayerP2OnCommand=halign,1;rotationx,40;zoom,20 ShowDancePad=false # "Pad should always be 3 units bigger in zoom than the dancer." @@ -1881,6 +1881,7 @@ Codes="" TimerSeconds=60 DoRouletteOnMenuTimer=true RouletteTimerSeconds=15 +IdleCommentSeconds=20 # DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses" # diff --git a/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px [polish] 8x2.png b/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px [polish] 8x2.png new file mode 100644 index 0000000000..0b1c3f8727 Binary files /dev/null and b/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px [polish] 8x2.png differ diff --git a/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px.ini b/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px.ini index 90be41f302..e50af14561 100644 --- a/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px.ini +++ b/Themes/default/Fonts/_helveticaneuelt std extblk cn 42px.ini @@ -350,3 +350,32 @@ Line 9=úűüýţ˙ 93=20 94=6 95=11 + +[polish] +Baseline=43 + +Top=11 +LineSpacing=52 +DrawExtraPixelsLeft=2 +DrawExtraPixelsRight=4 +AdvanceExtraPixels=0 +line 0=ĄĆĘŁŃŚŹŻ +line 1=ąćęłńśźż + +0=23 +1=23 +2=23 +3=23 +4=23 +5=23 +6=23 +7=23 + +8=23 +9=23 +10=23 +11=16 +12=23 +13=23 +14=23 +15=23 \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua b/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua index 3bb840190e..59c903f8f3 100644 --- a/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua +++ b/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua @@ -5,7 +5,10 @@ local record = stats:GetMachineHighScoreIndex() local hasMachineRecord = record ~= -1 return LoadFont("Common normal")..{ - Text=string.format(THEME:GetString("ScreenEvaluation", "MachineRecord"), record+1); InitCommand=cmd(zoom,0.55;shadowlength,1;NoStroke;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25")); - BeginCommand=cmd(visible,hasMachineRecord;); + BeginCommand=function(self) + self:visible(hasMachineRecord); + local text = string.format(THEME:GetString("ScreenEvaluation", "MachineRecord"), record+1) + self:settext(text); + end; }; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua b/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua index af97bcb2cc..3166197762 100644 --- a/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua +++ b/Themes/default/Graphics/ScreenEvaluation PersonalRecord.lua @@ -5,7 +5,10 @@ local record = stats:GetPersonalHighScoreIndex() local hasPersonalRecord = record ~= -1 return LoadFont("Common normal")..{ - Text=string.format(THEME:GetString("ScreenEvaluation", "PersonalRecord"), record+1) InitCommand=cmd(zoom,0.55;shadowlength,1;NoStroke;glowshift;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25")); - BeginCommand=cmd(visible,hasPersonalRecord;); + BeginCommand=function(self) + self:visible(hasPersonalRecord); + local text = string.format(THEME:GetString("ScreenEvaluation", "PersonalRecord"), record+1) + self:settext(text) + end }; \ No newline at end of file diff --git a/Themes/default/Scripts/04 Other.lua b/Themes/default/Scripts/04 Other.lua new file mode 100644 index 0000000000..9f804da9fb --- /dev/null +++ b/Themes/default/Scripts/04 Other.lua @@ -0,0 +1,20 @@ +function SongMeterDisplayX(pn) + if Center1Player() then + return SCREEN_CENTER_X + else + return pn == PLAYER_1 and SCREEN_LEFT+16 or SCREEN_RIGHT-16 + end +end + +function SongMeterDisplayY(pn) + return Center1Player() and SCREEN_TOP+50 or SCREEN_CENTER_Y +end + +function SongMeterDisplayCommand(pn) + if Center1Player() then + return cmd(draworder,50;zoom,0;y,SCREEN_TOP-24;sleep,1.5;decelerate,0.5;zoom,1;y,SCREEN_TOP+50) + else + local xAdd = (pn == PLAYER_1) and -24 or 24 + return cmd(draworder,5;rotationz,-90;zoom,0;addx,xAdd;sleep,1.5;decelerate,0.5;zoom,1;addx,xAdd*-1) + end +end \ No newline at end of file diff --git a/NoteSkins/dance/midi-note-3d/res/Resource.psd b/_assets/NoteSkins/dance/midi-note-3d/res/Resource.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/Resource.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/Resource.psd diff --git a/NoteSkins/dance/midi-note-3d/res/down hold tail active.psd b/_assets/NoteSkins/dance/midi-note-3d/res/down hold tail active.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/down hold tail active.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/down hold tail active.psd diff --git a/NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd b/_assets/NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/down hold tail inactive.psd diff --git a/NoteSkins/dance/midi-note-3d/res/down roll tail active.psd b/_assets/NoteSkins/dance/midi-note-3d/res/down roll tail active.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/down roll tail active.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/down roll tail active.psd diff --git a/NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd b/_assets/NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/down roll tail inactive.psd diff --git a/NoteSkins/dance/midi-note-3d/res/hold body active.psd b/_assets/NoteSkins/dance/midi-note-3d/res/hold body active.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/hold body active.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/hold body active.psd diff --git a/NoteSkins/dance/midi-note-3d/res/hold body inactive.psd b/_assets/NoteSkins/dance/midi-note-3d/res/hold body inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/hold body inactive.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/hold body inactive.psd diff --git a/NoteSkins/dance/midi-note-3d/res/roll body active.psd b/_assets/NoteSkins/dance/midi-note-3d/res/roll body active.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/roll body active.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/roll body active.psd diff --git a/NoteSkins/dance/midi-note-3d/res/roll body inactive.psd b/_assets/NoteSkins/dance/midi-note-3d/res/roll body inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note-3d/res/roll body inactive.psd rename to _assets/NoteSkins/dance/midi-note-3d/res/roll body inactive.psd diff --git a/NoteSkins/dance/midi-note/res/Resource.psd b/_assets/NoteSkins/dance/midi-note/res/Resource.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/Resource.psd rename to _assets/NoteSkins/dance/midi-note/res/Resource.psd diff --git a/NoteSkins/dance/midi-note/res/down hold tail active.psd b/_assets/NoteSkins/dance/midi-note/res/down hold tail active.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/down hold tail active.psd rename to _assets/NoteSkins/dance/midi-note/res/down hold tail active.psd diff --git a/NoteSkins/dance/midi-note/res/down hold tail inactive.psd b/_assets/NoteSkins/dance/midi-note/res/down hold tail inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/down hold tail inactive.psd rename to _assets/NoteSkins/dance/midi-note/res/down hold tail inactive.psd diff --git a/NoteSkins/dance/midi-note/res/down roll tail active.psd b/_assets/NoteSkins/dance/midi-note/res/down roll tail active.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/down roll tail active.psd rename to _assets/NoteSkins/dance/midi-note/res/down roll tail active.psd diff --git a/NoteSkins/dance/midi-note/res/down roll tail inactive.psd b/_assets/NoteSkins/dance/midi-note/res/down roll tail inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/down roll tail inactive.psd rename to _assets/NoteSkins/dance/midi-note/res/down roll tail inactive.psd diff --git a/NoteSkins/dance/midi-note/res/hold body active.psd b/_assets/NoteSkins/dance/midi-note/res/hold body active.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/hold body active.psd rename to _assets/NoteSkins/dance/midi-note/res/hold body active.psd diff --git a/NoteSkins/dance/midi-note/res/hold body inactive.psd b/_assets/NoteSkins/dance/midi-note/res/hold body inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/hold body inactive.psd rename to _assets/NoteSkins/dance/midi-note/res/hold body inactive.psd diff --git a/NoteSkins/dance/midi-note/res/roll body active.psd b/_assets/NoteSkins/dance/midi-note/res/roll body active.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/roll body active.psd rename to _assets/NoteSkins/dance/midi-note/res/roll body active.psd diff --git a/NoteSkins/dance/midi-note/res/roll body inactive.psd b/_assets/NoteSkins/dance/midi-note/res/roll body inactive.psd similarity index 100% rename from NoteSkins/dance/midi-note/res/roll body inactive.psd rename to _assets/NoteSkins/dance/midi-note/res/roll body inactive.psd diff --git a/NoteSkins/dance/midi-routine-p1/res/Resource.psd b/_assets/NoteSkins/dance/midi-routine-p1/res/Resource.psd similarity index 100% rename from NoteSkins/dance/midi-routine-p1/res/Resource.psd rename to _assets/NoteSkins/dance/midi-routine-p1/res/Resource.psd diff --git a/NoteSkins/dance/midi-routine-p2/res/Resource.psd b/_assets/NoteSkins/dance/midi-routine-p2/res/Resource.psd similarity index 100% rename from NoteSkins/dance/midi-routine-p2/res/Resource.psd rename to _assets/NoteSkins/dance/midi-routine-p2/res/Resource.psd diff --git a/NoteSkins/dance/midi-solo/res/Resource.psd b/_assets/NoteSkins/dance/midi-solo/res/Resource.psd similarity index 100% rename from NoteSkins/dance/midi-solo/res/Resource.psd rename to _assets/NoteSkins/dance/midi-solo/res/Resource.psd diff --git a/NoteSkins/dance/midi-vivid/res/_notes.txt b/_assets/NoteSkins/dance/midi-vivid/res/_notes.txt similarity index 100% rename from NoteSkins/dance/midi-vivid/res/_notes.txt rename to _assets/NoteSkins/dance/midi-vivid/res/_notes.txt diff --git a/NoteSkins/dance/midi-vivid/res/additive.psd b/_assets/NoteSkins/dance/midi-vivid/res/additive.psd similarity index 100% rename from NoteSkins/dance/midi-vivid/res/additive.psd rename to _assets/NoteSkins/dance/midi-vivid/res/additive.psd diff --git a/NoteSkins/dance/midi-vivid/res/midi-vivid colors.psd b/_assets/NoteSkins/dance/midi-vivid/res/midi-vivid colors.psd similarity index 100% rename from NoteSkins/dance/midi-vivid/res/midi-vivid colors.psd rename to _assets/NoteSkins/dance/midi-vivid/res/midi-vivid colors.psd diff --git a/NoteSkins/dance/midi-vivid/res/midi-vivid_colors.html b/_assets/NoteSkins/dance/midi-vivid/res/midi-vivid_colors.html similarity index 100% rename from NoteSkins/dance/midi-vivid/res/midi-vivid_colors.html rename to _assets/NoteSkins/dance/midi-vivid/res/midi-vivid_colors.html diff --git a/NoteSkins/dance/midi-vivid/res/workingnoteskin.psd b/_assets/NoteSkins/dance/midi-vivid/res/workingnoteskin.psd similarity index 100% rename from NoteSkins/dance/midi-vivid/res/workingnoteskin.psd rename to _assets/NoteSkins/dance/midi-vivid/res/workingnoteskin.psd diff --git a/NoteSkins/dance/retro/ye olde noteskins/Left Go Receptor.png b/_assets/NoteSkins/dance/retro/ye olde noteskins/Left Go Receptor.png similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/Left Go Receptor.png rename to _assets/NoteSkins/dance/retro/ye olde noteskins/Left Go Receptor.png diff --git a/NoteSkins/dance/retro/ye olde noteskins/Left Receptor.lua b/_assets/NoteSkins/dance/retro/ye olde noteskins/Left Receptor.lua similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/Left Receptor.lua rename to _assets/NoteSkins/dance/retro/ye olde noteskins/Left Receptor.lua diff --git a/NoteSkins/dance/retro/ye olde noteskins/Right Receptor.lua b/_assets/NoteSkins/dance/retro/ye olde noteskins/Right Receptor.lua similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/Right Receptor.lua rename to _assets/NoteSkins/dance/retro/ye olde noteskins/Right Receptor.lua diff --git a/NoteSkins/dance/retro/ye olde noteskins/Up Go Receptor.png b/_assets/NoteSkins/dance/retro/ye olde noteskins/Up Go Receptor.png similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/Up Go Receptor.png rename to _assets/NoteSkins/dance/retro/ye olde noteskins/Up Go Receptor.png diff --git a/NoteSkins/dance/retro/ye olde noteskins/Up Receptor.lua b/_assets/NoteSkins/dance/retro/ye olde noteskins/Up Receptor.lua similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/Up Receptor.lua rename to _assets/NoteSkins/dance/retro/ye olde noteskins/Up Receptor.lua diff --git a/NoteSkins/dance/retro/ye olde noteskins/down base.png b/_assets/NoteSkins/dance/retro/ye olde noteskins/down base.png similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/down base.png rename to _assets/NoteSkins/dance/retro/ye olde noteskins/down base.png diff --git a/NoteSkins/dance/retro/ye olde noteskins/old down tap note 8x8.png b/_assets/NoteSkins/dance/retro/ye olde noteskins/old down tap note 8x8.png similarity index 100% rename from NoteSkins/dance/retro/ye olde noteskins/old down tap note 8x8.png rename to _assets/NoteSkins/dance/retro/ye olde noteskins/old down tap note 8x8.png diff --git a/src/BeginnerHelper.cpp b/src/BeginnerHelper.cpp index 6781aaac10..5fe57b0c64 100644 --- a/src/BeginnerHelper.cpp +++ b/src/BeginnerHelper.cpp @@ -167,7 +167,7 @@ bool BeginnerHelper::Init( int iDancePadType ) m_pDancer[pl]->PlayAnimation( "rest" ); m_pDancer[pl]->SetX( HELPER_X+PLAYER_X(pl) ); m_pDancer[pl]->SetY( HELPER_Y+10 ); - ActorUtil::LoadAllCommands( m_pDancer[pl], "BeginnerHelper" ); + ActorUtil::LoadAllCommandsAndOnCommand( m_pDancer[pl], "BeginnerHelper" ); // many of the models floating around have the vertex order flipped, so force this. m_pDancer[pl]->SetCullMode( CULL_NONE ); } diff --git a/src/GameState.cpp b/src/GameState.cpp index 5e4e1ebd39..72f5fcebbb 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -630,27 +630,6 @@ int GameState::GetNumStagesMultiplierForSong( const Song* pSong ) return iNumStages; } -int GameState::GetNumStagesForSongAndStyleType( const Song* pSong, StyleType st ) -{ - int iNumStages = GetNumStagesMultiplierForSong( pSong ); - - // One player, two-sides styles cost extra - switch( st ) - { - DEFAULT_FAIL( st ); - case StyleType_OnePlayerTwoSides: - if( g_Premium == Premium_Off ) - iNumStages *= 2; - break; - case StyleType_TwoPlayersTwoSides: - case StyleType_OnePlayerOneSide: - case StyleType_TwoPlayersSharedSides: - break; - } - - return iNumStages; -} - int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const { int iNumStagesOfThisSong = 1; @@ -688,7 +667,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() const if( IsAnExtraStage() ) iNumStagesOfThisSong = 1; else - iNumStagesOfThisSong = GameState::GetNumStagesForSongAndStyleType( m_pCurSong, pStyle->m_StyleType ); + iNumStagesOfThisSong = GameState::GetNumStagesMultiplierForSong( m_pCurSong ); } else if( m_pCurCourse ) iNumStagesOfThisSong = PREFSMAN->m_iSongsPerPlay; @@ -2444,6 +2423,7 @@ public: p->m_pCurCharacters[Enum::Check(L, 1)] = c; return 0; } + static int GetExpandedSectionName( T* p, lua_State *L ) { lua_pushstring(L, p->sExpandedSectionName); return 1; } static int Dopefish( T* p, lua_State *L ) { lua_pushboolean(L, p->m_bDopefish); @@ -2547,6 +2527,7 @@ public: ADD_METHOD( GetCurMusicSeconds ); ADD_METHOD( GetCharacter ); ADD_METHOD( SetCharacter ); + ADD_METHOD( GetExpandedSectionName ); ADD_METHOD( Dopefish ); } }; diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 40c387634f..404f06a882 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -71,6 +71,7 @@ void ScreenSelectMusic::Init() GAMESTATE->SetMasterPlayerNumber(PLAYER_1); } + IDLE_COMMENT_SECONDS.Load( m_sName, "IdleCommentSeconds" ); SAMPLE_MUSIC_DELAY_INIT.Load( m_sName, "SampleMusicDelayInit" ); SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" ); SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" ); @@ -226,6 +227,7 @@ void ScreenSelectMusic::Init() void ScreenSelectMusic::BeginScreen() { g_ScreenStartedLoadingAt.Touch(); + m_timerIdleComment.GetDeltaTime(); if( CommonMetrics::AUTO_SET_STYLE ) { @@ -376,6 +378,15 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce ) void ScreenSelectMusic::Update( float fDeltaTime ) { + if( !IsTransitioning() ) + { + if( IDLE_COMMENT_SECONDS > 0 && m_timerIdleComment.PeekDeltaTime() >= IDLE_COMMENT_SECONDS ) + { + SOUND->PlayOnceFromAnnouncer( m_sName+" IdleComment" ); + m_timerIdleComment.GetDeltaTime(); + } + } + ScreenWithMenuElements::Update( fDeltaTime ); CheckBackgroundRequests( false ); @@ -384,6 +395,9 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) { // LOG->Trace( "ScreenSelectMusic::Input()" ); + // reset announcer timer + m_timerIdleComment.GetDeltaTime(); + // debugging? // I just like being able to see untransliterated titles occasionally. if( input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_F9 ) diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index d1c22c4ebf..3f64ecc505 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -69,6 +69,9 @@ protected: vector m_vpTrails; int m_iSelection[NUM_PLAYERS]; + RageTimer m_timerIdleComment; + ThemeMetric IDLE_COMMENT_SECONDS; + ThemeMetric SAMPLE_MUSIC_DELAY_INIT; ThemeMetric SAMPLE_MUSIC_DELAY; ThemeMetric SAMPLE_MUSIC_LOOPS; diff --git a/src/SongUtil.cpp b/src/SongUtil.cpp index a585aa663c..0d01495931 100644 --- a/src/SongUtil.cpp +++ b/src/SongUtil.cpp @@ -975,7 +975,7 @@ void SongUtil::GetPlayableStepsTypes( const Song *pSong, set &vOut ) const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, iNumPlayers, *st ); bool bEnoughStages = GAMESTATE->IsAnExtraStage() || GAMESTATE->GetSmallestNumStagesLeftForAnyHumanPlayer() >= - GAMESTATE->GetNumStagesForSongAndStyleType(pSong, pStyle->m_StyleType); + GAMESTATE->GetNumStagesMultiplierForSong(pSong); if( bShowThisStepsType && bEnoughStages ) vOut.insert( *st );