diff --git a/parts/list.lua b/parts/list.lua index b2641a19..a2264497 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -157,8 +157,6 @@ end do--drawableText local function T(s,t)return love.graphics.newText(getFont(s),t)end drawableText={ - question=T(100,"?"), - bpm=T(15,"BPM"),kpm=T(15,"KPM"), modeName=T(30), anykey=T(40), diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 3dc11dc0..be15be36 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -58,7 +58,14 @@ local gridLines do end local LDmarks=gc.newSpriteBatch(DOGC{14,5,{'clear',1,1,1}},15,'static') for i=0,14 do LDmarks:add(3+20*i,615)end - +local bpmImage=DOGC{31,12, + {'setFT',15}, + {'print',"BPM",0,-5} +} +local kpmImage=DOGC{31,12, + {'setFT',15}, + {'print',"KPM",0,-5} +} local function boardTransform(mode) if mode then if mode=="U-D"then @@ -682,8 +689,8 @@ function draw.norm(P) else drawDial(510,515,P.dropSpeed) drawDial(555,570,P.keySpeed) - gc_draw(drawableText.bpm,540,485) - gc_draw(drawableText.kpm,494,578) + gc_draw(bpmImage,540,490) + gc_draw(kpmImage,494,583) drawFinesseCombo_norm(P) end diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index e5c0babf..8c612f32 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -164,7 +164,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(drawableText.question,850,80) + gc.draw(TEXTURE.question,850,110) end end diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 16211f54..6b99afbe 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -425,7 +425,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(drawableText.question,1090,460) + gc.draw(TEXTURE.question,1070,490) end --Block name diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 569251c4..3b56ee5d 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -182,7 +182,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(drawableText.question,980,570) + gc.draw(TEXTURE.question,980,600) end end diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 0742246d..8d317ff4 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -182,7 +182,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(drawableText.question,980,570) + gc.draw(TEXTURE.question,1050,430,nil,.6) end end diff --git a/parts/texture.lua b/parts/texture.lua index ad8e1465..ba3098b1 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -151,5 +151,11 @@ for i=1,8 do gc.translate(-12*i,i==1 and -8 or -14) end +--Question mark +TEXTURE.question=DOGC{45,80, + {'setFT',100}, + {'print',"?",0,-30}, +} + gc.setCanvas() return TEXTURE \ No newline at end of file