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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s79(uYshFF|lI>}b3$v~hr zUZUDfZHvgXDpqTC^9|d#evlDcxwB#J^bMQ0vBMX=Ntc?#(%()3Doum8)j@>s?Ic%Sst}XC-MSKR?sx#`WgW&GeXUcNtD>-tzdx zHm-B*4F@LF7_C%##m=yyJ|=ReNZ57JkcA7m{xUyl|7{=?njsT!zI-bP0l+XkKW9W9z 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s789ZGaLo80Oon-6BY$)J1 zfA6#)wJ5EoEt&!6Cd`vlENtlDW>J}<_EJ&v(o?qT)&k~p4pZ|~t@Z?+^62wr)P8Gq zPhN4^rgWS9XTMW^tlv>1J!}7$&egGx))=Ta{CI7}^rNCeJeHBm!Af-MQa558M>zWT;LYtbKfF3w)LD~^BC8uIU~kMq#u Ts;FULU|{fc^>bP0l+XkK3S5H^ 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!ia0y~yU=RRd4mJh`2Kmqb6B!s7@;zM~Lo7}wryOA2=Jhu{ zAtB*H)#4)sy8k$o^-_Iqu>3bR_~ZUeJ}vE^|0G5p9v+_md*>Tw>1}b3=9|;J{OsK V+z>pzhk=2C!PC{xWt~$(69B>EIywLV 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!ia0y~yU=RRd4mJh`2Kmqb6B!s7HhH=@hFF|VPFNsdAQYsq z)Af~o&)+-GC6yhS|5+RUaTlMgH7QA;X7!N+2M!!4(EZ2JB_~$WE1z2WaMGWCePaUy zg9E1Vu@x1)w0ks(nKF0qapJp)yDU#Xx^lyI>!%l{y3`sf1 zvKd_U6pnsN-e0L%ey~1;dBWqV5w|5T#yWHp{bbI}%-nqT;rX5lV_}_z i37bz!t(vLDz#y1muG{)zUmODi1B0ilpUXO@geCy6k64=k diff --git a/Userland/Games/Snake/SnakeGame.cpp b/Userland/Games/Snake/SnakeGame.cpp index 48efd50beb..828a875585 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 e29249346c..75cec5f3de 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 m_fruit_bitmaps; + NonnullRefPtrVector m_food_bitmaps; };