From 686f6d896266387a81ba97989962bdecd411eb14 Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 8 Aug 2025 00:10:21 +0200 Subject: [PATCH] lot of things ig. Lastly made function also show the card on passed coordinates. Coordinates are not getting passed over yet in blackjack.lua. It isnt testet also lol --- .luarc.json | 3 +- blackjack.lua | 46 ++++++++++-------- .../pixelCards/CuteCardsPixel.png | Bin 4058 -> 0 bytes .../pixelCards/CuteCardsPixel.png.import | 34 ------------- .../pixelCards/CuteCardsPixel_outline.png | Bin 4081 -> 0 bytes .../CuteCardsPixel_outline.png.import | 34 ------------- .../pixelCards/PokerChipsPixel.png | Bin 1265 -> 0 bytes .../pixelCards/PokerChipsPixel.png.import | 34 ------------- conf.lua | 1 + karten.lua | 34 ++++++++----- main.lua | 9 ++-- 11 files changed, 56 insertions(+), 139 deletions(-) delete mode 100644 cards_asset_pack/pixelCards/CuteCardsPixel.png delete mode 100644 cards_asset_pack/pixelCards/CuteCardsPixel.png.import delete mode 100644 cards_asset_pack/pixelCards/CuteCardsPixel_outline.png delete mode 100644 cards_asset_pack/pixelCards/CuteCardsPixel_outline.png.import delete mode 100644 cards_asset_pack/pixelCards/PokerChipsPixel.png delete mode 100644 cards_asset_pack/pixelCards/PokerChipsPixel.png.import diff --git a/.luarc.json b/.luarc.json index abcdd00..86a24df 100644 --- a/.luarc.json +++ b/.luarc.json @@ -1,6 +1,7 @@ { "diagnostics.globals": [ "currentScreen", - "drawMenu" + "drawMenu", + "spielerHand" ] } \ No newline at end of file diff --git a/blackjack.lua b/blackjack.lua index 7c32112..decfd10 100644 --- a/blackjack.lua +++ b/blackjack.lua @@ -1,38 +1,42 @@ +local love = require "love" require "karten" spielerHand = {} -dealerHand = {} -deck = {} +DealerHand = {} +Deck = {} -function loadBlackjack() - deck = createDeck() - shuffleDeck(deck) - dealInitialCards() +function LoadBlackjack() + Deck = Karten:createDeck() + Karten:shuffleDeck(Deck) + DealInitialCards() + Cards = love.graphics.newImage("/cards_asset_pack/CuteCards.png") end -function updateBlackjack(dt) +function UpdateBlackjack(dt) -- Hier können zukünftige Updates für Blackjack hinzugefügt werden end -function drawBlackjack() - love.graphics.print("Spieler Hand: " .. handValue(spielerHand), 50, 50) - love.graphics.print("Dealer Hand: " .. handValue(dealerHand), 50, 100) - love.graphics.print("Drücke 'H' für Hit oder 'S' für Stand", 50, 150) +function DrawBlackjack() + print(love.graphics:getWidth()) + love.graphics.draw(Cards, love.graphics.getWidth() / 2 - 90 , 50, 0, 0.2) + -- love.graphics.print("Spieler Hand: " .. Karten:handValue(spielerHand), 50, 50) + -- love.graphics.print("Dealer Hand: " .. Karten:handValue(DealerHand), 50, 100) + -- love.graphics.print("Drücke 'H' für Hit oder 'S' für Stand", 50, 150) end -function handleBlackjackInput(key) +function HandleBlackjackInput(key) if key == 'h' then - hit(spielerHand) - if handValue(spielerHand) > 21 then + Karten:hit(spielerHand) + if Karten:handValue(spielerHand) > 21 then love.graphics.print("Spieler hat verloren!", 50, 200) end elseif key == 's' then - while handValue(dealerHand) < 17 do - hit(dealerHand) + while Karten:handValue(DealerHand) < 17 do + Karten:hit(DealerHand) end - if handValue(dealerHand) > 21 then + if Karten:handValue(DealerHand) > 21 then love.graphics.print("Dealer hat verloren!", 50, 200) - elseif handValue(spielerHand) > handValue(dealerHand) then + elseif Karten:handValue(spielerHand) > Karten:handValue(DealerHand) then love.graphics.print("Spieler gewinnt!", 50, 200) else love.graphics.print("Dealer gewinnt!", 50, 200) @@ -40,10 +44,10 @@ function handleBlackjackInput(key) end end -function dealInitialCards() +function DealInitialCards() for i = 1, 2 do - hit(spielerHand) - hit(dealerHand) + Karten:hit(spielerHand) + Karten:hit(DealerHand) end end diff --git a/cards_asset_pack/pixelCards/CuteCardsPixel.png b/cards_asset_pack/pixelCards/CuteCardsPixel.png deleted file mode 100644 index eb305f90ae04a70b43d60d64a9d650af2bfbf925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4058 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 C&bV*@ diff --git a/cards_asset_pack/pixelCards/CuteCardsPixel.png.import b/cards_asset_pack/pixelCards/CuteCardsPixel.png.import deleted file mode 100644 index b7003ac..0000000 --- a/cards_asset_pack/pixelCards/CuteCardsPixel.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bmhicnjvqrotx" -path="res://.godot/imported/CuteCardsPixel.png-bbdbd180a598bcdd28e9cc85e1935838.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/CuteCards - asset pack/pixelCards/CuteCardsPixel.png" -dest_files=["res://.godot/imported/CuteCardsPixel.png-bbdbd180a598bcdd28e9cc85e1935838.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/cards_asset_pack/pixelCards/CuteCardsPixel_outline.png b/cards_asset_pack/pixelCards/CuteCardsPixel_outline.png deleted file mode 100644 index e735ccfbd241312a030461ab02fdba807173a16d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4081 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 To5Hkrc&3|%76$eDF7W>Wo~X;v diff --git a/cards_asset_pack/pixelCards/CuteCardsPixel_outline.png.import b/cards_asset_pack/pixelCards/CuteCardsPixel_outline.png.import deleted file mode 100644 index a6877e0..0000000 --- a/cards_asset_pack/pixelCards/CuteCardsPixel_outline.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dm33tyrs31h6b" -path="res://.godot/imported/CuteCardsPixel_outline.png-a6e98435eaee73056b7affa8bbf5e1e2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/CuteCards - asset pack/pixelCards/CuteCardsPixel_outline.png" -dest_files=["res://.godot/imported/CuteCardsPixel_outline.png-a6e98435eaee73056b7affa8bbf5e1e2.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/cards_asset_pack/pixelCards/PokerChipsPixel.png b/cards_asset_pack/pixelCards/PokerChipsPixel.png deleted file mode 100644 index 61e812c093af33404992426baca48dc6ab934c90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1265 zcmVPx(t4TybRCt{2Tf1&zF%X?xZIK^Xeh{UK(o(?|Kt;Psh4{hj4^Xk&tgZ2Qp2nAp zA|ELd!Pm!U?D6<97l47q@FErb1o$hJ{ZZ--EP$)lS_m3l_z5(H(O*Lh|o&vkJT?~-Px$c1erbtTW8 z!^Q~{WieEcB97KCxXx?#`Jyc^mj>Jh`rO2YHKEUQ*!Y6~$)l)|5m3*lyh|HM%0)aw z^?J<9=rwg=4qTtnE9&BG3~>FZO1%hls);0+ESgoh)HVu*CX6tH!$cSw7h~fD1B+pF z{(>mOP9WBs=oywMXlUTp0WWCC;?@Bv99rSe&{HfR0FJFDBE<(Ax)=dCwqXF(wpHZ9 z2R_b8kfAPJ+JGT`Q`a3fPMB0Oh9yG+aebD{+KQpJL@r?qs6pfswx&&79v;EQ>W~G% zUn|fCIFDetm?L)0Km4Ub&T;}1@bVaym+f>&hYz(In564p;T`R>V2};;)H+g0y z&-HLo?~-PxCyhw!N}fB1ja3@)a6DClG;y>({=D06*ynLuUM>x|4g9%<3v0rk=diK3 zrAwozkx^LbI&B~+sAp(ik9j%0o-|_O!1X!3k}l512v>6&G193Pl3==M(sHS7911O1 zVFrhZC^Rn4#*xWd5To-KL=ko(vED+@utY&a1Gf%%K|>a|4oKn93V)WKrZghmIsx!0 zHftLO0M)it;=%_$&PlML9$ngiVSY>3JvNGIL~FZ=1zIUKYb%D^lDMQTpazLc+M2d- zd3Yon#WZ4zM{r!+kvj=W;5=30;?VXiD?h`3BygiGUT(M7qNbr~OM}fW9gYFfv(- zVs!q3D8i0+>UuE8)J>qF;hyz{hAg}e(C;c8&R8#@@O-cMN5*?x#x1a|9nUSWk&Xx8 z<9OsbF^#A-N)I7cicOnQbY~%P;b*)ZEpcHz-q~*1s0{=?gqdkXZT}14Pb1QLTzw4h zfz89|O(ROSMt+URbw2L!@UIaqL7XUw%X2FAa(Vb7x~!QL(N%CWgEG>HPr^0s^PiAw b-~sptOqq>q*V4JK00000NkvXXu0mjfzPDld diff --git a/cards_asset_pack/pixelCards/PokerChipsPixel.png.import b/cards_asset_pack/pixelCards/PokerChipsPixel.png.import deleted file mode 100644 index 13d622a..0000000 --- a/cards_asset_pack/pixelCards/PokerChipsPixel.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d4lvd2ngebob7" -path="res://.godot/imported/PokerChipsPixel.png-c94cf11a09e7c8bc77d14bdf4442ee7e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/CuteCards - asset pack/pixelCards/PokerChipsPixel.png" -dest_files=["res://.godot/imported/PokerChipsPixel.png-c94cf11a09e7c8bc77d14bdf4442ee7e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/conf.lua b/conf.lua index d734ad5..5ffdd31 100644 --- a/conf.lua +++ b/conf.lua @@ -1,3 +1,4 @@ +local love = require "love" function love.conf(t) t.window.width = 350 end diff --git a/karten.lua b/karten.lua index ac22bf2..d5330ce 100644 --- a/karten.lua +++ b/karten.lua @@ -1,30 +1,28 @@ -karten = {} +local love = require "love" +Karten = {} -function createDeck() +function Karten:createDeck() local deck = {} - local suits = {"Herz", "Karo", "Pik", "Kreuz"} + local suits = {"Clubs", "Diamonds", "Spades", "Hearts"} local values = {2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 11} -- 10, J, Q, K sind alle 10, A ist 11 for _, suit in ipairs(suits) do for _, value in ipairs(values) do table.insert(deck, {suit = suit, value = value}) end end + + TileMap = love.graphics.newImage("/cards_asset_pack/CuteCards.png") return deck end -function shuffleDeck(deck) +function Karten:shuffleDeck(deck) for i = #deck, 2, -1 do local j = love.math.random(i) deck[i], deck[j] = deck[j], deck[i] end end -function hit(hand) - local card = table.remove(deck) - table.insert(hand, card) -end - -function handValue(hand) +function Karten:handValue(hand) local value = 0 local aces = 0 for _, card in ipairs(hand) do @@ -40,5 +38,19 @@ function handValue(hand) return value end -return karten +function Karten:hit(x, y, hand) + if #Deck > 0 then + local card = table.remove(Deck) + table.insert(hand, card) + local suits = {["Clubs"] = 0, ["Diamonds"] = 1, ["Spades"] = 2, ["Hearts"] = 3} + local tileWidth = TileMap:getWidth() / 4 + local tileHeight = TileMap:getHeight() / 13 + local tileX = suits[card.suit] + local tileY = math.min(card.value - 2, 9) + love.graphics.draw(TileMap, love.graphics.newQuad(tileX * tileWidth, tileY * tileHeight, tileWidth, tileHeight, TileMap:getDimensions()), x, y) + end +end + + +return Karten diff --git a/main.lua b/main.lua index 80c058e..576fd30 100644 --- a/main.lua +++ b/main.lua @@ -6,11 +6,12 @@ require "blackjack" function love.load() love.window.setTitle("Spiele Auswahl") currentScreen = "menu" + love.graphics.setBackgroundColor(0.30 ,0.30 ,0.46, 1) end function love.update(dt) if currentScreen == "blackjack" then - updateBlackjack(dt) + UpdateBlackjack(dt) end end @@ -18,7 +19,7 @@ function love.draw() if currentScreen == "menu" then drawMenu() elseif currentScreen == "blackjack" then - drawBlackjack() + DrawBlackjack() end end @@ -26,10 +27,10 @@ function love.keypressed(key) if currentScreen == "menu" then if key == '1' then currentScreen = "blackjack" - loadBlackjack() + LoadBlackjack() end elseif currentScreen == "blackjack" then - handleBlackjackInput(key) + HandleBlackjackInput(key) end end