Ported to OpenTTD mainline by smurfix · Pull Request #13 · kaomoneus/OpenTTD

smurfix · 2023-03-29T05:51:32Z

This merges the slow-pace mod to OpenTTD Mainline.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

The bug fix is important enough to be backported? (label: 'backport requested')
This PR touches english.txt or translations? Check the guidelines
This PR affects the save game format? (label 'savegame upgrade')
This PR affects the GS/AI API? (label 'needs review: Script API')
- ai_changelog.hpp, gs_changelog.hpp need updating.
- The compatibility wrappers (compat_*.nut) need updating.
This PR affects the NewGRF API? (label 'needs review: NewGRF')
- newgrf_debug_data.h may need updating.
- PR must be added to API tracker

english (au): 6 changes by krysclarke chinese (simplified): 3 changes by XiaoJi-Game, 1 change by ZZY2357 arabic (egypt): 11 changes by AviationGamerX korean: 3 changes by telk5093 indonesian: 8 changes by K4smun1

For bridges, a max speed of 0xFFFF (i.e. no effective limit) is no longer displayed as a limit in the UI. A max speed of 0 is also considered unlimited, for similarity to the roadtype and railtype interface.

dutch: 4 changes by Afoklala

…nTTD#10375)

…e() instead of MapSizeX() * MapSizeY()

english (au): 4 changes by krysclarke

