Skip to content

Merge staging into master for NAM 49 release - #502

Merged
TarkusSC4 merged 100 commits into
masterfrom
staging
Mar 3, 2025
Merged

Merge staging into master for NAM 49 release#502
TarkusSC4 merged 100 commits into
masterfrom
staging

Conversation

@TarkusSC4

Copy link
Copy Markdown
Member

No description provided.

jflann and others added 30 commits January 20, 2024 21:50
Adds .ini definitions for a new set of bridges for various single-tile networks
Adds bRUL TGI file for street-based networks
Adds bRULs for street-based networks
Adds bRULs for new OWR-based bridges
Adds bRULs for new road-based bridges (including NWM)
Adds bRULs for new RHW-based (dirt road) bridges
Added LTEXTs for the second of four new batches of bridges
Add bridge RULs for new road-based "green over deck truss" bridge (road and NWM)
Adds bridge RULs for new street-based "green over deck truss" bridge (street and SAM)
Adds bridge RULs for new OWR-based "green over deck truss" bridges (OWR-2 and OWR-3)
Adds bridge RULs for new RHW-based "green over deck truss" bridges (RHW-2, RHW-3, RHW-4S)
Adds LTEXT for new "green over deck truss" bridges
Adds 3 new style of bridges for various networks:
- Red Under Deck Arch Truss
- Green Over Deck Truss
- Yellow Steel Box Girder

Updates network.ini. various bridge rul, and ltexts.
SAM x El Rail / Monorail path and shadow remapping
* add script to compile bridge controller

* make script executable, handle case-sensitive file names, quote folders containing spaces

---------

Co-authored-by: memo <memo33@users.noreply.github.com>
UlisseWolf and others added 29 commits October 18, 2024 19:10
Added the LTEXTs of the new stations in the MTA Update
Updated the Italian translation
update GH action for compatibility with GH runner Ubuntu 24.04
This is the initial run of:

    sbt conflictingOverridesCheck --update

It tags all conflicting overrides with an inline comment. It does not
remove or modify any functionality.
This removes a lot of `conflicting-overrides` tags that were erroneously added due to incorrect distinction between RHD/LHD files.

    Found 93436 conflicting RUL2 overrides (removed 3423, added 90).

The changes almost exclusively affect RHD files. The RHD files came alphabetically after the LHD, so previously the RHD rules would be marked as conflicting.

Some exceptions:

- driveside-independent files: some rules are newly conflicting with RHD rules (previously those RHD rules had been "conflicting" with LHD rules). Usually, these rules are copies of LHD rules, which explains the conflict.
- 2 LHD files are affected: in both cases, the affected rules are also contained in RHD files that are loaded earlier.

All in all, the changes look plausible.
This adds `conflicting-override-rhd` or `conflicting-override-lhd` tags
when a driveside-independent rule conflicts with just RHD or LHD rules.
The correct rules are copied from the following files, which seem to
duplicate some of these rules:

    Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01A_Road_ThruT_OxO.txt
    Controller/RUL2/07_RHW/Sec7b_BaseNetwork/T01B_Road_ThruT_OxO.txt
…flicts)

The previous conflicts are now duplicates only.
* Traffic Simulator Capacity Icons

LTEXT translation provided for all languages supported in SimCity 4
This adds INRULs to fix the directional T-interchange configuration
involving 45° FLEX-Fly ending adjacent to a 3-level crossing.

Moreover, this generalizes the 3-level crossing INRULs so that a central
through-lane is not required, e.g. two RHW-4 networks separated by a
1-tile gap. (Technically, this is a 2-level crossing.)
Add LHD path remapping INI entries for FA Road x Rail crossings (FA-2 & FA-3)
fix 3-level crossings adjacent to 45° FLEX-Fly
Enable FLEXRamp A1 Outside for RHW-3 L1 & L2
@TarkusSC4
TarkusSC4 merged commit 91c6193 into master Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants