Add and update presets for Grid Layout Shuffle

2026-02-08 22:07:08 +01:00
parent 78c389e2d5
commit b8884e9010
26 changed files with 712 additions and 2 deletions
--- a/presets/world/owr_blockshuffle.yaml
+++ b/presets/world/owr_blockshuffle.yaml
@@ -1,5 +1,6 @@
-meta:
-  players: 1
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_checkerboardshuffle.yaml
+++ b/presets/world/owr_checkerboardshuffle.yaml
@@ -0,0 +1,140 @@
+settings:
+  1:
+    ow_layout: grid
+ow-grid:
+  1:
+    restricted_positions:
+      - cells:
+          - 0x00
+          - 0x02
+          - 0x04
+          - 0x06
+          - 0x09
+          - 0x0B
+          - 0x0D
+          - 0x0F
+          - 0x10
+          - 0x12
+          - 0x14
+          - 0x16
+          - 0x19
+          - 0x1B
+          - 0x1D
+          - 0x1F
+          - 0x20
+          - 0x22
+          - 0x24
+          - 0x26
+          - 0x29
+          - 0x2B
+          - 0x2D
+          - 0x2F
+          - 0x30
+          - 0x32
+          - 0x34
+          - 0x36
+          - 0x39
+          - 0x3B
+          - 0x3D
+          - 0x3F
+        positions:
+          - 0x00
+          - 0x02
+          - 0x04
+          - 0x06
+          - 0x09
+          - 0x0B
+          - 0x0D
+          - 0x0F
+          - 0x10
+          - 0x12
+          - 0x14
+          - 0x16
+          - 0x19
+          - 0x1B
+          - 0x1D
+          - 0x1F
+          - 0x20
+          - 0x22
+          - 0x24
+          - 0x26
+          - 0x29
+          - 0x2B
+          - 0x2D
+          - 0x2F
+          - 0x30
+          - 0x32
+          - 0x34
+          - 0x36
+          - 0x39
+          - 0x3B
+          - 0x3D
+          - 0x3F
+        world: both
+      - cells:
+          - 0x01
+          - 0x03
+          - 0x05
+          - 0x07
+          - 0x08
+          - 0x0A
+          - 0x0C
+          - 0x0E
+          - 0x11
+          - 0x13
+          - 0x15
+          - 0x17
+          - 0x18
+          - 0x1A
+          - 0x1C
+          - 0x1E
+          - 0x21
+          - 0x23
+          - 0x25
+          - 0x27
+          - 0x28
+          - 0x2A
+          - 0x2C
+          - 0x2E
+          - 0x31
+          - 0x33
+          - 0x35
+          - 0x37
+          - 0x38
+          - 0x3A
+          - 0x3C
+          - 0x3E
+        positions:
+          - 0x01
+          - 0x03
+          - 0x05
+          - 0x07
+          - 0x08
+          - 0x0A
+          - 0x0C
+          - 0x0E
+          - 0x11
+          - 0x13
+          - 0x15
+          - 0x17
+          - 0x18
+          - 0x1A
+          - 0x1C
+          - 0x1E
+          - 0x21
+          - 0x23
+          - 0x25
+          - 0x27
+          - 0x28
+          - 0x2A
+          - 0x2C
+          - 0x2E
+          - 0x31
+          - 0x33
+          - 0x35
+          - 0x37
+          - 0x38
+          - 0x3A
+          - 0x3C
+          - 0x3E
+        world: both
--- a/presets/world/owr_quadrantshuffle-diagonal.yaml
+++ b/presets/world/owr_quadrantshuffle-diagonal.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    groups:
--- a/presets/world/owr_quadrantshuffle-full.yaml
+++ b/presets/world/owr_quadrantshuffle-full.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    groups:
--- a/presets/world/owr_quadrantshuffle-grid.yaml
+++ b/presets/world/owr_quadrantshuffle-grid.yaml
@@ -0,0 +1,147 @@
+settings:
+  1:
+    ow_layout: grid
+ow-grid:
+  1:
+    restricted_positions:
+      - cells:
+          - 0x00
+          - 0x01
+          - 0x02
+          - 0x03
+          - 0x08
+          - 0x09
+          - 0x0A
+          - 0x0B
+          - 0x10
+          - 0x11
+          - 0x12
+          - 0x13
+          - 0x18
+          - 0x19
+          - 0x1A
+          - 0x1B
+        positions:
+          - 0x00
+          - 0x01
+          - 0x02
+          - 0x03
+          - 0x08
+          - 0x09
+          - 0x0A
+          - 0x0B
+          - 0x10
+          - 0x11
+          - 0x12
+          - 0x13
+          - 0x18
+          - 0x19
+          - 0x1A
+          - 0x1B
+        world: both
+      - cells:
+          - 0x20
+          - 0x21
+          - 0x22
+          - 0x23
+          - 0x28
+          - 0x29
+          - 0x2A
+          - 0x2B
+          - 0x30
+          - 0x31
+          - 0x32
+          - 0x33
+          - 0x38
+          - 0x39
+          - 0x3A
+          - 0x3B
+        positions:
+          - 0x20
+          - 0x21
+          - 0x22
+          - 0x23
+          - 0x28
+          - 0x29
+          - 0x2A
+          - 0x2B
+          - 0x30
+          - 0x31
+          - 0x32
+          - 0x33
+          - 0x38
+          - 0x39
+          - 0x3A
+          - 0x3B
+        world: both
+      - cells:
+          - 0x04
+          - 0x05
+          - 0x06
+          - 0x07
+          - 0x0C
+          - 0x0D
+          - 0x0E
+          - 0x0F
+          - 0x14
+          - 0x15
+          - 0x16
+          - 0x17
+          - 0x1C
+          - 0x1D
+          - 0x1E
+          - 0x1F
+        positions:
+          - 0x04
+          - 0x05
+          - 0x06
+          - 0x07
+          - 0x0C
+          - 0x0D
+          - 0x0E
+          - 0x0F
+          - 0x14
+          - 0x15
+          - 0x16
+          - 0x17
+          - 0x1C
+          - 0x1D
+          - 0x1E
+          - 0x1F
+        world: both
+      - cells:
+          - 0x24
+          - 0x25
+          - 0x26
+          - 0x27
+          - 0x2C
+          - 0x2D
+          - 0x2E
+          - 0x2F
+          - 0x34
+          - 0x35
+          - 0x36
+          - 0x37
+          - 0x3C
+          - 0x3D
+          - 0x3E
+          - 0x3F
+        positions:
+          - 0x24
+          - 0x25
+          - 0x26
+          - 0x27
+          - 0x2C
+          - 0x2D
+          - 0x2E
+          - 0x2F
+          - 0x34
+          - 0x35
+          - 0x36
+          - 0x37
+          - 0x3C
+          - 0x3D
+          - 0x3E
+          - 0x3F
+        world: both
+    split_large_screens: true
--- a/presets/world/owr_quadrantshuffle-vanillaborders.yaml
+++ b/presets/world/owr_quadrantshuffle-vanillaborders.yaml
@@ -1,5 +1,6 @@
 settings:
  1:
+    ow_layout: wild
    ow_whirlpool: false
 ow-edges:
  1:
--- a/presets/world/owr_ringshuffle-borders.yaml
+++ b/presets/world/owr_ringshuffle-borders.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_ringshuffle-full.yaml
+++ b/presets/world/owr_ringshuffle-full.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    groups:
--- a/presets/world/owr_ringshuffle-grid.yaml
+++ b/presets/world/owr_ringshuffle-grid.yaml
@@ -0,0 +1,147 @@
+settings:
+  1:
+    ow_layout: grid
+ow-grid:
+  1:
+    restricted_positions:
+      - cells:
+          - 0x00
+          - 0x01
+          - 0x02
+          - 0x03
+          - 0x04
+          - 0x05
+          - 0x06
+          - 0x07
+          - 0x08
+          - 0x0F
+          - 0x10
+          - 0x17
+          - 0x18
+          - 0x1F
+          - 0x20
+          - 0x27
+          - 0x28
+          - 0x2F
+          - 0x30
+          - 0x37
+          - 0x38
+          - 0x39
+          - 0x3A
+          - 0x3B
+          - 0x3C
+          - 0x3D
+          - 0x3E
+          - 0x3F
+        positions:
+          - 0x00
+          - 0x01
+          - 0x02
+          - 0x03
+          - 0x04
+          - 0x05
+          - 0x06
+          - 0x07
+          - 0x08
+          - 0x0F
+          - 0x10
+          - 0x17
+          - 0x18
+          - 0x1F
+          - 0x20
+          - 0x27
+          - 0x28
+          - 0x2F
+          - 0x30
+          - 0x37
+          - 0x38
+          - 0x39
+          - 0x3A
+          - 0x3B
+          - 0x3C
+          - 0x3D
+          - 0x3E
+          - 0x3F
+        world: both
+      - cells:
+          - 0x09
+          - 0x0A
+          - 0x0B
+          - 0x0C
+          - 0x0D
+          - 0x0E
+          - 0x11
+          - 0x16
+          - 0x19
+          - 0x1E
+          - 0x21
+          - 0x26
+          - 0x29
+          - 0x2E
+          - 0x31
+          - 0x32
+          - 0x33
+          - 0x34
+          - 0x35
+          - 0x36
+        positions:
+          - 0x09
+          - 0x0A
+          - 0x0B
+          - 0x0C
+          - 0x0D
+          - 0x0E
+          - 0x11
+          - 0x16
+          - 0x19
+          - 0x1E
+          - 0x21
+          - 0x26
+          - 0x29
+          - 0x2E
+          - 0x31
+          - 0x32
+          - 0x33
+          - 0x34
+          - 0x35
+          - 0x36
+        world: both
+      - cells:
+          - 0x12
+          - 0x13
+          - 0x14
+          - 0x15
+          - 0x1A
+          - 0x1D
+          - 0x22
+          - 0x25
+          - 0x2A
+          - 0x2B
+          - 0x2C
+          - 0x2D
+        positions:
+          - 0x12
+          - 0x13
+          - 0x14
+          - 0x15
+          - 0x1A
+          - 0x1D
+          - 0x22
+          - 0x25
+          - 0x2A
+          - 0x2B
+          - 0x2C
+          - 0x2D
+        world: both
+      - cells:
+          - 0x1B
+          - 0x1C
+          - 0x23
+          - 0x24
+        positions:
+          - 0x1B
+          - 0x1C
+          - 0x23
+          - 0x24
+        world: both
+    split_large_screens: true
--- a/presets/world/owr_ringshuffle-interiors.yaml
+++ b/presets/world/owr_ringshuffle-interiors.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-dark.yaml
+++ b/presets/world/owr_shuffle-dark.yaml
@@ -1,5 +1,6 @@
 settings:
  1:
