3 files changed, 49 insertions, 33 deletions

@@ -19,23 +19,23 @@ const std::vector<int> lasers = {
 
 // Note: Some of these (non-desert) are duplicated elsewhere
 const std::vector<int> burnablePanels = {
-        0x17D9C, // Treehouse Yellow 7
-        0x17DC2, // Treehouse Yellow 8
-        0x17DC4, // Treehouse Yellow 9
-        0x00999, // Swamp Discontinuous 1
-        0x0099D, // Swamp Discontinuous 2
-        0x009A0, // Swamp Discontinuous 3
-        0x009A1, // Swamp Discontinuous 4
-        0x00007, // Swamp Rotation Tutorial 1
-        0x00008, // Swamp Rotation Tutorial 2
-        0x00009, // Swamp Rotation Tutorial 3
-        0x0000A, // Swamp Rotation Tutorial 4
-        0x28AC7, // Town Blue 1
-        0x28AC8, // Town Blue 2
-        0x28ACA, // Town Blue 3
-        0x28ACB, // Town Blue 4
-        0x28ACC, // Town Blue 5
-        0x17CF0, // Mill Discard
+//      0x17D9C, // Treehouse Yellow 7
+//      0x17DC2, // Treehouse Yellow 8
+//      0x17DC4, // Treehouse Yellow 9
+//      0x00999, // Swamp Discontinuous 1
+//      0x0099D, // Swamp Discontinuous 2
+//      0x009A0, // Swamp Discontinuous 3
+//      0x009A1, // Swamp Discontinuous 4
+//      0x00007, // Swamp Rotation Tutorial 1
+//      0x00008, // Swamp Rotation Tutorial 2
+//      0x00009, // Swamp Rotation Tutorial 3
+//      0x0000A, // Swamp Rotation Tutorial 4
+//      0x28AC7, // Town Blue 1
+//      0x28AC8, // Town Blue 2
+//      0x28ACA, // Town Blue 3
+//      0x28ACB, // Town Blue 4
+//      0x28ACC, // Town Blue 5
+//      0x17CF0, // Mill Discard
 
         0x00698, // Desert Surface 1
         0x0048F, // Desert Surface 2
@@ -5,6 +5,7 @@
  * Treehouse pivots *should* work, but I need to not copy style_flags.
    This seems to cause crashes when pivots appear elsewhere in the world.
  * Some panels are impossible casually: (idc, I think)
+ * Shadows burn marks are not appearing
  ** Town Stars, Invisible dots
  * Something is wrong with jungle
  * FEATURES:
@@ -48,20 +49,19 @@ int main(int argc, char** argv)
                 srand(seed);
         }
 
-        /*
-        randomizer.SwapPanels(0x0007C, 0x0005D, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 1
-        randomizer.SwapPanels(0x0007E, 0x0005E, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 2
-        randomizer.SwapPanels(0x00075, 0x0005F, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 3
-        randomizer.SwapPanels(0x00073, 0x00060, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 4
-        randomizer.SwapPanels(0x00077, 0x00061, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 5
-        0x00079; // Symmetry Island Colored Dots 6
+//      randomizer.SwapPanels(0x28AC7, 0x00698, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 1
+//      randomizer.SwapPanels(0x28AC8, 0x0048F, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 2
+//      randomizer.SwapPanels(0x28ACA, 0x09F92, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 3
+//      randomizer.SwapPanels(0x28ACB, 0x0A036, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 4
+//      randomizer.SwapPanels(0x28ACC, 0x09DA6, SWAP_LINES | SWAP_STYLE); // Symmetry Island Colored Dots 5
+//      0x00079; // Symmetry Island Colored Dots 6
+//
+//      0x0005D; // Outside Tutorial Dots Tutorial 1
+//      0x0005E; // Outside Tutorial Dots Tutorial 2
+//      0x0005F; // Outside Tutorial Dots Tutorial 3
+//      0x00060; // Outside Tutorial Dots Tutorial 4
+//      0x00061; // Outside Tutorial Dots Tutorial 5
 
-        0x0005D; // Outside Tutorial Dots Tutorial 1
-        0x0005E; // Outside Tutorial Dots Tutorial 2
-        0x0005F; // Outside Tutorial Dots Tutorial 3
-        0x00060; // Outside Tutorial Dots Tutorial 4
-        0x00061; // Outside Tutorial Dots Tutorial 5
-        */
 
 
         // Content swaps -- must happen before squarePanels
@@ -44,6 +44,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"
+                    }
+                }
             }
         }
         "Release"
@@ -68,6 +76,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"
+                    }
+                }
             }
         }
     }
@@ -146,15 +162,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:WitnessRandomizer"
-        "ProductCode" = "8:{9EB4E1F3-2D4E-4D2B-B8AA-B51C12F8149B}"
-        "PackageCode" = "8:{2D819EE6-D857-426F-A0B0-48CDB593BCD3}"
+        "ProductCode" = "8:{CFA35C1B-207B-4F9A-AF67-3D3FC8B47530}"
+        "PackageCode" = "8:{EB510A81-D971-401F-BCA1-03DB37ED9F10}"
         "UpgradeCode" = "8:{B2AF0F34-4917-4AEC-B892-FE4FD4B9584A}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.2"
+        "ProductVersion" = "8:1.0.3"
         "Manufacturer" = "8:jbzdarkid"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"