Page MenuHomeWildfire Games

blacksmith → forge
ClosedPublic

Authored by Nescio on Aug 24 2020, 3:22 PM.

Details

Summary

This patch is similar to e.g. D2756/rP23935.
A blacksmith is a person, not a building. The correct name for a blacksmith's workshop is a forge or a smithy. This misnomer is probably ‘inherited’ from Age of Empires II; that another game is unable to use proper English is no justification for 0 A.D. to do the same.
This patch therefore:

  • renames the *_blacksmith.xml templates to *_forge.xml;
  • corrects all relevant lines in the simulation/ files;
  • updates all occurrences in the maps/ files accordingly.

To keep this patch reviewable, art and audio files are not touched here; that could be done later in a separate patch.

Test Plan

Check for correctness and completeness.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Nescio created this revision.Aug 24 2020, 3:22 PM
Owners added subscribers: Restricted Owners Package, Restricted Owners Package, Restricted Owners Package.Aug 24 2020, 3:22 PM
Nescio requested review of this revision.Aug 24 2020, 3:28 PM
genava55 accepted this revision.Aug 24 2020, 3:44 PM
genava55 added a subscriber: genava55.

I approve totally this change. I was wondering the same but I wasn't confident enough about my English to say so.

This revision is now accepted and ready to land.Aug 24 2020, 3:44 PM
Freagarach requested changes to this revision.Aug 24 2020, 3:57 PM

Grep says tutorial needs an update ^^

This revision now requires changes to proceed.Aug 24 2020, 3:57 PM

Can you specify why you chose forge instead of smithy?

Nescio updated this revision to Diff 13280.Aug 24 2020, 4:07 PM
Freagarach accepted this revision.Aug 24 2020, 4:17 PM
  • Correct.
  • Complete.
  • Nice change for the better.
This revision is now accepted and ready to land.Aug 24 2020, 4:17 PM

Can you specify why you chose forge instead of smithy?

That's a fascinating question! Both terms are basically equivalents. The reason I opted for “forge” instead of “smithy” is because blacksmith and smithy imply working with iron, whereas smith and forge can apply to any metal. While 0 A.D. is situated in the Iron Age, bronze (i.e. copper + tin) was still very important, hence why I preferred the more generic term “forge”.
Were 0 A.D. situated in the Middle Ages, I might have had proposed “smithy” instead. (The word “forge” is etymologically derived from Latin fabrica, “smithy” from Old Norse smithja.)

Freagarach added a subscriber: Gallaecio.EditedAug 24 2020, 4:31 PM

Thanks for the clarification! To me this change seems good (although I like "smithy" more, for no specific reason).
I'll ping @Gallaecio in case they have some opinion on the matter and have some time to express it.
(Else I'll commit this within a few days.)

Sounds good to me.

And I’m basically off 0 A.D. contributions again, so don’t wait on my opinion :)

And I’m basically off 0 A.D. contributions again, so don’t wait on my opinion :)

Yeah, I read that somewhere ^^ But thanks for the answer on this :D

Freagarach removed a reviewer: Restricted Owners Package.Aug 25 2020, 8:58 AM

I also approve the name change.

This revision was automatically updated to reflect the committed changes.
Owners added subscribers: Restricted Owners Package, Restricted Owners Package.Aug 26 2020, 5:00 PM

(I included the sound files (were only two) and one gui-file.)