+    ow_parallel: false
    ow_whirlpool: false
 ow-edges:
  1:
@@ -77,6 +78,25 @@ ow-edges:
      Desert Pass EC*: Dam WC*
      Desert Pass ES*: Dam WS*
      Dam EC*: South Pass WC*
+ow-grid:
+  1:
+    fixed_arrangements:
+      - arrangement:
+          - 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07
+          - 0x08 0x09 0x0A 0x0B 0x0C 0x0D 0x0E 0x0F
+          - 0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17
+          - 0x18 0x19 0x1A 0x1B 0x1C 0x1D 0x1E 0x1F
+          - 0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27
+          - 0x28 0x29 0x2A 0x2B 0x2C 0x2D 0x2E 0x2F
+          - 0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37
+          - 0x38 0x39 0x3A 0x3B 0x3C 0x3D 0x3E 0x3F
+        world: light
+    restricted_positions:
+      - cells:
+          - 0x00
+        positions:
+          - 0x00
+        world: light
 ow-whirlpools:
  1:
    two-way:
--- a/presets/world/owr_shuffle-horizontal.yaml
+++ b/presets/world/owr_shuffle-horizontal.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-horizontalbycolumns.yaml
+++ b/presets/world/owr_shuffle-horizontalbycolumns.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-largescreenpool.yaml
+++ b/presets/world/owr_shuffle-largescreenpool.yaml
@@ -0,0 +1,149 @@
+settings:
+  1:
+    ow_layout: grid
+ow-grid:
+  1:
+    restricted_positions:
+      - cells:
+          - 0x00
+          - 0x03
+          - 0x05
+          - 0x18
+          - 0x1B
+          - 0x1E
+          - 0x30
+          - 0x35
+        positions:
+          - 0x00
+          - 0x03
+          - 0x05
+          - 0x18
+          - 0x1B
+          - 0x1E
+          - 0x30
+          - 0x35
+        world: both
+      - cells:
+          - 0x01
+          - 0x04
+          - 0x06
+          - 0x19
+          - 0x1C
+          - 0x1F
+          - 0x31
+          - 0x36
+        positions:
+          - 0x01
+          - 0x04
+          - 0x06
+          - 0x19
+          - 0x1C
+          - 0x1F
+          - 0x31
+          - 0x36
+        world: both
+      - cells:
+          - 0x08
+          - 0x0B
+          - 0x0D
+          - 0x20
+          - 0x23
+          - 0x26
+          - 0x38
+          - 0x3D
+        positions:
+          - 0x08
+          - 0x0B
+          - 0x0D
+          - 0x20
+          - 0x23
+          - 0x26
+          - 0x38
+          - 0x3D
+        world: both
+      - cells:
+          - 0x09
+          - 0x0C
+          - 0x0E
+          - 0x21
+          - 0x24
+          - 0x27
+          - 0x39
+          - 0x3E
+        positions:
+          - 0x09
+          - 0x0C
+          - 0x0E
+          - 0x21
+          - 0x24
+          - 0x27
+          - 0x39
+          - 0x3E
+        world: both
+      - cells:
+          - 0x02
+          - 0x07
+          - 0x0A
+          - 0x0F
+          - 0x10
+          - 0x11
+          - 0x12
+          - 0x13
+          - 0x14
+          - 0x15
+          - 0x16
+          - 0x17
+          - 0x1A
+          - 0x1D
+          - 0x22
+          - 0x25
+          - 0x28
+          - 0x29
+          - 0x2A
+          - 0x2B
+          - 0x2C
+          - 0x2D
+          - 0x2E
+          - 0x2F
+          - 0x32
+          - 0x33
+          - 0x34
+          - 0x37
+          - 0x3A
+          - 0x3B
+          - 0x3C
+          - 0x3F
+        positions:
+          - 0x02
+          - 0x07
+          - 0x0A
+          - 0x0F
+          - 0x10
+          - 0x11
+          - 0x12
+          - 0x13
+          - 0x14
+          - 0x15
+          - 0x16
+          - 0x17
+          - 0x1A
+          - 0x1D
+          - 0x22
+          - 0x25
+          - 0x28
+          - 0x29
+          - 0x2A
+          - 0x2B
+          - 0x2C
+          - 0x2D
+          - 0x2E
+          - 0x2F
+          - 0x32
+          - 0x33
+          - 0x34
+          - 0x37
+          - 0x3A
+          - 0x3B
+          - 0x3C
+          - 0x3F
+        world: both
--- a/presets/world/owr_shuffle-largescreens.yaml
+++ b/presets/world/owr_shuffle-largescreens.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 settings:
  1:
    ow_whirlpool: false
