Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Witness: More control over progressive symbols #3961

Draft
wants to merge 47 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9027f3
More control over progressive symbols!
NewSoupVi Sep 19, 2024
065274d
Cleanup crew
NewSoupVi Sep 19, 2024
d328213
lol
NewSoupVi Sep 19, 2024
c8aa350
Make it configurable how second stage items act on their own
NewSoupVi Sep 19, 2024
63861a0
only let independent symbols work if they're not progressive
NewSoupVi Sep 19, 2024
5c92fb0
revert defaults
NewSoupVi Sep 19, 2024
1b8a856
Better description
NewSoupVi Sep 19, 2024
4ded65a
comment for reviewers
NewSoupVi Sep 19, 2024
84a59a6
A complicated docstring for a complicated function
NewSoupVi Sep 19, 2024
827f5d3
More accurate
NewSoupVi Sep 19, 2024
1fa5ec0
This probably works more generically
NewSoupVi Sep 19, 2024
31e0f48
Actually, this would cause other issues anyway, so no need to make th…
NewSoupVi Sep 19, 2024
3d79c84
:/
NewSoupVi Sep 19, 2024
f3003b1
oops
NewSoupVi Sep 19, 2024
67d4fd0
Change the system to use collect/remove override so that plando and s…
NewSoupVi Sep 19, 2024
da74ecc
Vi stop doing that thing challenge
NewSoupVi Sep 19, 2024
4c24963
Make SecondStateSymbolsActIndependently an OptionSet
NewSoupVi Sep 19, 2024
b3cb5e9
jank
NewSoupVi Sep 19, 2024
d4ddcb6
oop
NewSoupVi Sep 19, 2024
ba29b31
this is why we make unit tests I guess
NewSoupVi Sep 19, 2024
bb98ac8
More unit tests
NewSoupVi Sep 19, 2024
4ac815b
More unit tests
NewSoupVi Sep 19, 2024
49b8f24
Add note about the absence of Rotated Shapers from the independent sy…
NewSoupVi Sep 19, 2024
cfee7ff
More verbose description
NewSoupVi Sep 19, 2024
c4721ab
More verbose description
NewSoupVi Sep 19, 2024
403788a
slight reword
NewSoupVi Sep 19, 2024
83860e0
Ruff ruff :3 I am a good puppy <3
NewSoupVi Sep 19, 2024
2dac460
Remove invis dots
NewSoupVi Sep 19, 2024
a7507e7
oops
NewSoupVi Sep 19, 2024
64b39f3
Remove some unused symbols
NewSoupVi Sep 19, 2024
bfd2b58
display name
NewSoupVi Sep 19, 2024
5e3a556
linecounting -> discard
NewSoupVi Sep 20, 2024
035b1a0
Make all progressive chains always work
NewSoupVi Sep 20, 2024
03492d8
Unfortunately, this optimisation is now unsafe with plando :(
NewSoupVi Sep 20, 2024
01dfb36
oops
NewSoupVi Sep 20, 2024
4c37d22
This is now a possible optimisation
NewSoupVi Sep 20, 2024
4e1ba53
optimise optimise optimise
NewSoupVi Sep 20, 2024
a93a152
optimise optimise optimise
NewSoupVi Sep 20, 2024
0a0cc13
fix
NewSoupVi Sep 20, 2024
dde5638
ruff
NewSoupVi Sep 20, 2024
a19d36f
oh
NewSoupVi Sep 20, 2024
b7bb723
fixed frfr
NewSoupVi Sep 20, 2024
6b8ce5c
mypy
NewSoupVi Sep 20, 2024
d6942e2
Clean up the tests a bit
NewSoupVi Oct 18, 2024
afedaab
oop
NewSoupVi Oct 18, 2024
d622f2c
I actually like this better now, so I'm doing it as default
NewSoupVi Oct 18, 2024
af29c2a
Merge branch 'main' into progressive_symbol_options
NewSoupVi Oct 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions worlds/witness/data/WitnessItems.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Symbols:
2 - Full Dots
3 - Invisible Dots
5 - Sound Dots
7 - Sparse Dots
10 - Symmetry
20 - Triangles
30 - Eraser
Expand All @@ -12,12 +13,16 @@ Symbols:
50 - Negative Shapers
60 - Stars
61 - Stars + Same Colored Symbol
67 - Simple Stars
71 - Black/White Squares
72 - Colored Squares
80 - Arrows
200 - Progressive Dots - Dots,Full Dots
210 - Progressive Symmetry - Symmetry,Colored Dots
260 - Progressive Stars - Stars,Stars + Same Colored Symbol
200 - Progressive Dots
240 - Progressive Shapers
210 - Progressive Symmetry
260 - Progressive Stars
270 - Progressive Squares
280 - Progressive Line-Counting Symbols

Useful:
510 - Puzzle Skip
Expand Down
124 changes: 62 additions & 62 deletions worlds/witness/data/WitnessLogic.txt
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review help:

Every change in the Logic.txt files should fall under these categories.

  1. Removing "Dots" when "Full Dots" is already there
  2. Removing "Stars" when "Stars + Same Colored Symbol" is already there
  3. Removing Symmetry off of the Laser set specifically

This was done with regex replacement and probably does not need to be reviewed too thoroughly

Large diffs are not rendered by default.

338 changes: 169 additions & 169 deletions worlds/witness/data/WitnessLogicExpert.txt

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions worlds/witness/data/WitnessLogicVanilla.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ Outside Tutorial Vault (Outside Tutorial):
158651 - 0x03481 (Vault Box) - True - True

Outside Tutorial Path To Outpost (Outside Tutorial) - Outside Tutorial Outpost - 0x0A170:
158011 - 0x0A171 (Outpost Entry Panel) - True - Dots & Full Dots
158011 - 0x0A171 (Outpost Entry Panel) - True - Full Dots
Door - 0x0A170 (Outpost Entry) - 0x0A171

Outside Tutorial Outpost (Outside Tutorial) - Outside Tutorial - 0x04CA3:
158012 - 0x04CA4 (Outpost Exit Panel) - True - Dots & Full Dots
158012 - 0x04CA4 (Outpost Exit Panel) - True - Full Dots
Door - 0x04CA3 (Outpost Exit) - 0x04CA4
158600 - 0x17CFB (Discard) - True - Triangles

Expand Down Expand Up @@ -138,12 +138,12 @@ Door - 0x18269 (Upper) - 0x1C349
159000 - 0x0332B (Glass Factory Black Line Reflection EP) - True - True

Symmetry Island Upper (Symmetry Island):
158065 - 0x00A52 (Laser Yellow 1) - True - Symmetry & Colored Dots
158066 - 0x00A57 (Laser Yellow 2) - 0x00A52 - Symmetry & Colored Dots
158067 - 0x00A5B (Laser Yellow 3) - 0x00A57 - Symmetry & Colored Dots
158068 - 0x00A61 (Laser Blue 1) - 0x00A52 - Symmetry & Colored Dots
158069 - 0x00A64 (Laser Blue 2) - 0x00A61 & 0x00A57 - Symmetry & Colored Dots
158070 - 0x00A68 (Laser Blue 3) - 0x00A64 & 0x00A5B - Symmetry & Colored Dots
158065 - 0x00A52 (Laser Yellow 1) - True - Colored Dots
158066 - 0x00A57 (Laser Yellow 2) - 0x00A52 - Colored Dots
158067 - 0x00A5B (Laser Yellow 3) - 0x00A57 - Colored Dots
158068 - 0x00A61 (Laser Blue 1) - 0x00A52 - Colored Dots
158069 - 0x00A64 (Laser Blue 2) - 0x00A61 & 0x00A57 - Colored Dots
158070 - 0x00A68 (Laser Blue 3) - 0x00A64 & 0x00A5B - Colored Dots
158700 - 0x0360D (Laser Panel) - 0x00A68 - True
Laser - 0x00509 (Laser) - 0x0360D
159001 - 0x03367 (Glass Factory Black Line EP) - True - True
Expand Down Expand Up @@ -285,7 +285,7 @@ Quarry Stoneworks Middle Floor (Quarry Stoneworks) - Quarry Stoneworks Lift - Tr
158125 - 0x00E0C (Lower Row 1) - True - Dots & Eraser
158126 - 0x01489 (Lower Row 2) - 0x00E0C - Dots & Eraser
158127 - 0x0148A (Lower Row 3) - 0x01489 - Dots & Eraser
158128 - 0x014D9 (Lower Row 4) - 0x0148A - Dots & Full Dots & Eraser
158128 - 0x014D9 (Lower Row 4) - 0x0148A - Full Dots & Eraser
158129 - 0x014E7 (Lower Row 5) - 0x014D9 - Dots
158130 - 0x014E8 (Lower Row 6) - 0x014E7 - Dots & Eraser

Expand Down Expand Up @@ -336,12 +336,12 @@ Quarry Boathouse Upper Back (Quarry Boathouse) - Quarry Boathouse Upper Middle -
158155 - 0x38663 (Second Barrier Panel) - True - True
Door - 0x3865F (Second Barrier) - 0x38663
158156 - 0x021B5 (Back First Row 1) - True - Stars & Eraser
158157 - 0x021B6 (Back First Row 2) - 0x021B5 - Stars & Stars + Same Colored Symbol & Eraser
158157 - 0x021B6 (Back First Row 2) - 0x021B5 - Stars + Same Colored Symbol & Eraser
158158 - 0x021B7 (Back First Row 3) - 0x021B6 - Stars & Eraser
158159 - 0x021BB (Back First Row 4) - 0x021B7 - Stars & Stars + Same Colored Symbol & Eraser
158160 - 0x09DB5 (Back First Row 5) - 0x021BB - Stars & Stars + Same Colored Symbol & Eraser
158161 - 0x09DB1 (Back First Row 6) - 0x09DB5 - Stars & Stars + Same Colored Symbol & Eraser
158162 - 0x3C124 (Back First Row 7) - 0x09DB1 - Stars & Stars + Same Colored Symbol & Eraser
158159 - 0x021BB (Back First Row 4) - 0x021B7 - Stars + Same Colored Symbol & Eraser
158160 - 0x09DB5 (Back First Row 5) - 0x021BB - Stars + Same Colored Symbol & Eraser
158161 - 0x09DB1 (Back First Row 6) - 0x09DB5 - Stars + Same Colored Symbol & Eraser
158162 - 0x3C124 (Back First Row 7) - 0x09DB1 - Stars + Same Colored Symbol & Eraser
158163 - 0x09DB3 (Back First Row 8) - 0x3C124 - Stars & Eraser & Shapers
158164 - 0x09DB4 (Back First Row 9) - 0x09DB3 - Stars & Eraser & Shapers
158165 - 0x275FA (Hook Control) - True - Shapers & Eraser
Expand Down Expand Up @@ -535,11 +535,11 @@ Door - 0x0A0C9 (Cargo Box Entry) - 0x0A0C8
158221 - 0x28AE3 (Vines) - 0x18590 - True
158222 - 0x28938 (Apple Tree) - 0x28AE3 - True
158223 - 0x079DF (Triple Exit) - 0x28938 - True
158235 - 0x2899C (Wooden Roof Lower Row 1) - True - Rotated Shapers & Dots & Full Dots
158236 - 0x28A33 (Wooden Roof Lower Row 2) - 0x2899C - Shapers & Rotated Shapers & Dots & Full Dots
158237 - 0x28ABF (Wooden Roof Lower Row 3) - 0x28A33 - Shapers & Rotated Shapers & Dots & Full Dots
158238 - 0x28AC0 (Wooden Roof Lower Row 4) - 0x28ABF - Rotated Shapers & Dots & Full Dots
158239 - 0x28AC1 (Wooden Roof Lower Row 5) - 0x28AC0 - Rotated Shapers & Dots & Full Dots
158235 - 0x2899C (Wooden Roof Lower Row 1) - True - Rotated Shapers & Full Dots
158236 - 0x28A33 (Wooden Roof Lower Row 2) - 0x2899C - Shapers & Rotated Shapers & Full Dots
158237 - 0x28ABF (Wooden Roof Lower Row 3) - 0x28A33 - Shapers & Rotated Shapers & Full Dots
158238 - 0x28AC0 (Wooden Roof Lower Row 4) - 0x28ABF - Rotated Shapers & Full Dots
158239 - 0x28AC1 (Wooden Roof Lower Row 5) - 0x28AC0 - Rotated Shapers & Full Dots
Door - 0x034F5 (Wooden Roof Stairs) - 0x28AC1
158225 - 0x28998 (RGB House Entry Panel) - True - Stars & Rotated Shapers
Door - 0x28A61 (RGB House Entry) - 0x28998
Expand Down Expand Up @@ -924,28 +924,28 @@ Treehouse Second Purple Bridge (Treehouse) - Treehouse Left Orange Bridge - 0x17
158368 - 0x17DC6 (Second Purple Bridge 7) - 0x17D91 - Stars & Colored Squares

Treehouse Left Orange Bridge (Treehouse) - Treehouse Laser Room Front Platform - 0x17DDB - Treehouse Laser Room Back Platform - 0x17DDB - Treehouse Burned House - 0x17DDB:
158376 - 0x17DB3 (Left Orange Bridge 1) - True - Stars & Black/White Squares & Stars + Same Colored Symbol
158376 - 0x17DB3 (Left Orange Bridge 1) - True - Black/White Squares & Stars + Same Colored Symbol
158377 - 0x17DB5 (Left Orange Bridge 2) - 0x17DB3 - Stars & Black/White Squares
158378 - 0x17DB6 (Left Orange Bridge 3) - 0x17DB5 - Stars & Black/White Squares & Stars + Same Colored Symbol
158379 - 0x17DC0 (Left Orange Bridge 4) - 0x17DB6 - Stars & Black/White Squares & Stars + Same Colored Symbol
158380 - 0x17DD7 (Left Orange Bridge 5) - 0x17DC0 - Stars & Black/White Squares & Stars + Same Colored Symbol
158381 - 0x17DD9 (Left Orange Bridge 6) - 0x17DD7 - Stars & Black/White Squares & Colored Squares & Stars + Same Colored Symbol
158382 - 0x17DB8 (Left Orange Bridge 7) - 0x17DD9 - Stars & Black/White Squares & Colored Squares & Stars + Same Colored Symbol
158383 - 0x17DDC (Left Orange Bridge 8) - 0x17DB8 - Stars & Colored Squares & Stars + Same Colored Symbol
158384 - 0x17DD1 (Left Orange Bridge 9 & Directional) - 0x17DDC - Stars & Colored Squares & Stars + Same Colored Symbol
158385 - 0x17DDE (Left Orange Bridge 10) - 0x17DD1 - Stars & Colored Squares & Stars + Same Colored Symbol
158386 - 0x17DE3 (Left Orange Bridge 11) - 0x17DDE - Stars & Colored Squares & Stars + Same Colored Symbol
158387 - 0x17DEC (Left Orange Bridge 12) - 0x17DE3 - Stars & Black/White Squares & Stars + Same Colored Symbol
158388 - 0x17DAE (Left Orange Bridge 13) - 0x17DEC - Stars & Black/White Squares & Stars + Same Colored Symbol
158389 - 0x17DB0 (Left Orange Bridge 14) - 0x17DAE - Stars & Black/White Squares & Stars + Same Colored Symbol
158390 - 0x17DDB (Left Orange Bridge 15) - 0x17DB0 - Stars & Black/White Squares & Stars + Same Colored Symbol
158378 - 0x17DB6 (Left Orange Bridge 3) - 0x17DB5 - Black/White Squares & Stars + Same Colored Symbol
158379 - 0x17DC0 (Left Orange Bridge 4) - 0x17DB6 - Black/White Squares & Stars + Same Colored Symbol
158380 - 0x17DD7 (Left Orange Bridge 5) - 0x17DC0 - Black/White Squares & Stars + Same Colored Symbol
158381 - 0x17DD9 (Left Orange Bridge 6) - 0x17DD7 - Black/White Squares & Colored Squares & Stars + Same Colored Symbol
158382 - 0x17DB8 (Left Orange Bridge 7) - 0x17DD9 - Black/White Squares & Colored Squares & Stars + Same Colored Symbol
158383 - 0x17DDC (Left Orange Bridge 8) - 0x17DB8 - Colored Squares & Stars + Same Colored Symbol
158384 - 0x17DD1 (Left Orange Bridge 9 & Directional) - 0x17DDC - Colored Squares & Stars + Same Colored Symbol
158385 - 0x17DDE (Left Orange Bridge 10) - 0x17DD1 - Colored Squares & Stars + Same Colored Symbol
158386 - 0x17DE3 (Left Orange Bridge 11) - 0x17DDE - Colored Squares & Stars + Same Colored Symbol
158387 - 0x17DEC (Left Orange Bridge 12) - 0x17DE3 - Black/White Squares & Stars + Same Colored Symbol
158388 - 0x17DAE (Left Orange Bridge 13) - 0x17DEC - Black/White Squares & Stars + Same Colored Symbol
158389 - 0x17DB0 (Left Orange Bridge 14) - 0x17DAE - Black/White Squares & Stars + Same Colored Symbol
158390 - 0x17DDB (Left Orange Bridge 15) - 0x17DB0 - Black/White Squares & Stars + Same Colored Symbol

Treehouse Green Bridge (Treehouse) - Treehouse Green Bridge Front House - 0x17E61 - Treehouse Green Bridge Left House - 0x17E61:
158369 - 0x17E3C (Green Bridge 1) - True - Stars & Shapers
158370 - 0x17E4D (Green Bridge 2) - 0x17E3C - Stars & Shapers
158371 - 0x17E4F (Green Bridge 3) - 0x17E4D - Stars & Shapers & Rotated Shapers
158372 - 0x17E52 (Green Bridge 4 & Directional) - 0x17E4F - Stars & Rotated Shapers
158373 - 0x17E5B (Green Bridge 5) - 0x17E52 - Stars & Shapers & Stars + Same Colored Symbol
158373 - 0x17E5B (Green Bridge 5) - 0x17E52 - Shapers & Stars + Same Colored Symbol
158374 - 0x17E5F (Green Bridge 6) - 0x17E5B - Stars & Negative Shapers & Rotated Shapers
158375 - 0x17E61 (Green Bridge 7) - 0x17E5F - Stars & Shapers & Rotated Shapers

Expand Down Expand Up @@ -1032,8 +1032,8 @@ Door - 0x09E54 (Exit) - 0x09EAF & 0x09F6E & 0x09E6B & 0x09E7B
Mountain Floor 2 (Mountain Floor 2) - Mountain Floor 2 Light Bridge Room Near - 0x09FFB - Mountain Floor 2 Beyond Bridge - 0x09E86 - Mountain Floor 2 Above The Abyss - True - Mountain Pink Bridge EP - TrueOneWay:
158426 - 0x09FD3 (Near Row 1) - True - Colored Squares
158427 - 0x09FD4 (Near Row 2) - 0x09FD3 - Colored Squares & Dots
158428 - 0x09FD6 (Near Row 3) - 0x09FD4 - Stars & Colored Squares & Stars + Same Colored Symbol
158429 - 0x09FD7 (Near Row 4) - 0x09FD6 - Stars & Colored Squares & Stars + Same Colored Symbol & Shapers
158428 - 0x09FD6 (Near Row 3) - 0x09FD4 - Colored Squares & Stars + Same Colored Symbol
158429 - 0x09FD7 (Near Row 4) - 0x09FD6 - Colored Squares & Stars + Same Colored Symbol & Shapers
158430 - 0x09FD8 (Near Row 5) - 0x09FD7 - Colored Squares
Door - 0x09FFB (Staircase Near) - 0x09FD8

Expand Down Expand Up @@ -1081,9 +1081,9 @@ Door - 0x17F33 (Rock Open) - 0x17FA2 | 0x334E1
Mountain Bottom Floor Pillars Room (Mountain Bottom Floor) - Elevator - 0x339BB & 0x33961:
158522 - 0x0383A (Right Pillar 1) - True - Stars
158523 - 0x09E56 (Right Pillar 2) - 0x0383A - Stars & Dots
158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Dots & Full Dots
158524 - 0x09E5A (Right Pillar 3) - 0x09E56 - Full Dots
158525 - 0x33961 (Right Pillar 4) - 0x09E5A - Dots & Symmetry
158526 - 0x0383D (Left Pillar 1) - True - Dots & Full Dots
158526 - 0x0383D (Left Pillar 1) - True - Full Dots
158527 - 0x0383F (Left Pillar 2) - 0x0383D - Black/White Squares
158528 - 0x03859 (Left Pillar 3) - 0x0383F - Shapers
158529 - 0x339BB (Left Pillar 4) - 0x03859 - Black/White Squares & Stars & Symmetry
Expand Down Expand Up @@ -1132,17 +1132,17 @@ Caves (Caves) - Main Island - 0x2D73F | 0x2D859 - Caves Path to Challenge - 0x01
158472 - 0x32962 (First Floor Left) - True - Rotated Shapers & Shapers
158473 - 0x32966 (First Floor Grounded) - True - Stars & Black/White Squares
158474 - 0x01A31 (First Floor Middle) - True - Colored Squares
158475 - 0x00B71 (First Floor Right) - True - Colored Squares & Stars & Stars + Same Colored Symbol & Eraser
158475 - 0x00B71 (First Floor Right) - True - Colored Squares & Stars + Same Colored Symbol & Eraser
158478 - 0x288EA (First Wooden Beam) - True - Rotated Shapers
158479 - 0x288FC (Second Wooden Beam) - True - Black/White Squares & Shapers & Rotated Shapers
158480 - 0x289E7 (Third Wooden Beam) - True - Black/White Squares
158481 - 0x288AA (Fourth Wooden Beam) - True - Black/White Squares & Shapers
158482 - 0x17FB9 (Left Upstairs Single) - True - Dots
158483 - 0x0A16B (Left Upstairs Left Row 1) - True - Dots & Full Dots
158484 - 0x0A2CE (Left Upstairs Left Row 2) - 0x0A16B - Dots & Full Dots
158485 - 0x0A2D7 (Left Upstairs Left Row 3) - 0x0A2CE - Dots & Full Dots
158486 - 0x0A2DD (Left Upstairs Left Row 4) - 0x0A2D7 - Dots & Full Dots
158487 - 0x0A2EA (Left Upstairs Left Row 5) - 0x0A2DD - Dots & Full Dots
158483 - 0x0A16B (Left Upstairs Left Row 1) - True - Full Dots
158484 - 0x0A2CE (Left Upstairs Left Row 2) - 0x0A16B - Full Dots
158485 - 0x0A2D7 (Left Upstairs Left Row 3) - 0x0A2CE - Full Dots
158486 - 0x0A2DD (Left Upstairs Left Row 4) - 0x0A2D7 - Full Dots
158487 - 0x0A2EA (Left Upstairs Left Row 5) - 0x0A2DD - Full Dots
158488 - 0x0008F (Right Upstairs Left Row 1) - True - Dots & Invisible Dots
158489 - 0x0006B (Right Upstairs Left Row 2) - 0x0008F - Dots & Invisible Dots
158490 - 0x0008B (Right Upstairs Left Row 3) - 0x0006B - Dots & Invisible Dots
Expand All @@ -1163,7 +1163,7 @@ Door - 0x2D859 (Swamp Shortcut Door) - 0x17CF2
159341 - 0x3397C (Skylight EP) - True - True

Caves Path to Challenge (Caves) - Challenge - 0x0A19A:
158477 - 0x0A16E (Challenge Entry Panel) - True - Stars & Shapers & Stars + Same Colored Symbol
158477 - 0x0A16E (Challenge Entry Panel) - True - Shapers & Stars + Same Colored Symbol
Door - 0x0A19A (Challenge Entry) - 0x0A16E

==Challenge==
Expand Down
Loading
Loading