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.

Sign up for GitHub

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

Jump to bottom

Start industry and research growth only if happiness is at least five #2745

Merged
merged 2 commits into from Apr 14, 2020
Merged

Start industry and research growth only if happiness is at least five #2745

merged 2 commits into from Apr 14, 2020

Conversation

agrrr3
Copy link
Contributor

@agrrr3 agrrr3 commented Feb 6, 2020 •
edited by geoffthemedio

This PR delays getting industry/research benefits directly after invasion.

forum discussion

  • Apply normal industry and research growth only if happiness is at least five
  • Apply force energy structure industry and research growth only if happiness is at least five

This should be playtested - especially xenophobes and also concentration camps. Also not sure if the AI would need to know about this.

Start industry and research growth only if happiness is at least five
5bdcb99 
* Apply normal industry and research growth only if happiness is at least five
* Apply force energy structure industry and research growth only if happiness is at least five
@geoffthemedio geoffthemedio added category:feature The Issue/PR describes or implements a new game feature. component:game mechanic The Issue/PR deals with the currently used or planned game mechanics. labels Feb 7, 2020
@geoffthemedio geoffthemedio added this to the post release milestone Feb 7, 2020
@geoffthemedio geoffthemedio added status:testing requested The Implementation can't be tested sufficiently by the developer and require support. status:work in progress The PR contains some implementation but isn't ready for merging onto the main development branch. labels Feb 7, 2020
@TheSilentOne1
Copy link
Member

There needs to be some indication for the player why production and research aren't rising; maybe make use of the planet status indicator.

@Vezzra Vezzra removed this from the post release milestone Feb 9, 2020
@geoffthemedio
Copy link
Member

@agrrr3 status update?

@agrrr3
Copy link
Contributor Author

agrrr3 commented Apr 8, 2020

Need to find time to work on the status indicator if that is a merge blocker.

Planet bad happiness status indicator, sitrep and force energy struct…
ff99143 
…ure inform about restricted industry and research meter growth.
@agrrr3
Copy link
Contributor Author

agrrr3 commented Apr 10, 2020

I guess the stringtable changes fix the status indicator, because I can simply piggyback on the usually no-colonisation-below-five-happiness status indicator. I just can not verify this currently as my dev setup is not working due to the python3 migration.

@TheSilentOne1
Copy link
Member

TheSilentOne1 commented Apr 10, 2020 •
edited

Seems fine to me, so industry and research meters now only start growing once the population treshold has been reached?

@agrrr3
Copy link
Contributor Author

agrrr3 commented Apr 10, 2020

Yes, it works, my compile works again and the text is helpful.

No playtesting done for xenophobes / concentration camps though.

@agrrr3
Copy link
Contributor Author

agrrr3 commented Apr 13, 2020

Did a short code review to check how xenos and concentration camps work. I think the changes of this PR will not affect the two. xenos scripts do not set industry or research. concentration camps do directly set the industry regardless of the current value. Should be fine. So please remove the work-in-progress, this can be merged.

@geoffthemedio geoffthemedio removed the status:work in progress The PR contains some implementation but isn't ready for merging onto the main development branch. label Apr 14, 2020
@geoffthemedio geoffthemedio merged commit 5c35c15 into freeorion:master Apr 14, 2020
@geoffthemedio geoffthemedio added status:merged All relevant commits of this PR were merged into the master development branch. and removed status:testing requested The Implementation can't be tested sufficiently by the developer and require support. labels Apr 14, 2020
@geoffthemedio geoffthemedio added this to the next release milestone Apr 14, 2020
@swaqvalley swaqvalley mentioned this pull request Apr 16, 2020
Closed
@urshmost
Copy link

Some indication in the Industry tooltip for the planet would be helpful, I had been troubleshooting this 'issue' and was about to file a report on it when I found this thread.
'Conquered Colony Strife -99' or something

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
category:feature The Issue/PR describes or implements a new game feature. component:game mechanic The Issue/PR deals with the currently used or planned game mechanics. status:merged All relevant commits of this PR were merged into the master development branch.
Projects
None yet
Milestone
v0.4.10
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@agrrr3 @TheSilentOne1 @geoffthemedio @urshmost @Vezzra