Fix for stone types
parent
f8a6cab24e
commit
92b7230a4d
|
@ -644,7 +644,7 @@ namespace stardew_access.Features
|
||||||
toReturn.name = obj.DisplayName;
|
toReturn.name = obj.DisplayName;
|
||||||
|
|
||||||
// Get object names based on index
|
// Get object names based on index
|
||||||
(string? name, CATEGORY category) correctNameAndCategory = getCorrectNameAndCategoryFromIndex(index);
|
(string? name, CATEGORY category) correctNameAndCategory = getCorrectNameAndCategoryFromIndex(index, obj.Name);
|
||||||
|
|
||||||
if (correctNameAndCategory.name != null)
|
if (correctNameAndCategory.name != null)
|
||||||
toReturn = correctNameAndCategory;
|
toReturn = correctNameAndCategory;
|
||||||
|
@ -716,7 +716,7 @@ namespace stardew_access.Features
|
||||||
return MachineState.Waiting;
|
return MachineState.Waiting;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static (string? name, CATEGORY category) getCorrectNameAndCategoryFromIndex(int index)
|
private static (string? name, CATEGORY category) getCorrectNameAndCategoryFromIndex(int index, string objName)
|
||||||
{
|
{
|
||||||
switch (index)
|
switch (index)
|
||||||
{
|
{
|
||||||
|
@ -746,8 +746,30 @@ namespace stardew_access.Features
|
||||||
case 320:
|
case 320:
|
||||||
case 321:
|
case 321:
|
||||||
return ("Ice crystal", CATEGORY.Debris);
|
return ("Ice crystal", CATEGORY.Debris);
|
||||||
|
case 118:
|
||||||
|
case 120:
|
||||||
|
case 122:
|
||||||
|
case 124:
|
||||||
|
return ("Barrel", CATEGORY.MineItems);
|
||||||
|
case 119:
|
||||||
|
case 121:
|
||||||
|
case 123:
|
||||||
|
case 125:
|
||||||
|
return ("Item box", CATEGORY.MineItems);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (objName.ToLower().Contains("stone"))
|
||||||
|
{
|
||||||
|
switch (index)
|
||||||
|
{
|
||||||
|
case 76:
|
||||||
|
return ("Frozen geode", CATEGORY.MineItems);
|
||||||
|
case 77:
|
||||||
|
return ("Magma geode", CATEGORY.MineItems);
|
||||||
case 75:
|
case 75:
|
||||||
return ("Geode", CATEGORY.MineItems);
|
return ("Geode", CATEGORY.MineItems);
|
||||||
|
case 819:
|
||||||
|
return ("Omni geode node", CATEGORY.MineItems);
|
||||||
case 32:
|
case 32:
|
||||||
case 34:
|
case 34:
|
||||||
case 36:
|
case 36:
|
||||||
|
@ -772,35 +794,19 @@ namespace stardew_access.Features
|
||||||
case 816:
|
case 816:
|
||||||
case 817:
|
case 817:
|
||||||
return ("Fossil stone", CATEGORY.Debris);
|
return ("Fossil stone", CATEGORY.Debris);
|
||||||
case 118:
|
case 25:
|
||||||
case 120:
|
return ("Mussel Node", CATEGORY.MineItems);
|
||||||
case 122:
|
case 95:
|
||||||
case 124:
|
return ("Radioactive Node", CATEGORY.MineItems);
|
||||||
return ("Barrel", CATEGORY.MineItems);
|
case 843:
|
||||||
case 119:
|
case 844:
|
||||||
case 121:
|
return ("Cinder shard node", CATEGORY.MineItems);
|
||||||
case 123:
|
|
||||||
case 125:
|
|
||||||
return ("Item box", CATEGORY.MineItems);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Game1.currentLocation is Mine or MineShaft)
|
|
||||||
{
|
|
||||||
switch (index)
|
|
||||||
{
|
|
||||||
case 76:
|
|
||||||
return ("Frozen geode", CATEGORY.MineItems);
|
|
||||||
case 77:
|
|
||||||
return ("Magma geode", CATEGORY.MineItems);
|
|
||||||
case 8:
|
case 8:
|
||||||
case 66:
|
case 66:
|
||||||
return ("Amethyst node", CATEGORY.MineItems);
|
return ("Amethyst node", CATEGORY.MineItems);
|
||||||
case 14:
|
case 14:
|
||||||
case 62:
|
case 62:
|
||||||
return ("Aquamarine node", CATEGORY.MineItems);
|
return ("Aquamarine node", CATEGORY.MineItems);
|
||||||
case 843:
|
|
||||||
case 844:
|
|
||||||
return ("Cinder shard node", CATEGORY.MineItems);
|
|
||||||
case 2:
|
case 2:
|
||||||
case 72:
|
case 72:
|
||||||
return ("Diamond node", CATEGORY.MineItems);
|
return ("Diamond node", CATEGORY.MineItems);
|
||||||
|
@ -822,8 +828,6 @@ namespace stardew_access.Features
|
||||||
case 10:
|
case 10:
|
||||||
case 68:
|
case 68:
|
||||||
return ("Topaz node", CATEGORY.MineItems);
|
return ("Topaz node", CATEGORY.MineItems);
|
||||||
case 819:
|
|
||||||
return ("Omni geode node", CATEGORY.MineItems);
|
|
||||||
case 751:
|
case 751:
|
||||||
case 849:
|
case 849:
|
||||||
return ("Copper node", CATEGORY.MineItems);
|
return ("Copper node", CATEGORY.MineItems);
|
||||||
|
|
Loading…
Reference in New Issue