random people

TheSillyDoggo · Jul 16, 2024 · d01c89f · d01c89f
1 parent 02858bb
commit d01c89f
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 6 deletions.
diff --git a/emojis/other/mewhen.png b/emojis/other/mewhen.png
diff --git a/emojis/players/colon.png b/emojis/players/colon.png
diff --git a/emojis/players/cyclic.png b/emojis/players/cyclic.png
diff --git a/emojis/players/default.png b/emojis/players/default.png
diff --git a/emojis/players/evw.png b/emojis/players/evw.png
diff --git a/emojis/players/juniper.png b/emojis/players/juniper.png
diff --git a/emojis/players/riot.png b/emojis/players/riot.png
diff --git a/emojis/players/robtop.png b/emojis/players/robtop.png
diff --git a/emojis/players/sdslayer.png b/emojis/players/sdslayer.png
diff --git a/emojis/players/thesillydoggo.png b/emojis/players/thesillydoggo.png
diff --git a/emojis/players/tride.png b/emojis/players/tride.png
diff --git a/emojis/players/uproxide.png b/emojis/players/uproxide.png
diff --git a/emojis/players/wulzy.png b/emojis/players/wulzy.png
diff --git a/mod.json b/mod.json
@@ -24,6 +24,9 @@
 			"GJ_EmojiSheet02": [
 				"emojis/other/*.png"
 			],
+			"GJ_EmojiSheet03": [
+				"emojis/players/*.png"
+			],
 			"GJ_EmojiUISheet": [
 				"resources/*.png"
 			]

diff --git a/src/EmojiNode.cpp b/src/EmojiNode.cpp
@@ -85,7 +85,7 @@ std::vector<std::pair<std::string, std::string>> emojis = {
     std::pair("eldermod", "modBadge_02_001.png"),
     std::pair("leaderboardmod", "modBadge_03_001.png"),
 
-    std::pair("$$newline$$", "$$newline$$"),
+    std::pair("$$newline$$Discord", "$$newline$$"),
 
     //discord
     _Emoji("100"),
@@ -113,7 +113,7 @@ std::vector<std::pair<std::string, std::string>> emojis = {
     _Emoji("eggplant"),
     _Emoji("clown"),
 
-    std::pair("$$newline$$", "$$newline$$"),
+    std::pair("$$newline$$Other", "$$newline$$"),
 
     //other
     _Emoji("amogus"),
@@ -150,9 +150,26 @@ std::vector<std::pair<std::string, std::string>> emojis = {
     _Emoji("gd"),
     std::pair("geode", "geode-icon.png"_spr),
     _Emoji("boar"),
+    _Emoji("mewhen"),
+
+    // players
+    std::pair("$$newline$$Players", "$$newline$$"),
+
+    _Emoji("default"),
+    _Emoji("sdslayer"),
+    _Emoji("evw"),
+    _Emoji("tride"),
+    _Emoji("colon"),
+    _Emoji("robtop"),
+    _Emoji("wulzy"),
+    _Emoji("juniper"),
+    _Emoji("riot"),
+    _Emoji("cyclic"),
+    _Emoji("thesillydoggo"),
+    _Emoji("uproxide"),
 
     // cat collection, thank you c# discord. i wuv you <3
-    std::pair("$$newline$$", "$$newline$$"),
+    std::pair("$$newline$$Cat Collection", "$$newline$$"),
 
     _Emoji("catbless"),
     _Emoji("catcash"),
@@ -163,7 +180,7 @@ std::vector<std::pair<std::string, std::string>> emojis = {
     _Emoji("catderp"),
     _Emoji("catfacepalm"),
     _Emoji("catfine"),
-    _Emoji("catgasm"),
+    // _Emoji("catgasm"),
     _Emoji("catgasp"),
     _Emoji("catgift"),
     _Emoji("catgrump"),

diff --git a/src/EmojiPickPopup.cpp b/src/EmojiPickPopup.cpp
@@ -106,16 +106,23 @@ void EmojiPickPopup::populateScroll(CCContentLayer* content)
         {
             //newline
 
+            auto text = CCLabelBMFont::create(emoji.first.substr(11).c_str(), "chatFont.fnt");
+            text->setColor(ccc3(0, 0, 0));
+            text->setOpacity(50);
+            text->setAnchorPoint(ccp(0, 0.5f));
+            text->setPosition(ccp(10, (y + 1.25f) * spacer));
+
             auto line = CCLayerColor::create();
             line->setOpacity(50);
             line->ignoreAnchorPointForPosition(false);
-            line->setContentSize(ccp(content->getContentWidth() - 25, 2));
-            line->setPosition(ccp(content->getContentWidth() / 2, (y + 1.25f) * spacer));
+            line->setContentSize(ccp((content->getContentWidth() - 25) - text->getScaledContentWidth() - 5, 2));
+            line->setPosition(ccp(content->getContentWidth() / 2 + text->getScaledContentWidth() / 2 + 5 / 2, (y + 1.25f) * spacer));
 
             x = -1;
             y += 1.5f;
 
             content->addChild(line);
+            content->addChild(text);
         }
     }