summary refs log tree commit diff stats
path: root/WitnessRandomizer/Panels.h
diff options
context:
space:
mode:
authorjbzdarkid <jbzdarkid@gmail.com>2018-10-27 17:18:43 -0700
committerjbzdarkid <jbzdarkid@gmail.com>2018-10-27 17:18:43 -0700
commit76bcf9faffde81bf34ed5138db7b181694bce635 (patch)
tree29e5b3dfaeb555105e5748f0ae68d902570407e2 /WitnessRandomizer/Panels.h
parent7e6307117421cacc6e4bb6ef5b2909a19879ae3f (diff)
downloadwitness-tutorializer-76bcf9faffde81bf34ed5138db7b181694bce635.tar.gz
witness-tutorializer-76bcf9faffde81bf34ed5138db7b181694bce635.tar.bz2
witness-tutorializer-76bcf9faffde81bf34ed5138db7b181694bce635.zip
Fix random order not working
Diffstat (limited to 'WitnessRandomizer/Panels.h')
-rw-r--r--WitnessRandomizer/Panels.h62
1 files changed, 31 insertions, 31 deletions
diff --git a/WitnessRandomizer/Panels.h b/WitnessRandomizer/Panels.h index 747bbc7..9d4e88c 100644 --- a/WitnessRandomizer/Panels.h +++ b/WitnessRandomizer/Panels.h
@@ -2,7 +2,7 @@
2#include <vector> 2#include <vector>
3 3
4// Some of these (the puzzle ones) are duplicated elsewhere 4// Some of these (the puzzle ones) are duplicated elsewhere
5const std::vector<int> lasers = { 5std::vector<int> lasers = {
6 0x0360D, // Symmetry 6 0x0360D, // Symmetry
7 0x03615, // Swamp 7 0x03615, // Swamp
8 0x09DE0, // Bunker 8 0x09DE0, // Bunker
@@ -18,24 +18,24 @@ const std::vector<int> lasers = {
18}; 18};
19 19
20// Note: Some of these (non-desert) are duplicated elsewhere 20// Note: Some of these (non-desert) are duplicated elsewhere
21const std::vector<int> burnablePanels = { 21std::vector<int> burnablePanels = {
22// 0x17D9C, // Treehouse Yellow 7 22 0x17D9C, // Treehouse Yellow 7
23// 0x17DC2, // Treehouse Yellow 8 23 0x17DC2, // Treehouse Yellow 8
24// 0x17DC4, // Treehouse Yellow 9 24 0x17DC4, // Treehouse Yellow 9
25// 0x00999, // Swamp Discontinuous 1 25 0x00999, // Swamp Discontinuous 1
26// 0x0099D, // Swamp Discontinuous 2 26 0x0099D, // Swamp Discontinuous 2
27// 0x009A0, // Swamp Discontinuous 3 27 0x009A0, // Swamp Discontinuous 3
28// 0x009A1, // Swamp Discontinuous 4 28 0x009A1, // Swamp Discontinuous 4
29// 0x00007, // Swamp Rotation Tutorial 1 29 0x00007, // Swamp Rotation Tutorial 1
30// 0x00008, // Swamp Rotation Tutorial 2 30 0x00008, // Swamp Rotation Tutorial 2
31// 0x00009, // Swamp Rotation Tutorial 3 31 0x00009, // Swamp Rotation Tutorial 3
32// 0x0000A, // Swamp Rotation Tutorial 4 32 0x0000A, // Swamp Rotation Tutorial 4
33// 0x28AC7, // Town Blue 1 33 0x28AC7, // Town Blue 1
34// 0x28AC8, // Town Blue 2 34 0x28AC8, // Town Blue 2
35// 0x28ACA, // Town Blue 3 35 0x28ACA, // Town Blue 3
36// 0x28ACB, // Town Blue 4 36 0x28ACB, // Town Blue 4
37// 0x28ACC, // Town Blue 5 37 0x28ACC, // Town Blue 5
38// 0x17CF0, // Mill Discard 38 0x17CF0, // Mill Discard
39 39
40 0x00698, // Desert Surface 1 40 0x00698, // Desert Surface 1
41 0x0048F, // Desert Surface 2 41 0x0048F, // Desert Surface 2
@@ -63,7 +63,7 @@ const std::vector<int> burnablePanels = {
63 63
64// Note: Some of these (non-controls) are duplicated elsewhere 64// Note: Some of these (non-controls) are duplicated elsewhere
65// TODO: Gave up 65// TODO: Gave up
66const std::vector<int> leftRightPanels = { 66std::vector<int> leftRightPanels = {
67 0x01A54, // Glass Factory Entry 67 0x01A54, // Glass Factory Entry
68 0x00086, // Glass Factory Vertical Symmetry 1 68 0x00086, // Glass Factory Vertical Symmetry 1
69 0x00087, // Glass Factory Vertical Symmetry 2 69 0x00087, // Glass Factory Vertical Symmetry 2
@@ -77,7 +77,7 @@ const std::vector<int> leftRightPanels = {
77}; 77};
78 78
79// Note: Some of these (non-controls) are duplicated elsewhere 79// Note: Some of these (non-controls) are duplicated elsewhere
80const std::vector<int> upDownPanels = { 80std::vector<int> upDownPanels = {
81 0x0008D, // Glass Factory Rotational Symmetry 1 81 0x0008D, // Glass Factory Rotational Symmetry 1
82 0x00081, // Glass Factory Rotational Symmetry 2 82 0x00081, // Glass Factory Rotational Symmetry 2
83 0x00083, // Glass Factory Rotational Symmetry 3 83 0x00083, // Glass Factory Rotational Symmetry 3
@@ -100,7 +100,7 @@ const std::vector<int> upDownPanels = {
100}; 100};
101 101
102// Note: Some of these (non-controls) are duplicated elsewhere 102// Note: Some of these (non-controls) are duplicated elsewhere
103const std::vector<int> leftForwardRightPanels = { 103std::vector<int> leftForwardRightPanels = {
104// 0x00075, // Symmetry Island Colored Dots 3 104// 0x00075, // Symmetry Island Colored Dots 3
105// 0x288EA, // UTM Perspective 1 105// 0x288EA, // UTM Perspective 1
106// 0x288FC, // UTM Perspective 2 106// 0x288FC, // UTM Perspective 2
@@ -112,7 +112,7 @@ const std::vector<int> leftForwardRightPanels = {
112 0x17E52, // Treehouse Green 4 112 0x17E52, // Treehouse Green 4
113}; 113};
114 114
115const std::vector<int> pillars = { 115std::vector<int> pillars = {
116 0x0383D, // Mountain 3 Left Pillar 1 116 0x0383D, // Mountain 3 Left Pillar 1
117 0x0383F, // Mountain 3 Left Pillar 2 117 0x0383F, // Mountain 3 Left Pillar 2
118 0x03859, // Mountain 3 Left Pillar 3 118 0x03859, // Mountain 3 Left Pillar 3
@@ -126,7 +126,7 @@ const std::vector<int> pillars = {
126// 0x1C319, // Challenge Right Pillar 126// 0x1C319, // Challenge Right Pillar
127}; 127};
128 128
129const std::vector<int> mountainMultipanel = { 129std::vector<int> mountainMultipanel = {
130 0x09FCC, // Mountain 2 Multipanel 1 130 0x09FCC, // Mountain 2 Multipanel 1
131 0x09FCE, // Mountain 2 Multipanel 2 131 0x09FCE, // Mountain 2 Multipanel 2
132 0x09FCF, // Mountain 2 Multipanel 3 132 0x09FCF, // Mountain 2 Multipanel 3
@@ -135,7 +135,7 @@ const std::vector<int> mountainMultipanel = {
135 0x09FD2, // Mountain 2 Multipanel 6 135 0x09FD2, // Mountain 2 Multipanel 6
136}; 136};
137 137
138const std::vector<int> squarePanels = { 138std::vector<int> squarePanels = {
139 0x00064, // Tutorial Straight 139 0x00064, // Tutorial Straight
140 0x00182, // Tutorial Bend 140 0x00182, // Tutorial Bend
141 0x0A3B2, // Tutorial Back Right 141 0x0A3B2, // Tutorial Back Right
@@ -449,11 +449,12 @@ const std::vector<int> squarePanels = {
449 0x00558, // UTM Blue Right Near 2 449 0x00558, // UTM Blue Right Near 2
450 0x00567, // UTM Blue Right Near 3 450 0x00567, // UTM Blue Right Near 3
451 0x006FE, // UTM Blue Right Near 4 451 0x006FE, // UTM Blue Right Near 4
452 0x0A16E, // UTM Challenge Entrance
452 0x039B4, // Tunnels Theater Catwalk 453 0x039B4, // Tunnels Theater Catwalk
453 0x09E85, // Tunnels Town Shortcut 454 0x09E85, // Tunnels Town Shortcut
454}; 455};
455 456
456const std::vector<int> shadowsPanels = { 457std::vector<int> shadowsPanels = {
457 0x198B5, // Shadows Tutorial 1 458 0x198B5, // Shadows Tutorial 1
458 0x198BD, // Shadows Tutorial 2 459 0x198BD, // Shadows Tutorial 2
459 0x198BF, // Shadows Tutorial 3 460 0x198BF, // Shadows Tutorial 3
@@ -478,7 +479,7 @@ const std::vector<int> shadowsPanels = {
478 0x19650, // Shadows Laser 479 0x19650, // Shadows Laser
479}; 480};
480 481
481const std::vector<int> monasteryPanels = { 482std::vector<int> monasteryPanels = {
482 0x00B10, // Monastery Left Door 483 0x00B10, // Monastery Left Door
483 0x00290, // Monastery Exterior 1 484 0x00290, // Monastery Exterior 1
484 0x00C92, // Monastery Right Door 485 0x00C92, // Monastery Right Door
@@ -493,7 +494,7 @@ const std::vector<int> monasteryPanels = {
493 0x17CA4, // Monastery Laser 494 0x17CA4, // Monastery Laser
494}; 495};
495 496
496const std::vector<int> bunkerPanels = { 497std::vector<int> bunkerPanels = {
497 0x09F7D, // Bunker Tutorial 1 498 0x09F7D, // Bunker Tutorial 1
498 0x09FDC, // Bunker Tutorial 2 499 0x09FDC, // Bunker Tutorial 2
499 0x09FF7, // Bunker Tutorial 3 500 0x09FF7, // Bunker Tutorial 3
@@ -514,7 +515,7 @@ const std::vector<int> bunkerPanels = {
514 0x0A079, // Bunker Elevator 515 0x0A079, // Bunker Elevator
515}; 516};
516 517
517const std::vector<int> junglePanels = { 518std::vector<int> junglePanels = {
518 0x002C4, // Jungle Waves 1 519 0x002C4, // Jungle Waves 1
519 0x00767, // Jungle Waves 2 520 0x00767, // Jungle Waves 2
520 0x002C6, // Jungle Waves 3 521 0x002C6, // Jungle Waves 3
@@ -533,7 +534,7 @@ const std::vector<int> junglePanels = {
533}; 534};
534 535
535// There might be something to do with these, I haven't decided yet. 536// There might be something to do with these, I haven't decided yet.
536const std::vector<int> nothingPanels = { 537std::vector<int> nothingPanels = {
537// Doors & Shortcuts & Shortcut doors & Door controls 538// Doors & Shortcuts & Shortcut doors & Door controls
538 0x0C339, // Desert Surface Door 539 0x0C339, // Desert Surface Door
539 0x0A249, // Desert Pond Exit Door 540 0x0A249, // Desert Pond Exit Door
@@ -664,7 +665,6 @@ const std::vector<int> nothingPanels = {
664// 0x3C114, // Mountain 3 Right Open Door 665// 0x3C114, // Mountain 3 Right Open Door
665 0x09F7F, // Mountaintop Laser Box 666 0x09F7F, // Mountaintop Laser Box
666 0x17C34, // Mountaintop Perspective 667 0x17C34, // Mountaintop Perspective
667 0x0A16E, // UTM Challenge Entrance
668// 0x334E1, // UTM Secret Door Control 668// 0x334E1, // UTM Secret Door Control
669// 0x2773D, // Tunnels Desert Shortcut 669// 0x2773D, // Tunnels Desert Shortcut
670// 0x27732, // Tunnels Theater Shortcut 670// 0x27732, // Tunnels Theater Shortcut