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

Target infrastructure by ShortRange weapons and ensure combat #2498

Conversation

@agrrr3
Copy link
Contributor

commented Jul 7, 2019

…happens so planets may be invaded

Intended as Fix for #2488

Infrastructure (construction) boosts planetary defense so ship weapons should target all planets which have infrastructure left.

Enforcing a minimal value of one for construction via FOCS is KISS and re-triggers combat every turn which allows troops to invade the planet.
Only a single bout is wasted on "already defeated" planets, which is acceptable.

I tested that construction one always is set and after attacking a shield-less defense-less planet one can invade every turn.
Somebody probably should have a look what happens with monsters and test with force energy structures.

@agrrr3

This comment has been minimized.

Copy link
Contributor Author

commented Jul 10, 2019

Is there a tag for like help-wanted-testing ?

nullptr,
boost::make_unique<ValueRef::Constant<double>>(0.0)))))));
boost::make_unique<Condition::Not>(
boost::make_unique<Condition::MeterValue>(

This comment has been minimized.

Copy link
@geoffthemedio

geoffthemedio Jul 12, 2019

Member

Why remove the shield and defense tests?

This comment has been minimized.

Copy link
@agrrr3

agrrr3 Jul 12, 2019

Author Contributor

The implicit assumption is that you always have infrastructure if you have either defense or shields.

But that is maybe not necessarily so. So at least for robustness i will expand the condition

Fix #2488 - Target infrastructure by ShortRange weapons and ensure co…
…mbat happens so planets may be invaded

Infrastructure (construction) boosts planetary defense so ship weapons should target all planets which have infrastructure left.

Enforcing a minimal value of one for construction via FOCS is KISS and re-triggers combat every turn which allows troops to invade the planet.
Only a single bout is wasted on "already defeated" planets, which is acceptable.

@agrrr3 agrrr3 force-pushed the agrrr3:ShortRangeCombatTargetsAlsoPlanetsWithInfrastructure branch from 8e8025a to 785ccff Jul 12, 2019

@geoffthemedio

This comment has been minimized.

Copy link
Member

commented Jul 14, 2019

If you want we can merge this... Let me know.

@agrrr3

This comment has been minimized.

Copy link
Contributor Author

commented Jul 14, 2019

@geoffthemedio ok, please merge

@geoffthemedio geoffthemedio merged commit 0ab06aa into freeorion:master Jul 14, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.