Bug Mafia thinks Numberology summons to last adventured zone

[Erosion]

I've been wondering why my spooky forest tracker was always off by 1.
It turns out that Mafia incorrectly believes numberology summons into your last zone for turns_spent, rather than being its own thing.

Affects turns_spent as well as mafia kitchen cabinet tracking, possibly other endofcombat trackers as well.

 

[ckb]

This is related to https://kolmafia.us/threads/set-lastadventure-to-none-when-casting-calculate-the-universe.28992/

Also - There are some other things that do not correctly manage location, like $location[Trick-or-Treating]

 

[ckb]

This looks like it is due to Mafia not knowing how these fights work in in FightRequest.java, line 2995:

    // If this was an item-generated monster, reset
    KoLAdventure.setNextAdventure(KoLAdventure.lastVisitedLocation);

Commenting out this line solves the location reset for Trick-or-Treating (I don't have any more numberology casts today). But that is probably not the right thing to do.