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

City states adjustments #4597

Merged
merged 6 commits into from
Jul 22, 2021
Merged

City states adjustments #4597

merged 6 commits into from
Jul 22, 2021

Conversation

SimonCeder
Copy link
Collaborator

@SimonCeder SimonCeder commented Jul 21, 2021

Adds extra checks for city states to make them behave more like Civ V

  • City states spawn only with one settler regardless of difficulty and era
  • City states will not explore more than one hex outside their territory. They will still go after barbarians and enemy civs.
  • EDIT: Added factors for slower production, pop growth, and border expansion for city states.
  • Default number of city states in a new game is now 8 (the Civ V default; they are now less annoying than before)

@xlenstra
Copy link
Collaborator

Based on a quick skim of the source code for the base game, city states require 1.5 times as much culture for border expansion

@ajustsomebody
Copy link
Contributor

should i open a todo list issue that has missing features for city states?

@xlenstra
Copy link
Collaborator

should i open a todo list issue that has missing features for city states?

Sure! I would advise on putting it in #663, but that would save us work on figuring it all out

@ajustsomebody
Copy link
Contributor

ajustsomebody commented Jul 21, 2021

should i open a todo list issue that has missing features for city states?

Sure! I would advise on putting it in #663, but that would save us work on figuring it all out

i think #663 is too cluttered, i will open the thread tomorrow if it is okay

@SimonCeder
Copy link
Collaborator Author

should i open a todo list issue that has missing features for city states?

That would be very helpful!

Based on a quick skim of the source code for the base game, city states require 1.5 times as much culture for border expansion

So it is! m_iMINOR_CIV_PLOT_CULTURE_COST_MULTIPLIER(150), CvGlobals.cpp. For some reason I never thought to look. Adjusted. Turns out there are also multipliers for growth, production, etc.

@ravignir
Copy link
Contributor

  • Default number of city states in a new game is now 8 (the Civ V default; they are now less annoying than before)

Yes, but civ5 map is bigger(56×36), unciv is (44x29).
That feels more like 3 civs/6 city states.

@ajustsomebody
Copy link
Contributor

ajustsomebody commented Jul 22, 2021

@SimonCeder @xlenstra done! #4602
also i have lot more mega-threads about issues, just in case yall might want to check them

@SimonCeder
Copy link
Collaborator Author

  • Default number of city states in a new game is now 8 (the Civ V default; they are now less annoying than before)

Yes, but civ5 map is bigger(56×36), unciv is (44x29).
That feels more like 3 civs/6 city states.

Actually it should be 5 city states for the same density! 6 sounds good for now.

@@ -290,11 +290,11 @@ object GameStarter {


if (civ.isCityState()) {
// City states should spawn with one settler only irregardless of era and difficulty
Copy link
Owner

Choose a reason for hiding this comment

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

Please don't use the word irregardless

Copy link
Collaborator

Choose a reason for hiding this comment

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

🤣 I just had to check this discussion because I saw that creative word in Studio without the spellchecker whining - and - eagle eyes. I actually quite like it.

@yairm210 yairm210 merged commit f41d30e into yairm210:master Jul 22, 2021
@SomeTroglodyte
Copy link
Collaborator

👍 I like where this is going went. Just one thing comes to mind: It might help future coders to see the quality of research backing some code decisions so they won't go and re-research. So a *= 1.5f // from original source code or similar could be useful someday. I get the current commenting is from before this discussion here - just - food for thought.

@SimonCeder SimonCeder deleted the city-states branch July 23, 2021 17:28
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.

6 participants