mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 12:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

data cleanup

Browse Source
This commit is contained in:
gymnast86
2026-05-05 02:08:51 -07:00
parent 97388be8e5
commit f4992aa378
5 changed files with 1749 additions and 1633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_mg_rod.cpp
+2 -6
View File
@@ -2907,12 +2907,8 @@ static void lure_heart(dmg_rod_class* i_this) {
fopAcM_delete(obj_life);
fopAcM_onItem(obj_life, 0x80);
#if TARGET_PC
if (randomizer_IsActive()) {
// Call the item get function for the ranodmized item instead
u16 key = (getStageID() << 8) | 0x80;
u8 itemId = verifyProgressiveItem(randomizer_GetContext().mFreestandingItemOverrides[key]);
execItemGet(itemId);
} else
// Don't give the item here in rando. We give it later when the FLW message happens
if (!randomizer_IsActive())
#endif
execItemGet(dItemNo_KAKERA_HEART_e);
u8 eventReg = dComIfGs_getEventReg(0xECFF);
src/d/d_msg_flow.cpp
-10
View File
@@ -519,16 +519,6 @@ int dMsgFlow_c::setNormalMsg(mesg_flow_node* i_flowNode_p, fopAc_ac_c* i_speaker
if (msg_no == 0x71E && g_randomizerState.mFishingBottleItemId != 0) {
msg_no = getItemMessageID(g_randomizerState.mFishingBottleItemId);
g_randomizerState.mFishingBottleItemId = 0;
}
// If this is Hena's message about catching a piece of heart, replace it with our
// randomized item. This happens before the execItemGet function, so we don't need
// to store it like the fishing bottle check above.
else if ((msg_no == 0x1D8C || msg_no == 0x1D9A) && dMsgObject_getGroupID() == 7) {
u16 key = (getStageID() << 8) | 0x80;
u8 itemId = verifyProgressiveItem(randomizer_GetContext().mFreestandingItemOverrides[key]);
msg_no = getItemMessageID(itemId);
// Ignore the rest of the flow after this
var_r29->next_node_idx = -1;
} else {
u32 key = (dMsgObject_getGroupID() << 16) | msg_no;
auto& flowItemOverrides = randomizer_GetContext().mFlowItemMessageOverrides;
src/dusk/randomizer/game/randomizer_context.cpp
+58 -40
View File
@@ -600,81 +600,99 @@ void GenerateAndWriteSeed(std::string& generationStatusMsg) {
// Chest Overrides
// Keyed by u16 of 0xFF00 (stage index) and 0x00FF (tbox id)
if (location->HasCategories("Chest")) {
u8 stage = metaData[0]["Stage"].as<u8>();
u8 tboxId = metaData[0]["Tbox ID"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stage << 8) | tboxId;
randoData.mTreasureChestOverrides[key] = itemId;
for (const auto& chestNode : metaData["Chest"]) {
u8 stage = chestNode["Stage"].as<u8>();
u8 tboxId = chestNode["Tbox Id"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stage << 8) | tboxId;
randoData.mTreasureChestOverrides[key] = itemId;
}
}
// Poe Overrides
// Keyed by u16 of 0xFF00 (stage index) and 0x00FF (collectible flag)
if (location->HasCategories("Poe")) {
const auto& stage = metaData[0]["Stage"].as<u8>();
const auto& flag = metaData[0]["Flag"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stage << 8) | flag;
randoData.mPoeOverrides[key] = itemId;
for (const auto& poeNode : metaData["Poe"]) {
const auto& stage = poeNode["Stage"].as<u8>();
const auto& flag = poeNode["Flag"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stage << 8) | flag;
randoData.mPoeOverrides[key] = itemId;
}
}
// Freestanding Overrides
// Keyed by the stage index and collectible flag of the item
if (location->HasCategories("Freestanding Item")) {
u8 stage = metaData[0]["Stage"].as<u8>();
u8 flag = metaData[0]["Flag"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stage << 8) | flag;
randoData.mFreestandingItemOverrides[key] = itemId;
for (const auto& freestandingItemNode: metaData["Freestanding Item"]) {
u8 stage = freestandingItemNode["Stage"].as<u8>();
u8 flag = freestandingItemNode["Flag"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stage << 8) | flag;
randoData.mFreestandingItemOverrides[key] = itemId;
}
}
// Bug Rewards
// Keyed by the item id of the original bug
if (location->HasCategories("Bug Reward")) {
u8 bugItemId = metaData[0]["Bug Item Id"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
randoData.mBugRewardOverrides[bugItemId] = itemId;
for (const auto& bugRewardNode : metaData["Bug Reward"]) {
u8 bugItemId = bugRewardNode["Item Id"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
randoData.mBugRewardOverrides[bugItemId] = itemId;
}
}
// Sky Characters
// Keyed by u16 of 0xFF00 (stage index) and 0x00FF (roomNo)
if (location->HasCategories("Sky Book")) {
u8 stageIdx = metaData[0]["Stage"].as<u8>();
u8 roomNo = metaData[0]["Room"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stageIdx << 8) | roomNo;
randoData.mSkyCharacterOverrides[key] = itemId;
if (location->HasCategories("Sky Character")) {
for (const auto& skyCharacterNode : metaData["Sky Character"]) {
u8 stageIdx = skyCharacterNode["Stage"].as<u8>();
u8 roomNo = skyCharacterNode["Room"].as<u8>();
u8 itemId = location->GetCurrentItem()->GetID();
u16 key = (stageIdx << 8) | roomNo;
randoData.mSkyCharacterOverrides[key] = itemId;
}
}
// Golden Wolves
// Keyed by u16 of the event flag for obtaining the golden wolf item
if (location->HasCategories("Golden Wolf")) {
u16 flag = metaData[0]["Flag"].as<u16>();
u8 itemId = location->GetCurrentItem()->GetID();
randoData.mGoldenWolfOverrides[flag] = itemId;
for (const auto& goldenWolfNode : metaData["Golden Wolf"]) {
u16 flag = goldenWolfNode["Flag"].as<u16>();
u8 itemId = location->GetCurrentItem()->GetID();
randoData.mGoldenWolfOverrides[flag] = itemId;
}
}
// Shop Items
// Keyed by u16 of the stage and original shop item
if (location->HasCategories("Shop") && world->Setting("Shop Items") == "On") {
u8 stage = metaData[0]["Stage"].as<u8>();
u8 originalItem = metaData[0]["Item"].as<u8>();
u16 key = (stage << 8) | originalItem;
randoData.mShopOverrides[key] = location->GetCurrentItem()->GetID();
for (const auto& shopNode : metaData["Shop"]) {
u8 stage = shopNode["Stage"].as<u8>();
u8 originalItem = shopNode["Item"].as<u8>();
u16 key = (stage << 8) | originalItem;
randoData.mShopOverrides[key] = location->GetCurrentItem()->GetID();
}
}
// Items whose text we determine during a FLW message
// Items that we determine the text of and then give during a FLW message
if (location->HasCategories("FLW Message")) {
u8 group = metaData[0]["Group"].as<u8>();
u16 messageId = metaData[0]["Message Id"].as<u16>();
u32 key = (group << 16) | messageId;
randoData.mFlowItemMessageOverrides[key] = location->GetCurrentItem()->GetID();
for (const auto& flwMessageNode : metaData["FLW Message"]) {
u8 group = flwMessageNode["Group"].as<u8>();
u16 messageId = flwMessageNode["Message Id"].as<u16>();
u32 key = (group << 16) | messageId;
randoData.mFlowItemMessageOverrides[key] = location->GetCurrentItem()->GetID();
}
}
// Items that we lookup just by calling their location name
if (location->HasCategories("Location Name Lookup")) {
const auto& locationName = metaData.as<std::string>();
const int itemId = location->GetCurrentItem()->GetID();
randoData.mItemLocations[locationName] = itemId;
if (location->HasCategories("Name Lookup")) {
for (const auto& locationNameNode : metaData["Name Lookup"]) {
const auto& locationName = locationNameNode.as<std::string>();
const int itemId = location->GetCurrentItem()->GetID();
randoData.mItemLocations[locationName] = itemId;
}
}
}
src/dusk/randomizer/generator/data/locations.yaml
+1679 -1576
View File
File diff suppressed because it is too large Load Diff
src/dusk/randomizer/generator/logic/world.cpp
+10 -1
View File
@@ -166,7 +166,7 @@ namespace randomizer::logic::world
for (const auto& locationNode : locationDataTree)
{
// Check to make sure all required fields are present
YAMLVerifyFields(locationNode, "Name", "Categories");
YAMLVerifyFields(locationNode, "Name", "Categories", "Metadata");
// Required Fields
auto name = locationNode["Name"].as<std::string>();
@@ -199,6 +199,15 @@ namespace randomizer::logic::world
auto hintPriority = locationNode["Hint Priority"].as<std::string>("Never");
auto metadata = locationNode["Metadata"];
// Add metadata fields to categories as well
if (metadata.IsMap()) {
for (const auto& fieldNode : metadata) {
const auto& category = fieldNode.first.as<std::string>();
categories.insert(category);
this->_registeredLocationCategories.insert(category);
}
}
auto location = std::make_unique<location::Location>(locationIdCounter++,
name,
categories,