Ported to OpenTTD mainline

smurfix commented 1 year ago

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

kaomoneus commented 1 year ago

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

smurfix commented 1 year ago

Yep.

kaomoneus commented 1 year ago

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 commented 1 year ago

It's been some time but AFAIR no.

pippin88 commented 1 year ago

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

kaomoneus commented 1 year ago

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 commented 1 year ago

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

smurfix commented 1 year ago

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 commented 1 year ago

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

kaomoneus commented 11 months ago

@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 commented 11 months ago

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

S-Rafael commented 11 months ago

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

kaomoneus commented 11 months ago

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 commented 11 months ago

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 commented 11 months ago

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 commented 11 months ago

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 commented 11 months ago

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 commented 11 months ago

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 commented 11 months ago

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

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

kaomoneus / OpenTTD

Ported to OpenTTD mainline #13

Checklist for review