From 43f0560ecd3801cd7bb3fb676b67b96debea8fa8 Mon Sep 17 00:00:00 2001 From: Phlex <3514085+PhlexPlexico@users.noreply.github.com> Date: Tue, 30 Jun 2026 11:50:37 -0600 Subject: [PATCH] nit: Add more items for ice trap models to draw. fix: Further adjust TinyXML checks for cached settings. --- Z3DR | 2 +- docs/release-notes/changelog-latest-nightly.md | 5 ++--- .../{ => nightlies}/changelog-nightly-807511.md | 0 .../old-releases/nightlies/changelog-nightly-a4e9c3.md | 8 ++++++++ .../{ => nightlies}/changelog-nightly-e0ee25.md | 0 .../{ => versions}/changelog-version-1.4.3.md | 0 source/item_pool.cpp | 9 ++++++--- source/preset.cpp | 4 +++- 8 files changed, 20 insertions(+), 8 deletions(-) rename docs/release-notes/old-releases/{ => nightlies}/changelog-nightly-807511.md (100%) create mode 100644 docs/release-notes/old-releases/nightlies/changelog-nightly-a4e9c3.md rename docs/release-notes/old-releases/{ => nightlies}/changelog-nightly-e0ee25.md (100%) rename docs/release-notes/old-releases/{ => versions}/changelog-version-1.4.3.md (100%) diff --git a/Z3DR b/Z3DR index a3943a3..241bf3b 160000 --- a/Z3DR +++ b/Z3DR @@ -1 +1 @@ -Subproject commit a3943a3cb1f20d1d09f6cc713678cc61e193bf80 +Subproject commit 241bf3bba672121db56d0bf7136e4a084074c0a6 diff --git a/docs/release-notes/changelog-latest-nightly.md b/docs/release-notes/changelog-latest-nightly.md index dc90f6d..c312a35 100644 --- a/docs/release-notes/changelog-latest-nightly.md +++ b/docs/release-notes/changelog-latest-nightly.md @@ -1,8 +1,7 @@ # Latest Nightly Changes ## Features -- None, small bug fixes only! +- Add new models to ice traps when songsanity is enabled. ## Fixes -- Adjust the XML loader to look for empty elementss before reading to avoid crashing. -- Adjust Song of Time Logic to not run for No Logic seeds. \ No newline at end of file +- Properly draw ice traps and have no item overhead when retrieving said ice traps. \ No newline at end of file diff --git a/docs/release-notes/old-releases/changelog-nightly-807511.md b/docs/release-notes/old-releases/nightlies/changelog-nightly-807511.md similarity index 100% rename from docs/release-notes/old-releases/changelog-nightly-807511.md rename to docs/release-notes/old-releases/nightlies/changelog-nightly-807511.md diff --git a/docs/release-notes/old-releases/nightlies/changelog-nightly-a4e9c3.md b/docs/release-notes/old-releases/nightlies/changelog-nightly-a4e9c3.md new file mode 100644 index 0000000..dc90f6d --- /dev/null +++ b/docs/release-notes/old-releases/nightlies/changelog-nightly-a4e9c3.md @@ -0,0 +1,8 @@ +# Latest Nightly Changes + +## Features +- None, small bug fixes only! + +## Fixes +- Adjust the XML loader to look for empty elementss before reading to avoid crashing. +- Adjust Song of Time Logic to not run for No Logic seeds. \ No newline at end of file diff --git a/docs/release-notes/old-releases/changelog-nightly-e0ee25.md b/docs/release-notes/old-releases/nightlies/changelog-nightly-e0ee25.md similarity index 100% rename from docs/release-notes/old-releases/changelog-nightly-e0ee25.md rename to docs/release-notes/old-releases/nightlies/changelog-nightly-e0ee25.md diff --git a/docs/release-notes/old-releases/changelog-version-1.4.3.md b/docs/release-notes/old-releases/versions/changelog-version-1.4.3.md similarity index 100% rename from docs/release-notes/old-releases/changelog-version-1.4.3.md rename to docs/release-notes/old-releases/versions/changelog-version-1.4.3.md diff --git a/source/item_pool.cpp b/source/item_pool.cpp index ef54d97..ea17bc5 100644 --- a/source/item_pool.cpp +++ b/source/item_pool.cpp @@ -868,7 +868,7 @@ void GenerateItemPool() { 0x4A, //ProgressiveSword }; //Check song shuffle and dungeon reward shuffle just for ice traps - /* + if (ShuffleSongs.Value() != 0) { //Push item ids for songs IceTrapModels.push_back(0x4B); @@ -877,10 +877,13 @@ void GenerateItemPool() { IceTrapModels.push_back(0x4E); IceTrapModels.push_back(0x4F); IceTrapModels.push_back(0x51); + IceTrapModels.push_back(0x53); IceTrapModels.push_back(0x54); - IceTrapModels.push_back(0x53); // should be song of time but not included yet + IceTrapModels.push_back(0x6C); + IceTrapModels.push_back(0x72); + IceTrapModels.push_back(0x73); //IceTrapModels.push_back(0xC6); - }*/ + } if (ShuffleRewards.Value() != 0) { //Push item ids for dungeon rewards IceTrapModels.push_back(0x55); diff --git a/source/preset.cpp b/source/preset.cpp index d87c041..7166d48 100644 --- a/source/preset.cpp +++ b/source/preset.cpp @@ -148,8 +148,10 @@ bool LoadPreset(std::string_view presetName, OptionCategory category) { // Do an additional check to see if the settings is a null element. // This returns a null ptr so we can let it be known that it's an old // template file from before cosmetics were being generated. - if (preset.FirstChildElement("settings")->GetText() == nullptr) + if (preset.FirstChildElement("settings")->NoChildren()) { return false; + } + XMLElement* curNode = rootNode->FirstChildElement();