Rename folders of wares/workers to fit new names

[wl-zocker]

When doing the big string changes, also the name of workers and wares have changed. To keep the names (game, code, folders) consistent, I suggest to rename the folders, if possible. It would make the system more logical, also to new programmers, and avoid questions like "Why is the folder of the gardener called 'ferner'?"
Since save game compatibility is broken anyway, this is no problem.

List of wares/workers which need to be updated/moved:
Ferner -> Gardener
Trunk -> Log
Bakingtray -> Bread paddle
Goldstone -> Gold ore
Metalwork Shop -> Metal workshop
Fernery -> Reed Yard

[GunChleoc (gunchleoc)]

I did a grep for "ferner" and "trunk" to see how widespread the changes would be. The following files will need to be changed:

CONTENT
- campaign scripts
- map definitions and scripts
- tribes' scripting for headquarters_medium and citadel_village
- tribe's conf and help files

PROGRAMMING
- src/ai/defaultai.cc
- src/ai/ai_hints.cc
- src/logic/legacy.cc
- test/maps/expedition.wmf
- test/maps/lua_testsuite.wmf

DOCUMENTATION
- doc/sphinx/source/introduction.rst

I could handle all those, except for src/logic/legacy.cc where I don't know what the implications are - do I rename or not?

The current terminology changes are documented on the forum:

https://wl.widelands.org/forum/topic/1449/?page=3#post-10600

But there are also older changes (e.g. bakingtray -> bread paddle) that we will need to take care of.

[Hans Joachim Desserud (hjd)]

I added goldstone/ore to the list of wares which need to be updated too.

I wouldn't worry too much about legacy.cc, it will be going away soon (bug 1292221). I don't know enough about it to say whether we should postpone this action until that file has been removed though.

[GunChleoc (gunchleoc)]

The game seems to run whether I change legacy.cc or not. So, I'll just go for it and change it to be consistent.

[Hans Joachim Desserud (hjd)]

GunChleoc: Ok, go for it.

Btw, please rename the files using `bzr move`, so that our source control is aware of the renaming. When changing the file names directly bazaar will interpret it as the old one was removed and a new one happened to be added at the same time. I also believe `bzr move`will make it possible to look into the history of the files from before they were moved. This is a nitpick issue though, so you don't need to redo already changed files, but please keep it in mind for future changes. ;)

(For an example, compare http://bazaar.launchpad.net/~hjd/widelands/bzr-mv-test/revision/6875 vs http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1292799/revision/6875)

[SirVer (sirver)]

bzr move is not a nitpick! that is really important.

this will make merge conflicts in merges less painful, as bzr can apply the patches to moved files, but not to delete or readded ones.

[GunChleoc (gunchleoc)]

I didn't see this in time. I have done an add in the other direction and then a move, I hope this will fix stuff.

[wl-zocker (wl-zocker)]

I added two more. Do you also want to change the spelling (armor, ax) and the separation of names (Cattle Farm, Helm Smithy etc.)?

[GunChleoc (gunchleoc)]

The spelling yes, the separation no. Unless somebody thinks that the separation is confusing.

I went through the conf files, you can see the items with their corresponding text very nicely there. Apart from separation the ones I think can stay as they are:

BARBARIANS
hardener=_Wood Hardener
metalworks=_Metal Workshop
oremine=_Iron Ore Mine etc.
castle_village=_Citadel Village

EMPIRE
burners_house=_Charcoal Burner
oremine=_Iron Ore Mine etc.

If you want me to fix them as well, just let me know.

[GunChleoc (gunchleoc)]

Fixed in build19-rc1.