A clanmate just fought the NS after forgetting to switch back to the familiar she was doing a 100% run with. Apparently the familiar warning added by Hola in r9762 wasn't shown before the NS fight.
Specifically, I think the culprit is the change in r9770 in which an AreaCombatData check was added:
It looks like the Sorceress Tower isn't included in combats.txt, so areaSummary is probably null for the NS fight. The warning probably doesn't fire for the tower monsters or the Shadow fight either.
I'm not sure what the best way to fix this is:
- roll back r9770
- add "Level 1" to "Level 6", "Shadow Fight" and "Naughty Sorceress" to combats.txt
- add something like urlString.indexOf( "lair" ) != -1 to the check above
Thoughts?
Specifically, I think the culprit is the change in r9770 in which an AreaCombatData check was added:
PHP:
if ( KoLCharacter.getFamiliar().isUnexpectedFamiliar() && areaSummary != null && areaSummary.combats() > 0 &&
( !KoLCharacter.kingLiberated() || KoLCharacter.getFamiliar().getId() == FamiliarPool.BLACK_CAT ) )
{
this.sendFamiliarWarning();
return;
}
It looks like the Sorceress Tower isn't included in combats.txt, so areaSummary is probably null for the NS fight. The warning probably doesn't fire for the tower monsters or the Shadow fight either.
I'm not sure what the best way to fix this is:
- roll back r9770
- add "Level 1" to "Level 6", "Shadow Fight" and "Naughty Sorceress" to combats.txt
- add something like urlString.indexOf( "lair" ) != -1 to the check above
Thoughts?