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

Changing form requires concoction refresh. Drop transformed outfit pieces from checkpoints. #2236

Merged
merged 1 commit into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/net/sourceforge/kolmafia/request/TinkeringBenchRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import net.sourceforge.kolmafia.AdventureResult;
import net.sourceforge.kolmafia.KoLConstants;
import net.sourceforge.kolmafia.KoLmafia;
import net.sourceforge.kolmafia.SpecialOutfit;
import net.sourceforge.kolmafia.objectpool.Concoction;
import net.sourceforge.kolmafia.objectpool.ConcoctionPool;
import net.sourceforge.kolmafia.objectpool.ItemPool;
Expand Down Expand Up @@ -97,6 +98,15 @@ public void run() {
return;
}

// CreateItemRequest makes an outfit Checkpoint in its item creation
// loop. If we were wearing an item which we are upgrading, we don't
// want it to try to equip it, find it is gone, and try to make
// another one. It won't be possible, but its wasted effort and
// obfuscates the logging.
for (AdventureResult item : this.concoction.getIngredients()) {
SpecialOutfit.forgetEquipment(item);
}

KoLmafia.updateDisplay("Creating 1 " + this.getName() + "...");
super.run();
}
Expand Down
10 changes: 10 additions & 0 deletions src/net/sourceforge/kolmafia/session/ChoiceControl.java
Original file line number Diff line number Diff line change
Expand Up @@ -6744,6 +6744,16 @@
break;
}

case 1520:
// Well, come on
// -> Lose Savage Beast and gain Mild-Mannered Professor
case 1521:
// Turn and face the strange
// -> Lose Mild-Mannered Professor and gain Savage Beast
// In either case, access to the Tinkering Bench changes
ConcoctionDatabase.refreshConcoctions();
break;

Check warning on line 6755 in src/net/sourceforge/kolmafia/session/ChoiceControl.java

View check run for this annotation

Codecov / codecov/patch

src/net/sourceforge/kolmafia/session/ChoiceControl.java#L6754-L6755

Added lines #L6754 - L6755 were not covered by tests

case 1523:
// Research Bench
ResearchBenchRequest.postChoice2(urlString, text);
Expand Down