[PATCH] Restricted classes should allow whitelisting

[elexis]

The RestrictedClasses property of the Attack component allows to blacklist certain entity types from being attacked by the unit.

For example women are allowed to attack other women and siege, but not buildings or fighters.

However right now one can only specify a blacklist, not a whitelist. The fishing ship ought to be able to only attack SeaCreature. Since we can only specify a blacklist and not a whitelist, we have to add every possible entity to that list that isn't a SeaCreature. Notice the attack cursor when selecting a fishing ship and hovering any land animal.

Instead one should be able to specify a whitelist or blacklist.

Related code: RestrictedClasses in Attack.js and simulation/templates/

refs r11710 r11873

[elexis]

In 18509:

Prevent fishing ships from trying to attack entities besides fauna, refs #4092.

[mimo]

I don't think r18509 is the right approach. It would be much better that the tests on RestrictedClasses use the MatchesClassList function from globalscripts instead of the indexOf, and then it would be enough to have "!"SeaCreature

[elexis]

Thanks for the hint, that's indeed better than the proposal of the ticket description, as it would also mean that we don't have to differentiate between a blacklist and a whitelist in the template and also allows for logical OR/AND.

[erraunt]

uninteresting obvious part of the patch.

[erraunt]

Changed in the way suggested by mimo, looks rather simple, hopefully it is correct. Tested in-game, and looks like it is working.

[erraunt]

Not sure why the diff tool prints strange indentation though.

[elexis]

Added AI compatibility, as noticed by fatherbushido. Those are all the occurances of RestrictedClasses. Couldn't find any template besides the fishing ship which has an Attack component but no attacking abilities (besides killing whale).

[elexis]

nuked one loc too much

[fatherbushido]

In 18741:

Uses MatchesClassList for restricted classes tests in order to allow more flexibility as whitelisting. Uses it for fishing boat template and fixes a cursor inconsistency. Patch by erraunt and elexis. Fixes #4092