diff options
| -rw-r--r-- | main.lua | 11 | ||||
| -rw-r--r-- | menu.lua | 8 | ||||
| -rw-r--r-- | selector.lua | 2 |
3 files changed, 14 insertions, 7 deletions
@@ -46,9 +46,10 @@ function love.load() love.graphics.setDefaultFilter("nearest", "nearest") -- Font - Font = love.graphics.newImageFont("assets/font2.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-,!:()[]{}<>", -1) + -- 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-,!:()[]{}<> + Font = love.graphics.newImageFont("assets/font4.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1) Bold = love.graphics.newImageFont("assets/font3.png", " 0123456789AEFILNORSTUW", -2) - Font:setLineHeight(1) + Font:setLineHeight(9/16) love.graphics.setFont(Font) -- Menu bijaczes @@ -98,14 +99,14 @@ function love.keypressed(key) controller:keypressed(key) end -- Misc global input - if key == "x" then + if key == "f5" then debug = not debug end if key == "escape" or key == "f1" then love.event.quit() end - if key == "f5" and debug then - local new = World:new("default", {"leon", Controllers[1]}, {"lonestar", Controllers[2]}) + if key == "f6" and debug then + local new = World:new("default", {"link", Controllers[1]}, {"weed", Controllers[2]}) Scene:delete() changeScene(new) end @@ -130,7 +130,7 @@ function Menu:draw() love.graphics.printf("ROFLNAUTS2",(w/2)*scale,(32+dy)*scale,336,"center",(angle*5)*math.pi/180,scale,scale,168,12) -- footer love.graphics.setFont(Font) - love.graphics.printf("Use W,S,A,D,G,H or Arrows,Enter,Rshift or Gamepad\n\nA game by Awesomenauts Community\nSeltzy, ParaDoX, MilkingChicken, Burningdillo, Bronkey, Aki\nBased on a game by Jan Willem Nijman, Paul Veer and Bits_Beats XOXO", (w/2)*scale, (h-42)*scale, 336, "center", 0, scale, scale, 168, 4) + love.graphics.printf("Use W,S,A,D,G,H or Arrows,Enter,Rshift or Gamepad\n\nA game by Awesomenauts Community\nSeltzy, ParaDoX, MilkingChicken, Burningdillo, Bronkey, Aki, 04font\nBased on a game by Jan Willem Nijman, Paul Veer and Bits_Beats XOXO", (w/2)*scale, (h-42)*scale, 336, "center", 0, scale, scale, 168, 4) end -- Upadte @@ -186,12 +186,18 @@ function Menu:assignController(controller) end function Menu:controllerPressed(control, controller) + -- assign to character selection if control == "attack" then local selector = self:getSelectorsInactive()[1] if selector ~= nil then selector:assignController(controller) end end + -- map selection chaos! + if control == "left" then + end + if control == "right" then + end end -- It just must be here diff --git a/selector.lua b/selector.lua index 01d7fcf..19dfca6 100644 --- a/selector.lua +++ b/selector.lua @@ -43,7 +43,7 @@ function Selector:draw () love.graphics.draw(sprite, p.active, x*scale, y*scale, 0, scale, scale) end if self.naut ~= 1 then - love.graphics.printf(name, (x-6)*scale, (y+33)*scale, 44, "center", 0, scale, scale) + love.graphics.printf(string.upper(name), (x-8)*scale, (y+33)*scale, 48, "center", 0, scale, scale) end end function Selector:assignController(controller) |