Skip to content

Commit

Permalink
Focus.Achievements: Handle Orre quests (issue #355)
Browse files Browse the repository at this point in the history
Orre quests are now set to be handled at the same time as Sinnoh ones
  • Loading branch information
Farigh committed Mar 26, 2024
2 parents 965003e + b3bf18d commit a2af6ed
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/lib/Farm.js
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ class AutomationFarm

if (App.game.farming.hasBerry(berryType))
{
App.game.farming.plant(index, berryType, true);
App.game.farming.plant(index, berryType);
this.__internal__plantedBerryCount++;
return true;
}
Expand Down Expand Up @@ -1916,7 +1916,7 @@ class AutomationFarm
if (App.game.farming.plotList[plotIndex].isUnlocked
&& App.game.farming.plotList[plotIndex].isEmpty())
{
App.game.farming.plant(plotIndex, berryType, true);
App.game.farming.plant(plotIndex, berryType);

// Subtract the harvest amount (-1 for the planted berry)
neededAmount -= (berryHarvestAmount - 1);
Expand Down
8 changes: 7 additions & 1 deletion src/lib/Focus/Achievements.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,17 @@ class AutomationFocusAchievements
static __internal__getRegionFromCategoryName(categoryName)
{
// Handle Sevii Island content at the same time as Hoenn content
if (categoryName == "sevii")
if ((categoryName == "sevii"))
{
return GameConstants.Region.hoenn;
}

// Handle Orre content at the same time as Sinnoh content
if ((categoryName == "orre"))
{
return GameConstants.Region.sinnoh;
}

// Handle Magikarp Jump Island content at the same time as Galar content, unless the user chose to do it last
if (categoryName == "magikarpJump")
{
Expand Down

0 comments on commit a2af6ed

Please sign in to comment.