about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--WitnessRandomizer/Panels.h34
-rw-r--r--WitnessRandomizer/WitnessRandomizer.cpp26
-rw-r--r--WitnessRandomizerInstaller/WitnessRandomizerInstaller.vdproj22
3 files changed, 49 insertions, 33 deletions
diff --git a/WitnessRandomizer/Panels.h b/WitnessRandomizer/Panels.h index 7b9c96c..747bbc7 100644 --- a/WitnessRandomizer/Panels.h +++ b/WitnessRandomizer/Panels.h
@@ -19,23 +19,23 @@ const std::vector<int> lasers = {
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 = { 21const std::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
diff --git a/WitnessRandomizer/WitnessRandomizer.cpp b/WitnessRandomizer/WitnessRandomizer.cpp index 7827ddb..6ce0256 100644 --- a/WitnessRandomizer/WitnessRandomizer.cpp +++ b/WitnessRandomizer/WitnessRandomizer.cpp
@@ -5,6 +5,7 @@
5 * Treehouse pivots *should* work, but I need to not copy style_flags. 5 * Treehouse pivots *should* work, but I need to not copy style_flags.
6 This seems to cause crashes when pivots appear elsewhere in the world. 6 This seems to cause crashes when pivots appear elsewhere in the world.
7 * Some panels are impossible casually: (idc, I think) 7 * Some panels are impossible casually: (idc, I think)
8 * Shadows burn marks are not appearing
8 ** Town Stars, Invisible dots 9 ** Town Stars, Invisible dots
9 * Something is wrong with jungle 10 * Something is wrong with jungle
10 * FEATURES: 11 * FEATURES:
@@ -48,20 +49,19 @@ int main(int argc, char** argv)
48 srand(seed); 49 srand(seed);
49 } 50 }
50 51
51 /* 52// randomizer.SwapPanels(0x28AC7, 0x00698, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 1
52 randomizer.SwapPanels(0x0007C, 0x0005D, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 1 53// randomizer.SwapPanels(0x28AC8, 0x0048F, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 2
53 randomizer.SwapPanels(0x0007E, 0x0005E, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 2 54// randomizer.SwapPanels(0x28ACA, 0x09F92, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 3
54 randomizer.SwapPanels(0x00075, 0x0005F, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 3 55// randomizer.SwapPanels(0x28ACB, 0x0A036, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 4
55 randomizer.SwapPanels(0x00073, 0x00060, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 4 56// randomizer.SwapPanels(0x28ACC, 0x09DA6, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 5
56 randomizer.SwapPanels(0x00077, 0x00061, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 5 57// 0x00079; // Symmetry Island Colored Dots 6
57 0x00079; // Symmetry Island Colored Dots 6 58//
59// 0x0005D; // Outside Tutorial Dots Tutorial 1
60// 0x0005E; // Outside Tutorial Dots Tutorial 2
61// 0x0005F; // Outside Tutorial Dots Tutorial 3
62// 0x00060; // Outside Tutorial Dots Tutorial 4
63// 0x00061; // Outside Tutorial Dots Tutorial 5
58 64
59 0x0005D; // Outside Tutorial Dots Tutorial 1
60 0x0005E; // Outside Tutorial Dots Tutorial 2
61 0x0005F; // Outside Tutorial Dots Tutorial 3
62 0x00060; // Outside Tutorial Dots Tutorial 4
63 0x00061; // Outside Tutorial Dots Tutorial 5
64 */
65 65
66 66
67 // Content swaps -- must happen before squarePanels 67 // Content swaps -- must happen before squarePanels
diff --git a/WitnessRandomizerInstaller/WitnessRandomizerInstaller.vdproj b/WitnessRandomizerInstaller/WitnessRandomizerInstaller.vdproj index a2cf517..922b7d1 100644 --- a/WitnessRandomizerInstaller/WitnessRandomizerInstaller.vdproj +++ b/WitnessRandomizerInstaller/WitnessRandomizerInstaller.vdproj
@@ -44,6 +44,14 @@
44 "PrerequisitesLocation" = "2:1" 44 "PrerequisitesLocation" = "2:1"
45 "Url" = "8:" 45 "Url" = "8:"
46 "ComponentsUrl" = "8:" 46 "ComponentsUrl" = "8:"
47 "Items"
48 {
49 "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
50 {
51 "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
52 "ProductCode" = "8:.NETFramework,Version=v4.6.1"
53 }
54 }
47 } 55 }
48 } 56 }
49 "Release" 57 "Release"
@@ -68,6 +76,14 @@
68 "PrerequisitesLocation" = "2:1" 76 "PrerequisitesLocation" = "2:1"
69 "Url" = "8:" 77 "Url" = "8:"
70 "ComponentsUrl" = "8:" 78 "ComponentsUrl" = "8:"
79 "Items"
80 {
81 "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
82 {
83 "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
84 "ProductCode" = "8:.NETFramework,Version=v4.6.1"
85 }
86 }
71 } 87 }
72 } 88 }
73 } 89 }
@@ -146,15 +162,15 @@
146 { 162 {
147 "Name" = "8:Microsoft Visual Studio" 163 "Name" = "8:Microsoft Visual Studio"
148 "ProductName" = "8:WitnessRandomizer" 164 "ProductName" = "8:WitnessRandomizer"
149 "ProductCode" = "8:{9EB4E1F3-2D4E-4D2B-B8AA-B51C12F8149B}" 165 "ProductCode" = "8:{CFA35C1B-207B-4F9A-AF67-3D3FC8B47530}"
150 "PackageCode" = "8:{2D819EE6-D857-426F-A0B0-48CDB593BCD3}" 166 "PackageCode" = "8:{EB510A81-D971-401F-BCA1-03DB37ED9F10}"
151 "UpgradeCode" = "8:{B2AF0F34-4917-4AEC-B892-FE4FD4B9584A}" 167 "UpgradeCode" = "8:{B2AF0F34-4917-4AEC-B892-FE4FD4B9584A}"
152 "AspNetVersion" = "8:2.0.50727.0" 168 "AspNetVersion" = "8:2.0.50727.0"
153 "RestartWWWService" = "11:FALSE" 169 "RestartWWWService" = "11:FALSE"
154 "RemovePreviousVersions" = "11:TRUE" 170 "RemovePreviousVersions" = "11:TRUE"
155 "DetectNewerInstalledVersion" = "11:TRUE" 171 "DetectNewerInstalledVersion" = "11:TRUE"
156 "InstallAllUsers" = "11:FALSE" 172 "InstallAllUsers" = "11:FALSE"
157 "ProductVersion" = "8:1.0.2" 173 "ProductVersion" = "8:1.0.3"
158 "Manufacturer" = "8:jbzdarkid" 174 "Manufacturer" = "8:jbzdarkid"
159 "ARPHELPTELEPHONE" = "8:" 175 "ARPHELPTELEPHONE" = "8:"
160 "ARPHELPLINK" = "8:" 176 "ARPHELPLINK" = "8:"