diff --git a/stepmania/Data/Translation.dat b/stepmania/Data/Translation.dat index b3409d85a8..8feed2413d 100644 --- a/stepmania/Data/Translation.dat +++ b/stepmania/Data/Translation.dat @@ -20,6 +20,48 @@ # changes. [Songs] + +# ChickenWing XX whatever... is really Chicken Wing +TitleFrom: Chicken Wing XX +TitleTo: Chicken Wing +ArtistTo: Banya +* +# SLAM XX is really SLAM... hmmm see a pattern yet? +TitleFrom: SLAM XX +TitleTo: SLAM +ArtistTo: Novasonic +* +# Holiday XX is really Holiday +TitleFrom: Holiday XX +TitleTo: Holiday +ArtistTo: F2 Original +* +# CanCan XX is really CanCan +TitleFrom: (CanCan XX)|(Can Can XX)|(Kang Kang XX)|(KangKang XX)|(Kang Kang)|(KangKang) +TitleTo: Can Can +ArtistTo: F2 Original +* +# So many people like to rape this name... +ArtistFrom: (.*Banya.*) +ArtistTo: Banya +* +ArtistFrom: (¹ÚÁöÀ±)|(Park Ji Yoon) +ArtistTo: 박지윤 +* +# Baek Ji Young - Sad Salsa +TitleFrom: Sad Salsa +ArtistTo: 뱩지옝 +* +# Lee Hyun Do - Pierrot +TitleFrom: Pierrot +ArtistFrom: (Lee Hyun Do)|(Li Hyun Do) +ArtistTo: 이혠도 +* +# Yu Seung Jun - Hope Find You +TitleFrom: Hope Find You +ArtistTo: 유승준 +TitleTo: 잦길바래 +* # "Candy", "Candy star", or "Candy #". TitleFrom: Candy(( star)?|#) ArtistFrom: Luv.* @@ -344,7 +386,7 @@ ArtistFrom: (Nobuo Uematsu)|(Uematsu Nobuo) ArtistTo: 植松伸夫 [Courses] -TitleFrom: (.*Kidou)|(Demon Road)|(Road of Oni)|(Oni Michi) +TitleFrom: (.*Kidou)|(Demon Road)|(Road of Oni)|(Oni Michi)|(MAX2 Kidou/Onimichi.*) TitleTo: 鬼道 * TitleFrom: (.*Kidou 2)|(Demon Road 2)|(Road of Oni 2)|(Oni Michi 2) @@ -375,4 +417,4 @@ TitleTo: 真鬼道 # DWInsanity's Ayumi Platinum Course TitleFrom: Ayumi( Platinum)? TitleTo: あゆみ Platinum -* +* \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png new file mode 100644 index 0000000000..db5c0bb82e Binary files /dev/null and b/stepmania/Themes/default/Fonts/_korean 16px [jamo 1] 8x8.png differ diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png new file mode 100644 index 0000000000..ca1c638695 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_korean 16px [jamo 2] 8x8.png differ diff --git a/stepmania/Themes/default/Fonts/_korean 16px [jamo 3] 8x8.png b/stepmania/Themes/default/Fonts/_korean 16px [jamo 3] 8x8.png new file mode 100644 index 0000000000..55dd6fd033 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_korean 16px [jamo 3] 8x8.png differ diff --git a/stepmania/Themes/default/Fonts/_korean 16px.ini b/stepmania/Themes/default/Fonts/_korean 16px.ini index 04ccbb1257..5e7f92e69b 100644 --- a/stepmania/Themes/default/Fonts/_korean 16px.ini +++ b/stepmania/Themes/default/Fonts/_korean 16px.ini @@ -1,23 +1,308 @@ #GA to GWAGS +#U+AC00 [jamo 1] -Top=5 -Baseline=26 +Top=25 +Baseline=32 LineSpacing=28 -DefaultWidth=28 +DefaultWidth=39 -line 0=가감갠갰걀걐걠거검겐겠결곀곐고곰 -line 1=각갑갡갱걁걑걡걱겁겑겡겱곁곑곡곱 -line 2=갂값갢갲걂걒걢걲겂겒겢겲곂곒곢곲 -line 3=갃갓갣갳걃걓걣걳것겓겣겳곃곓곣곳 -line 4=간갔갤갴걄걔걤건겄겔겤겴계곔곤곴 -line 5=갅강갥갵걅걕걥걵겅겕겥겵곅곕곥공 -line 6=갆갖갦갶걆걖걦걶겆겖겦겶곆곖곦곶 -line 7=갇갗갧갷걇걗걧걷겇겗겧겷곇곗곧곷 -line 8=갈갘갨갸걈걘걨걸겈겘겨겸곈곘골곸 -line 9=갉같갩갹걉걙걩걹겉겙격겹곉곙곩곹 -line 10=갊갚갪갺걊걚걪걺겊겚겪겺곊곚곪곺 -line 11=갋갛갫갻걋걛걫걻겋겛겫겻곋곛곫곻 -line 12=갌개갬갼걌걜걬걼게겜견겼곌곜곬과 -line 13=갍객갭갽걍걝걭걽겍겝겭경곍곝곭곽 -line 14=갎갞갮갾걎걞걮걾겎겞겮겾곎곞곮곾 -line 15=갏갟갯갿걏걟걯걿겏겟겯겿곏곟곯곿 \ No newline at end of file +line 0=가감갠갰걀걐걠거 +line 1=각갑갡갱걁걑걡걱 +line 2=갂값갢갲걂걒걢걲 +line 3=갃갓갣갳걃걓걣걳 +line 4=간갔갤갴걄걔걤건 +line 5=갅강갥갵걅걕걥걵 +line 6=갆갖갦갶걆걖걦걶 +line 7=갇갗갧갷걇걗걧걷 + +#U+AC80 +[jamo 2] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=검겐겠결곀곐고곰 +line 1=겁겑겡겱곁곑곡곱 +line 2=겂겒겢겲곂곒곢곲 +line 3=것겓겣겳곃곓곣곳 +line 4=겄겔겤겴계곔곤곴 +line 5=겅겕겥겵곅곕곥공 +line 6=겆겖겦겶곆곖곦곶 +line 7=겇겗겧겷곇곗곧곷 + +#U+AC08 +[jamo 3] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=갈갘갨갸걈걘걨걸 +line 1=갉같갩갹걉걙걩걹 +line 2=갊갚갪갺걊걚걪걺 +line 3=갋갛갫갻걋걛걫걻 +line 4=갌개갬갼걌걜걬걼 +line 5=갍객갭갽걍걝걭걽 +line 6=갎갞갮갾걎걞걮걾 +line 7=갏갟갯갿걏걟걯걿 + +#U+AC88 +[jamo 4] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=겈겘겨겸곈곘골곸 +line 1=겉겙격겹곉곙곩곹 +line 2=겊겚겪겺곊곚곪곺 +line 3=겋겛겫겻곋곛곫곻 +line 4=게겜견겼곌곜곬과 +line 5=겍겝겭경곍곝곭곽 +line 6=겎겞겮겾곎곞곮곾 +line 7=겏겟겯겿곏곟곯곿 + +#JUN to JJAED +#U+C900 +[jamo 5] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=준줐줠줰쥀쥐쥠쥰 +line 1=줁중줡줱쥁쥑쥡쥱 +line 2=줂줒줢줲쥂쥒쥢쥲 +line 3=줃줓줣줳쥃쥓쥣쥳 +line 4=줄줔줤줴쥄쥔쥤쥴 +line 5=줅줕줥줵쥅쥕쥥쥵 +line 6=줆줖줦줶쥆쥖쥦쥶 +line 7=줇줗줧줷쥇쥗쥧쥷 + +#U+C980 +[jamo 6] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=즀즐즠즰지짐짠짰 +line 1=즁즑즡즱직집짡짱 +line 2=즂즒즢즲짂짒짢짲 +line 3=즃즓즣즳짃짓짣짳 +line 4=즄즔즤즴진짔짤짴 +line 5=즅즕즥즵짅징짥짵 +line 6=즆즖즦즶짆짖짦짶 +line 7=즇즗즧즷짇짗짧짷 + +#U+C908 +[jamo 7] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=줈줘줨줸쥈쥘쥨쥸 +line 1=줉줙줩줹쥉쥙쥩쥹 +line 2=줊줚줪줺쥊쥚쥪쥺 +line 3=줋줛줫줻쥋쥛쥫쥻 +line 4=줌줜줬줼쥌쥜쥬쥼 +line 5=줍줝줭줽쥍쥝쥭쥽 +line 6=줎줞줮줾쥎쥞쥮쥾 +line 7=줏줟줯줿쥏쥟쥯쥿 + +#U+C988 +[jamo 8] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=즈즘즨즸질짘짨째 +line 1=즉즙즩즹짉짙짩짹 +line 2=즊즚즪즺짊짚짪짺 +line 3=즋즛즫즻짋짛짫짻 +line 4=즌즜즬즼짌짜짬짼 +line 5=즍증즭즽짍짝짭짽 +line 6=즎즞즮즾짎짞짮짾 +line 7=즏즟즯즿짏짟짯짿 + +#YEOSS to WEC +#U+C600 +[jamo 9] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=였옐옠옰와왐왠왰 +line 1=영옑옡옱왁왑왡왱 +line 2=옂옒옢옲왂왒왢왲 +line 3=옃옓옣옳왃왓왣왳 +line 4=옄옔오옴완왔왤왴 +line 5=옅옕옥옵왅왕왥왵 +line 6=옆옖옦옶왆왖왦왶 +line 7=옇옗옧옷왇왗왧왷 + +#U+C680 +[jamo 10] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=욀욐욠우움원웠웰 +line 1=욁욑욡욱웁웑웡웱 +line 2=욂욒욢욲웂웒웢웲 +line 3=욃욓욣욳웃웓웣웳 +line 4=욄요욤운웄월웤웴 +line 5=욅욕욥욵웅웕웥웵 +line 6=욆욖욦욶웆웖웦웶 +line 7=욇욗욧욷웇웗웧웷 + +#U+C608 +[jamo 11] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=예옘온옸왈왘왨외 +line 1=옉옙옩옹왉왙왩왹 +line 2=옊옚옪옺왊왚왪왺 +line 3=옋옛옫옻왋왛왫왻 +line 4=옌옜올옼왌왜왬왼 +line 5=옍옝옭옽왍왝왭왽 +line 6=옎옞옮옾왎왞왮왾 +line 7=옏옟옯옿왏왟왯왿 + +#U+C688 +[jamo 12] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=욈욘욨울웈웘웨웸 +line 1=욉욙용욹웉웙웩웹 +line 2=욊욚욪욺웊웚웪웺 +line 3=욋욛욫욻웋웛웫웻 +line 4=욌욜욬욼워웜웬웼 +line 5=욍욝욭욽웍웝웭웽 +line 6=욎욞욮욾웎웞웮웾 +line 7=욏욟욯욿웏웟웯웿 + +#MIL to BOLB +#U+C000 +[jamo 13] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=밀밐밠배뱀뱐뱠뱰 +line 1=밁밑밡백뱁뱑뱡뱱 +line 2=밂밒밢밲뱂뱒뱢뱲 +line 3=밃밓밣밳뱃뱓뱣뱳 +line 4=밄바밤밴뱄뱔뱤뱴 +line 5=밅박밥밵뱅뱕뱥뱵 +line 6=밆밖밦밶뱆뱖뱦뱶 +line 7=밇밗밧밷뱇뱗뱧뱷 + +#U+C080 +[jamo 14] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=벀벐베벰변볐볠볰 +line 1=벁벑벡벱볁병볡볱 +line 2=벂벒벢벲볂볒볢볲 +line 3=벃벓벣벳볃볓볣볳 +line 4=버범벤벴별볔볤보 +line 5=벅법벥벵볅볕볥복 +line 6=벆벖벦벶볆볖볦볶 +line 7=벇벗벧벷볇볗볧볷 + + +#U+C008 +[jamo 15] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=밈반밨밸뱈뱘뱨뱸 +line 1=밉밙방밹뱉뱙뱩뱹 +line 2=밊밚밪밺뱊뱚뱪뱺 +line 3=밋받밫밻뱋뱛뱫뱻 +line 4=밌발밬밼뱌뱜뱬뱼 +line 5=밍밝밭밽뱍뱝뱭뱽 +line 6=밎밞밮밾뱎뱞뱮뱾 +line 7=및밟밯밿뱏뱟뱯뱿 + + + +#U+C088 +[jamo 16] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=번벘벨벸볈볘볨본 +line 1=벉벙벩벹볉볙볩볹 +line 2=벊벚벪벺볊볚볪볺 +line 3=벋벛벫벻볋볛볫볻 +line 4=벌벜벬벼볌볜볬볼 +line 5=벍벝벭벽볍볝볭볽 +line 6=벎벞벮벾볎볞볮볾 +line 7=벏벟벯벿볏볟볯볿 + +#WEK TO JYAE +#U+C700 +[jamo 17] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=윀윐유윰은읐읠읰 +line 1=윁윑육윱읁응읡읱 +line 2=윂윒윢윲읂읒읢읲 +line 3=윃윓윣윳읃읓읣읳 +line 4=위윔윤윴을읔읤이 +line 5=윅윕윥융읅읕읥익 +line 6=윆윖윦윶읆읖읦읶 +line 7=윇윗윧윷읇읗읧읷 + +#U+C780 +[jamo 18] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=잀자잠잰쟀쟐쟠쟰 +line 1=잁작잡잱쟁쟑쟡쟱 +line 2=잂잒잢잲쟂쟒쟢쟲 +line 3=잃잓잣잳쟃쟓쟣쟳 +line 4=임잔잤잴쟄쟔쟤쟴 +line 5=입잕장잵쟅쟕쟥쟵 +line 6=잆잖잦잶쟆쟖쟦쟶 +line 7=잇잗잧잷쟇쟗쟧쟷 + +#U+C708 +[jamo 19] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=윈윘율윸읈의읨인 +line 1=윉윙윩윹읉읙읩읹 +line 2=윊윚윪윺읊읚읪읺 +line 3=윋윛윫윻읋읛읫읻 +line 4=윌윜윬으음읜읬일 +line 5=윍윝윭윽읍읝읭읽 +line 6=윎윞윮윾읎읞읮읾 +line 7=윏윟윯윿읏읟읯읿 + +#U+C788 +[jamo 20] +Top=25 +Baseline=32 +LineSpacing=28 +DefaultWidth=39 +line 0=있잘잨잸쟈쟘쟨쟸 +line 1=잉잙잩잹쟉쟙쟩쟹 +line 2=잊잚잪잺쟊쟚쟪쟺 +line 3=잋잛잫잻쟋쟛쟫쟻 +line 4=잌잜재잼쟌쟜쟬쟼 +line 5=잍잝잭잽쟍쟝쟭쟽 +line 6=잎잞잮잾쟎쟞쟮쟾 +line 7=잏잟잯잿쟏쟟쟯쟿 \ No newline at end of file diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 8df3ed41e5..484388e8b9 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -162,6 +162,7 @@ ScrollingListOffCommand=bouncebegin,0.5;zoomy,0 GuideOffCommand=bouncebegin,0.5;addy,400 ChoiceListHighlightOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0 ChoiceListFrameOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0 +UseModeSpecificBGAnims=0 [ScreenStyleSplash] NextScreen=ScreenSelectGroup diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 461a46023d..87c7433bc5 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -29,6 +29,7 @@ #include "RageTimer.h" #include "ActorUtil.h" #include "RageTextureManager.h" +#include "AnnouncerManager.h" #define SCROLLING_LIST_X THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListX") #define SCROLLING_LIST_Y THEME->GetMetricF("ScreenEz2SelectMusic","ScrollingListY") @@ -189,6 +190,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic") MusicChanged(); } + SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music intro") ); } void ScreenEz2SelectMusic::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index b41a9f594b..55c7a8fc7d 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -218,6 +218,10 @@ void ScreenSelect::Input( const DeviceInput& DeviceI, const InputEventType type, } } +// For some reason the menu likes to take 10 seconds to transition O_o +// quite noticeable pause... and in the meantime the player is sitting there +// wondering why their keys aren't working... even ESC... @_@ + if( m_Menu.IsTransitioning() ) return; diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index fecef74d20..56370d5a2b 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -34,6 +34,7 @@ Chris Danford #define GUIDE_X THEME->GetMetricF("ScreenSelectMode", "GuideX") #define GUIDE_Y THEME->GetMetricF("ScreenSelectMode", "GuideY") #define USECONFIRM THEME->GetMetricI("ScreenSelectMode","UseConfirm") +#define USE_MODE_SPECIFIC_BGS THEME->GetMetricI("ScreenSelectMode", "UseModeSpecificBGAnims") /************************************ ScreenSelectMode (Constructor) @@ -63,6 +64,13 @@ ScreenSelectMode::ScreenSelectMode() : ScreenSelect( "ScreenSelectMode" ) CString sElementPath = THEME->GetPathToG(sElementName); arrayLocations.push_back( sElementPath ); + + if(USE_MODE_SPECIFIC_BGS == 1) + { + BGAnimation templayer; + templayer.LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenSelectMode background %s", mc.name )) ); + templayer.SetDiffuse(RageColor(0,0,0,0)); + } } // m_ScrollingList.UseSpriteType(BANNERTYPE); @@ -103,6 +111,15 @@ void ScreenSelectMode::MenuLeft( PlayerNumber pn ) } m_ScrollingList.Left(); m_soundModeChange.Play(); + if(USE_MODE_SPECIFIC_BGS == 1) + { + ChangeBGA(); + } +} + +void ScreenSelectMode::ChangeBGA() +{ + } void ScreenSelectMode::MenuRight( PlayerNumber pn ) @@ -114,6 +131,10 @@ void ScreenSelectMode::MenuRight( PlayerNumber pn ) } m_ScrollingList.Right(); m_soundModeChange.Play(); + if(USE_MODE_SPECIFIC_BGS == 1) + { + ChangeBGA(); + } } void ScreenSelectMode::UpdateSelectableChoices() @@ -156,6 +177,10 @@ void ScreenSelectMode::UpdateSelectableChoices() m_ScrollingList.SetSelection(0); m_ScrollingList.Unload(); m_ScrollingList.Load(GraphicPaths); + if(USE_MODE_SPECIFIC_BGS == 1) + { + // TODO: Finish implementing this! (Got exams no time to finish...) + } } void ScreenSelectMode::HandleScreenMessage( const ScreenMessage SM ) diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 4a859fd851..8ff3807603 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -17,6 +17,7 @@ Andrew Livy #include "ModeChoice.h" #include "BitmapText.h" #include "RandomSample.h" +#include "BGAnimationLayer.h" /* Class Definition */ @@ -35,8 +36,10 @@ public: protected: virtual int GetSelectionIndex( PlayerNumber pn ); virtual void UpdateSelectableChoices(); + void ChangeBGA(); int m_iNumChoices; int m_iSelectableChoices[MAX_ELEMS]; + RageSound m_soundModeChange; RageSound m_soundConfirm; RageSound m_soundStart; @@ -47,5 +50,6 @@ protected: Sprite m_sprJoinMessage[NUM_PLAYERS]; Sprite m_sprJoinFrame[NUM_PLAYERS]; Sprite m_Guide; + vector m_Backgrounds; bool m_bSelected; }; diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 89ad6cfeda..16e1bc486f 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -92,7 +92,11 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 +<<<<<<< StepMania.dsp +TargetDir=\Stepmania\stepmania +======= TargetDir=\stepmania +>>>>>>> 1.222 TargetName=StepMania-debug SOURCE="$(InputPath)" PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ @@ -2174,10 +2178,6 @@ SOURCE=.\UnlockSystem.h # End Group # Begin Source File -SOURCE=.\cursor1.cur -# End Source File -# Begin Source File - SOURCE=.\error.bmp # End Source File # Begin Source File