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

Corporation fixes #139

Merged
merged 1 commit into from Jan 17, 2017
Merged

Corporation fixes #139

merged 1 commit into from Jan 17, 2017

Conversation

MeuhV1
Copy link
Contributor

@MeuhV1 MeuhV1 commented Jan 15, 2017

Fixed wrong buttons in corporation advisor
Fixed corpotion pedia page when playing Brazil

REQUIRES RECOMPILING THE DLL

@MeuhV1 MeuhV1 changed the title GP names in pedia and corporation fixs GP names in pedia and corporation fixes Jan 15, 2017
@AppVeyorBot
Copy link

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.

I don't think I want the Great People lists to be visible in the civilopedia. Discovering all the names that exist should be part of the game, and a reward for getting those GPs, in my opinion.

Can you separate the actual bug fixes from this pull request so I can approve them on their own? Everything looks fine there for me.

@MeuhV1
Copy link
Contributor Author

MeuhV1 commented Jan 16, 2017

Done

@MeuhV1 MeuhV1 changed the title GP names in pedia and corporation fixes Corporation fixes Jan 16, 2017
@AppVeyorBot
Copy link

@@ -102,6 +102,7 @@ def __init__(self):
self.W_INFLUENCES_AREA = self.X_CITY2_AREA + self.W_CITY_AREA - self.X_INFLUENCES_AREA
self.H_INFLUENCES_AREA = self.H_REQUIREMENTS_AREA
self.INFLUENCES_ID = "InfluencessAreaWidget"
self.iCorporationTech = iCorporation
Copy link
Owner

Choose a reason for hiding this comment

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

I suggest to solve this using

from Consts import *
from Consts import iCorporation as iCorporationTech

Should work iirc. At least the iCorporationTech shouldn't be a member variable of the CvCorporationScreen class.

@AppVeyorBot
Copy link

@MeuhV1
Copy link
Contributor Author

MeuhV1 commented Jan 16, 2017

Incorporated (pun intended) suggestions.

@AppVeyorBot
Copy link

@dguenms dguenms merged commit 66705f8 into dguenms:develop Jan 17, 2017
@MeuhV1 MeuhV1 deleted the Civilopedia branch April 20, 2017 07:51
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