diff --git a/modes/sprintPenta.lua b/modes/sprintPenta.lua index fa387c7c..b2431c0e 100644 --- a/modes/sprintPenta.lua +++ b/modes/sprintPenta.lua @@ -12,16 +12,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=40-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r<21 and r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/modes/sprint_10.lua b/modes/sprint_10.lua index 0bb1fbc7..ff361e3f 100644 --- a/modes/sprint_10.lua +++ b/modes/sprint_10.lua @@ -11,16 +11,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=10-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/modes/sprint_100.lua b/modes/sprint_100.lua index e8c5c02d..752daf12 100644 --- a/modes/sprint_100.lua +++ b/modes/sprint_100.lua @@ -11,16 +11,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=100-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r<21 and r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/modes/sprint_1000.lua b/modes/sprint_1000.lua index 311d455f..7945a213 100644 --- a/modes/sprint_1000.lua +++ b/modes/sprint_1000.lua @@ -11,16 +11,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=1000-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r<21 and r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/modes/sprint_20.lua b/modes/sprint_20.lua index 194502dc..9371cd57 100644 --- a/modes/sprint_20.lua +++ b/modes/sprint_20.lua @@ -11,16 +11,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=20-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/modes/sprint_40.lua b/modes/sprint_40.lua index 0b07f15c..a3f6e7ff 100644 --- a/modes/sprint_40.lua +++ b/modes/sprint_40.lua @@ -11,16 +11,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=40-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r<21 and r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/modes/sprint_400.lua b/modes/sprint_400.lua index 2b731113..fdc9e679 100644 --- a/modes/sprint_400.lua +++ b/modes/sprint_400.lua @@ -11,16 +11,11 @@ return{ PLY.newPlayer(1,340,15) end, mesDisp=function(P) - local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y setFont(55) local r=400-P.stat.row if r<0 then r=0 end mStr(r,69,335) - if r<21 and r>0 then - gc.setLineWidth(4) - gc.setColor(1,r>10 and 0 or rnd(),.5) - gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) - end + P:drawTargetLine(r) end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, diff --git a/parts/player.lua b/parts/player.lua index a5af9398..f78777ec 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -999,6 +999,14 @@ local function Pdraw_demo(P) TEXT.draw(P.bonus) gc.pop() end +function player.drawTargetLine(P,r) + if r<21+(P.fieldBeneath+P.fieldUp)/30 and r>0 then + gc.setLineWidth(4) + gc.setColor(1,r>10 and 0 or rnd(),.5) + local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y+P.fieldBeneath+P.fieldUp + gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy) + end +end ---------------------------------------------------- ----------------------------------------------------