…n those displayed in GUI (OpenTTD#10227) * Change: Store "all time" and "since minimum age" last year profits on groups * Fix: Update last year profit for groups when copying vehicle statistics on autoreplace * Codechange: Refactor profit last year * Change: Rename some group related items for clarity * Change: Reorder the fields in GroupStatistics That way less memory gets wasted.

english (us): 4 changes by 2TallTyler romanian: 10 changes by bnegrut russian: 4 changes by Ln-Wolf portuguese: 4 changes by azulcosta

…mary variant is missing

…rossings (OpenTTD#10400)

spanish: 4 changes by MontyMontana

…TTD#10404)

finnish: 8 changes by hpiirai polish: 4 changes by pAter-exe

…penTTD#10410) From 3px to 2px (multiplied by UI scale).

… the documentation

…gurations

korean: 4 changes by telk5093

This replaces C-style memory management.

Variable scope is also tweaked in a couple of cases reducing line count.

…looding themselves (OpenTTD#8517)

)

japanese: 32 changes by fmang danish: 7 changes by bscargo

japanese: 31 changes by fmang

japanese: 12 changes by fmang

japanese: 22 changes by fmang

kaomoneus · 2023-05-16T18:40:45Z

Hello! Sorry, I didn't notice your pr, was a bit out of business. Are you still interested in it?

smurfix · 2023-05-17T05:53:21Z

Yep.

kaomoneus · 2023-05-17T06:00:12Z

OK. Am I right, that this PR intended to sync SlowPace mod with latest OpenTTD version? If so, I think I'll have time to work on it at Sunday. Did you apply some additional custom changes? Could If so, could you please highlight first of them?
Thank you!

smurfix · 2023-05-17T06:15:51Z

It's been some time but AFAIR no.

pippin88 · 2023-05-27T06:37:40Z

I am also very keen to see Slow Pace updated to / merged with 13.1

kaomoneus · 2023-09-11T17:11:55Z

Hey guys! Sorry for latency. I started merging process. So far I visually checked for conflicts. Still have to compile/test it before release. Feel free to check it. All merging process will be here:
https://github.com/kaomoneus/OpenTTD/tree/slow_pace-merge-13

kaomoneus · 2023-09-14T18:13:09Z

@smurfix are here any chances that we merge it into mainstream repo?

smurfix · 2023-09-15T04:49:02Z

Go ahead and play with it / merge / do whatever it takes.

As for myself I have roughly a negative month of free time until at least the end of the year, life being what it is, so I can't be of much help.

kaomoneus · 2023-09-16T11:06:56Z

negative month
ahah, same here.. this is why I slow-paced the work on slow-pace mod

kaomoneus · 2023-09-24T13:18:37Z

@smurfix , @pippin88 mostly done. It's only remained to fix builds for emscripten and Linux. Feel free to contribute with this. See https://github.com/kaomoneus/OpenTTD/actions/runs/6288959187 for details.

pippin88 · 2023-09-25T01:38:30Z

Thank you - I'm sorry, I don't know enough programming to be any help

S-Rafael · 2023-09-26T12:23:57Z

The error on the Linux build seems to be from failing to build Python 3 and looks identical to this issue:
microsoft/vcpkg#33080
Perhaps some extra dependencies are needed (see comments on that issue).

kaomoneus · 2023-09-27T17:46:43Z

The error on the Linux build seems to be from failing to build Python 3 and looks identical to this issue: microsoft/vcpkg#33080 Perhaps some extra dependencies are needed (see comments on that issue).

Thank you for the hint! Will check it!

kaomoneus · 2023-10-01T17:17:28Z

The error on the Linux build seems to be from failing to build Python 3 and looks identical to this issue: microsoft/vcpkg#33080 Perhaps some extra dependencies are needed (see comments on that issue).

Well it doesn't help. Just checked it on mainstream master and release/13 branches, it also fails. No issues on mainstream bugtracker though. Looks weird.

S-Rafael · 2023-10-01T18:51:55Z

Well it doesn't help. Just checked it on mainstream master and release/13 branches, it also fails. No issues on mainstream bugtracker though. Looks weird.

I looked at the master branch in your fork and the Linux build was actually successful. A few pipeline steps are showing as failed but they seem to have been manually cancelled? See here for example:
https://github.com/kaomoneus/OpenTTD/actions/runs/6372056866/job/17294535505

kaomoneus · 2023-10-04T10:36:51Z

Well it doesn't help. Just checked it on mainstream master and release/13 branches, it also fails. No issues on mainstream bugtracker though. Looks weird.

I looked at the master branch in your fork and the Linux build was actually successful. A few pipeline steps are showing as failed but they seem to have been manually cancelled? See here for example: https://github.com/kaomoneus/OpenTTD/actions/runs/6372056866/job/17294535505

The latest build of master is this one:
https://github.com/kaomoneus/OpenTTD/actions/runs/6372060217

As I can see linux step fails

from logs I can see still the very similar message:

installed/x64-linux/share/vcpkg-cmake/vcpkg_cmake_configure.cmake:252 (vcpkg_execute_required_process)
    ports/dbus/portfile.cmake:24 (vcpkg_cmake_configure)
    scripts/ports.cmake:147 (include)
  
  
  error: building dbus:x64-linux failed with: BUILD_FAILED
  Elapsed time to handle dbus:x64-linux: 13 s
  Please ensure you're using the latest port files with `git pull` and `vcpkg update`.
  Then check for known issues at:
    https://github.com/microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+in%3Atitle+dbus
  You can submit a new issue at:
    https://github.com/microsoft/vcpkg/issues/new?title=[dbus]+Build+error&body=Copy+issue+body+from+%2Fvcpkg%2Finstalled%2Fvcpkg%2Fissue_body.md
  
  Error: Process completed with exit code 1.

kaomoneus · 2023-10-07T08:10:49Z

Now I see, that rust and vcpkg caches are not found by workflow of my fork, and yet same workflow (and same commit) mainstream successfully restores cache for both cases...

kaomoneus · 2023-10-07T16:23:04Z

Finally I have fixed Linux(Generic), I have even created an issue on mainstream: OpenTTD#11356
It has been closed though...
Hopefully soon I'll publish SlowPace release for 13.4.

kaomoneus · 2023-10-10T07:07:33Z

@smurfix, @pippin88 , @S-Rafael , release is ready, please check it out

https://github.com/kaomoneus/OpenTTD/releases/tag/13.4.slowpace-1.3.1

translators and others added 30 commits January 19, 2023 18:45

Update: Translations from eints

3c80f2d

english (au): 6 changes by krysclarke chinese (simplified): 3 changes by XiaoJi-Game, 1 change by ZZY2357 arabic (egypt): 11 changes by AviationGamerX korean: 3 changes by telk5093 indonesian: 8 changes by K4smun1

Fix OpenTTD#10362: NewGRF bridges without speed limits.

01be423

For bridges, a max speed of 0xFFFF (i.e. no effective limit) is no longer displayed as a limit in the UI. A max speed of 0 is also considered unlimited, for similarity to the roadtype and railtype interface.

Update: Translations from eints

5eb2e0f

dutch: 4 changes by Afoklala

Change: Log AI/GS Squirrel crashes in white text for readability (Ope…

3b0b572

…nTTD#10375)

Codechange: use MakeSea/AllocateMap in the oldloader instead of MemSetT

953445a

Codechange: use ScriptMap size functions instead of global functions

22d3de8

Codechange: use MapLogY() instead of FindFirstBit(MapSizeY()), MapSiz…

9c1a3b1

…e() instead of MapSizeX() * MapSizeY()

Codechange: add map size related functions to Map structure

d481f78

Codechange: migrate size related functions to Map structure

fe2bcd2

Codechange: move TILE_MASK to Map::WrapToMap

de6bc8e

Codechange: hide the map's size related fields in the Map structure

7cdc23f

Update: Translations from eints

8b5fa2c

english (au): 4 changes by krysclarke

Update: Translations from eints

7d502e2

english (us): 4 changes by 2TallTyler romanian: 10 changes by bnegrut russian: 4 changes by Ln-Wolf portuguese: 4 changes by azulcosta

Fix OpenTTD#10377, Fix 94167df: bad sorting of rail vehicles when pri…

8aeef66

…mary variant is missing

Fix OpenTTD#10395: When loading old saves, don't forcibly bar level c…

9c5de7f

…rossings (OpenTTD#10400)

Update: Translations from eints

97844df

spanish: 4 changes by MontyMontana

Fix OpenTTD#10220: Don't select unselectable engine as default. (Open…

4dfd6a0

…TTD#10404)

Update: Translations from eints

01a2449

finnish: 8 changes by hpiirai polish: 4 changes by pAter-exe

Change OpenTTD#10255: Reduce basic thickness of linkgraph GUI lines (O…

2d0c1ff

…penTTD#10410) From 3px to 2px (multiplied by UI scale).

Fix: no ScriptEvent sub class should export constructors to scripts

042f90a

Fix: scripts cannot call constructors of ScriptEvents, so remove from…

41fa94b

… the documentation

Fix: warnings about obsolete settings/setting values in Doxygen confi…

3112b38

…gurations

Fix: missing/duplicate documentation tags for scripts

f9a473b

Fix: scripts are not aware of nullptr, they only know null

2fd9946

Update: Translations from eints

0794072

korean: 4 changes by telk5093

Codechange: Use vector for NewGRF spec overrides.

eedb786

This replaces C-style memory management.

Codechange: Add missing this-> in override manager.

bcc53c5

Variable scope is also tweaked in a couple of cases reducing line count.

Codechange: Rename override manager variables.

ede1201

Codechange: Make void tiles flood edge tiles, instead of edge tiles f…

46dc6da

…looding themselves (OpenTTD#8517)

2TallTyler and others added 9 commits March 19, 2023 11:02

Cleanup: Keep spacing saveload versions by groups of five (OpenTTD#10576

e543889

)

Update: Translations from eints

d15a14b

japanese: 32 changes by fmang danish: 7 changes by bscargo

Update: Translations from eints

1d91521

japanese: 31 changes by fmang

Update: Translations from eints

83eb73a

japanese: 12 changes by fmang

Update: Translations from eints

24e9af8

japanese: 22 changes by fmang

Merge remote-tracking branch 'slow/slow_pace' into slow

45ac237

fix indent

22d3bea

The max loan editor needs to see non-paced prices

ad12228

Also Pace-ify the monetary limit on engine renewal

c0d0e4a

smurfix force-pushed the slow-13 branch from dd79d8c to c0d0e4a Compare March 29, 2023 05:53

smurfix changed the title ~~Slow 13~~ Ported to OpenTTD mainline Mar 29, 2023

Conversation

smurfix commented Mar 29, 2023

Checklist for review

Uh oh!

kaomoneus commented May 16, 2023

Uh oh!

smurfix commented May 17, 2023

Uh oh!

kaomoneus commented May 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

smurfix commented May 17, 2023

Uh oh!

pippin88 commented May 27, 2023

Uh oh!

kaomoneus commented Sep 11, 2023

Uh oh!

kaomoneus commented Sep 14, 2023

Uh oh!

smurfix commented Sep 15, 2023

Uh oh!

kaomoneus commented Sep 16, 2023

Uh oh!

kaomoneus commented Sep 24, 2023

Uh oh!

pippin88 commented Sep 25, 2023

Uh oh!

S-Rafael commented Sep 26, 2023

Uh oh!

kaomoneus commented Sep 27, 2023

Uh oh!

kaomoneus commented Oct 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

S-Rafael commented Oct 1, 2023

Uh oh!

kaomoneus commented Oct 4, 2023

Uh oh!

kaomoneus commented Oct 7, 2023

Uh oh!

kaomoneus commented Oct 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kaomoneus commented Oct 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

kaomoneus commented May 17, 2023 •

edited

Loading

kaomoneus commented Oct 1, 2023 •

edited

Loading

kaomoneus commented Oct 7, 2023 •

edited

Loading