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.

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

Respect missing pants slot when equipping discount trousers #935

Merged
merged 2 commits into from Jul 29, 2022
Merged

Respect missing pants slot when equipping discount trousers #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e1d7a1
Respect missing pants slot when equipping discount trousers
gausie Jul 29, 2022
ad82fcb
Merge branch 'main' into respect-glover-for-discounts
gausie Jul 29, 2022
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
5 changes: 3 additions & 2 deletions src/net/sourceforge/kolmafia/request/NPCPurchaseRequest.java
View file
Open in desktop
Expand Up @@ -163,9 +163,10 @@ private static boolean usingTrousers() {
return DISCOUNT_TROUSERS.contains(EquipmentManager.getEquipment(EquipmentManager.PANTS));
}

private static AdventureResult ownTrousers() {
private static AdventureResult getEquippableTrousers() {
return DISCOUNT_TROUSERS.stream()
.filter(KoLConstants.inventory::contains)
.filter(EquipmentManager::canEquip)
.findFirst()
.orElse(null);
}
Expand Down Expand Up @@ -273,7 +274,7 @@ public boolean ensureProperAttire() {
// purchase, but only if auto-recovery isn't running.

if (!usingTrousers()) {
var trousers = ownTrousers();
var trousers = getEquippableTrousers();
if (trousers != null) {
(new EquipmentRequest(trousers, EquipmentManager.PANTS)).run();
}
Expand Down
76 changes: 49 additions & 27 deletions test/net/sourceforge/kolmafia/request/NPCPurchaseRequestTest.java
View file
Open in desktop
Expand Up @@ -4,14 +4,17 @@
import static internal.helpers.Networking.assertPostRequest;
import static internal.helpers.Player.withEquippableItem;
import static internal.helpers.Player.withEquipped;
import static internal.helpers.Player.withPath;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;

import internal.helpers.Cleanups;
import internal.helpers.HttpClientWrapper;
import net.sourceforge.kolmafia.AscensionPath;
import net.sourceforge.kolmafia.session.EquipmentManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;

class NPCPurchaseRequestTest {
Expand All @@ -26,37 +29,56 @@ public void canGetPrice() {
assertThat(req.getPrice(), equalTo(50));
}

@Test
public void priceDiscountedByTravoltanTrousers() {
var cleanups = new Cleanups(withEquipped(EquipmentManager.PANTS, "Travoltan trousers"));
try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
assertThat(req.getPrice(), equalTo(66));
@Nested
class DiscountTrousers {
@Test
public void priceDiscountedByTravoltanTrousers() {
var cleanups = new Cleanups(withEquipped(EquipmentManager.PANTS, "Travoltan trousers"));
try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
assertThat(req.getPrice(), equalTo(66));
}
}
}

@Test
public void priceDiscountedBySweatpants() {
var cleanups = new Cleanups(withEquipped(EquipmentManager.PANTS, "designer sweatpants"));
try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
assertThat(req.getPrice(), equalTo(66));
@Test
public void priceDiscountedBySweatpants() {
var cleanups = new Cleanups(withEquipped(EquipmentManager.PANTS, "designer sweatpants"));
try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
assertThat(req.getPrice(), equalTo(66));
}
}
}

@Test
public void equipsTrousersIfNecessary() {
var cleanups = new Cleanups(withEquippableItem("designer sweatpants"));

try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
var result = req.ensureProperAttire();
assertThat(result, equalTo(true));

var requests = getRequests();
assertThat(requests, hasSize(1));
assertPostRequest(
requests.get(0), "/inv_equip.php", "which=2&ajax=1&action=equip&whichitem=10929");
@Test
public void equipsTrousersIfNecessary() {
var cleanups = new Cleanups(withEquippableItem("designer sweatpants"));

try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
var result = req.ensureProperAttire();
assertThat(result, equalTo(true));

var requests = getRequests();
assertThat(requests, hasSize(1));
assertPostRequest(
requests.get(0), "/inv_equip.php", "which=2&ajax=1&action=equip&whichitem=10929");
}
}

@Test
public void respectsMissingPantsSlot() {
var cleanups =
new Cleanups(
withEquippableItem("designer sweatpants"), withPath(AscensionPath.Path.YOU_ROBOT));

try (cleanups) {
var req = new NPCPurchaseRequest("Hippy Store (Hippy)", "hippy", 242, 665, 70, 1);
var result = req.ensureProperAttire();
assertThat(result, equalTo(true));

var requests = getRequests();
assertThat(requests, hasSize(0));
}
}
}
}