From 169cd5651ee138cfef5a93c601e74f7616f543d9 Mon Sep 17 00:00:00 2001 From: Paul Liverman Date: Sun, 6 Dec 2015 11:25:22 -0800 Subject: [PATCH] simple changes --- ReadMe.md | 2 +- src/main.lua | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 335520e..cb480b4 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -2,7 +2,7 @@ Does what it says on the tin (including little notes at the bottom on how to use it!). -The only thing it won't tell you how to do is press m to generate a new deck (clipped in the top left corner). This is because that's not really intended, and this is a brand new super alpha project thing. +The only thing it won't tell you how to do is press M to generate a new deck (clipped in the top left corner). This is because that's not really intended, and this is a brand new super alpha project thing. (Oh, and press J to get 2 Jokers.) --- diff --git a/src/main.lua b/src/main.lua index 4c4125b..0021ba1 100644 --- a/src/main.lua +++ b/src/main.lua @@ -29,12 +29,15 @@ local function makeDeck(jokers) end function love.load() - insert(items, makeDeck(true)) + insert(items, makeDeck(false)) items[1]:shuffleCards() items[1]:moveTo(lg.getWidth()/2, lg.getHeight()/2) items[2] = Card("", "Joker") - items[2]:moveTo(100, 100) + items[2]:moveTo(80, 100) items[2]:flip() + items[3] = Card("", "Joker") + items[3]:moveTo(85, 105) + items[3]:flip() end local holding = false -- we might be holding something! @@ -254,7 +257,11 @@ function love.keypressed(key) end if key == "m" then - insert(items, makeDeck(true)) + insert(items, makeDeck(false)) + end + if key == "j" then + insert(items, Card("", "Joker")) + insert(items, Card("", "Joker")) end end