From adaacc4e067f4c2f295fe6d002a7a7cd98edb709 Mon Sep 17 00:00:00 2001 From: LimeGradient <87611796+LimeGradient@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:19:09 -0400 Subject: [PATCH] fix logo and pack deselecting --- .github/ISSUE_TEMPLATE/config.yml | 5 ----- .github/ISSUE_TEMPLATE/modpack-submission.yml | 18 ------------------ changelog.md | 1 + src/lists/PackCell.cpp | 10 ++++++++-- src/lists/PackSelectList.cpp | 7 ++++++- src/lists/PackSelectList.h | 1 + 6 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/modpack-submission.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 7d0af50..0000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -blank_issues_enabled: true -contact_links: - - name: LimeGradient's Discord - url: https://discord.gg/44ANAhXz7r - about: For support, submissions, or to chat, join the discord! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/modpack-submission.yml b/.github/ISSUE_TEMPLATE/modpack-submission.yml deleted file mode 100644 index ec76d1c..0000000 --- a/.github/ISSUE_TEMPLATE/modpack-submission.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: New Modpack Submission -description: Submit a Modpack to the Index! -title: "[Modpack]: " -labels: [ - "Modpack Submission" -] -body: - - type: markdown - attributes: - value: | - Thank you for submitting your modpack to the index! - - type: input - id: modpack-download-link - attributes: - label: Modpack Download Link - description: The download link to your modpack - validations: - required: true \ No newline at end of file diff --git a/changelog.md b/changelog.md index 6d16e58..0205eca 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,7 @@ - Added new pack schema - Fixed icons - Fixed empty file names when exporting +- Fixed mods importing without the proper binary # v1.1.1 - Ported to GD 2.206 diff --git a/src/lists/PackCell.cpp b/src/lists/PackCell.cpp index 69aea95..ddd1832 100644 --- a/src/lists/PackCell.cpp +++ b/src/lists/PackCell.cpp @@ -26,12 +26,14 @@ bool PackCell::init(PackInfo* packInfo) { m_logo = CCSprite::createWithTexture(texture); image->release(); texture->release(); + + m_logo->setScale(0.135f); } else { m_logo = CCSprite::createWithSpriteFrameName("discord-icon.png"_spr); + m_logo->setScale(0.75f); } m_logo->setID("logo-sprite"); - m_logo->setScale(0.135f); m_logo->setAnchorPoint({.5f, .5f}); m_logo->setPosition({15.f, 14.f}); this->addChild(m_logo); @@ -108,7 +110,11 @@ bool PackCell::init(PackInfo* packInfo) { void PackCell::onEnable(CCObject*) { auto packSelectLayer = static_cast(CCScene::get()->getChildByIDRecursive("pack-select-list")); - packSelectLayer->packSelect(this->m_packInfo); + if (!this->m_enableToggle->isToggled()) { + packSelectLayer->packSelect(this->m_packInfo); + } else { + packSelectLayer->packDeselect(); + } } PackCell* PackCell::create(PackInfo* packInfo) { diff --git a/src/lists/PackSelectList.cpp b/src/lists/PackSelectList.cpp index 0ffb8b1..3ba51c0 100644 --- a/src/lists/PackSelectList.cpp +++ b/src/lists/PackSelectList.cpp @@ -115,7 +115,7 @@ void PackSelectList::packSelect(PackInfo* packInfo) { if (packJson["hasLocalMods"].as_bool() == true) { FLAlertLayer::create( "Mod Profiles", - "Warning! this pack might contain mods in development! Beware!", + "Warning! This pack may contain mods in development! Beware!", "Ok" )->show(); } @@ -127,6 +127,11 @@ void PackSelectList::packSelect(PackInfo* packInfo) { m_restartBtn->setVisible(true); } +void PackSelectList::packDeselect() { + m_importPackBtn->setVisible(true); + m_restartBtn->setVisible(false); +} + void PackSelectList::onImportPack(CCObject*) { } diff --git a/src/lists/PackSelectList.h b/src/lists/PackSelectList.h index f764187..6d25415 100644 --- a/src/lists/PackSelectList.h +++ b/src/lists/PackSelectList.h @@ -34,4 +34,5 @@ class PackSelectList : public CCNode { static PackSelectList* create(CCSize const& size); void packSelect(PackInfo* packInfo); + void packDeselect(); }; \ No newline at end of file