Skip to content

Commit c7b738c

Browse files
committed
Fix character minimum level checking for active party
1 parent c16d64c commit c7b738c

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

AkashaScanner/Core/Artifacts/ArtifactScrapPlan.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public override void Activate()
3636
Navigation.SelectSortOrder(0);
3737
}
3838

39-
public override ScrapResult OnReceive(Artifact item)
39+
public override ScrapResult OnReceive(Artifact item, int _)
4040
{
4141
if (item.Rarity < MinRarity)
4242
return ScrapResult.ShouldDrop | ScrapResult.ShouldStop;
@@ -61,7 +61,7 @@ public override void Activate()
6161
Navigation.SelectSortOrder(1);
6262
}
6363

64-
public override ScrapResult OnReceive(Artifact item)
64+
public override ScrapResult OnReceive(Artifact item, int _)
6565
{
6666
if (item.Level < MinLevel || (item.Level == MinLevel && item.Rarity < MinRarity))
6767
return ScrapResult.ShouldDrop | ScrapResult.ShouldStop;

AkashaScanner/Core/Characters/CharacterScrapPlan.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ protected class ByLevelScrapPlan : BasicScrapPlan
1616
{
1717
public int MinLevel { get; init; }
1818

19-
public override ScrapResult OnReceive(Character item)
19+
public override ScrapResult OnReceive(Character item, int order)
2020
{
2121
if (item.Level < MinLevel)
22-
return ScrapResult.ShouldDrop | ScrapResult.ShouldStop;
22+
{
23+
if (order > 4)
24+
return ScrapResult.ShouldDrop | ScrapResult.ShouldStop;
25+
else
26+
return ScrapResult.ShouldDrop;
27+
}
2328

2429
return ScrapResult.None;
2530
}

AkashaScanner/Core/ScrapPlans/BaseScrapPlanManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public virtual void Activate() { }
2727
public bool ShouldStopScrapping() => StoppedAt != Ongoing;
2828
public bool ShouldStopProcessing(int order) => StoppedAt != Ongoing && StoppedAt < order;
2929

30-
public virtual ScrapResult OnReceive(R item) => ScrapResult.None;
30+
public virtual ScrapResult OnReceive(R item, int order) => ScrapResult.None;
3131

3232
public ScrapResult Add(R item, int order)
3333
{
34-
var result = OnReceive(item);
34+
var result = OnReceive(item, order);
3535

3636
if (StoppedAt == Ongoing && result.ShouldStop())
3737
StoppedAt = order;

AkashaScanner/Core/Weapons/WeaponScrapPlan.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public override void Activate()
3636
Navigation.SelectSortOrder(1);
3737
}
3838

39-
public override ScrapResult OnReceive(Weapon item)
39+
public override ScrapResult OnReceive(Weapon item, int _)
4040
{
4141
if (item.Rarity < MinRarity)
4242
return ScrapResult.ShouldDrop | ScrapResult.ShouldStop;
@@ -61,7 +61,7 @@ public override void Activate()
6161
Navigation.SelectSortOrder(2);
6262
}
6363

64-
public override ScrapResult OnReceive(Weapon item)
64+
public override ScrapResult OnReceive(Weapon item, int _)
6565
{
6666
if (item.Level < MinLevel || (item.Level == MinLevel && item.Rarity < MinRarity))
6767
return ScrapResult.ShouldDrop | ScrapResult.ShouldStop;

0 commit comments

Comments
 (0)