From 2776822ef185836b33eab96e25e12393d2c0d859 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Sun, 28 Oct 2018 21:05:28 -0700 Subject: Names are bad / compiled for old version because dumb --- Installer/Installer.vdproj | 18 +++++++++++++----- Source/Randomizer.cpp | 5 +++++ 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 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" + { + "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.6.1" + } + } } } } @@ -145,20 +153,20 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:Installer" - "ProductCode" = "8:{34868EC7-346B-490E-A881-16189741A4A1}" - "PackageCode" = "8:{5699DE4A-74E2-4F40-BEE5-B5518D72CA61}" + "ProductName" = "8:Witness Randomizer" + "ProductCode" = "8:{6F5835BB-A6A5-431A-8375-F8992CD74B86}" + "PackageCode" = "8:{88F29213-17E5-4446-A1F4-97D01C6DF2C5}" "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.0" + "ProductVersion" = "8:2.0.1" "Manufacturer" = "8:jbzdarkid" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" - "Title" = "8:Installer" + "Title" = "8:Witness Randomizer" "Subject" = "8:" "ARPCONTACT" = "8:jbzdarkid" "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 @@ /* * BUGS: + * Tutorial back left is not protected anymore * Shipwreck vault is solved reversed? * Verify UTM perspective? * FEATURES: + * Determine if the user has entered the seed, and re-randomize it if not + * Prevent re-randomization (?) + * Clear "Randomized" state on NG (?) + * Limit back distance to pillars (like before) * Randomize audio logs -- Hard, seem to be unloaded some times? * Swap sounds in jungle (along with panels) -- maybe impossible * 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 @@ #pragma once #include "Memory.h" -#define GLOBALS 0x5B28C0 -// #define GLOBALS 0x62A080 +// #define GLOBALS 0x5B28C0 +#define GLOBALS 0x62A080 __declspec(selectany) int SWAP_NONE = 0x0; __declspec(selectany) int SWAP_TARGETS = 0x1; @@ -157,4 +157,5 @@ private: #define PANEL_TARGET 0x4A8 #define SPECULAR_TEXTURE 0x4D0 #define CABLE_TARGET_2 0xD0 +#define AUDIO_LOG_NAME 0x0 #endif \ No newline at end of file -- cgit 1.4.1