Skip to content

nit: Add more items for ice trap models to draw. #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhlexPlexico merged 1 commit into from
Jun 30, 2026
Merged

nit: Add more items for ice trap models to draw. #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Z3DR
Open in desktop
Submodule Z3DR updated 3 files
+7 −7 code/source/rnd/item_override.cpp
+1 −1 code/source/rnd/models.cpp
+1 −1 code/source/rnd/savefile.cpp
5 changes: 2 additions & 3 deletions docs/release-notes/changelog-latest-nightly.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
- Properly draw ice traps and have no item overhead when retrieving said ice traps.
0 .../old-releases/changelog-nightly-807511.md → ...ses/nightlies/changelog-nightly-807511.md
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions docs/release-notes/old-releases/nightlies/changelog-nightly-a4e9c3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
0 .../old-releases/changelog-nightly-e0ee25.md → ...ses/nightlies/changelog-nightly-e0ee25.md
View file
Open in desktop
File renamed without changes.
0 ...s/old-releases/changelog-version-1.4.3.md → ...eases/versions/changelog-version-1.4.3.md
View file
Open in desktop
File renamed without changes.
9 changes: 6 additions & 3 deletions source/item_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ void GenerateItemPool() {
0x4A, //ProgressiveSword
};
//Check song shuffle and dungeon reward shuffle just for ice traps
/*

if (ShuffleSongs.Value<u8>() != 0) {
//Push item ids for songs
IceTrapModels.push_back(0x4B);
Expand All @@ -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<u8>() != 0) {
//Push item ids for dungeon rewards
IceTrapModels.push_back(0x55);
Expand Down
4 changes: 3 additions & 1 deletion source/preset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down