about summary refs log tree commit diff stats
path: root/WitnessRandomizer
diff options
context:
space:
mode:
authorjbzdarkid <jbzdarkid@gmail.com>2018-10-27 17:24:26 -0700
committerjbzdarkid <jbzdarkid@gmail.com>2018-10-27 17:24:26 -0700
commit5fece6818232b7fc618163b9e6242e662a382957 (patch)
tree7ce9f6444801c395c1a006b8956e8e7a08664876 /WitnessRandomizer
parent8020f954eea029ab23cb0262a83cda2cf18a217f (diff)
downloadwitness-tutorializer-5fece6818232b7fc618163b9e6242e662a382957.tar.gz
witness-tutorializer-5fece6818232b7fc618163b9e6242e662a382957.tar.bz2
witness-tutorializer-5fece6818232b7fc618163b9e6242e662a382957.zip
Fix UTM/mountain 2 elevator
Diffstat (limited to 'WitnessRandomizer')
-rw-r--r--WitnessRandomizer/Panels.h12
-rw-r--r--WitnessRandomizer/WitnessRandomizer.cpp1
2 files changed, 9 insertions, 4 deletions
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<int> leftRightPanels = {
76 0x17D02, // Town Windmill Control 76 0x17D02, // Town Windmill Control
77}; 77};
78 78
79// These panels are very tall (aka not square) and can't take symmetry panels on them.
80std::vector<int> tallUpDownPanels = {
81 0x335AB, // UTM In Elevator Control
82 0x3369D, // UTM Lower Elevator Control
83 0x335AC, // UTM Upper Elevator Control
84 0x09EEB, // Mountain 2 Elevator
85};
86
79// Note: Some of these (non-controls) are duplicated elsewhere 87// Note: Some of these (non-controls) are duplicated elsewhere
80std::vector<int> upDownPanels = { 88std::vector<int> upDownPanels = {
81 0x0008D, // Glass Factory Rotational Symmetry 1 89 0x0008D, // Glass Factory Rotational Symmetry 1
@@ -93,10 +101,6 @@ std::vector<int> upDownPanels = {
93 101
94 0x0A3B5, // Tutorial Back Left 102 0x0A3B5, // Tutorial Back Left
95 0x17CC4, // Mill Elevator Control 103 0x17CC4, // Mill Elevator Control
96 0x335AB, // UTM In Elevator Control
97 0x3369D, // UTM Lower Elevator Control
98 0x335AC, // UTM Upper Elevator Control
99// 0x09EEB, // Mountain 2 Elevator
100}; 104};
101 105
102// Note: Some of these (non-controls) are duplicated elsewhere 106// 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)
66 66
67 67
68// // Content swaps -- must happen before squarePanels 68// // Content swaps -- must happen before squarePanels
69// randomizer.Randomize(tallUpDownPanels, SWAP_LINES | SWAP_STYLE);
69// randomizer.Randomize(upDownPanels, SWAP_LINES | SWAP_STYLE); 70// randomizer.Randomize(upDownPanels, SWAP_LINES | SWAP_STYLE);
70// randomizer.Randomize(leftForwardRightPanels, SWAP_LINES); 71// randomizer.Randomize(leftForwardRightPanels, SWAP_LINES);
71// 72//