Version bump 0.1.9.0

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.1.9.0
+- Expanded Crossed OW to four separate options, see Readme for details
+- Crossed OW will now play a short SFX when changing worlds
+- Improved Link/Bunny state in Crossed OW
+- Fixed issue with TR Pegs when fluting directly from an area with hammerpegs
+- Updated OW GUI layout
+
 ### 0.1.8.2
 - Fixed issue with game crashing on using Flute
 - Fixed issues with Link/Bunny state in Crossed OW
@@ -7,7 +14,6 @@
 - Fixed issue with Mystery for OW boolean options
 - ~~Merged DR v0.5.1.0 - Major Keylogic Update~~
 
-
 ### 0.1.8.1
 - Fixed issue with activating flute in DW (OW Mixed)
 - Fixed issue with Parallel+Crossed not generating

OverworldShuffle.py

@@ -2,7 +2,7 @@ import RaceRandom as random, logging, copy
 from BaseClasses import OWEdge, WorldType, RegionType, Direction, Terrain, PolSlot, Entrance
 from OWEdges import OWTileRegions, OWTileGroups, OWEdgeGroups, OpenStd, parallel_links, IsParallel
 
-__version__ = '0.1.8.2-u'
+__version__ = '0.1.9.0-u'
 
 def link_overworld(world, player):
     # setup mandatory connections

README.md

