mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-13 03:44:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix rando first item bits in editor

Browse Source
This commit is contained in:
gymnast86
2026-06-07 00:54:13 -07:00
parent 5b6f2f6e91
commit 41e0a81c39
2 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/randomizer/game/verify_item_functions.cpp
+41 -72
View File
@@ -8,10 +8,9 @@ bool haveItem(u32 item) {
return checkItemGet((u8)item, 1);
}
u32 getProgressiveSword() {
static constexpr u8 progressiveItemsList[] = {dItemNo_Randomizer_WOOD_STICK_e, dItemNo_Randomizer_SWORD_e, dItemNo_Randomizer_MASTER_SWORD_e};
u32 listLength = sizeof(progressiveItemsList) / sizeof(progressiveItemsList[0]);
template<typename T, size_t N>
u32 getProgressiveItem(const std::array<T, N>& progressiveItemsList) {
u32 listLength = N;
for (int i = 0; i < listLength; i++)
{
const u32 item = progressiveItemsList[i];
@@ -22,48 +21,42 @@ u32 getProgressiveSword() {
}
// All previous obtained, so return last upgrade
return dItemNo_Randomizer_LIGHT_SWORD_e;
return progressiveItemsList[listLength - 1];
}
u32 getProgressiveSword() {
static constexpr std::array progressiveItemsList = {
dItemNo_Randomizer_WOOD_STICK_e,
dItemNo_Randomizer_SWORD_e,
dItemNo_Randomizer_MASTER_SWORD_e,
dItemNo_Randomizer_LIGHT_SWORD_e,
};
return getProgressiveItem(progressiveItemsList);
};
u32 getProgressiveBow() {
static const u8 progressiveItemsList[] = {dItemNo_Randomizer_BOW_e, dItemNo_Randomizer_ARROW_LV2_e};
static constexpr std::array progressiveItemsList = {
dItemNo_Randomizer_BOW_e,
dItemNo_Randomizer_ARROW_LV2_e,
dItemNo_Randomizer_ARROW_LV3_e,
};
u32 listLength = sizeof(progressiveItemsList) / sizeof(progressiveItemsList[0]);
for (int i = 0; i < listLength; i++)
{
const u32 item = progressiveItemsList[i];
if (!haveItem(item))
{
return item;
}
}
// All previous obtained, so return last upgrade
return dItemNo_Randomizer_ARROW_LV3_e;
return getProgressiveItem(progressiveItemsList);
};
u32 getProgressiveSkill() {
static const u8 progressiveItemsList[] = {
static constexpr std::array progressiveItemsList = {
dItemNo_Randomizer_ENDING_BLOW_e,
dItemNo_Randomizer_SHIELD_ATTACK_e,
dItemNo_Randomizer_BACK_SLICE_e,
dItemNo_Randomizer_HELM_SPLITTER_e,
dItemNo_Randomizer_MORTAL_DRAW_e,
dItemNo_Randomizer_JUMP_STRIKE_e
dItemNo_Randomizer_JUMP_STRIKE_e,
dItemNo_Randomizer_GREAT_SPIN_e,
};
u32 listLength = sizeof(progressiveItemsList) / sizeof(progressiveItemsList[0]);
for (int i = 0; i < listLength; i++)
{
const u32 item = progressiveItemsList[i];
if (!haveItem(item))
{
return item;
}
}
// All previous obtained, so return last upgrade
return dItemNo_Randomizer_GREAT_SPIN_e;
return getProgressiveItem(progressiveItemsList);
};
u32 getProgressiveSkybook() {
@@ -87,58 +80,34 @@ u32 getProgressiveSkybook() {
};
u32 getProgressiveKeyShard() {
static const u8 progressiveItemsList[] = {dItemNo_Randomizer_L2_KEY_PIECES1_e, dItemNo_Randomizer_L2_KEY_PIECES2_e};
static constexpr std::array progressiveItemsList = {
dItemNo_Randomizer_L2_KEY_PIECES1_e,
dItemNo_Randomizer_L2_KEY_PIECES2_e,
dItemNo_Randomizer_LV2_BOSS_KEY_e,
};
u32 listLength = sizeof(progressiveItemsList) / sizeof(progressiveItemsList[0]);
for (int i = 0; i < listLength; i++)
{
const u32 item = progressiveItemsList[i];
if (!haveItem(item))
{
return item;
}
}
// All previous obtained, so return last upgrade
return dItemNo_Randomizer_LV2_BOSS_KEY_e;
return getProgressiveItem(progressiveItemsList);
};
u32 getProgressiveMirrorShard() {
static const u8 progressiveItemsList[] = {
static constexpr std::array progressiveItemsList = {
dItemNo_Randomizer_MIRROR_PIECE_1_e,
dItemNo_Randomizer_MIRROR_PIECE_2_e,
dItemNo_Randomizer_MIRROR_PIECE_3_e
dItemNo_Randomizer_MIRROR_PIECE_3_e,
dItemNo_Randomizer_MIRROR_PIECE_4_e,
};
u32 listLength = sizeof(progressiveItemsList) / sizeof(progressiveItemsList[0]);
for (int i = 0; i < listLength; i++)
{
const u32 item = progressiveItemsList[i];
if (!haveItem(item))
{
return item;
}
}
// All previous obtained, so return last upgrade
return dItemNo_Randomizer_MIRROR_PIECE_4_e;
return getProgressiveItem(progressiveItemsList);
};
u32 getProgressiveFusedShadow() {
static const u8 progressiveItemsList[] = {dItemNo_Randomizer_FUSED_SHADOW_1_e, dItemNo_Randomizer_FUSED_SHADOW_2_e};
static constexpr std::array progressiveItemsList = {
dItemNo_Randomizer_FUSED_SHADOW_1_e,
dItemNo_Randomizer_FUSED_SHADOW_2_e,
dItemNo_Randomizer_FUSED_SHADOW_3_e,
};
u32 listLength = sizeof(progressiveItemsList) / sizeof(progressiveItemsList[0]);
for (int i = 0; i < listLength; i++)
{
const u32 item = progressiveItemsList[i];
if (!haveItem(item))
{
return item;
}
}
// All previous obtained, so return last upgrade
return dItemNo_Randomizer_FUSED_SHADOW_3_e;
return getProgressiveItem(progressiveItemsList);
};
u8 getWarashibeItemCount() {
src/dusk/ui/editor.cpp
+25
View File
@@ -9,6 +9,7 @@
#include "d/d_kankyo.h"
#include "d/d_meter2_info.h"
#include "dusk/map_loader_definitions.h"
#include "dusk/randomizer/game/verify_item_functions.h"
#include "number_button.hpp"
#include "pane.hpp"
#include "select_button.hpp"
@@ -1097,10 +1098,21 @@ std::vector<ToggleEntry> collect_crystal_toggle_entries(
.isSelected = [index] { return dComIfGs_isCollectCrystal(index); },
.setSelected =
[index](bool selected) {
static constexpr u8 fusedShadowItemNos[] = {
dItemNo_Randomizer_FUSED_SHADOW_1_e,
dItemNo_Randomizer_FUSED_SHADOW_2_e,
dItemNo_Randomizer_FUSED_SHADOW_3_e,
};
if (selected) {
dComIfGs_onCollectCrystal(index);
if (randomizer_IsActive()) {
dComIfGs_onItemFirstBit(fusedShadowItemNos[index]);
}
} else {
dComIfGs_offCollectCrystal(index);
if (randomizer_IsActive()) {
dComIfGs_offItemFirstBit(fusedShadowItemNos[index]);
}
}
},
});
@@ -1119,10 +1131,23 @@ std::vector<ToggleEntry> collect_mirror_toggle_entries(
.isSelected = [index] { return dComIfGs_isCollectMirror(index); },
.setSelected =
[index](bool selected) {
static constexpr u8 mirrorShardItemNos[] = {
dItemNo_Randomizer_MIRROR_PIECE_1_e,
dItemNo_Randomizer_MIRROR_PIECE_2_e,
dItemNo_Randomizer_MIRROR_PIECE_3_e,
dItemNo_Randomizer_MIRROR_PIECE_4_e,
};
if (selected) {
if (randomizer_IsActive()) {
dComIfGs_onItemFirstBit(mirrorShardItemNos[index]);
}
dComIfGs_onCollectMirror(index);
} else {
dComIfGs_offCollectMirror(index);
if (randomizer_IsActive()) {
dComIfGs_offItemFirstBit(mirrorShardItemNos[index]);
}
}
},
});