feat(difficulty): Add Demon difficulty

Author: SpaghettDev

src/custom_layers/RLDifficultySelectLayer.cpp

@@ -1,4 +1,5 @@
 #include "RLDifficultySelectLayer.hpp"
+#include "../utils.hpp"
 
 RLDifficultySelectLayer* RLDifficultySelectLayer::create(const RLDifficultySelectInfo& dsi)
 {
@@ -26,15 +27,19 @@ bool RLDifficultySelectLayer::init(const RLDifficultySelectInfo& dsi)
 
 	difficulty_buttons_menu = CCMenu::create();
 	difficulty_buttons_menu->setID("difficulty-buttons");
+	difficulty_buttons_menu->setContentSize({ 380.f, 180.f });
+	difficulty_buttons_menu->setLayout(
+		AxisLayout::create()
+			->setGap(15.f)
+			->setGrowCrossAxis(true)
+	);
 	m_mainLayer->addChild(difficulty_buttons_menu, 11);
 
 
-	for (int i = 0; i < m_dsi.difficulties.size(); i++)
+	for (const auto& difficulty : m_dsi.difficulties)
 	{
-		const auto difficulty = m_dsi.difficulties.at(i);
-
 		auto difficultySprite = CCSprite::createWithSpriteFrameName(
-			fmt::format("difficulty_{0:0{1}}_btn2_001.png", static_cast<int>(difficulty), 2).c_str()
+			rl::constants::difficulty_to_sprite.at(difficulty).data()
 		);
 		difficultySprite->setScale(1.2f);
 		auto difficultyButton = CCMenuItemSpriteExtra::create(
@@ -44,12 +49,15 @@ bool RLDifficultySelectLayer::init(const RLDifficultySelectInfo& dsi)
 		);
 		if (m_dsi.selectedDifficulty != difficulty)
 			difficultyButton->setColor({ 125, 125, 125 });
-		difficultyButton->setPosition({ -125.f + i * 60.f, 7.f });
+		difficultyButton->setLayoutOptions(AxisLayoutOptions::create());
 		difficultyButton->setTag(static_cast<int>(difficulty));
 		difficulty_buttons_menu->addChild(difficultyButton);
 	}
 
 
+	difficulty_buttons_menu->updateLayout();
+
+
 	auto title = CCLabelBMFont::create(m_dsi.title.data(), "bigFont.fnt");
 	title->setPosition({ .0f, 70.f });
 	m_buttonMenu->addChild(title);

src/custom_layers/RLDifficultySelectLayer.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include <string_view>
-#include <array>
+#include <vector>
 #include <functional>
 
 #include <Geode/Enums.hpp>
@@ -12,7 +12,7 @@ class RLDifficultySelectLayer;
 struct RLDifficultySelectInfo
 {
 	std::string_view title;
-	std::array<GJDifficulty, 5> difficulties;
+	std::vector<GJDifficulty> difficulties;
 	GJDifficulty selectedDifficulty;
 	std::function<void(GJDifficulty, GJDifficulty)> onSelectDifficulty;
 	std::function<void(RLDifficultySelectLayer*)> onOk = nullptr;

src/listfetcher/ListFetcher.cpp

@@ -74,7 +74,12 @@ void ListFetcher::getRandomNormalListLevel(GJDifficulty difficulty, level_pair_t
 		.bodyString(
 			fmt::format("secret={}&type={}&star={}&page={}&len={}{}",
 				GJ_SECRET, 0, 1,
-				rl::utils::randomInt(1, m_cNormalListMaxPage[static_cast<int>(difficulty) - 1]),
+				rl::utils::randomInt(
+					1,
+					difficulty == static_cast<GJDifficulty>(-2)
+						? m_cNormalListMaxPage[5]
+						: m_cNormalListMaxPage[static_cast<int>(difficulty) - 1]
+				),
 				GJ_LEN_QUERY, getDifficultyQuery(difficulty)
 			)
 		)

src/listfetcher/ListFetcher.hpp

@@ -28,25 +28,29 @@ class ListFetcher
 
 	// TODO: move to rl::constants
 	inline static const std::map<GJDifficulty, int> m_cDemonDiffToFilter{
+		{ static_cast<GJDifficulty>(-2), 0 },
 		{ GJDifficulty::DemonEasy, 1 },
 		{ GJDifficulty::DemonMedium, 2 },
 		{ GJDifficulty::Demon, 3 },
 		{ GJDifficulty::DemonInsane, 4 },
 		{ GJDifficulty::DemonExtreme, 5 }
 	};
 	// these are only for rated Tiny to XL levels
-	inline static const std::array<int, 10> m_cNormalListMaxPage{
-		74, // Easy
-		173, // Normal
-		1031, // Hard
-		1308, // Harder
-		543, // Insane
-
-		142, // Hard Demon
-		187, // Easy Demon
-		205, // Medium Demon
-		99, // Insane Demon
-		90 // Extreme Demon
+	// TODO: fetch dynamically
+	inline static const std::array<int, 11> m_cNormalListMaxPage{
+		84, // Easy
+		189, // Normal
+		1156, // Hard
+		1497, // Harder
+		634, // Insane
+
+		803, // Demon
+
+		148, // Hard Demon
+		210, // Easy Demon
+		229, // Medium Demon
+		109, // Insane Demon
+		108 // Extreme Demon
 	};
 	inline static const int m_cDemonListMaxPage = 490;
 

src/roulette/layers/RLRouletteLayer.cpp

@@ -455,7 +455,7 @@ void RLRouletteLayer::onPlusButton(CCObject*)
 {
 	m_demon_select_layer = RLDifficultySelectLayer::create({
 		"Demon Filter",
-		{ GJDifficulty::DemonEasy, GJDifficulty::DemonMedium, GJDifficulty::Demon, GJDifficulty::DemonInsane, GJDifficulty::DemonExtreme },
+		{ static_cast<GJDifficulty>(-2), GJDifficulty::DemonEasy, GJDifficulty::DemonMedium, GJDifficulty::Demon, GJDifficulty::DemonInsane, GJDifficulty::DemonExtreme },
 		m_selected_demon_difficulty,
 		[&](GJDifficulty currentDifficulty, GJDifficulty previousDifficulty)
 		{

src/roulette/manager/DataManager.hpp

@@ -67,7 +67,7 @@ namespace DataManager
 			if constexpr (key == DMArrayKey::DIFFICULTY_ARRAY)
 				return { 6, { true, false, false, false, false, false } };
 			else if constexpr (key == DMArrayKey::DEMON_DIFFICULTY_ARRAY)
-				return { 5, { true, false, false, false, false, false } };
+				return { 6, { false, true, false, false, false, false, false } };
 			else if constexpr (key == DMArrayKey::SELECTED_LIST_ARRAY)
 				return { 4, { true, false, false, false } };
 

src/utils.hpp

@@ -267,7 +267,8 @@ namespace rl
 			{ GJDifficulty::Demon, 5 }
 		};
 
-		inline const std::array<GJDifficulty, 5> idx_to_demon_diff{
+		inline const std::array<GJDifficulty, 6> idx_to_demon_diff{
+			static_cast<GJDifficulty>(-2),
 			GJDifficulty::DemonEasy,
 			GJDifficulty::DemonMedium,
 			GJDifficulty::Demon,
@@ -276,11 +277,12 @@ namespace rl
 		};
 
 		inline const std::map<GJDifficulty, int> demon_diff_to_idx{
-			{ GJDifficulty::DemonEasy, 0 },
-			{ GJDifficulty::DemonMedium, 1 },
-			{ GJDifficulty::Demon, 2 },
-			{ GJDifficulty::DemonInsane, 3 },
-			{ GJDifficulty::DemonExtreme, 4 }
+			{ static_cast<GJDifficulty>(-2), 0 },
+			{ GJDifficulty::DemonEasy, 1 },
+			{ GJDifficulty::DemonMedium, 2 },
+			{ GJDifficulty::Demon, 3 },
+			{ GJDifficulty::DemonInsane, 4 },
+			{ GJDifficulty::DemonExtreme, 5 }
 		};
 	}
 }