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

Minelayer: remove unnecessary requirement on Rearmable #21380

Merged

PunkPun merged 1 commit into OpenRA:bleed from michaeldgg2:minelayer-remove-rearmable

Apr 3, 2024

Contributor

michaeldgg2 commented Mar 30, 2024

Minelayer requires Rearmable, but Minelayer does not use it. LayMines activity uses Rearmable, but it can work without it:

if ((minefield == null || minefield.Contains(self.Location)) && CanLayMine(self, self.Location))
{
    if (rearmableInfo != null && ammoPools.Any(p => p.Info.Name == minelayer.Info.AmmoPoolName && !p.HasAmmo))
    {
    // ...

This PR simply removes the mandatory dependency on Rearmable, making it possible to remove Rearmable trait on actors, which don't need to use it.


          Minelayer: remove unnecessary requirement Rearmable

a8b98cf

PunkPun approved these changes

View reviewed changes

PunkPun merged commit ed5c7bb into OpenRA:bleed

3 checks passed

Member

PunkPun commented Apr 3, 2024

michaeldgg2 deleted the minelayer-remove-rearmable branch

April 3, 2024 16:07

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment