Skip to content

reposition various FLEX pieces to avoid cursor offset #531

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.

Sign up for GitHub

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

Merged
TarkusSC4 merged 2 commits into from
Aug 31, 2025
Merged

reposition various FLEX pieces to avoid cursor offset #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1428096
reposition various FLEX pieces to avoid cursor offset
memo33 Aug 27, 2025
4ce910b
update to NAM DLL 1.2.0
memo33 Aug 29, 2025
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
804 changes: 412 additions & 392 deletions Controller/RUL0/0000_TuLEPS_CanAM/0460_FlexTurnLanes.txt
View file
Open in desktop

Large diffs are not rendered by default.

2,028 changes: 637 additions & 1,391 deletions Controller/RUL0/5000_RHW/5000_Starters.txt
View file
Open in desktop

Large diffs are not rendered by default.

2,696 changes: 228 additions & 2,468 deletions Controller/RUL0/5000_RHW/5B00_FlexFly5x5_MANAGED.txt
View file
Open in desktop

Large diffs are not rendered by default.

161 changes: 80 additions & 81 deletions Controller/RUL0/6000_Street_PedMall_SAM/6700_SAM.txt
View file
Open in desktop

Large diffs are not rendered by default.

227 changes: 110 additions & 117 deletions Controller/RUL0/7000_Road_NWM/7A00_NWM/7B00_Starters.txt
View file
Open in desktop

Large diffs are not rendered by default.

152 changes: 76 additions & 76 deletions Controller/RUL0/7000_Road_NWM/7F00_ElevatedViaducts.txt
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Controller/RUL0/B000_Lightrail/B3F0_DraggableGLR.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,20 @@ CopyFrom = 0x3B3F4
;Added by memo 01/31/07.
;modified by memo 01/17/2013 for use with Vanishing Construction Lot
;Ground Light Rail Straight Puzzle Piece - drag
Piece = 0.0, 0.0, 0, 0, 0x580cc706
Piece = 0.0, -16.0, 0, 0, 0x580cc706
PreviewEffect = preview_draggable_glr___001

CellLayout =.......
CellLayout =...Z<..
CellLayout =...a...
CellLayout =...Z...
CellLayout =...a..<
CellLayout =...^...

CheckType = Z - lightrail: 0x02000200
CheckType = a - lightrail: 0x02000200 Road: 0x00010100, 0xffffffff optional

ConsLayout =........
ConsLayout =...+...<
ConsLayout =........
ConsLayout =...+....
ConsLayout =.......<
ConsLayout =...^....

AutoTileBase = 0x55387000 ; former 0x580cc700
Expand Down Expand Up @@ -119,21 +119,21 @@ CopyFrom = 0x3B3F0
;Added by memo 02/26/07.
;modified by memo 01/17/2013 for use with Vanishing Construction Lot
;Ground Light Rail Diagonal Puzzle Piece - drag
Piece = 0.0, 0.0, 0, 0, 0x580d3706
Piece = 16.0, 0.0, 0, 0, 0x580d3706
PreviewEffect = preview_draggable_glr___003

CellLayout =........
CellLayout =...aZ<..
CellLayout =........
CellLayout =....^...
CellLayout =...^....

CheckType = Z - lightrail: 0x00000301
CheckType = a - lightrail: 0x03010000 Road: 0x01010000, 0xffffffff optional

ConsLayout =.........
ConsLayout =....+...<
ConsLayout =.........
ConsLayout =....^....
ConsLayout =...^.....

AutoTileBase = 0x55387000 ; former 0x580d3700
ReplacementIntersection = 0, 0
Expand Down Expand Up @@ -218,20 +218,20 @@ CopyFrom = 0x3B3F5
;Added by memo 03/26/07.
;modified by memo 01/17/2013 for use with Vanishing Construction Lot
;Ground Light Rail Rural Straight Puzzle Piece - drag
Piece = 0.0, 0.0, 0, 0, 0x580cc707
Piece = 0.0, -16.0, 0, 0, 0x580cc707
PreviewEffect = preview_draggable_glr___004

CellLayout =.......
CellLayout =...Z<..
CellLayout =...a...
CellLayout =...Z...
CellLayout =...a..<
CellLayout =...^...

CheckType = Z - lightrail: 0x02000200
CheckType = a - lightrail: 0x02000200 Road: 0x00030300, 0xffffffff optional

ConsLayout =........
ConsLayout =...+...<
ConsLayout =........
ConsLayout =...+....
ConsLayout =.......<
ConsLayout =...^....

AutoTileBase = 0x55387000 ; former 0x580db700
Expand Down Expand Up @@ -262,21 +262,21 @@ CopyFrom = 0x3B3F2
;Added by memo 03/26/07.
;modified by memo 01/17/2013 for use with Vanishing Construction Lot
;Ground Light Rail Rural Diagonal Puzzle Piece - drag
Piece = 0.0, 0.0, 0, 0, 0x580d3707
Piece = 16.0, 0.0, 0, 0, 0x580d3707
PreviewEffect = preview_draggable_glr___006

CellLayout =........
CellLayout =...aZ<..
CellLayout =........
CellLayout =....^...
CellLayout =...^....

CheckType = Z - lightrail: 0x00000301
CheckType = a - lightrail: 0x03010000 onewayroad: 0x01010000, 0xffffffff optional

ConsLayout =.........
ConsLayout =....+...<
ConsLayout =.........
ConsLayout =....^....
ConsLayout =...^.....

AutoTileBase = 0x55387000 ; former 0x580dc700
ReplacementIntersection = 0, 0
Expand Down
20 changes: 10 additions & 10 deletions Controller/RUL0/B000_Lightrail/BD00_GLRExtension.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ AddTypes = BD01, 1BD01, 2BD01, 3BD01, 4BD01, 5BD01, 6BD01, 7BD01 ;Ground Lig
;Added by Chrisim 16 September 2010
;modified by memo 01/17/2013 for use with Vanishing Construction Lot
;Ground Light Rail Straight Alt1 Puzzle Piece - drag
Piece = 0.0, 0.0, 0, 0, 0x5F888006
Piece = 0.0, -16.0, 0, 0, 0x5F888006
PreviewEffect = preview_draggable_glr___011

CellLayout =.......
CellLayout =...Z<..
CellLayout =...a...
CellLayout =...Z...
CellLayout =...a..<
CellLayout =...^...

CheckType = Z - lightrail: 0x02000200
CheckType = a - lightrail: 0x02000200 Road: 0x00010300, 0xffffffff optional

ConsLayout =........
ConsLayout =...+...<
ConsLayout =........
ConsLayout =...+....
ConsLayout =.......<
ConsLayout =...^....

AutoTileBase = 0x55387000 ; former 0x5F888000
Expand Down Expand Up @@ -53,20 +53,20 @@ CopyFrom = 0x3BD00
;Added by Chrisim 16 September 2010
;modified by memo 01/17/2013 for use with Vanishing Construction Lot
;Ground Light Rail Straight Alt2 Puzzle Piece - drag
Piece = 0.0, 0.0, 0, 0, 0x5F88C006
Piece = 0.0, -16.0, 0, 0, 0x5F88C006
PreviewEffect = preview_draggable_glr___010

CellLayout =.......
CellLayout =...Z<..
CellLayout =...a...
CellLayout =...Z...
CellLayout =...a..<
CellLayout =...^...

CheckType = Z - lightrail: 0x02000200
CheckType = a - lightrail: 0x02000200 onewayroad: 0x00010300, 0xffffffff optional

ConsLayout =........
ConsLayout =...+...<
ConsLayout =........
ConsLayout =...+....
ConsLayout =.......<
ConsLayout =...^....

AutoTileBase = 0x55387000 ; former 0x5F88C000
Expand Down
2 changes: 1 addition & 1 deletion lua/adv_nam_dll.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-- This file defines advisor messages related to the NAM DLL.

-- Note that this Lua file is not intended for distribution with the DLL itself, but for distribution with the NAM DBPF files to ensure compatibility between NAM and DLL.
nam_dll_version_expected = "1.1.1" -- needs to be updated whenever a new DLL version is released
nam_dll_version_expected = "1.2.0" -- needs to be updated whenever a new DLL version is released

-- (When this script is first executed, the `nam_dll_version` is still `nil`, but it gets defined before the trigger conditions are evaluated.)
function is_nam_dll_correct()
Expand Down
45 changes: 20 additions & 25 deletions src/main/scala/module/flexfly/CompileFlexFlyRul0And1.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,22 +150,22 @@ object CompileFlexFlyRul0And1 {
val (previewId90, previewName90) = previewIter.next()
val (previewId45, previewName45) = previewIter.next()
val orient: IntFlags => IntFlags = if (reverse) reverseIntFlags else identity
def ff90(cursorInside: Boolean): String = {
val hidOffset = if (cursorInside) 0 else 0x80000
def ff90(): String = {
val hidOffset = 0
f"""
|[HighwayIntersectionInfo_0x${hid+hidOffset}%08X]
|;Added by memo 2014/11/16
|;FlexFly 90 (cursor ${if (cursorInside) "inside" else "outside"})
|Piece = ${if (cursorInside) "-48.0" else "-80.0"}, 0.0, 0, 1, 0x$previewId90%08X
|;FlexFly 90
|Piece = -64.0, 0.0, 0, 1, 0x$previewId90%08X
|PreviewEffect = $previewName90
|
|CellLayout=........
|CellLayout=.abY....
|CellLayout=...cY...
|CellLayout=....dY..
|CellLayout=.....e..
|CellLayout=....${if (cursorInside) "Zf." else ".fZ"}<
|CellLayout=....${if (cursorInside) "^.." else "..^"}.
|CellLayout=....Zf.<
|CellLayout=.....^..
|
|CheckType = Z - dirtroad: 0x02020202
|CheckType = Y - dirtroad: 0x00000000, 0xFFFFFFFF optional
Expand All @@ -181,8 +181,8 @@ object CompileFlexFlyRul0And1 {
|ConsLayout=........
|ConsLayout=........
|ConsLayout=........
|ConsLayout=....${if (cursorInside) "+.." else "..+"}<
|ConsLayout=....${if (cursorInside) "^.." else "..^"}.
|ConsLayout=....+..<
|ConsLayout=.....^..
|
|AutoTileBase = 0x55387000
|PlaceQueryID = 0x$previewId90%08X
Expand Down Expand Up @@ -212,21 +212,21 @@ object CompileFlexFlyRul0And1 {
|""".stripMargin.trim
}

def ff45(cursorInside: Boolean): String = {
val hidOffset = if (cursorInside) 0 else 0x80000
def ff45(): String = {
val hidOffset = 0
f"""
|[HighwayIntersectionInfo_0x${hid+hidOffset+1}%08X]
|;Added by memo 2014/11/16
|;FlexFly 45 (cursor ${if (cursorInside) "inside" else "outside"})
|Piece = ${if (cursorInside) "0.0" else "-32.0"}, 0.0, 0, 1, 0x$previewId45%08X
|;FlexFly 45
|Piece = -16.0, 0.0, 0, 1, 0x$previewId45%08X
|PreviewEffect = $previewName45
|
|CellLayout=........
|CellLayout=...Xc...
|CellLayout=....dY..
|CellLayout=.....e..
|CellLayout=....${if (cursorInside) "Zf." else ".fZ"}<
|CellLayout=....${if (cursorInside) "^.." else "..^"}.
|CellLayout=....Zf.<
|CellLayout=.....^..
|
|CheckType = Z - dirtroad: 0x02020202
|CheckType = Y - dirtroad: 0x00000000, 0xFFFFFFFF optional
Expand All @@ -240,8 +240,8 @@ object CompileFlexFlyRul0And1 {
|ConsLayout=........
|ConsLayout=........
|ConsLayout=........
|ConsLayout=....${if (cursorInside) "+.." else "..+"}<
|ConsLayout=....${if (cursorInside) "^.." else "..^"}.
|ConsLayout=....+..<
|ConsLayout=.....^..
|
|AutoTileBase = 0x55387000
|PlaceQueryID = 0x$previewId45%08X
Expand Down Expand Up @@ -272,14 +272,9 @@ object CompileFlexFlyRul0And1 {
}

f"""
|${ff90(cursorInside = true)}
|${ff90()}
|
|${ff90(cursorInside = false)}
|
|
|${ff45(cursorInside = true)}
|
|${ff45(cursorInside = false)}
|${ff45()}
|""".stripMargin
}

Expand All @@ -295,8 +290,8 @@ object CompileFlexFlyRul0And1 {
def printRul0(file: File, resolver: IdResolver) = scala.util.Using.resource(new PrintWriter(file)) { printer =>
printer.println(";This file was generated automatically. DO NOT EDIT!")
val hid0 = 0x5B00
for (hid <- hid0 until hid0 + 40) {
val numbers = (0 until 16) map (i => f"${hid+0x10000*i}%X") mkString ", "
for (hid <- hid0 until hid0 + 40) {
val numbers = (0 until 8) map (i => f"${hid+0x10000*i}%X") mkString ", "
val tag = if (hid == hid0) "RotationRing" else "AddTypes"
printer.println(f"$tag = $numbers ; flexfly")
}
Expand Down