release

TheSillyDoggo · Jul 16, 2024 · e0f5ca8 · e0f5ca8
1 parent 948d5af
commit e0f5ca8
Show file tree

Hide file tree

Showing 78 changed files with 33 additions and 7 deletions.
diff --git a/emojis/animated/bonk/bonk.gif b/emojis/animated/bonk/bonk.gif
diff --git a/emojis/animated/bonk/bonk_1.png b/emojis/animated/bonk/bonk_1.png
diff --git a/emojis/animated/bonk/bonk_10.png b/emojis/animated/bonk/bonk_10.png
diff --git a/emojis/animated/bonk/bonk_11.png b/emojis/animated/bonk/bonk_11.png
diff --git a/emojis/animated/bonk/bonk_12.png b/emojis/animated/bonk/bonk_12.png
diff --git a/emojis/animated/bonk/bonk_13.png b/emojis/animated/bonk/bonk_13.png
diff --git a/emojis/animated/bonk/bonk_14.png b/emojis/animated/bonk/bonk_14.png
diff --git a/emojis/animated/bonk/bonk_15.png b/emojis/animated/bonk/bonk_15.png
diff --git a/emojis/animated/bonk/bonk_16.png b/emojis/animated/bonk/bonk_16.png
diff --git a/emojis/animated/bonk/bonk_17.png b/emojis/animated/bonk/bonk_17.png
diff --git a/emojis/animated/bonk/bonk_2.png b/emojis/animated/bonk/bonk_2.png
diff --git a/emojis/animated/bonk/bonk_3.png b/emojis/animated/bonk/bonk_3.png
diff --git a/emojis/animated/bonk/bonk_4.png b/emojis/animated/bonk/bonk_4.png
diff --git a/emojis/animated/bonk/bonk_5.png b/emojis/animated/bonk/bonk_5.png
diff --git a/emojis/animated/bonk/bonk_6.png b/emojis/animated/bonk/bonk_6.png
diff --git a/emojis/animated/bonk/bonk_7.png b/emojis/animated/bonk/bonk_7.png
diff --git a/emojis/animated/bonk/bonk_8.png b/emojis/animated/bonk/bonk_8.png
diff --git a/emojis/animated/bonk/bonk_9.png b/emojis/animated/bonk/bonk_9.png
diff --git a/emojis/animated/hype/hype.gif b/emojis/animated/hype/hype.gif
diff --git a/emojis/animated/hype/hype_1.png b/emojis/animated/hype/hype_1.png
diff --git a/emojis/animated/hype/hype_10.png b/emojis/animated/hype/hype_10.png
diff --git a/emojis/animated/hype/hype_2.png b/emojis/animated/hype/hype_2.png
diff --git a/emojis/animated/hype/hype_3.png b/emojis/animated/hype/hype_3.png
diff --git a/emojis/animated/hype/hype_4.png b/emojis/animated/hype/hype_4.png
diff --git a/emojis/animated/hype/hype_5.png b/emojis/animated/hype/hype_5.png
diff --git a/emojis/animated/hype/hype_6.png b/emojis/animated/hype/hype_6.png
diff --git a/emojis/animated/hype/hype_7.png b/emojis/animated/hype/hype_7.png
diff --git a/emojis/animated/hype/hype_8.png b/emojis/animated/hype/hype_8.png
diff --git a/emojis/animated/hype/hype_9.png b/emojis/animated/hype/hype_9.png
diff --git a/emojis/animated/ned_explosion/ned_explosion.gif b/emojis/animated/ned_explosion/ned_explosion.gif
diff --git a/emojis/animated/ned_explosion/ned_explosion_1.png b/emojis/animated/ned_explosion/ned_explosion_1.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_10.png b/emojis/animated/ned_explosion/ned_explosion_10.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_11.png b/emojis/animated/ned_explosion/ned_explosion_11.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_12.png b/emojis/animated/ned_explosion/ned_explosion_12.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_2.png b/emojis/animated/ned_explosion/ned_explosion_2.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_3.png b/emojis/animated/ned_explosion/ned_explosion_3.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_4.png b/emojis/animated/ned_explosion/ned_explosion_4.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_5.png b/emojis/animated/ned_explosion/ned_explosion_5.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_6.png b/emojis/animated/ned_explosion/ned_explosion_6.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_7.png b/emojis/animated/ned_explosion/ned_explosion_7.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_8.png b/emojis/animated/ned_explosion/ned_explosion_8.png
diff --git a/emojis/animated/ned_explosion/ned_explosion_9.png b/emojis/animated/ned_explosion/ned_explosion_9.png
diff --git a/emojis/animated/partying/partying.gif b/emojis/animated/partying/partying.gif
diff --git a/emojis/animated/partying/partying_1.png b/emojis/animated/partying/partying_1.png
diff --git a/emojis/animated/partying/partying_10.png b/emojis/animated/partying/partying_10.png
diff --git a/emojis/animated/partying/partying_11.png b/emojis/animated/partying/partying_11.png
diff --git a/emojis/animated/partying/partying_12.png b/emojis/animated/partying/partying_12.png
diff --git a/emojis/animated/partying/partying_2.png b/emojis/animated/partying/partying_2.png
diff --git a/emojis/animated/partying/partying_3.png b/emojis/animated/partying/partying_3.png
diff --git a/emojis/animated/partying/partying_4.png b/emojis/animated/partying/partying_4.png
diff --git a/emojis/animated/partying/partying_5.png b/emojis/animated/partying/partying_5.png
diff --git a/emojis/animated/partying/partying_6.png b/emojis/animated/partying/partying_6.png
diff --git a/emojis/animated/partying/partying_7.png b/emojis/animated/partying/partying_7.png
diff --git a/emojis/animated/partying/partying_8.png b/emojis/animated/partying/partying_8.png
diff --git a/emojis/animated/partying/partying_9.png b/emojis/animated/partying/partying_9.png
diff --git a/emojis/animated/petmaurice/petmaurice.gif b/emojis/animated/petmaurice/petmaurice.gif
diff --git a/emojis/animated/petmaurice/petmaurice_1.png b/emojis/animated/petmaurice/petmaurice_1.png
diff --git a/emojis/animated/petmaurice/petmaurice_2.png b/emojis/animated/petmaurice/petmaurice_2.png
diff --git a/emojis/animated/petmaurice/petmaurice_3.png b/emojis/animated/petmaurice/petmaurice_3.png
diff --git a/emojis/animated/petmaurice/petmaurice_4.png b/emojis/animated/petmaurice/petmaurice_4.png
diff --git a/emojis/animated/petmaurice/petmaurice_5.png b/emojis/animated/petmaurice/petmaurice_5.png
diff --git a/emojis/animated/polarbear/polarbear.gif b/emojis/animated/polarbear/polarbear.gif
diff --git a/emojis/animated/polarbear/polarbear_1.png b/emojis/animated/polarbear/polarbear_1.png
diff --git a/emojis/animated/polarbear/polarbear_10.png b/emojis/animated/polarbear/polarbear_10.png
diff --git a/emojis/animated/polarbear/polarbear_11.png b/emojis/animated/polarbear/polarbear_11.png
diff --git a/emojis/animated/polarbear/polarbear_12.png b/emojis/animated/polarbear/polarbear_12.png
diff --git a/emojis/animated/polarbear/polarbear_13.png b/emojis/animated/polarbear/polarbear_13.png
diff --git a/emojis/animated/polarbear/polarbear_2.png b/emojis/animated/polarbear/polarbear_2.png
diff --git a/emojis/animated/polarbear/polarbear_3.png b/emojis/animated/polarbear/polarbear_3.png
diff --git a/emojis/animated/polarbear/polarbear_4.png b/emojis/animated/polarbear/polarbear_4.png
diff --git a/emojis/animated/polarbear/polarbear_5.png b/emojis/animated/polarbear/polarbear_5.png
diff --git a/emojis/animated/polarbear/polarbear_6.png b/emojis/animated/polarbear/polarbear_6.png
diff --git a/emojis/animated/polarbear/polarbear_7.png b/emojis/animated/polarbear/polarbear_7.png
diff --git a/emojis/animated/polarbear/polarbear_8.png b/emojis/animated/polarbear/polarbear_8.png
diff --git a/emojis/animated/polarbear/polarbear_9.png b/emojis/animated/polarbear/polarbear_9.png
diff --git a/mod.json b/mod.json
@@ -28,7 +28,13 @@
 				"emojis/players/*.png"
 			],
 			"GJ_AnimatedEmojiSheet01": [
-				"emojis/animated/shiggy/*.png"
+				"emojis/animated/shiggy/*.png",
+				"emojis/animated/hype/*.png",
+				"emojis/animated/petmaurice/*.png",
+				"emojis/animated/bonk/*.png",
+				"emojis/animated/partying/*.png",
+				"emojis/animated/ned_explosion/*.png",
+				"emojis/animated/polarbear/*.png"
 			],
 			"GJ_EmojiUISheet": [
 				"resources/*.png"

diff --git a/src/EmojiNode.cpp b/src/EmojiNode.cpp
@@ -298,7 +298,14 @@ std::vector<std::pair<std::string, std::string>> emojis = {
 };
 
 std::vector<std::pair<std::string, float>> animated = {
+    std::pair("$$newline$$Animated", 42069),
     std::pair("shiggy", 0.02f),
+    std::pair("hype", 0.07f),
+    std::pair("petmaurice", 0.05f),
+    std::pair("bonk", 0.06f),
+    std::pair("partying", 0.04f),
+    std::pair("ned_explosion", 0.02f),
+    std::pair("polarbear", 0.03f),
 };
 
 std::vector<std::pair<std::string, std::string>> EmojiNode::getEmojis()

diff --git a/src/EmojiPickPopup.cpp b/src/EmojiPickPopup.cpp
@@ -67,19 +67,32 @@ bool EmojiPickPopup::setup(CCTextInputNode* input, CCNode* node)
 void EmojiPickPopup::populateScroll(CCContentLayer* content)
 {
     float height = 17.5f;
-    float spacer = content->getContentWidth() / (10);
+    float spacer = content->getContentWidth() / 11;
     int x = -1;
     float y = 0;
 
-    auto emojis = EmojiNode::getEmojis();
+    auto aemojis = EmojiNode::getEmojis();
+    auto bemojis = EmojiNode::getAnimatedEmojis();
+
+    std::vector<std::string> emojis;
+
+    for (auto em : aemojis)
+    {
+        emojis.push_back(em.first);
+    }
+
+    for (auto bm : bemojis)
+    {
+        emojis.push_back(bm.first);
+    }
 
     for (auto emoji : emojis)
     {
-        if (!emoji.first.starts_with("$$newline$$"))
+        if (!emoji.starts_with("$$newline$$"))
         {
             auto menu = CCMenu::create();
 
-            auto spr = EmojiNode::createWithKey(emoji.first);
+            auto spr = EmojiNode::createWithKey(emoji);
 
             if (!spr)
                 return;
@@ -97,7 +110,7 @@ void EmojiPickPopup::populateScroll(CCContentLayer* content)
             spr->setScale(height / spr->getContentHeight());
 
             auto btn = CCMenuItemSpriteExtra::create(spr, this, menu_selector(EmojiPickPopup::onPickEmoji));
-            btn->setID(emoji.first);
+            btn->setID(emoji);
 
             menu->addChild(btn);
             content->addChild(menu);
@@ -106,7 +119,7 @@ void EmojiPickPopup::populateScroll(CCContentLayer* content)
         {
             //newline
 
-            auto text = CCLabelBMFont::create(emoji.first.substr(11).c_str(), "chatFont.fnt");
+            auto text = CCLabelBMFont::create(emoji.substr(11).c_str(), "chatFont.fnt");
             text->setColor(ccc3(0, 0, 0));
             text->setOpacity(50);
             text->setAnchorPoint(ccp(0, 0.5f));