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

message for pirating civ about the gold captured #71

Merged
merged 1 commit into from Jan 28, 2019

Conversation

LynxAbraxas
Copy link
Contributor

This PR introduces a game message to tell the pirating civilization what amount of gold was pirated from with trade route. This is in relation to #49.
Pirating with ctp2 style works in the way that a unit is placed on a trade route, ordered to pirate and then left there for the following turns. Gold will only be assigned at the beginning of each new turn if the unit stays there.

@MartinGuehmann
Copy link
Collaborator

In CTP1, we had two kinds of messages, one that said who the bastards were and one without that information. That should depend whether the bastards were visible on the map. But I think currently, this information is also available in the Diplomanager. So that it doesn't help to hide this and we can include as it is.

@LynxAbraxas
Copy link
Contributor Author

The messages from CTP1 that I think your refer to seem to randomly give away who it was in the message to the player suffering the pirating.
This message is only for the player doing the pirating to have some feedback that the gold arrived.

@MartinGuehmann
Copy link
Collaborator

OK, I see could you still add the message to info_str.txt from the other languages, no translation is needed, except for the German file. The translation is:

TRADE_PIRATE_GOLD "Wir erbeuteten {gold[0].value} Gold als wir den Handelsweg von {city[0].name} nach {city[1].name} von {player[0].civ_name_plural#DAT} überfiehlen."

@MartinGuehmann
Copy link
Collaborator

The English info_str.txt now contains the message, twice.

find -name info_str.txt | xargs sed -i '/^TRADE_PIRATED/aTRADE_PIRATE_GOLD                   "{gold[0].value} gold was pirated on the trade route from {city[0].name} to {city[1].name} owned by {player[0].civ_name_plural}."'
@LynxAbraxas
Copy link
Contributor Author

Ah, yes, many thanks for noticing that mistake, it's always good to have a review.
If you find the new commit OK, it would be ready for merging from my side.

@MartinGuehmann
Copy link
Collaborator

Ah, yes, many thanks for noticing that mistake, it's always good to have a review.
If you find the new commit OK, it would be ready for merging from my side.

I see. From my side it is OK, and I think it has been reviewed enough. So, when Travis is done it can go in. I don't expect any other people to comment on it.

@LynxAbraxas
Copy link
Contributor Author

Thanks for merging. History looks exactly as expected and the commit preserveds its SHA.

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

2 participants