Added the Missing Bundle
parent
5e65ca8dbd
commit
18a671d97a
|
@ -326,11 +326,9 @@ namespace stardew_access.Features
|
||||||
|
|
||||||
public static string? getJunimoBundleAt(int x, int y)
|
public static string? getJunimoBundleAt(int x, int y)
|
||||||
{
|
{
|
||||||
if (Game1.currentLocation is not CommunityCenter communityCenter || Game1.currentLocation is not AbandonedJojaMart abandonedJojaMart)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
string? name = null;
|
string? name = null;
|
||||||
if (communityCenter != null)
|
if (Game1.currentLocation is CommunityCenter communityCenter)
|
||||||
|
{
|
||||||
name = (x, y) switch
|
name = (x, y) switch
|
||||||
{
|
{
|
||||||
(14, 5) => "Pantry",
|
(14, 5) => "Pantry",
|
||||||
|
@ -341,19 +339,22 @@ namespace stardew_access.Features
|
||||||
(46, 11) => "Bulletin Board",
|
(46, 11) => "Bulletin Board",
|
||||||
_ => null,
|
_ => null,
|
||||||
};
|
};
|
||||||
else if (abandonedJojaMart != null)
|
if (name != null && communityCenter.shouldNoteAppearInArea(CommunityCenter.getAreaNumberFromName(name)))
|
||||||
|
return $"{name} bundle";
|
||||||
|
}
|
||||||
|
else if (Game1.currentLocation is not AbandonedJojaMart)
|
||||||
|
{
|
||||||
name = (x, y) switch
|
name = (x, y) switch
|
||||||
{
|
{
|
||||||
(8, 8) => "Missing",
|
(8, 8) => "Missing",
|
||||||
_ => null,
|
_ => null,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (name != null && communityCenter != null && communityCenter.shouldNoteAppearInArea(CommunityCenter.getAreaNumberFromName(name)))
|
if (name != null)
|
||||||
return $"{name} bundle";
|
return $"{name} bundle";
|
||||||
else if (name != null && abandonedJojaMart != null)
|
}
|
||||||
return $"{name} bundle";
|
|
||||||
else
|
return null;
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool isCollidingAtTile(int x, int y)
|
public static bool isCollidingAtTile(int x, int y)
|
||||||
|
|
Loading…
Reference in New Issue