Skip to content

Commit

Permalink
Merge fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@NewSoupVi
NewSoupVi committed Nov 9, 2022
2 parents d6ef5e8 + 9a35d56 commit 08b3540
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ This project was originally started by [NewSoupVi](https://github.com/newsoupvi)

## Witness Random Puzzle Generator

#### Randomizer Version 1.2 is finally out! It includes numerous puzzle tweaks, nerfs, and bug fixes. Full change log coming shortly

The Witness Random Puzzle Generator takes most of the puzzles in Jonathan Blow's "The Witness" and makes them into new, randomly generated puzzles. The mod requires the game in order to function. No game files will be altered, as the randomizer works enterly in RAM. This mod uses WinAPI, so it is only compatible with Microsoft Windows. There is a program you can use that might make it work with Linux; see https://marugawa.dk/witness-randomizer-on-linux for more details.

This project is a fork of jbzdarkid's puzzle randomizer at https://github.com/jbzdarkid/witness-randomizer. His discoveries about how puzzle data is encoded in The Witness were invaluable to this project, so a huge thank you to jbzdarkid for his contributions.
Expand Down
14 changes: 7 additions & 7 deletions Source/PuzzleList.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1536,11 +1536,11 @@ void PuzzleList::GenerateSwampH()
generator->setGridSize(5, 5);
generator->pathWidth = 0.6f;
generator->setFlag(Generate::Config::BigShapes);
generator->generate(0x00001, Decoration::Dot_Intersection, 49, Decoration::Poly, 2, Decoration::Poly | Decoration::Negative, 1, Decoration::Start, 1);
generator->generate(0x014D2, Decoration::Dot_Intersection, 49, Decoration::Poly, 2, Decoration::Poly | Decoration::Negative, 2, Decoration::Start, 1);
generator->generate(0x00001, Decoration::Dot_Intersection, 36, Decoration::Poly, 2, Decoration::Poly | Decoration::Negative, 1, Decoration::Start, 1);
generator->generate(0x014D2, Decoration::Dot_Intersection, 36, Decoration::Poly, 2, Decoration::Poly | Decoration::Negative, 2, Decoration::Start, 1);
generator->removeFlag(Generate::Config::BigShapes);
generator->generate(0x014D4, Decoration::Dot_Intersection, 49, Decoration::Poly, 3, Decoration::Poly | Decoration::Negative, 1, Decoration::Start, 1);
generator->generate(0x014D1, Decoration::Dot_Intersection, 49, Decoration::Poly, 3, Decoration::Poly | Decoration::Negative, 2, Decoration::Start, 1);
generator->generate(0x014D4, Decoration::Dot_Intersection, 36, Decoration::Poly, 3, Decoration::Poly | Decoration::Negative, 1, Decoration::Start, 1);
generator->generate(0x014D1, Decoration::Dot_Intersection, 36, Decoration::Poly, 3, Decoration::Poly | Decoration::Negative, 2, Decoration::Start, 1);
//Modify Swamp Island
generator->resetConfig();
generator->initPanel(0x17C0A);
Expand Down Expand Up @@ -2036,7 +2036,7 @@ void PuzzleList::GenerateMountainH()
specialCase->initPillarSymmetry(generator, 0x0383F, Panel::Symmetry::PillarParallel);
generator->generate(0x0383F, Decoration::Triangle | Decoration::Color::Orange, 8);
specialCase->initPillarSymmetry(generator, 0x09E56, Panel::Symmetry::PillarHorizontal);
generator->generate(0x09E56, Decoration::Triangle | Decoration::Color::Orange, 4, Decoration::Dot_Intersection, 45);
generator->generate(0x09E56, Decoration::Triangle | Decoration::Color::Orange, 4, Decoration::Dot_Intersection, 36);
generator->setFlagOnce(Generate::Config::RequireCombineShapes);
generator->setGridSize(6, 4);
specialCase->initPillarSymmetry(generator, 0x03859, Panel::Symmetry::PillarRotational);
Expand Down Expand Up @@ -2124,7 +2124,7 @@ void PuzzleList::GenerateCavesH()
generator->setGridSize(5, 5);
generator->pathWidth = 0.85f;
generator->setFlagOnce(Generate::Config::DisconnectShapes);
generator->generate(0x32962, Decoration::Dot_Intersection, 49, Decoration::Poly | Decoration::Can_Rotate, 3, Decoration::Start, 1);
generator->generate(0x32962, Decoration::Dot_Intersection, 36, Decoration::Poly | Decoration::Can_Rotate, 3, Decoration::Start, 1);
generator->setFlagOnce(Generate::Config::ResetColors);
generator->setFlagOnce(Generate::Config::TreehouseLayout);
generator->setFlagOnce(Generate::Config::BigShapes);
Expand Down Expand Up @@ -2156,7 +2156,7 @@ void PuzzleList::GenerateCavesH()
{ Decoration::Eraser | Decoration::Color::White, 1 } }, Decoration::Triangle);
generator->removeFlag(Generate::Config::DecorationsOnly);
generator->setFlagOnce(Generate::Config::RequireCancelShapes);
specialCase->generateCenterPerspective(0x288AA, { { Decoration::Dot_Intersection, 49 },{ Decoration::Poly, 2 },
specialCase->generateCenterPerspective(0x288AA, { { Decoration::Dot_Intersection, 36 },{ Decoration::Poly, 2 },
{ Decoration::Poly | Decoration::Negative | Decoration::Color::Blue, 4 } }, Decoration::Poly);

//Full Dots + Arrows
Expand Down

0 comments on commit 08b3540

Please sign in to comment.