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

Fix or remove bogus yaml definitions from the default mods. #15253

Merged
merged 8 commits into from Jun 14, 2018

Conversation

Projects
None yet
3 participants
@pchote
Copy link
Member

pchote commented Jun 12, 2018

This PR removes all of the unused/bogus trait and weapon property definitions in the default mods. See commit descriptions for more info where required, and feel free to use my throw-on-junk-properties branch to verify that there are no more hidden cases (except for the AI support power decisions, which will have a PR of their own).

Fixes #15232.
Fixes #15233.
Fixes #15234.
Fixes #15236.
Fixes #15250.

pchote added some commits Jun 12, 2018

Fix DamageTypes definitions for forest fires.
In practice this doesn't actually change anything
because TargetType restrictions already guarantee
that only Incideniary weapons can damage them.
Fix RocketLauncher projectile inheritance.
This projectile inherits the Missile template,
but then overrides it with ballistic behaviour.
This prevents all of the Missile properties that
aren't used by Bullet from being inherited.
Remove bogus undefined/unused trait property definitions.
None of these exist in current bleed, so this
won't change any in-game behaviour.

@pchote pchote added this to the Next release milestone Jun 12, 2018

@@ -596,7 +596,6 @@ outpost:
RequiresCondition: !severe-damaged
GrantConditionOnDamageState@STOPDISH:
Condition: severe-damaged
ValidDamageState: Medium, Heavy, Critical

This comment has been minimized.

@pchote

pchote Jun 12, 2018

Author Member

The correct yaml name here would be ValidDamageStates, but this then produces the wrong behaviour ingame. We don't want to stop the dish on Medium; only on Heavy and Critical, which is already the default.

@@ -1130,7 +1129,6 @@ palace:
RequiresCondition: !launchpad-damaged && harkonnen
GrantConditionOnDamageState@LAUNCHPADDAMAGED:
Condition: launchpad-damaged
ValidDamageState: Medium, Heavy, Critical

This comment has been minimized.

@pchote

pchote Jun 12, 2018

Author Member

Likewise here.

@@ -506,7 +506,6 @@ THF:
Passenger:
PipType: Yellow
Infiltrates:
InfiltrateTypes: Cash

This comment has been minimized.

@pchote

pchote Jun 12, 2018

Author Member

We don't define Cash as an infiltratable type, so renaming this to Types would still have been wrong.

@@ -706,7 +705,6 @@ Ant:
Mobile:
Speed: 99
TurnSpeed: 12
SharesCell: no

This comment has been minimized.

@pchote

pchote Jun 12, 2018

Author Member

Related to #15235, which is not fixed here. This PR just removes the bogus definition.

@@ -367,7 +367,6 @@
Selectable:
Priority: 2
RevealsShroud:
VisibilityType: CenterPosition

This comment has been minimized.

@pchote

pchote Jun 12, 2018

Author Member

Related to #15231, which is not fixed here. This PR just removes the bogus definition.

@reaperrr reaperrr merged commit 75f78f8 into OpenRA:bleed Jun 14, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pchote pchote deleted the pchote:remove-bogus-yaml-definitions branch Jul 9, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.