From 5fece6818232b7fc618163b9e6242e662a382957 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Sat, 27 Oct 2018 17:24:26 -0700 Subject: Fix UTM/mountain 2 elevator --- WitnessRandomizer/Panels.h | 12 ++++++++---- WitnessRandomizer/WitnessRandomizer.cpp | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'WitnessRandomizer') diff --git a/WitnessRandomizer/Panels.h b/WitnessRandomizer/Panels.h index 9d4e88c..e070005 100644 --- a/WitnessRandomizer/Panels.h +++ b/WitnessRandomizer/Panels.h @@ -76,6 +76,14 @@ std::vector leftRightPanels = { 0x17D02, // Town Windmill Control }; +// These panels are very tall (aka not square) and can't take symmetry panels on them. +std::vector tallUpDownPanels = { + 0x335AB, // UTM In Elevator Control + 0x3369D, // UTM Lower Elevator Control + 0x335AC, // UTM Upper Elevator Control + 0x09EEB, // Mountain 2 Elevator +}; + // Note: Some of these (non-controls) are duplicated elsewhere std::vector upDownPanels = { 0x0008D, // Glass Factory Rotational Symmetry 1 @@ -93,10 +101,6 @@ std::vector upDownPanels = { 0x0A3B5, // Tutorial Back Left 0x17CC4, // Mill Elevator Control - 0x335AB, // UTM In Elevator Control - 0x3369D, // UTM Lower Elevator Control - 0x335AC, // UTM Upper Elevator Control -// 0x09EEB, // Mountain 2 Elevator }; // Note: Some of these (non-controls) are duplicated elsewhere diff --git a/WitnessRandomizer/WitnessRandomizer.cpp b/WitnessRandomizer/WitnessRandomizer.cpp index 52efcf2..6c84803 100644 --- a/WitnessRandomizer/WitnessRandomizer.cpp +++ b/WitnessRandomizer/WitnessRandomizer.cpp @@ -66,6 +66,7 @@ int main(int argc, char** argv) // // Content swaps -- must happen before squarePanels +// randomizer.Randomize(tallUpDownPanels, SWAP_LINES | SWAP_STYLE); // randomizer.Randomize(upDownPanels, SWAP_LINES | SWAP_STYLE); // randomizer.Randomize(leftForwardRightPanels, SWAP_LINES); // -- cgit 1.4.1