Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved Great People #140

Merged
merged 10 commits into from Jan 17, 2017
Merged

Improved Great People #140

merged 10 commits into from Jan 17, 2017

Conversation

etiennefd
Copy link
Contributor

@etiennefd etiennefd commented Jan 16, 2017

At first I was going to simply correct a few mistakes here and there, and maybe add some names I could think of. I ended up adding quite a lot.

Highlights:

  • fixed many spelling mistakes, missing diacritics, missing first names, missing feminine markers, wrong types of GP, wrong eras, and names that were not in their native language
  • the German merchant and engineer lists were identical; I split them and added several names
  • added some non-prophet names for Tibet, then realized Tibet uses Chinese lists, and figured I'd leave the names in anyway
  • tried to improve ancient or poorly known civilization lists (Egypt, Babylon, Phoenicia, Aztecs), which often include random ruler names that have nothing to do with their type. It's better now, especially for artists and scientists, though it's still not perfect.

~ Steb

Copy link
Owner

@dguenms dguenms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall really great changes, both all the minor bugs and misspellings you caught and the new additions and era adjustments.

Only some minor comments, we can merge after you have addressed them.

"Pygmalion", # 9th BC
"fElishat", # 8th BC
"Hanno", # 5th BC
"Azelmicus", # 4th BC
"Hanno", # 4th BC
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should add a split into the classical era with the 4th century BC onwards?

"Katsushika Hokusai", # 18th
"Yosa Buson", # 18th
iIndustrial,
"Katsushika Hokusai", # 19th
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -666,15 +700,15 @@ def setup():
"Shigeru Miyamoto", # 20th
],
iGreatStatesman : [
"Shoutouku Taishi", # 6th
"Shotoku Taishi", # 6th
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to Wikipedia, the correct transliteration is Shoutoku Taishi. DoC consistently uses wapuro romaji for transliteration, where long o = ou.

iMedieval,
"Taira no Kiyomori", # 12th
iRenaissance,
"Tokugawa Ieyasu", # 16th
"Arai Hakuseki", # 17th
iIndustrial,
"Sakamoto Ryouma", # 19th
"Oukubo Toshimichi", # 19th
"Sakamoto Ryoma", # 19th
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ryouma (see above).

"Sakamoto Ryouma", # 19th
"Oukubo Toshimichi", # 19th
"Sakamoto Ryoma", # 19th
"Okubo Toshimichi", # 19th
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oukubo (see above).

@@ -2228,6 +2317,12 @@ def setup():
iModern,
"Tenzin Gyatso", # 20th
],
iGreatScientist : [
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the current code, Tibet won't use these entries, but the Chinese lists instead (there is a special rule coded into the getAlias() method above). We can change this, but I'm not sure if it's better to only have one name in your list.

- More Tibetan names
- Wapuro romaji (long o = ou) for Japanese names
@AppVeyorBot
Copy link

@etiennefd
Copy link
Contributor Author

Thanks for your comments! They should now be addressed.

I have to disagree that DoC "consistently uses wapuro romaji for transliteration", since the long o's were represented by "o" in all Japanese names except the three I changed! But according to your preference (which is not the same as mine), I changed all of them to "ou".

The only proper response to your comment on Tibetan names, of course, was do some research and make decent lists for all categories. (Some names, like Yeshe Tsogyal and Tsongkhapa, probably fit more as prophets, but I didn't want to mess up the Dalai-Lama concept.)

@dguenms
Copy link
Owner

dguenms commented Jan 17, 2017

Thanks for changing the Japanese names. You're right that "consistently" is a bit of an overstatement, but it is my preferred standard (considering Civ4 cannot render the appropriate diacritic), and stuff like city names already adheres to the rule pretty strictly, so names should too.

Good call on keeping the prophets limited to dalai lamas, it's mostly that way to improve immersion when playing the Tibetan UHV. So for the moment we are agreed to keep the other Tibetan GP names, but keep them disabled, until the lists are further expanded?

@etiennefd
Copy link
Contributor Author

I think there are sufficient Tibetan names now, and in fact I took the initiative to remove the getAlias() line already. Your call.

@dguenms
Copy link
Owner

dguenms commented Jan 17, 2017

Oh sorry, haven't even looked into the code again yet. That's indeed an impressive list! Merge coming.

@dguenms dguenms merged commit 11bf29e into dguenms:develop Jan 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants