diff --git a/data/dead.lua b/data/dead.lua index 3037e20..ea614cf 100644 --- a/data/dead.lua +++ b/data/dead.lua @@ -4,7 +4,7 @@ function dead.start() dead.count=0 dead.pos={} dead.vel={} - for i=1,128 do + for i=1,128*o2aX do dead.pos[i]=0 dead.vel[i]=(200+math.random(0,399))/400 end @@ -12,30 +12,33 @@ function dead.start() end function dead.update() + font.current(font_sf) dead.count=dead.count+1 - for i=1,128 do - if dead.pos[i]<96 then + for i=1,128*o2aX do + if dead.pos[i]<96*o2aX then dead.pos[i]=dead.pos[i]+dead.vel[i] draw.vline(i-1,0,dead.pos[i],16) end end + local text_x = 44*o2aX + local text_y = 40*o2aX if dead.count>50 then if dead.count>130 then - draw.text("GAME OVER",44,40,2) + draw.text("GAME OVER",text_x,text_y,2) elseif dead.count>120 then - draw.text("GAME OVE",44,40,2) + draw.text("GAME OVE",text_x,text_y,2) elseif dead.count>110 then - draw.text("GAME OV",44,40,2) + draw.text("GAME OV",text_x,text_y,2) elseif dead.count>100 then - draw.text("GAME O",44,40,2) + draw.text("GAME O",text_x,text_y,2) elseif dead.count>90 then - draw.text("GAME",44,40,2) + draw.text("GAME",text_x,text_y,2) elseif dead.count>80 then - draw.text("GAM",44,40,2) + draw.text("GAM",text_x,text_y,2) elseif dead.count>70 then - draw.text("GA",44,40,2) + draw.text("GA",text_x,text_y,2) elseif dead.count>60 then - draw.text("G",44,40,2) + draw.text("G",text_x,text_y,2) end end diff --git a/data/game.lua b/data/game.lua index 4298096..cf7f12d 100644 --- a/data/game.lua +++ b/data/game.lua @@ -19,7 +19,6 @@ require "fireball" require "switches" require "logo" -local arcade_config = require("arcade_config") o2aX = arcade_config.org2arc_escala modes={playing=0,editing=1} diff --git a/data/main.lua b/data/main.lua index 9524aa4..c50c198 100644 --- a/data/main.lua +++ b/data/main.lua @@ -1,3 +1,5 @@ +arcade_config = require("arcade_config") + require "final" require "fade" require "audio" @@ -27,7 +29,6 @@ require "abad" require "intro" require "game" -local arcade_config = require("arcade_config") --require "fade" --require "audio"