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

Make COMBAT_TARGETS_PLANET_WITH_DEFENSE macro consider infrastructure #2859

Merged

Conversation

Oberlus
Copy link
Contributor

@Oberlus Oberlus commented Apr 15, 2020

Fixes #2488 as suggested by @agrrr3 in this post.

Tested with mass drivers against an Acirema HW, Furthest HW with Moderate Tech Special, and a Gysache AI HW without Planetary Defense Regeneration.

@agrrr3
Copy link
Contributor

agrrr3 commented Apr 15, 2020

@geoffthemedio As Oberlus playtested this and it is more consistent with the c++ backend, please merge (i think else the slow server game gets delayed by two weeks)

Not Defense high = 0
Not Shield high = 0
Not Defense high = 0
Not Construction high = 0
Copy link
Contributor

Choose a reason for hiding this comment

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

Does construction somehow affect it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This way it mimics the way it is done in the backend. So the answer must be yes.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes in the past it was too messy to combine regeneration for defense and shield for triggering combat with the usual balance and intended feature (zero defense and zero shields should be possible on a colony). So we reused the unused construction for triggering combat by ensuring minimum construction one (on colonies).

@geoffthemedio geoffthemedio added category:bug The Issue/PR describes or solves a perceived malfunction within the game. component:content scripting The Issue/PR deals with the FOCS language, turn events or the universe generator. component:game mechanic The Issue/PR deals with the currently used or planned game mechanics. labels Apr 15, 2020
@geoffthemedio geoffthemedio added this to the next release milestone Apr 15, 2020
@geoffthemedio geoffthemedio merged commit f2e4d6e into freeorion:master Apr 15, 2020
@geoffthemedio geoffthemedio added the status:merged All relevant commits of this PR were merged into the master development branch. label Apr 15, 2020
@Oberlus Oberlus deleted the fix-2488-targetInfrastructure branch April 20, 2020 06:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:bug The Issue/PR describes or solves a perceived malfunction within the game. component:content scripting The Issue/PR deals with the FOCS language, turn events or the universe generator. 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
Development

Successfully merging this pull request may close these issues.

Planet invasion only possible on odd turns if planet does not have defence regeneration
4 participants