From 2d5ba2c03890a493cb6e52f8584dd2dee872ef3a Mon Sep 17 00:00:00 2001 From: Jouca Date: Wed, 3 Jul 2024 07:41:39 +0900 Subject: [PATCH] Added world, galaxy and universe gauntlets particles --- changelog.md | 4 +- src/Styles/GauntletStyle.cpp | 166 +++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 2134ff4..ef96545 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,7 @@ # Changelog -## v1.3.2 (---) +## v1.3.2 (2024-07-03) * Added Mac Support -* Added Monster, Doom, Portal, Strange, Fantasy, Mystery, Cursed and Split gauntlets particles +* Added Monster, Doom, Portal, Strange, Fantasy, Mystery, Cursed, World, Galaxy, Universe and Split gauntlets particles ## v1.3.1 (2024-06-29) * Added Discord gauntlet design diff --git a/src/Styles/GauntletStyle.cpp b/src/Styles/GauntletStyle.cpp index 68507e6..ea60efe 100644 --- a/src/Styles/GauntletStyle.cpp +++ b/src/Styles/GauntletStyle.cpp @@ -126,6 +126,86 @@ class $modify(CustomGauntletSelectLayer, GauntletSelectLayer) { sprite->setScale(1.270f); sprite->setZOrder(0); node->addChild(sprite); + + // Show gauntlets sprite again + gauntlet->setVisible(true); + gauntlet->setPosition({1, 16}); + gauntlet->setScale(1); + gauntlet_node->setZOrder(3); + + // Particle + CCParticleSystemQuad* particle = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.729412a0a0.352941a0a0.796078a0a1a0a7a0a0a0a0.729412a0a0.352941a0a0.796078a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle); + particle->setPosition({10, 24}); + particle->setZOrder(1); + particle->setScaleX(1.310f); + particle->setScaleY(2.610f); + CCParticleSystemQuad* particle2 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.34902a0a0.466667a0a0.792157a0a1a0a7a0a0a0a0.34902a0a0.466667a0a0.792157a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle2); + particle2->setPosition({6, 24}); + particle2->setZOrder(1); + particle2->setScaleX(1.310f); + particle2->setScaleY(2.610f); + CCParticleSystemQuad* particle3 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.360784a0a0.854902a0a0.368627a0a1a0a7a0a0a0a0.360784a0a0.854902a0a0.368627a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle3); + particle3->setPosition({2, 24}); + particle3->setZOrder(1); + particle3->setScaleX(1.310f); + particle3->setScaleY(2.610f); + CCParticleSystemQuad* particle4 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.866667a0a0.839216a0a0.247059a0a1a0a7a0a0a0a0.866667a0a0.839216a0a0.247059a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle4); + particle4->setPosition({-2, 24}); + particle4->setZOrder(1); + particle4->setScaleX(1.310f); + particle4->setScaleY(2.610f); + CCParticleSystemQuad* particle5 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.866667a0a0.294118a0a0.247059a0a1a0a7a0a0a0a0.866667a0a0.294118a0a0.247059a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle5); + particle5->setPosition({-6, 24}); + particle5->setZOrder(1); + particle5->setScaleX(1.310f); + particle5->setScaleY(2.610f); + CCParticleSystemQuad* particle6 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.729412a0a0.352941a0a0.796078a0a1a0a7a0a0a0a0.729412a0a0.352941a0a0.796078a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle6); + particle6->setPosition({-9, 24}); + particle6->setZOrder(1); + particle6->setScaleX(-1.310f); + particle6->setScaleY(2.610f); + CCParticleSystemQuad* particle7 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.34902a0a0.466667a0a0.792157a0a1a0a7a0a0a0a0.34902a0a0.466667a0a0.792157a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle7); + particle7->setPosition({-5, 24}); + particle7->setZOrder(1); + particle7->setScaleX(-1.310f); + particle7->setScaleY(2.610f); + CCParticleSystemQuad* particle8 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.360784a0a0.854902a0a0.368627a0a1a0a7a0a0a0a0.360784a0a0.854902a0a0.368627a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle8); + particle8->setPosition({-1, 24}); + particle8->setZOrder(1); + particle8->setScaleX(-1.310f); + particle8->setScaleY(2.610f); + CCParticleSystemQuad* particle9 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.866667a0a0.839216a0a0.247059a0a1a0a7a0a0a0a0.866667a0a0.839216a0a0.247059a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle9); + particle9->setPosition({3, 24}); + particle9->setZOrder(1); + particle9->setScaleX(-1.310f); + particle9->setScaleY(2.610f); + CCParticleSystemQuad* particle10 = GameToolbox::particleFromString("22a-1a3a0a20a90a0a29a0a0a0a0a0a0a0a0a0a7a0a0a0a0.866667a0a0.294118a0a0.247059a0a1a0a7a0a0a0a0.866667a0a0.294118a0a0.247059a0a1a0a0.4a0a0.4a0a35a0a35a0a-50a0a1a2a1a0a0a0a159a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle10); + particle10->setPosition({7, 24}); + particle10->setZOrder(1); + particle10->setScaleX(-1.310f); + particle10->setScaleY(2.610f); + CCParticleSystemQuad* particle11 = GameToolbox::particleFromString("38a-1a1.5a0.3a21a90a90a0a0a31a69a0a0a0a0a0a0a2a1a65a57a1a0a1a0a1a0a1a0a5a1a0a0a1a0a1a0a1a0a1a0a0.2a0a0.4a0a0a0a0a0a0a0a0a2a1a0a0a0a169a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle11); + particle11->setPosition({1, 6}); + particle11->setZOrder(1); + particle11->setScaleX(1.710f); + particle11->setScaleY(1.660f); + CCParticleSystemQuad* particle12 = GameToolbox::particleFromString("11a-1a1.5a0.3a6a90a90a0a0a31a69a0a0a0a0a0a0a4a1a0a0a1a0a1a0a1a0a1a0a7a1a52a55a1a0a1a0a1a0a1a0a0.2a0a0.4a0a0a0a0a0a0a0a0a2a1a0a0a0a167a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle12); + particle12->setPosition({1, 16}); + particle12->setZOrder(1); + particle12->setScaleX(1.835f); + particle12->setScaleY(1.485f); } else if (gauntletName == "Fantasy") { CCSprite* sprite = CCSprite::createWithSpriteFrameName("fantasy_gauntlet.png"_spr); sprite->setPosition(bg->getPosition()); @@ -242,12 +322,98 @@ class $modify(CustomGauntletSelectLayer, GauntletSelectLayer) { sprite->setScale(1.695f); sprite->setZOrder(0); node->addChild(sprite); + + // Show gauntlets sprite again + gauntlet->setVisible(true); + gauntlet->setPosition({0, 11}); + gauntlet->setScale(0.975); + gauntlet_node->setZOrder(3); + + // Particle + CCParticleSystemQuad* particle = GameToolbox::particleFromString("11a-1a1a0.3a8a90a90a0a0a0a0a0a0a0a0a0a0a50a3a0a0a0.627451a0a0.286275a0a0.470588a0a1a0a50a3a106a70a0.627451a0a0.286275a0a0.470588a0a1a0a0a0a0a0a0a0a0a0a0a0a0a2a1a0a0a0a176a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle); + particle->setPosition({0, 24}); + particle->setZOrder(1); + particle->setScaleX(1.610f); + particle->setScaleY(1.610f); + CCParticleSystemQuad* particle2 = GameToolbox::particleFromString("14a-1a1.2a0.3a9a112a6a42a0a15a0a0a0a0a0a0a0a4a0a340a0a0.913725a0a0.72549a0a0.337255a0a1a0a4a0a340a0a0.913725a0a0.72549a0a0.337255a0a1a0a0.3a0a0.3a0a0a0a0a0a0a0a0a2a1a0a0a0a31a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle2); + particle2->setPosition({-25, 111}); + particle2->setZOrder(1); + particle2->setScaleX(2.660f); + particle2->setScaleY(3.710f); + particle2->setRotation(180); + CCParticleSystemQuad* particle3 = GameToolbox::particleFromString("38a-1a1.5a0.3a21a90a90a0a0a31a69a0a0a0a0a0a0a2a1a65a57a0.886275a0a0.866667a0a0.454902a0a1a0a5a1a0a0a0.886275a0a0.866667a0a0.454902a0a1a0a0.2a0a0.4a0a0a0a0a0a0a0a0a2a1a0a0a0a169a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle3); + particle3->setPosition({2, 6}); + particle3->setZOrder(1); + particle3->setScaleX(1.685f); + particle3->setScaleY(1.485f); + CCParticleSystemQuad* particle4 = GameToolbox::particleFromString("11a-1a1.5a0.3a6a90a90a0a0a31a69a0a0a0a0a0a0a4a1a0a0a0.890196a0a0.376471a0a0.65098a0a1a0a7a1a52a55a0.890196a0a0.376471a0a0.65098a0a1a0a0.2a0a0.4a0a0a0a0a0a0a0a0a2a1a0a0a0a167a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle4); + particle4->setPosition({2, -2}); + particle4->setZOrder(1); + particle4->setScaleX(1.310f); + particle4->setScaleY(1.635f); + CCParticleSystemQuad* particle5 = GameToolbox::particleFromString("4a-1a1a0.3a3a90a90a0a0a0a0a0a0a0a0a0a0a50a3a0a0a0.862745a0a0.352941a0a0.623529a0a1a0a50a3a106a22a0.862745a0a0.352941a0a0.623529a0a1a0a0.3a0a0.3a0a0a0a0a0a0a0a0a2a1a0a0a0a164a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle5); + particle5->setPosition({0, 24}); + particle5->setZOrder(1); + particle5->setScaleX(1.785f); + particle5->setScaleY(1.785f); } else if (gauntletName == "Universe") { CCSprite* sprite = CCSprite::createWithSpriteFrameName("universe_gauntlet.png"_spr); sprite->setPosition(bg->getPosition()); sprite->setScale(1.270f); sprite->setZOrder(0); node->addChild(sprite); + + // Show gauntlets sprite again + gauntlet->setVisible(true); + gauntlet->setPosition({0, 16}); + gauntlet->setScale(0.975f); + gauntlet_node->setZOrder(3); + + // Particle + CCParticleSystemQuad* particle = GameToolbox::particleFromString("23a-1a3a0.3a6a90a180a29a0a11a0a0a0a0a0a0a0a38a1a0a0a0.0627451a0a0.0980392a0a0.105882a0a1a0a50a1a0a0a0.0627451a0a0.0980392a0a0.105882a0a1a0a0.1a0a0.5a0a10a0a28a0a0a0a1a2a1a0a1a0a46a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle); + particle->setPosition({0, 11}); + particle->setZOrder(1); + particle->setScaleX(1.485f); + particle->setScaleY(2.685f); + CCParticleSystemQuad* particle2 = GameToolbox::particleFromString("20a-1a0.5a0a15a90a0a44a0a11a0a0a0a0a0a0a0a4a1a0a0a0.760784a0a0.447059a0a0.94902a0a1a0a4a1a0a0a0.760784a0a0.447059a0a0.94902a0a1a0a0.1a0a0.1a0a0a0a0a0a0a0a0a2a1a0a0a0a33a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle2); + particle2->setPosition({32, -74}); + particle2->setZOrder(1); + particle2->setScaleX(3.685f); + particle2->setScaleY(8.310f); + particle2->setRotation(-20); + CCParticleSystemQuad* particle3 = GameToolbox::particleFromString("19a-1a0.5a0a38a90a0a44a0a20a0a0a0a0a0a0a0a2a1a0a0a0.94902a0a0.67451a0a0.447059a0a1a0a2a1a0a0a0.94902a0a0.67451a0a0.447059a0a1a0a0.1a0a0.1a0a0a0a0a0a0a0a0a2a1a0a0a0a33a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle3); + particle3->setPosition({34, -96}); + particle3->setZOrder(1); + particle3->setScaleX(2.135f); + particle3->setScaleY(8.935f); + particle3->setRotation(-20); + CCParticleSystemQuad* particle4 = GameToolbox::particleFromString("20a-1a1a0a15a90a0a36a0a11a0a0a0a0a0a0a0a4a1a0a0a0.447059a0a0.654902a0a0.94902a0a1a0a4a1a0a0a0.447059a0a0.654902a0a0.94902a0a1a0a0.2a0a0.2a0a0a0a0a0a0a0a0a2a1a0a0a0a28a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle4); + particle4->setPosition({41, -92}); + particle4->setZOrder(1); + particle4->setScaleX(3.235f); + particle4->setScaleY(6.585f); + particle4->setRotation(-20); + CCParticleSystemQuad* particle5 = GameToolbox::particleFromString("11a-1a1a0.3a8a90a90a0a0a0a0a0a0a0a0a0a0a50a3a0a0a0.239216a0a0.403922a0a0.419608a0a1a0a50a3a106a70a0.239216a0a0.403922a0a0.419608a0a1a0a0a0a0a0a0a0a0a0a0a0a0a2a1a0a0a0a176a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle5); + particle5->setPosition({0, 24}); + particle5->setZOrder(1); + particle5->setScaleX(1.710f); + particle5->setScaleY(1.710f); + CCParticleSystemQuad* particle6 = GameToolbox::particleFromString("4a-1a1a0.3a3a90a90a0a0a0a0a0a0a0a0a0a0a50a3a0a0a0.32549a0a0.537255a0a0.560784a0a1a0a50a3a106a22a0.32549a0a0.537255a0a0.560784a0a1a0a0.3a0a0.3a0a0a0a0a0a0a0a0a2a1a0a0a0a190a0a0a0a0a0a0a0a0a0a0a0a0a0a0", NULL, false); + node->addChild(particle6); + particle6->setPosition({-2, 24}); + particle6->setZOrder(1); + particle6->setScaleX(2.710f); + particle6->setScaleY(2.710f); } else if (gauntletName == "Cursed") { CCSprite* sprite = CCSprite::createWithSpriteFrameName("cursed_gauntlet.png"_spr); sprite->setPosition(bg->getPosition());