From d87e2287dc09d11c64bffacb0460020d7b217898 Mon Sep 17 00:00:00 2001
From: Xexxa <93391300+Xexxa@users.noreply.github.com>
Date: Wed, 19 Oct 2022 23:25:38 +0200
Subject: [PATCH] Snake: Use emoji for in-game food graphics

---
 Base/res/icons/snake/cauliflower.png | Bin 282 -> 0 bytes
 Base/res/icons/snake/eggplant.png    | Bin 313 -> 0 bytes
 Base/res/icons/snake/paprika.png     | Bin 168 -> 0 bytes
 Base/res/icons/snake/tomato.png      | Bin 235 -> 0 bytes
 Userland/Games/Snake/SnakeGame.cpp   |  19 +++++++++++++------
 Userland/Games/Snake/SnakeGame.h     |   2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 Base/res/icons/snake/cauliflower.png
 delete mode 100644 Base/res/icons/snake/eggplant.png
 delete mode 100644 Base/res/icons/snake/paprika.png
 delete mode 100644 Base/res/icons/snake/tomato.png

diff --git a/Base/res/icons/snake/cauliflower.png b/Base/res/icons/snake/cauliflower.png
deleted file mode 100644
index 6bcda88e51ffa2f2f17aff3b2dce7821c4ed6fd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002tNkl<ZILoDy
zJraU25QSeDdqyU-6qb4gJ0~}=x3%yb7OA;_otLn)w1pBKT96q|fQ1B;Wdns<Wq<PR
zOLl=jP52UdmUc9@-kiiNfV(&a3VfIAx&n8mbpZ{UVku+i%z;J<?BdyHT(;c+$g{NL
z=(Y;Z2Y|qkd@`vb>IVR@e_UCa6js+2RH2~?{R8BO`!Et!XdGWRr<)CzGDg@W{3n{i
zHY!15K7|0Vu${0;9Dr@A(4+1nfU({4jOBa9g4(EbK;JR;|3H(r8l#S?5ZrS3x;g9I
gHx<4On=*THA74yxUj6~K(EtDd07*qoM6N<$f@A1*&j0`b

diff --git a/Base/res/icons/snake/eggplant.png b/Base/res/icons/snake/eggplant.png
deleted file mode 100644
index e017e2d2a444a0ec6f431470d751fc5d226f585f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00031Nkl<ZILob)
zJx&8L5JsQ9mQp5KDuT2rP|lE^9wBjnhzkTHlqTsRDbnQzdxdZV&OnuJB|5xP%1Dk)
z0W0k~-X9^RvS&PR=KEy$uef|0n!ogkt6k!(FeiZc>pBAXcz73G0SZ7m6_u0IWa+?>
zW~)|^{JhNsz(9`xxOusw--}D24jbG*Kb{r(y$cRU-R?ngn2k5VX@{e3lp-sa*aT-x
zlZ9&qZ1-~!g8cYV50QSt=Bi<nrSpwF)Alr3yP{&XDtVDt-lf^A2m*c$H8M7l52=FO
zDa}?&h5+0BT-jV<b)6gl5d}T)O|`k|_79q({6`82jULoN{APe}+^=3pE(&;j00000
LNkvXXu0mjf3S5H^

diff --git a/Base/res/icons/snake/paprika.png b/Base/res/icons/snake/paprika.png
deleted file mode 100644
index 03ac589786b590aeafdd263b97a19b430f26d46b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``JOJ0Ar_~TQx33h^ZJ{fkdSbp
zYVnZ*-G3a)dZ|7)SpFLu{BeIKpO*H|e-a}P5d7ae-!NluU=mPe!iJx}#n&rF#5VL5
zN;X_&?cw3+ITCg3h=ZbpX#*FVz*N2yUY#Muj0;uHm@L?4Y+zu(!0@@q)Z>QW@jXDR
O89ZJ6T-G@yGywp?<2pJ3

diff --git a/Base/res/icons/snake/tomato.png b/Base/res/icons/snake/tomato.png
deleted file mode 100644
index f341ed1cb45e51cb1e516c04f4d5477e607f0ef1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`n><|{Lo7}wCoB*!5DHS*>H5mP
z=kJ~8lFE+E|EvxFxQkELnv^6^v--#ZASlrN$I&GxR?;h<TKaI(pMHH~0|SEtrtz^A
zEsX~|AKE{*YdPA}V)FQl^%ViN84Nzg{~w=bF$F1-+4}Tve-gt^hNBEgImfaYT=f)=
zeoNk8sabxoK81P0<Eat1B`?N0bSa+DQ_#``>u~*K&dki*eD>k_o(f}OorMXTPfD$t
bsl~t`m|?El`eI)k(De+Su6{1-oD!M<u#Z@q

diff --git a/Userland/Games/Snake/SnakeGame.cpp b/Userland/Games/Snake/SnakeGame.cpp
index 48efd50beb4..828a8755856 100644
--- a/Userland/Games/Snake/SnakeGame.cpp
+++ b/Userland/Games/Snake/SnakeGame.cpp
@@ -18,10 +18,17 @@
 SnakeGame::SnakeGame()
 {
     set_font(Gfx::FontDatabase::default_fixed_width_font().bold_variant());
-    m_fruit_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/icons/snake/paprika.png"sv).release_value_but_fixme_should_propagate_errors());
-    m_fruit_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/icons/snake/eggplant.png"sv).release_value_but_fixme_should_propagate_errors());
-    m_fruit_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/icons/snake/cauliflower.png"sv).release_value_but_fixme_should_propagate_errors());
-    m_fruit_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/icons/snake/tomato.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F41F.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F95A.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F99C.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F986.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1FAB2.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F426.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F424.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F40D.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F989.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F54A.png"sv).release_value_but_fixme_should_propagate_errors());
+    m_food_bitmaps.append(*Gfx::Bitmap::try_load_from_file("/res/emoji/U+1F408.png"sv).release_value_but_fixme_should_propagate_errors());
     reset();
 
     m_high_score = Config::read_i32("Snake"sv, "Snake"sv, "HighScore"sv, 0);
@@ -66,7 +73,7 @@ void SnakeGame::spawn_fruit()
             break;
     }
     m_fruit = coord;
-    m_fruit_type = get_random_uniform(m_fruit_bitmaps.size());
+    m_fruit_type = get_random_uniform(m_food_bitmaps.size());
 }
 
 Gfx::IntRect SnakeGame::score_rect() const
@@ -209,7 +216,7 @@ void SnakeGame::paint_event(GUI::PaintEvent& event)
         painter.fill_rect(bottom_side, Color::from_rgb(0x888800));
     }
 
-    painter.draw_scaled_bitmap(cell_rect(m_fruit), m_fruit_bitmaps[m_fruit_type], m_fruit_bitmaps[m_fruit_type].rect());
+    painter.draw_scaled_bitmap(cell_rect(m_fruit), m_food_bitmaps[m_fruit_type], m_food_bitmaps[m_fruit_type].rect());
 
     painter.draw_text(high_score_rect(), m_high_score_text, Gfx::TextAlignment::TopLeft, Color::from_rgb(0xfafae0));
     painter.draw_text(score_rect(), m_score_text, Gfx::TextAlignment::TopLeft, Color::White);
diff --git a/Userland/Games/Snake/SnakeGame.h b/Userland/Games/Snake/SnakeGame.h
index e29249346c6..75cec5f3de0 100644
--- a/Userland/Games/Snake/SnakeGame.h
+++ b/Userland/Games/Snake/SnakeGame.h
@@ -70,5 +70,5 @@ private:
     String m_high_score_text;
     bool m_is_new_high_score { false };
 
-    NonnullRefPtrVector<Gfx::Bitmap> m_fruit_bitmaps;
+    NonnullRefPtrVector<Gfx::Bitmap> m_food_bitmaps;
 };