Skip to content

Commit 1254807

Browse files
committed
Containers: change extension of .json files
1 parent c41c531 commit 1254807

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

Source/Documentation/Manual/features-rollingstock.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -581,16 +581,16 @@ How to define container data
581581

582582
Container shape files (``.s``) must be located in subfolders (or sub-subfolders) of the
583583
``Trainset`` folder.
584-
Containers that can be managed must be provided with a Json ``.loa`` file. The ``.loa`` files
584+
Containers that can be managed must be provided with a Json ``.load-or`` file. The ``.load-or`` files
585585
must be located in a subfolder of the ``Trainset`` folder. It is warmly advised to keep all
586-
``.loa`` file in a single folder: ``Common.ContainerData`` is suggested. It is also advised to name
587-
the ``.loa`` files in a consistent way: ``40HCtriton.loa`` is suggested, where ``40HC`` is the
586+
``.load-or`` file in a single folder: ``Common.ContainerData`` is suggested. It is also advised to name
587+
the ``.load-or`` files in a consistent way: ``40HCtriton.load-or`` is suggested, where ``40HC`` is the
588588
container type and ``triton`` the brand painted on the container.
589589

590-
Format of the .loa file
590+
Format of the .load-or file
591591
'''''''''''''''''''''''
592592

593-
Here below a sample of a ``.loa`` file::
593+
Here below a sample of a ``.load-or`` file::
594594

595595
{
596596
"Container":
@@ -704,8 +704,8 @@ shown here::
704704
As can be seen, for each container loaded at startup a ``LoadData`` entry must be
705705
present. The meaning of the parameters is as follows:
706706

707-
- The first parameter is the name of the ``.loa`` file
708-
- The second parameter is the path (having ``Trainset`` as base path) where the ``.loa``
707+
- The first parameter is the name of the ``.load-or`` file
708+
- The second parameter is the path (having ``Trainset`` as base path) where the ``.load-or``
709709
file resides
710710
- The third parameter indicates where the container is allocated on the wagon.
711711

@@ -1032,17 +1032,17 @@ its child stack location 10. Same applies to stack location 3 and its child stac
10321032
Population of container stations at game start
10331033
''''''''''''''''''''''''''''''''''''''''''''''
10341034

1035-
Container stations may be populated at game start. This occurs by inserting an ``.lsp``
1036-
(load station population) in the ``Openrails`` subfolder of the "Activities" folder of the
1035+
Container stations may be populated at game start. This occurs by inserting a ``.load-stations-loads-or``
1036+
file in the ``Openrails`` subfolder of the "Activities" folder of the
10371037
route, and inserting the following line at the bottom of the ``Tr_Activity_Header`` in
10381038
``.act`` files ::
10391039

10401040
ORTSLoadStationsPopulation ( BigContainerStationPopulation )
10411041

1042-
where ``BigContainerStationPopulation`` is the name of the ``.lsp`` file. At the moment population at
1042+
where ``BigContainerStationPopulation`` is the name of the ``.load-stations-loads-or`` file. At the moment population at
10431043
game start is possible only in Activity mode.
10441044

1045-
The ``.lsp`` file is a Json file. An example is shown here below ::
1045+
The ``.load-stations-loads-or`` file is a Json file. An example is shown here below ::
10461046

10471047
"ContainerStationsPopulation": [
10481048
{
@@ -1073,8 +1073,8 @@ The file can define the population at startup of many container stations.
10731073

10741074
- The ``LoadStationID`` contains the info needed to identify the container station.
10751075
- The ``LoadData`` array contains the data to populate the container station.
1076-
- The value of ``File`` is the name of the ``.loa`` file identifying the container.
1077-
- The value of ``Folder`` is the path where the ``.loa`` can be found, starting from the
1076+
- The value of ``File`` is the name of the ``.load-or`` file identifying the container.
1077+
- The value of ``Folder`` is the path where the ``.load-or`` can be found, starting from the
10781078
``TRAINSET``.
10791079
- The value of ``StackLocation`` is the index of the Stack Location. If the index is equal
10801080
or higher than the number of stack locations defined in the extension ``.w`` file, the

Source/Orts.Simulation/Simulation/Container.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public void PreloadContainerStation(PickupObj thisWorldObj)
502502
foreach (var loadDataEntry in (loadStationPopulation as ContainerStationPopulation).LoadData)
503503
{
504504
string loadDataFolder = Simulator.BasePath + @"\trains\trainset\" + loadDataEntry.FolderName;
505-
string loadFilePath = loadDataFolder + @"\" + loadDataEntry.FileName + ".loa";
505+
string loadFilePath = loadDataFolder + @"\" + loadDataEntry.FileName + ".load-or";
506506
if (!File.Exists(loadFilePath))
507507
{
508508
Trace.TraceWarning($"Ignored missing load {loadFilePath}");

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/FreightAnimations.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public void Load(MSTSWagon wagon, List<LoadData> loadDataList, bool listInWagFil
328328
foreach (var loadData in loadDataList)
329329
{
330330
string loadDataFolder = wagon.Simulator.BasePath + @"\trains\trainset\" + loadData.Folder;
331-
string loadFilePath = loadDataFolder + @"\" + loadData.Name + ".loa";
331+
string loadFilePath = loadDataFolder + @"\" + loadData.Name + ".load-or";
332332
if (!File.Exists(loadFilePath))
333333
{
334334
Trace.TraceWarning($"Ignored missing load {loadFilePath}");

Source/Orts.Simulation/Simulation/Simulator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public void Start(CancellationToken cancellation)
444444
ContainerManager = new ContainerManager(this);
445445
if (Activity?.Tr_Activity?.Tr_Activity_Header?.LoadStationsPopulationFile != null)
446446
{
447-
var populationFilePath = RoutePath + @"\Activities\Openrails\" + Activity.Tr_Activity.Tr_Activity_Header.LoadStationsPopulationFile + ".lsp";
447+
var populationFilePath = RoutePath + @"\Activities\Openrails\" + Activity.Tr_Activity.Tr_Activity_Header.LoadStationsPopulationFile + ".load-stations-loads-or";
448448
LoadStationsPopulationFile = new LoadStationsPopulationFile(populationFilePath);
449449
}
450450
Signals = new Signals(this, SIGCFG, cancellation);

0 commit comments

Comments
 (0)