reset card shop when travelling among worlds

This commit is contained in:
myk
2013-03-05 19:52:48 +00:00
parent 8aab4c8c6e
commit b613464e3f

View File

@@ -297,6 +297,7 @@ public class SSubmenuQuestUtil {
if (worlds.size() < 1) { if (worlds.size() < 1) {
JOptionPane.showMessageDialog(null, "There are currently no worlds you can travel to\nin this version of Forge.", "No worlds", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(null, "There are currently no worlds you can travel to\nin this version of Forge.", "No worlds", JOptionPane.ERROR_MESSAGE);
return;
} }
final String setPrompt = "Where do you wish to travel?"; final String setPrompt = "Where do you wish to travel?";
@@ -307,7 +308,6 @@ public class SSubmenuQuestUtil {
} }
if (qCtrl.getWorld() != newWorld) { if (qCtrl.getWorld() != newWorld) {
boolean needRemove = false; boolean needRemove = false;
if (nextChallengeInWins() < 1 && qCtrl.getAchievements().getCurrentChallenges().size() > 0) { if (nextChallengeInWins() < 1 && qCtrl.getAchievements().getCurrentChallenges().size() > 0) {
needRemove = true; needRemove = true;
@@ -329,7 +329,7 @@ public class SSubmenuQuestUtil {
qCtrl.getAchievements().addChallengesPlayed(); qCtrl.getAchievements().addChallengesPlayed();
} }
Singletons.getModel().getQuest().getAchievements().getCurrentChallenges().clear(); qCtrl.getAchievements().getCurrentChallenges().clear();
} }
qCtrl.setWorld(newWorld); qCtrl.setWorld(newWorld);
@@ -341,6 +341,7 @@ public class SSubmenuQuestUtil {
// then re-selecting your current quest data file.) // then re-selecting your current quest data file.)
qCtrl.getDuelsManager().randomizeOpponents(); qCtrl.getDuelsManager().randomizeOpponents();
qCtrl.getChallengesManager().randomizeOpponents(); qCtrl.getChallengesManager().randomizeOpponents();
qCtrl.getCards().clearShopList();
qCtrl.save(); qCtrl.save();
} }
} }