Refund allocation fix

freddyhayward · June 27, 2021, 03:04:24 AM

The main bug fixed by this pull request is that refunds weren't properly allocated. They now correctly identify and charge from their preferred line or convoy, rather than the owner of the stop, which apart from sometimes being a different owner to the line/convoy, did not identify the line/convoy or waytype, appearing as a mysterious 'other' instead.
~~https://github.com/jamespetts/simutrans-extended/pull/398~~
edit: the previous pull request has been closed in favour of https://github.com/jamespetts/simutrans-extended/pull/399, which only contains the bug fix.

jamespetts · June 27, 2021, 11:10:51 AM

Thank you for this. I see that there is a translation patch in this; I am concerned that this might make it harder to merge changes from Standard in the future. I do not think that these translation changes have yet made it into Standard?

freddyhayward · June 27, 2021, 11:19:02 AM

Quote from: jamespetts on June 27, 2021, 11:10:51 AMThank you for this. I see that there is a translation patch in this; I am concerned that this might make it harder to merge changes from Standard in the future. I do not think that these translation changes have yet made it into Standard?

They haven't indeed. Personally, it is much easier to work with the english translation. What would you prefer to be done? I can submit the translations to standard, revert the translations here, or leave the two separate.

jamespetts · June 27, 2021, 12:24:32 PM

Quote from: freddyhayward on June 27, 2021, 11:19:02 AM
They haven't indeed. Personally, it is much easier to work with the english translation. What would you prefer to be done? I can submit the translations to standard, revert the translations here, or leave the two separate.

I would suggest both submitting the translations to Standard and reverting the translations here - we can re-incorporate them when they have been merged from Standard.

I also find it much easier to work in English, but this is outweighed by the difficulty of incorporating from Standard when there have been translation changes in one but not the other.

freddyhayward · June 27, 2021, 02:49:53 PM

The original pull request has now closed in favour of https://github.com/jamespetts/simutrans-extended/pull/399

RESTRICTED ACCOUNT · June 28, 2021, 10:57:50 PM

There are many German functions left in the files related to city. It will be easier to translate this into English with standard and extended before improving the city's growth system.
Also there are still a few left over in the factory related stuff.
Unfortunately I have studied Janglish for 8 years in school but I can't speak English... (like many Japanese)

freddyhayward · June 29, 2021, 12:40:55 PM

James, this branch is ready to be merged. It now deals only with the bug in question.

makie · June 29, 2021, 01:51:27 PM

Quote from: Ranran on June 28, 2021, 10:57:50 PM
Unfortunately I have studied Janglish for 8 years in school but I can't speak English... (like many Japanese)

Oh a friend from me talk to a Japanese. He say Japanese is easy to speaking but difficult to leading and lighting.

jamespetts · July 04, 2021, 10:15:43 AM

Quote from: freddyhayward on June 29, 2021, 12:40:55 PM
James, this branch is ready to be merged. It now deals only with the bug in question.

Splendid, thank you - now incorporated (as of yesterday).

News:

Refund allocation fix