@@ -9,20 +9,19 @@ See https://alttpr.com/ for more details on the normal randomizer.
 This is a very new mode of LTTPR so the tools and info is very limited.
 - There is an [OW Rando Cheat Sheet](https://zelda.codemann8.com/images/shared/ow-rando-reference-sheet.png) that shows all the transitions that exist and are candidates for shuffle.
 - There is OW tracking capability within the following trackers:
-  - CodeTracker, an [EmoTracker](https://emotracker.net) package for LTTPR
   - [Community Tracker](https://alttptracker.dunka.net/)
+  - CodeTracker, an [EmoTracker](https://emotracker.net) package for LTTPR
 - There is an [OW OWG Reference Sheet](https://zelda.codemann8.com/images/shared/ow-owg-reference-sheet.png) that shows all the in-logic places where boots/mirror clips and fake flippers are expected from the player.
 
 # Known Issues
-(Updated 2021-06-23)
+(Updated 2021-08-26)
 
 ### If you want to playtest this, know these things:
 - Big Red Bomb may require bomb duping as ledge drops may be in the way of your path to the Pyramid Fairy crack
 - If you fake flipper, beware of transitioning south. You could end up at the top of the waterfall in the southeast of either world. If you mistakenly drop down, it is important to NOT make any other movements and S+Q immediately when the game allows you to (might take several seconds, the game has to scroll back to the original point of water entry) or there will be a hardlock. Falling from the waterfall is avoidable but it is super easy to do as it is super close to the transition.
-- In Crossed OW Tile Swap, there are some interesting bunny water-walk situations that can occur, these are meant to be out-of-logic but beware of logic bugs around this area.
+- In Crossed OW, there are some interesting bunny swimming situations that can occur, these are meant to be out-of-logic but beware of logic bugs around this area. But also, hardlocks can occur; if you take damage, be sure to S+Q immediately before moving in any direction, or you may get an infinite screen wrap glitch.
 
 ### Known bugs:
-- ~~In Mixed OW Tile Swap, Smith and Stumpy have issues when their tiles are swapped. Progression cannot be found on them when these tiles are swapped~~ (Fixed in 0.1.6.4)
 - Screens that loop on itself and also have free-standing items, the sprites are duplicated and can cause item duplication
 - When OWG are performed to enter mega-tile screens (large OW screens), there is a small chance that an incorrect VRAM reference value causes the map graphics to offset in increments of 16 pixels
 
@@ -66,26 +65,58 @@ OW Transitions are shuffled, but both worlds will have a matching layout.
 
 OW Transitions are shuffled within each world separately.
 
-## Crossed (--ow_crossed)
+## Crossed Options (--ow_crossed)
 
 This allows OW connections to be shuffled cross-world.
 
-## Visual Representation of Main OW Shuffle Settings
+Polar and Grouped both are guaranteed to result in two separated planes of tiles. To navigate to the other plane, you have the following methods: 1) Normal portals 2) Mirroring on DW tiles 3) Fluting to a LW tile that was previously unreachable
 
-![OW Shuffle Settings Combination](https://zelda.codemann8.com/images/shared/ow-modes.gif)
+Limited and Chaos are not bound to follow a two-plane framework. This means that it could be possible to travel on foot to every tile without entering a normal portal.
+
+See each option to get more details on the differences.
+
+### None
+
+Transitions will remain same-world.
+
+### Polar
+
+Only effective if Mixed/Tile Swap is enabled. Enabling Polar preserves the original/vanilla connections even when tiles are swapped/mixed. This results in a completely vanilla overworld, except that some tiles will transform Link to a Bunny (as per Mixed swapping some tiles to the other world). This offers an interesting twist on Mixed where you have a pre-conditioned knowledge of the terrain you will encounter, but not necessarily be able to do what you need to do there. (see Tile Swap/Mixed section for more details)
+
+### Grouped
+
+This option shuffles connections cross-world in the same manner as Tile Swap/Mixed, the connections leading in and coming out of a group of tiles are crossed. Unlike Polar, this uses a different set of tile groups as a basis of crossing connections, albeit the same rule govern which groups of tiles must cross together (see Tile Swap/Mixed for more details)
+
+### Limited
+
+Every transition independently is a candidate to be chosen as a cross-world connection, however only 9 transitions become crossed (in each world). This option abides by the Keep Similar Edges Together option and will guarantee same effect on all edges in a Similar Edge group if enabled. If a Similar Edge group is chosen from the pool of candidates, it only counts as one portal, not multiple.
+
+Note: Only parallel connections (a connection that also exists in the opposite world) are considered for cross-world connections, which means that the same connection in the opposite world will also connect cross-world.
+
+Motive: Why 9 connections? To imitate the effect of the 9 standard portals that exist.
+
+### Chaos
+
+Same as Limited, except that there is no limit to the number of cross-world connections that are made. Each transition has an equal 50/50 chance of being a crossed connection.
 
 ## Keep Similar Edges Together (--ow_keepsimilar)
 
 This keeps similar edge transitions together. ie. The 2 west edges of Potion Shop will be paired to another set of two similar edges
 
-## Mixed Overworld (--ow_mixed)
+Note: This affects OW Layout Shuffle mostly, but also affects Limited and Chaos modes in Crossed OW.
 
-OW tiles are randomly chosen to become a part of the opposite world
+## Tile Swap / Mixed Overworld (--ow_mixed)
+
+OW tiles are randomly chosen to become a part of the opposite world. When on the Overworld, there will be an L or D in the upper left corner, indicating which world you are currently in. Mirroring still works the same, you must be in the DW to mirror to the LW.
+
+Note: Tiles are put into groups that must be shuffled together when certain settings are enabled. For instance, if ER is disabled, then any tiles that have a connector cave that leads to another tile, those tiles must swap together; (an exception to this is the Old Man Rescue cave which has been modified similar to how Inverted modifies it, Old Man Rescue is ALWAYS accessible from the Light World)
 
 ## Flute Shuffle (--ow_fluteshuffle)
 
 When enabled, new flute spots are generated and gives the player the option to cancel out of the flute menu by pressing X.
 
+Note: Desert Teleporter Ledge is always guaranteed to be chosen. One of the three Mountain tiles are guaranteed if OW Layout Shuffle is set to Vanilla.
+
 ### Vanilla
 
 Flute spots remain unchanged.
@@ -114,10 +145,10 @@ Show the help message and exit.
 For specifying the overworld layout shuffle you want as above. (default: vanilla)
 
 ```
---ow_crossed
+--ow_crossed <mode>
 ```
 
-This allows cross-world connections on the overworld
+For specifying the type of cross-world connections  you want on the overworld
 
 ```
 --ow_keepsimilar