--- a/presets/world/owr_shuffle-light.yaml
+++ b/presets/world/owr_shuffle-light.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_parallel: false
 ow-edges:
  1:
    two-way:
@@ -69,6 +72,25 @@ ow-edges:
      Swamp Nook EC*: Swamp WC*
      Swamp Nook ES*: Swamp WS*
      Swamp EC*: Dark South Pass WC*
+ow-grid:
+  1:
+    fixed_arrangements:
+      - arrangement:
+          - 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07
+          - 0x08 0x09 0x0A 0x0B 0x0C 0x0D 0x0E 0x0F
+          - 0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17
+          - 0x18 0x19 0x1A 0x1B 0x1C 0x1D 0x1E 0x1F
+          - 0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27
+          - 0x28 0x29 0x2A 0x2B 0x2C 0x2D 0x2E 0x2F
+          - 0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37
+          - 0x38 0x39 0x3A 0x3B 0x3C 0x3D 0x3E 0x3F
+        world: dark
+    restricted_positions:
+      - cells:
+          - 0x00
+        positions:
+          - 0x00
+        world: dark
 ow-whirlpools:
  1:
    two-way:
--- a/presets/world/owr_shuffle-separatemountain.yaml
+++ b/presets/world/owr_shuffle-separatemountain.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    groups:
--- a/presets/world/owr_shuffle-smallscreens.yaml
+++ b/presets/world/owr_shuffle-smallscreens.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-splitsimilar.yaml
+++ b/presets/world/owr_shuffle-splitsimilar.yaml
@@ -1,5 +1,6 @@
 settings:
  1:
