diff options
author | jbzdarkid <jbzdarkid@gmail.com> | 2018-10-28 21:05:28 -0700 |
---|---|---|
committer | jbzdarkid <jbzdarkid@gmail.com> | 2018-10-28 21:05:28 -0700 |
commit | 2776822ef185836b33eab96e25e12393d2c0d859 (patch) | |
tree | ad4a3b36d5776e6cacc76835c505266ce7861ba9 | |
parent | 96fd92f58640ea657a0802aba7ee2aa0d3498b81 (diff) | |
download | witness-tutorializer-2776822ef185836b33eab96e25e12393d2c0d859.tar.gz witness-tutorializer-2776822ef185836b33eab96e25e12393d2c0d859.tar.bz2 witness-tutorializer-2776822ef185836b33eab96e25e12393d2c0d859.zip |
Names are bad / compiled for old version because dumb
-rw-r--r-- | Installer/Installer.vdproj | 18 | ||||
-rw-r--r-- | Source/Randomizer.cpp | 5 | ||||
-rw-r--r-- | Source/RandomizerCore.h | 5 |
3 files changed, 21 insertions, 7 deletions
diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj index c03dacc..11319a9 100644 --- a/Installer/Installer.vdproj +++ b/Installer/Installer.vdproj | |||
@@ -68,6 +68,14 @@ | |||
68 | "PrerequisitesLocation" = "2:1" | 68 | "PrerequisitesLocation" = "2:1" |
69 | "Url" = "8:" | 69 | "Url" = "8:" |
70 | "ComponentsUrl" = "8:" | 70 | "ComponentsUrl" = "8:" |
71 | "Items" | ||
72 | { | ||
73 | "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" | ||
74 | { | ||
75 | "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" | ||
76 | "ProductCode" = "8:.NETFramework,Version=v4.6.1" | ||
77 | } | ||
78 | } | ||
71 | } | 79 | } |
72 | } | 80 | } |
73 | } | 81 | } |
@@ -145,20 +153,20 @@ | |||
145 | "Product" | 153 | "Product" |
146 | { | 154 | { |
147 | "Name" = "8:Microsoft Visual Studio" | 155 | "Name" = "8:Microsoft Visual Studio" |
148 | "ProductName" = "8:Installer" | 156 | "ProductName" = "8:Witness Randomizer" |
149 | "ProductCode" = "8:{34868EC7-346B-490E-A881-16189741A4A1}" | 157 | "ProductCode" = "8:{6F5835BB-A6A5-431A-8375-F8992CD74B86}" |
150 | "PackageCode" = "8:{5699DE4A-74E2-4F40-BEE5-B5518D72CA61}" | 158 | "PackageCode" = "8:{88F29213-17E5-4446-A1F4-97D01C6DF2C5}" |
151 | "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}" | 159 | "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}" |
152 | "AspNetVersion" = "8:2.0.50727.0" | 160 | "AspNetVersion" = "8:2.0.50727.0" |
153 | "RestartWWWService" = "11:FALSE" | 161 | "RestartWWWService" = "11:FALSE" |
154 | "RemovePreviousVersions" = "11:TRUE" | 162 | "RemovePreviousVersions" = "11:TRUE" |
155 | "DetectNewerInstalledVersion" = "11:TRUE" | 163 | "DetectNewerInstalledVersion" = "11:TRUE" |
156 | "InstallAllUsers" = "11:FALSE" | 164 | "InstallAllUsers" = "11:FALSE" |
157 | "ProductVersion" = "8:2.0.0" | 165 | "ProductVersion" = "8:2.0.1" |
158 | "Manufacturer" = "8:jbzdarkid" | 166 | "Manufacturer" = "8:jbzdarkid" |
159 | "ARPHELPTELEPHONE" = "8:" | 167 | "ARPHELPTELEPHONE" = "8:" |
160 | "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" | 168 | "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" |
161 | "Title" = "8:Installer" | 169 | "Title" = "8:Witness Randomizer" |
162 | "Subject" = "8:" | 170 | "Subject" = "8:" |
163 | "ARPCONTACT" = "8:jbzdarkid" | 171 | "ARPCONTACT" = "8:jbzdarkid" |
164 | "Keywords" = "8:" | 172 | "Keywords" = "8:" |
diff --git a/Source/Randomizer.cpp b/Source/Randomizer.cpp index c4b3a13..97541b7 100644 --- a/Source/Randomizer.cpp +++ b/Source/Randomizer.cpp | |||
@@ -1,8 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * BUGS: | 2 | * BUGS: |
3 | * Tutorial back left is not protected anymore | ||
3 | * Shipwreck vault is solved reversed? | 4 | * Shipwreck vault is solved reversed? |
4 | * Verify UTM perspective? | 5 | * Verify UTM perspective? |
5 | * FEATURES: | 6 | * FEATURES: |
7 | * Determine if the user has entered the seed, and re-randomize it if not | ||
8 | * Prevent re-randomization (?) | ||
9 | * Clear "Randomized" state on NG (?) | ||
10 | * Limit back distance to pillars (like before) | ||
6 | * Randomize audio logs -- Hard, seem to be unloaded some times? | 11 | * Randomize audio logs -- Hard, seem to be unloaded some times? |
7 | * Swap sounds in jungle (along with panels) -- maybe impossible | 12 | * Swap sounds in jungle (along with panels) -- maybe impossible |
8 | * Make orange 7 (all of oranges?) hard. Like big = hard. | 13 | * Make orange 7 (all of oranges?) hard. Like big = hard. |
diff --git a/Source/RandomizerCore.h b/Source/RandomizerCore.h index da88e92..21ed0b6 100644 --- a/Source/RandomizerCore.h +++ b/Source/RandomizerCore.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #pragma once | 1 | #pragma once |
2 | #include "Memory.h" | 2 | #include "Memory.h" |
3 | 3 | ||
4 | #define GLOBALS 0x5B28C0 | 4 | // #define GLOBALS 0x5B28C0 |
5 | // #define GLOBALS 0x62A080 | 5 | #define GLOBALS 0x62A080 |
6 | 6 | ||
7 | __declspec(selectany) int SWAP_NONE = 0x0; | 7 | __declspec(selectany) int SWAP_NONE = 0x0; |
8 | __declspec(selectany) int SWAP_TARGETS = 0x1; | 8 | __declspec(selectany) int SWAP_TARGETS = 0x1; |
@@ -157,4 +157,5 @@ private: | |||
157 | #define PANEL_TARGET 0x4A8 | 157 | #define PANEL_TARGET 0x4A8 |
158 | #define SPECULAR_TEXTURE 0x4D0 | 158 | #define SPECULAR_TEXTURE 0x4D0 |
159 | #define CABLE_TARGET_2 0xD0 | 159 | #define CABLE_TARGET_2 0xD0 |
160 | #define AUDIO_LOG_NAME 0x0 | ||
160 | #endif \ No newline at end of file | 161 | #endif \ No newline at end of file |