Skip to content

Commit

Permalink
Added Fire, Ice, Poison, Time and Spike gauntlet design
Browse files Browse the repository at this point in the history
  • Loading branch information
Jouca committed Jul 19, 2024
1 parent 0ca12bd commit c452415
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 2 deletions.
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog
## <cj>v1.3.5</c> <cb>(---)</c>
* <cg>Added</c> <cj>Water</c> gauntlet design
* <cg>Added</c> <co>Fire</c>, <cj>Ice</c>, <cg>Poison</c>, <cb>Time</c>, <co>Spike</c> and <cj>Water</c> gauntlet design
* <cg>Added</c> SFX volume for notifications (using current SFX volume for GD)

## <cj>v1.3.4</c> <cb>(2024-07-16)</c>
Expand Down
Binary file added resources/gauntlets/fire_gauntlet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gauntlets/ice_gauntlet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gauntlets/poison_gauntlet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gauntlets/spike_gauntlet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/gauntlets/time_gauntlet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 31 additions & 1 deletion src/Styles/GauntletStyle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class $modify(CustomGauntletSelectLayer, GauntletSelectLayer) {
nullptr,
"Gauntlets redesign",
R"text(
All <cl>new designs for Gauntlets</c> are made by <cy>Zidnes</c>.
All <cl>new designs for Gauntlets</c> are made by <cy>Zidnes</c> and <cy>brift</c>.
<cl>Particles</c> are made by <cy>GammaReXx</c>.
Thanks for their contributions!
Expand Down Expand Up @@ -642,6 +642,36 @@ class $modify(CustomGauntletSelectLayer, GauntletSelectLayer) {
sprite->setScale(1.270f);
sprite->setZOrder(0);
node->addChild(sprite);
} else if (gauntletName == "Fire") {
CCSprite* sprite = CCSprite::createWithSpriteFrameName("fire_gauntlet.png"_spr);
sprite->setPosition(bg->getPosition());
sprite->setScale(1.270f);
sprite->setZOrder(0);
node->addChild(sprite);
} else if (gauntletName == "Ice") {
CCSprite* sprite = CCSprite::createWithSpriteFrameName("ice_gauntlet.png"_spr);
sprite->setPosition(bg->getPosition());
sprite->setScale(1.270f);
sprite->setZOrder(0);
node->addChild(sprite);
} else if (gauntletName == "Poison") {
CCSprite* sprite = CCSprite::createWithSpriteFrameName("poison_gauntlet.png"_spr);
sprite->setPosition(bg->getPosition());
sprite->setScale(1.270f);
sprite->setZOrder(0);
node->addChild(sprite);
} else if (gauntletName == "Time") {
CCSprite* sprite = CCSprite::createWithSpriteFrameName("time_gauntlet.png"_spr);
sprite->setPosition(bg->getPosition());
sprite->setScale(1.270f);
sprite->setZOrder(0);
node->addChild(sprite);
} else if (gauntletName == "Spike") {
CCSprite* sprite = CCSprite::createWithSpriteFrameName("spike_gauntlet.png"_spr);
sprite->setPosition(bg->getPosition());
sprite->setScale(1.270f);
sprite->setZOrder(0);
node->addChild(sprite);
} else if (gauntletName == "NCS I") {
CCSprite* sprite = CCSprite::createWithSpriteFrameName("ncs_gauntlet_1.png"_spr);
sprite->setPosition(bg->getPosition());
Expand Down

0 comments on commit c452415

Please sign in to comment.