+    ow_layout: wild
    ow_terrain: false
 ow-edges:
  1:
--- a/presets/world/owr_shuffle-splitsimilarterrain.yaml
+++ b/presets/world/owr_shuffle-splitsimilarterrain.yaml
@@ -1,5 +1,6 @@
 settings:
  1:
+    ow_layout: wild
    ow_terrain: true
 ow-edges:
  1:
--- a/presets/world/owr_shuffle-vanillaloop.yaml
+++ b/presets/world/owr_shuffle-vanillaloop.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-vanillamountain.yaml
+++ b/presets/world/owr_shuffle-vanillamountain.yaml
@@ -0,0 +1,16 @@
+ow-edges:
+  1:
+    two-way:
+      West Death Mountain EN*: East Death Mountain WN*
+      West Death Mountain ES*: East Death Mountain WS*
+      East Death Mountain EN*: Death Mountain TR Pegs WN*
+      West Dark Death Mountain EN*: East Dark Death Mountain WN*
+      West Dark Death Mountain ES*: East Dark Death Mountain WS*
+      East Dark Death Mountain EN*: Turtle Rock WN*
+ow-grid:
+  1:
+    fixed_arrangements:
+      - arrangement:
+          - 0x03 0x04 0x05 0x06 0x07
+          - 0x0B 0x0C 0x0D 0x0E    .
+        world: both
--- a/presets/world/owr_shuffle-vertical.yaml
+++ b/presets/world/owr_shuffle-vertical.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-verticalbyrows.yaml
+++ b/presets/world/owr_shuffle-verticalbyrows.yaml
@@ -1,3 +1,6 @@
+settings:
+  1:
+    ow_layout: wild
 ow-edges:
  1:
    two-way:
--- a/presets/world/owr_shuffle-wrappedgrid.yaml
+++ b/presets/world/owr_shuffle-wrappedgrid.yaml
@@ -0,0 +1,7 @@
+settings:
+  1:
+    ow_layout: grid
+ow-grid:
+  1:
+    wrap_horizontal: true
+    wrap_vertical: true
--- a/presets/world/owr_vanilla.yaml
+++ b/presets/world/owr_vanilla.yaml
@@ -144,6 +144,25 @@ ow-edges:
      Swamp EC*: Dark South Pass WC*
      South Pass ES*: Lake Hylia WS*
      Dark South Pass ES*: Ice Lake WS*
+ow-grid:
+  1:
+    fixed_arrangements:
+      - arrangement:
+          - 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07
+          - 0x08 0x09 0x0A 0x0B 0x0C 0x0D 0x0E 0x0F
+          - 0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17
+          - 0x18 0x19 0x1A 0x1B 0x1C 0x1D 0x1E 0x1F
+          - 0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27
+          - 0x28 0x29 0x2A 0x2B 0x2C 0x2D 0x2E 0x2F
+          - 0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37
+          - 0x38 0x39 0x3A 0x3B 0x3C 0x3D 0x3E 0x3F
+        world: both
+    restricted_positions:
+      - cells:
+          - 0x00
+        positions:
+          - 0x00
+        world: both
 ow-whirlpools:
  1:
    two-way: