cat

TheSillyDoggo · Jul 19, 2024 · a3af6df · a3af6df
1 parent 59c8ec5
commit a3af6df
Show file tree

Hide file tree

Showing 132 changed files with 27 additions and 31 deletions.
diff --git a/emojis/animated/colonthreecat/colonthreecat.gif b/emojis/animated/colonthreecat/colonthreecat.gif
diff --git a/emojis/animated/colonthreecat/colonthreecat_1.png b/emojis/animated/colonthreecat/colonthreecat_1.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_10.png b/emojis/animated/colonthreecat/colonthreecat_10.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_100.png b/emojis/animated/colonthreecat/colonthreecat_100.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_101.png b/emojis/animated/colonthreecat/colonthreecat_101.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_102.png b/emojis/animated/colonthreecat/colonthreecat_102.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_103.png b/emojis/animated/colonthreecat/colonthreecat_103.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_104.png b/emojis/animated/colonthreecat/colonthreecat_104.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_105.png b/emojis/animated/colonthreecat/colonthreecat_105.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_106.png b/emojis/animated/colonthreecat/colonthreecat_106.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_107.png b/emojis/animated/colonthreecat/colonthreecat_107.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_108.png b/emojis/animated/colonthreecat/colonthreecat_108.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_109.png b/emojis/animated/colonthreecat/colonthreecat_109.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_11.png b/emojis/animated/colonthreecat/colonthreecat_11.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_110.png b/emojis/animated/colonthreecat/colonthreecat_110.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_111.png b/emojis/animated/colonthreecat/colonthreecat_111.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_12.png b/emojis/animated/colonthreecat/colonthreecat_12.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_13.png b/emojis/animated/colonthreecat/colonthreecat_13.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_14.png b/emojis/animated/colonthreecat/colonthreecat_14.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_15.png b/emojis/animated/colonthreecat/colonthreecat_15.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_16.png b/emojis/animated/colonthreecat/colonthreecat_16.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_17.png b/emojis/animated/colonthreecat/colonthreecat_17.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_18.png b/emojis/animated/colonthreecat/colonthreecat_18.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_19.png b/emojis/animated/colonthreecat/colonthreecat_19.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_2.png b/emojis/animated/colonthreecat/colonthreecat_2.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_20.png b/emojis/animated/colonthreecat/colonthreecat_20.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_21.png b/emojis/animated/colonthreecat/colonthreecat_21.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_22.png b/emojis/animated/colonthreecat/colonthreecat_22.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_23.png b/emojis/animated/colonthreecat/colonthreecat_23.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_24.png b/emojis/animated/colonthreecat/colonthreecat_24.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_25.png b/emojis/animated/colonthreecat/colonthreecat_25.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_26.png b/emojis/animated/colonthreecat/colonthreecat_26.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_27.png b/emojis/animated/colonthreecat/colonthreecat_27.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_28.png b/emojis/animated/colonthreecat/colonthreecat_28.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_29.png b/emojis/animated/colonthreecat/colonthreecat_29.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_3.png b/emojis/animated/colonthreecat/colonthreecat_3.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_30.png b/emojis/animated/colonthreecat/colonthreecat_30.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_31.png b/emojis/animated/colonthreecat/colonthreecat_31.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_32.png b/emojis/animated/colonthreecat/colonthreecat_32.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_33.png b/emojis/animated/colonthreecat/colonthreecat_33.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_34.png b/emojis/animated/colonthreecat/colonthreecat_34.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_35.png b/emojis/animated/colonthreecat/colonthreecat_35.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_36.png b/emojis/animated/colonthreecat/colonthreecat_36.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_37.png b/emojis/animated/colonthreecat/colonthreecat_37.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_38.png b/emojis/animated/colonthreecat/colonthreecat_38.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_39.png b/emojis/animated/colonthreecat/colonthreecat_39.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_4.png b/emojis/animated/colonthreecat/colonthreecat_4.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_40.png b/emojis/animated/colonthreecat/colonthreecat_40.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_41.png b/emojis/animated/colonthreecat/colonthreecat_41.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_42.png b/emojis/animated/colonthreecat/colonthreecat_42.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_43.png b/emojis/animated/colonthreecat/colonthreecat_43.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_44.png b/emojis/animated/colonthreecat/colonthreecat_44.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_45.png b/emojis/animated/colonthreecat/colonthreecat_45.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_46.png b/emojis/animated/colonthreecat/colonthreecat_46.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_47.png b/emojis/animated/colonthreecat/colonthreecat_47.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_48.png b/emojis/animated/colonthreecat/colonthreecat_48.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_49.png b/emojis/animated/colonthreecat/colonthreecat_49.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_5.png b/emojis/animated/colonthreecat/colonthreecat_5.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_50.png b/emojis/animated/colonthreecat/colonthreecat_50.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_51.png b/emojis/animated/colonthreecat/colonthreecat_51.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_52.png b/emojis/animated/colonthreecat/colonthreecat_52.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_53.png b/emojis/animated/colonthreecat/colonthreecat_53.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_54.png b/emojis/animated/colonthreecat/colonthreecat_54.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_55.png b/emojis/animated/colonthreecat/colonthreecat_55.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_56.png b/emojis/animated/colonthreecat/colonthreecat_56.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_57.png b/emojis/animated/colonthreecat/colonthreecat_57.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_58.png b/emojis/animated/colonthreecat/colonthreecat_58.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_59.png b/emojis/animated/colonthreecat/colonthreecat_59.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_6.png b/emojis/animated/colonthreecat/colonthreecat_6.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_60.png b/emojis/animated/colonthreecat/colonthreecat_60.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_61.png b/emojis/animated/colonthreecat/colonthreecat_61.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_62.png b/emojis/animated/colonthreecat/colonthreecat_62.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_63.png b/emojis/animated/colonthreecat/colonthreecat_63.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_64.png b/emojis/animated/colonthreecat/colonthreecat_64.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_65.png b/emojis/animated/colonthreecat/colonthreecat_65.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_66.png b/emojis/animated/colonthreecat/colonthreecat_66.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_67.png b/emojis/animated/colonthreecat/colonthreecat_67.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_68.png b/emojis/animated/colonthreecat/colonthreecat_68.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_69.png b/emojis/animated/colonthreecat/colonthreecat_69.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_7.png b/emojis/animated/colonthreecat/colonthreecat_7.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_70.png b/emojis/animated/colonthreecat/colonthreecat_70.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_71.png b/emojis/animated/colonthreecat/colonthreecat_71.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_72.png b/emojis/animated/colonthreecat/colonthreecat_72.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_73.png b/emojis/animated/colonthreecat/colonthreecat_73.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_74.png b/emojis/animated/colonthreecat/colonthreecat_74.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_75.png b/emojis/animated/colonthreecat/colonthreecat_75.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_76.png b/emojis/animated/colonthreecat/colonthreecat_76.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_77.png b/emojis/animated/colonthreecat/colonthreecat_77.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_78.png b/emojis/animated/colonthreecat/colonthreecat_78.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_79.png b/emojis/animated/colonthreecat/colonthreecat_79.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_8.png b/emojis/animated/colonthreecat/colonthreecat_8.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_80.png b/emojis/animated/colonthreecat/colonthreecat_80.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_81.png b/emojis/animated/colonthreecat/colonthreecat_81.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_82.png b/emojis/animated/colonthreecat/colonthreecat_82.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_83.png b/emojis/animated/colonthreecat/colonthreecat_83.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_84.png b/emojis/animated/colonthreecat/colonthreecat_84.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_85.png b/emojis/animated/colonthreecat/colonthreecat_85.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_86.png b/emojis/animated/colonthreecat/colonthreecat_86.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_87.png b/emojis/animated/colonthreecat/colonthreecat_87.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_88.png b/emojis/animated/colonthreecat/colonthreecat_88.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_89.png b/emojis/animated/colonthreecat/colonthreecat_89.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_9.png b/emojis/animated/colonthreecat/colonthreecat_9.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_90.png b/emojis/animated/colonthreecat/colonthreecat_90.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_91.png b/emojis/animated/colonthreecat/colonthreecat_91.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_92.png b/emojis/animated/colonthreecat/colonthreecat_92.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_93.png b/emojis/animated/colonthreecat/colonthreecat_93.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_94.png b/emojis/animated/colonthreecat/colonthreecat_94.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_95.png b/emojis/animated/colonthreecat/colonthreecat_95.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_96.png b/emojis/animated/colonthreecat/colonthreecat_96.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_97.png b/emojis/animated/colonthreecat/colonthreecat_97.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_98.png b/emojis/animated/colonthreecat/colonthreecat_98.png
diff --git a/emojis/animated/colonthreecat/colonthreecat_99.png b/emojis/animated/colonthreecat/colonthreecat_99.png
diff --git a/emojis/other/GJLargeLock_001.png b/emojis/other/GJLargeLock_001.png
diff --git a/emojis/other/GJ_coinsIcon2_001.png b/emojis/other/GJ_coinsIcon2_001.png
diff --git a/emojis/other/GJ_coinsIcon_001.png b/emojis/other/GJ_coinsIcon_001.png
diff --git a/emojis/other/GJ_deleteIcon_001.png b/emojis/other/GJ_deleteIcon_001.png
diff --git a/emojis/other/GJ_likesIcon_001.png b/emojis/other/GJ_likesIcon_001.png
diff --git a/emojis/other/GJ_lockGray_001.png b/emojis/other/GJ_lockGray_001.png
diff --git a/emojis/other/GJ_lock_open_001.png b/emojis/other/GJ_lock_open_001.png
diff --git a/emojis/other/GJ_pointsIcon_001.png b/emojis/other/GJ_pointsIcon_001.png
diff --git a/emojis/other/GJ_starsIcon_001.png b/emojis/other/GJ_starsIcon_001.png
diff --git a/emojis/other/currencyDiamondIcon_001.png b/emojis/other/currencyDiamondIcon_001.png
diff --git a/emojis/other/currencyOrbIcon_001.png b/emojis/other/currencyOrbIcon_001.png
diff --git a/emojis/other/currencyOrb_001.png b/emojis/other/currencyOrb_001.png
diff --git a/emojis/other/diamond_small01_001.png b/emojis/other/diamond_small01_001.png
diff --git a/emojis/other/modBadge_01_001.png b/emojis/other/modBadge_01_001.png
diff --git a/emojis/other/modBadge_02_001.png b/emojis/other/modBadge_02_001.png
diff --git a/emojis/other/modBadge_03_001.png b/emojis/other/modBadge_03_001.png
diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "3.2.0",
-	"version": "v1.0.0",
+	"version": "v1.0.1",
 	"gd": {
 		"win": "2.206",
         "mac": "2.206",
@@ -34,7 +34,8 @@
 				"emojis/animated/bonk/*.png",
 				"emojis/animated/partying/*.png",
 				"emojis/animated/ned_explosion/*.png",
-				"emojis/animated/polarbear/*.png"
+				"emojis/animated/polarbear/*.png",
+				"emojis/animated/colonthreecat/*.png"
 			],
 			"GJ_EmojiUISheet": [
 				"resources/*.png"

diff --git a/src/EmojiNode.cpp b/src/EmojiNode.cpp
@@ -23,7 +23,7 @@ bool EmojiNode::initWithAnimatedSprite(std::string key, float rate)
     if (!CCSprite::init())
         return false;
 
-    for (size_t i = 1; i < 69; i++)
+    for (size_t i = 1; i < 420; i++)
     {
         auto s = fmt::format("{}{}_{}.png", ""_spr, key, i).c_str();
 
@@ -114,33 +114,33 @@ std::vector<std::pair<std::string, std::string>> emojis = {
     std::pair("insanedemon", "diffIcon_09_btn_001.png"),
     std::pair("extremedemon", "diffIcon_10_btn_001.png"),
 
-    std::pair("star", "GJ_starsIcon_001.png"),
+    std::pair("star", "GJ_starsIcon_001.png"_spr),
 
-    std::pair("orb", "currencyOrb_001.png"),
-    std::pair("orbs", "currencyOrbIcon_001.png"),
+    std::pair("orb", "currencyOrb_001.png"_spr),
+    std::pair("orbs", "currencyOrbIcon_001.png"_spr),
 
-    std::pair("diamond", "diamond_small01_001.png"),
-    std::pair("diamonds", "currencyDiamondIcon_001.png"),
+    std::pair("diamond", "diamond_small01_001.png"_spr),
+    std::pair("diamonds", "currencyDiamondIcon_001.png"_spr),
 
-    std::pair("like", "GJ_likesIcon_001.png"),
+    std::pair("like", "GJ_likesIcon_001.png"_spr),
     std::pair("dislike", "GJ_dislikesIcon_001.png"_spr), // rob i genuinely hate you for making it this differetn size it is size size different
 
     std::pair("check", "GJ_completesIcon_001.png"),
-    std::pair("cross", "GJ_deleteIcon_001.png"),
+    std::pair("cross", "GJ_deleteIcon_001.png"_spr),
 
-    std::pair("locked", "GJLargeLock_001.png"),
-    std::pair("lockedgray", "GJ_lockGray_001.png"),
-    std::pair("unlocked", "GJ_lock_open_001.png"),
+    std::pair("locked", "GJLargeLock_001.png"_spr),
+    std::pair("lockedgray", "GJ_lockGray_001.png"_spr),
+    std::pair("unlocked", "GJ_lock_open_001.png"_spr),
 
-    std::pair("goldcoin", "GJ_coinsIcon_001.png"),
+    std::pair("goldcoin", "GJ_coinsIcon_001.png"_spr),
     std::pair("uncollectedusercoin", "GJ_coinsIcon_gray_001.png"),
     _Emoji("usercoinunverified"),
-    std::pair("usercoin", "GJ_coinsIcon2_001.png"),
-    std::pair("points", "GJ_pointsIcon_001.png"),
+    std::pair("usercoin", "GJ_coinsIcon2_001.png"_spr),
+    std::pair("points", "GJ_pointsIcon_001.png"_spr),
 
-    std::pair("mod", "modBadge_01_001.png"),
-    std::pair("eldermod", "modBadge_02_001.png"),
-    std::pair("leaderboardmod", "modBadge_03_001.png"),
+    std::pair("mod", "modBadge_01_001.png"_spr),
+    std::pair("eldermod", "modBadge_02_001.png"_spr),
+    std::pair("leaderboardmod", "modBadge_03_001.png"_spr),
 
     std::pair("$$newline$$Discord", "$$newline$$"),
 
@@ -306,6 +306,7 @@ std::vector<std::pair<std::string, float>> animated = {
     std::pair("partying", 0.04f),
     std::pair("ned_explosion", 0.02f),
     std::pair("polarbear", 0.03f),
+    std::pair("colonthreecat", 0.03f),
 };
 
 std::vector<std::pair<std::string, std::string>> EmojiNode::getEmojis()

diff --git a/src/Hooks/CommentCell.cpp b/src/Hooks/CommentCell.cpp
@@ -60,8 +60,11 @@ class $modify (CommentCell) {
             }
 
 
-            if (comment->m_hasLevelID && comment->m_accountID == 16778880)
+            if (!m_accountComment && comment->m_accountID == 16778880)
             {
+                if (!getChildByID("username-label"))
+                    return;
+
                 auto badge = CCSprite::createWithSpriteFrameName("geode-icon.png"_spr);
                 badge->setScale(0.38f);
                 badge->setPosition(panel->getChildByID("username-label")->getPosition() + ccp(panel->getChildByID("username-label")->getScaledContentWidth(), 0) + ccp(8.125f, -1));

diff --git a/src/Hooks/ShareCommentLayer.cpp b/src/Hooks/ShareCommentLayer.cpp
@@ -11,7 +11,8 @@ class $modify (ShareCommentLayerExt, ShareCommentLayer)
         CCTextInputNode* inp = nullptr;
     };
 
-    void onEmojis(CCObject *) {
+    void onEmojis(CCObject*)
+    {
         if (m_fields->inp)
         {
             m_fields->inp->onClickTrackNode(false);
@@ -45,14 +46,4 @@ class $modify (ShareCommentLayerExt, ShareCommentLayer)
 
         return true;
     }
-
-    virtual void textChanged(CCTextInputNode* textInput)
-    {
-        ShareCommentLayer::textChanged(textInput);
-
-        if (m_fields->isComment)
-        {
-
-        }
-    }
 };