epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust point sequences for RA beach segments

Browse Source 
The TEMPERAT and SNOW tilesets' MultiBrush segment definitions used
inconsistent conventions for vertical and horizontal beaches. This
meant that:

- Tiling was biased to produce horizontally wider bodies of water.
- Vertical beaches did not line up with watercliffs when connecting.

This change redefines the point sequences to fix these issues.
This commit is contained in:
Ashley Newson
2025-08-17 19:31:24 +01:00
committed by Gustas Kažukauskas
parent c3b22c9102
commit 7cd7b32042
2 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mods/ra/tilesets/snow.yaml
View File

@@ -3296,49 +3296,49 @@ MultiBrushCollections:
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 4,5, 4,4, 3,4, 3,3, 2,3, 1,3, 1,2, 1,1, 1,0 Points: 5,5, 5,4, 4,4, 4,3, 3,3, 3,2, 2,2, 2,1, 2,0
MultiBrush@16: MultiBrush@16:
Template: 16 Template: 16
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 2,4, 1,4, 1,3, 1,2, 0,2, 0,1, 0,0 Points: 3,4, 3,3, 2,3, 2,2, 2,1, 1,1, 1,0
MultiBrush@17: MultiBrush@17:
Template: 17 Template: 17
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 3,3, 2,3, 2,2, 1,2, 1,1, 1,0 Points: 4,3, 4,2, 3,2, 3,1, 2,1, 2,0
MultiBrush@18: MultiBrush@18:
Template: 18 Template: 18
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 1,3, 1,2, 1,1, 1,0 Points: 2,3, 2,2, 2,1, 2,0
MultiBrush@19: MultiBrush@19:
Template: 19 Template: 19
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 0,1, 0,0 Points: 1,1, 1,0
MultiBrush@21: MultiBrush@21:
Template: 21 Template: 21
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 0,5, 1,5, 1,4, 1,3, 0,3, 0,2, 1,2, 1,1, 2,1, 2,0 Points: 1,5, 2,5, 2,4, 2,3, 2,2, 2,1, 3,1, 3,0
MultiBrush@22: MultiBrush@22:
Template: 22 Template: 22
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 1,4, 0,4, 0,3, 0,2, 0,1, 1,1, 2,1, 3,1, 3,0 Points: 2,4, 2,3, 1,3, 1,2, 2,2, 3,2, 3,1, 4,1, 4,0
MultiBrush@23: MultiBrush@23:
Template: 23 Template: 23
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 1,3, 0,3, 0,2, 0,1, 1,1, 2,1, 2,0, 3,0 Points: 2,3, 2,2, 2,1, 3,1, 4,1, 4,0
MultiBrush@24: MultiBrush@24:
Template: 24 Template: 24
Segment: Segment:
@@ -3410,121 +3410,121 @@ MultiBrushCollections:
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 5,0, 5,1, 4,1, 4,2, 3,2, 3,3, 3,4, 2,4, 2,5 Points: 4,0, 4,1, 4,2, 3,2, 3,3, 2,3, 2,4, 1,4, 1,5
MultiBrush@37: MultiBrush@37:
Template: 37 Template: 37
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 3,0, 3,1, 3,2, 3,3, 2,3, 2,4 Points: 2,0, 2,1, 2,2, 2,3, 1,3, 1,4
MultiBrush@38: MultiBrush@38:
Template: 38 Template: 38
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 3,0, 3,1, 2,1, 2,2, 1,2, 1,3 Points: 2,0, 2,1, 2,2, 1,2, 1,3, 0,3
MultiBrush@39: MultiBrush@39:
Template: 39 Template: 39
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 2,0, 2,1, 2,2, 2,3 Points: 1,0, 1,1, 1,2, 1,3
MultiBrush@40: MultiBrush@40:
Template: 40 Template: 40
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 2,0, 2,1 Points: 1,0, 1,1
MultiBrush@42: MultiBrush@42:
Template: 42 Template: 42
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 2,0, 2,1, 2,2, 2,3, 3,3, 4,3, 4,4, 4,5 Points: 1,0, 1,1, 1,2, 1,3, 2,3, 2,4, 3,4, 3,5
MultiBrush@43: MultiBrush@43:
Template: 43 Template: 43
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 1,0, 1,1, 1,2, 2,2, 2,3, 3,3, 3,4 Points: 0,0, 0,1, 0,2, 1,2, 1,3, 2,3, 2,4
MultiBrush@44: MultiBrush@44:
Template: 44 Template: 44
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 1,0, 1,1, 2,1, 3,1, 3,2, 3,3 Points: 0,0, 0,1, 1,1, 2,1, 2,2, 2,3
MultiBrush@45: MultiBrush@45:
Template: 45 Template: 45
Segment: Segment:
Start: Beach.L Start: Beach.L
End: Beach.U End: Beach.U
Points: 3,1, 3,2, 2,2, 1,2, 1,3, 0,3, 0,2, 0,1, 0,0, 1,0 Points: 3,1, 2,1, 1,1, 1,0, 2,0
MultiBrush@46: MultiBrush@46:
Template: 46 Template: 46
Segment: Segment:
Start: Beach.L Start: Beach.L
End: Beach.U End: Beach.U
Points: 2,1, 1,1, 0,1, 0,0 Points: 2,1, 1,1, 1,0
MultiBrush@47: MultiBrush@47:
Template: 47 Template: 47
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.R End: Beach.R
Points: 1,3, 1,2, 1,1, 1,0, 2,0, 2,1, 2,2, 3,2 Points: 2,3, 2,2, 3,2
MultiBrush@48: MultiBrush@48:
Template: 48 Template: 48
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.R End: Beach.R
Points: 0,2, 1,2, 1,1, 2,1 Points: 1,2, 1,1, 2,1
MultiBrush@49: MultiBrush@49:
Template: 49 Template: 49
Segment: Segment:
Start: Beach.R Start: Beach.R
End: Beach.D End: Beach.D
Points: 0,2, 1,2, 2,2, 2,3 Points: 0,2, 1,2, 1,3
MultiBrush@50: MultiBrush@50:
Template: 50 Template: 50
Segment: Segment:
Start: Beach.R Start: Beach.R
End: Beach.D End: Beach.D
Points: 0,1, 1,1, 2,1, 2,2 Points: 0,1, 1,1, 1,2
MultiBrush@51: MultiBrush@51:
Template: 51 Template: 51
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.L End: Beach.L
Points: 2,0, 2,1, 1,1, 0,1 Points: 1,0, 1,1, 0,1
MultiBrush@52: MultiBrush@52:
Template: 52 Template: 52
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.L End: Beach.L
Points: 2,0, 1,0, 1,1, 0,1 Points: 1,0, 1,1, 0,1
MultiBrush@53: MultiBrush@53:
Template: 53 Template: 53
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.R End: Beach.R
Points: 2,0, 2,1, 3,1, 3,2 Points: 1,0, 1,1, 2,1, 2,2, 3,2
MultiBrush@54: MultiBrush@54:
Template: 54 Template: 54
Segment: Segment:
Start: Beach.L Start: Beach.L
End: Beach.D End: Beach.D
Points: 3,1, 2,1, 2,2, 2,3 Points: 3,1, 2,1, 2,2, 1,2, 1,3
MultiBrush@55: MultiBrush@55:
Template: 55 Template: 55
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.L End: Beach.L
Points: 1,3, 1,2, 0,2, 0,1 Points: 2,3, 2,2, 1,2, 1,1, 0,1
MultiBrush@56: MultiBrush@56:
Template: 56 Template: 56
Segment: Segment:
Start: Beach.R Start: Beach.R
End: Beach.U End: Beach.U
Points: 0,2, 0,1, 1,1, 1,0 Points: 0,2, 1,2, 1,1, 2,1, 2,0
MultiBrush@59: MultiBrush@59:
Template: 59 Template: 59
Segment: Segment:

56
mods/ra/tilesets/temperat.yaml
View File

@@ -3756,49 +3756,49 @@ MultiBrushCollections:
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 4,5, 4,4, 3,4, 3,3, 2,3, 1,3, 1,2, 1,1, 1,0 Points: 5,5, 5,4, 4,4, 4,3, 3,3, 3,2, 2,2, 2,1, 2,0
MultiBrush@16: MultiBrush@16:
Template: 16 Template: 16
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 2,4, 1,4, 1,3, 1,2, 0,2, 0,1, 0,0 Points: 3,4, 3,3, 2,3, 2,2, 2,1, 1,1, 1,0
MultiBrush@17: MultiBrush@17:
Template: 17 Template: 17
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 3,3, 2,3, 2,2, 1,2, 1,1, 1,0 Points: 4,3, 4,2, 3,2, 3,1, 2,1, 2,0
MultiBrush@18: MultiBrush@18:
Template: 18 Template: 18
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 1,3, 1,2, 1,1, 1,0 Points: 2,3, 2,2, 2,1, 2,0
MultiBrush@19: MultiBrush@19:
Template: 19 Template: 19
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 0,1, 0,0 Points: 1,1, 1,0
MultiBrush@21: MultiBrush@21:
Template: 21 Template: 21
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 0,5, 1,5, 1,4, 1,3, 0,3, 0,2, 1,2, 1,1, 2,1, 2,0 Points: 1,5, 2,5, 2,4, 2,3, 2,2, 2,1, 3,1, 3,0
MultiBrush@22: MultiBrush@22:
Template: 22 Template: 22
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 1,4, 0,4, 0,3, 0,2, 0,1, 1,1, 2,1, 3,1, 3,0 Points: 2,4, 2,3, 1,3, 1,2, 2,2, 3,2, 3,1, 4,1, 4,0
MultiBrush@23: MultiBrush@23:
Template: 23 Template: 23
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.U End: Beach.U
Points: 1,3, 0,3, 0,2, 0,1, 1,1, 2,1, 2,0, 3,0 Points: 2,3, 2,2, 2,1, 3,1, 4,1, 4,0
MultiBrush@24: MultiBrush@24:
Template: 24 Template: 24
Segment: Segment:
@@ -3870,121 +3870,121 @@ MultiBrushCollections:
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 5,0, 5,1, 4,1, 4,2, 3,2, 3,3, 3,4, 2,4, 2,5 Points: 4,0, 4,1, 4,2, 3,2, 3,3, 2,3, 2,4, 1,4, 1,5
MultiBrush@37: MultiBrush@37:
Template: 37 Template: 37
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 3,0, 3,1, 3,2, 3,3, 2,3, 2,4 Points: 2,0, 2,1, 2,2, 2,3, 1,3, 1,4
MultiBrush@38: MultiBrush@38:
Template: 38 Template: 38
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 3,0, 3,1, 2,1, 2,2, 1,2, 1,3 Points: 2,0, 2,1, 2,2, 1,2, 1,3, 0,3
MultiBrush@39: MultiBrush@39:
Template: 39 Template: 39
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 2,0, 2,1, 2,2, 2,3 Points: 1,0, 1,1, 1,2, 1,3
MultiBrush@40: MultiBrush@40:
Template: 40 Template: 40
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 2,0, 2,1 Points: 1,0, 1,1
MultiBrush@42: MultiBrush@42:
Template: 42 Template: 42
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 2,0, 2,1, 2,2, 2,3, 3,3, 4,3, 4,4, 4,5 Points: 1,0, 1,1, 1,2, 1,3, 2,3, 2,4, 3,4, 3,5
MultiBrush@43: MultiBrush@43:
Template: 43 Template: 43
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 1,0, 1,1, 1,2, 2,2, 2,3, 3,3, 3,4 Points: 0,0, 0,1, 0,2, 1,2, 1,3, 2,3, 2,4
MultiBrush@44: MultiBrush@44:
Template: 44 Template: 44
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.D End: Beach.D
Points: 1,0, 1,1, 2,1, 3,1, 3,2, 3,3 Points: 0,0, 0,1, 1,1, 2,1, 2,2, 2,3
MultiBrush@45: MultiBrush@45:
Template: 45 Template: 45
Segment: Segment:
Start: Beach.L Start: Beach.L
End: Beach.U End: Beach.U
Points: 3,1, 3,2, 2,2, 1,2, 1,3, 0,3, 0,2, 0,1, 0,0, 1,0 Points: 3,1, 2,1, 1,1, 1,0, 2,0
MultiBrush@46: MultiBrush@46:
Template: 46 Template: 46
Segment: Segment:
Start: Beach.L Start: Beach.L
End: Beach.U End: Beach.U
Points: 2,1, 1,1, 0,1, 0,0 Points: 2,1, 1,1, 1,0
MultiBrush@47: MultiBrush@47:
Template: 47 Template: 47
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.R End: Beach.R
Points: 1,3, 1,2, 1,1, 1,0, 2,0, 2,1, 2,2, 3,2 Points: 2,3, 2,2, 3,2
MultiBrush@48: MultiBrush@48:
Template: 48 Template: 48
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.R End: Beach.R
Points: 0,2, 1,2, 1,1, 2,1 Points: 1,2, 1,1, 2,1
MultiBrush@49: MultiBrush@49:
Template: 49 Template: 49
Segment: Segment:
Start: Beach.R Start: Beach.R
End: Beach.D End: Beach.D
Points: 0,2, 1,2, 2,2, 2,3 Points: 0,2, 1,2, 1,3
MultiBrush@50: MultiBrush@50:
Template: 50 Template: 50
Segment: Segment:
Start: Beach.R Start: Beach.R
End: Beach.D End: Beach.D
Points: 0,1, 1,1, 2,1, 2,2 Points: 0,1, 1,1, 1,2
MultiBrush@51: MultiBrush@51:
Template: 51 Template: 51
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.L End: Beach.L
Points: 2,0, 2,1, 1,1, 0,1 Points: 1,0, 1,1, 0,1
MultiBrush@52: MultiBrush@52:
Template: 52 Template: 52
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.L End: Beach.L
Points: 2,0, 1,0, 1,1, 0,1 Points: 1,0, 1,1, 0,1
MultiBrush@53: MultiBrush@53:
Template: 53 Template: 53
Segment: Segment:
Start: Beach.D Start: Beach.D
End: Beach.R End: Beach.R
Points: 2,0, 2,1, 3,1, 3,2 Points: 1,0, 1,1, 2,1, 2,2, 3,2
MultiBrush@54: MultiBrush@54:
Template: 54 Template: 54
Segment: Segment:
Start: Beach.L Start: Beach.L
End: Beach.D End: Beach.D
Points: 3,1, 2,1, 2,2, 2,3 Points: 3,1, 2,1, 2,2, 1,2, 1,3
MultiBrush@55: MultiBrush@55:
Template: 55 Template: 55
Segment: Segment:
Start: Beach.U Start: Beach.U
End: Beach.L End: Beach.L
Points: 1,3, 1,2, 0,2, 0,1 Points: 2,3, 2,2, 1,2, 1,1, 0,1
MultiBrush@56: MultiBrush@56:
Template: 56 Template: 56
Segment: Segment:
Start: Beach.R Start: Beach.R
End: Beach.U End: Beach.U
Points: 0,2, 0,1, 1,1, 1,0 Points: 0,2, 1,2, 1,1, 2,1, 2,0
MultiBrush@59: MultiBrush@59:
Template: 59 Template: 59
Segment: Segment: