Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-20 06:21:19 +01:00
Code Issues Projects Releases Wiki Activity

Clarify offer/accept prompt names

Browse Source
This commit is contained in:
PikaMug 2019-09-25 23:06:54 -04:00
parent fcf24a51cb
commit afaeb8e24e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -85,7 +85,7 @@ import me.blackvein.quests.listeners.DungeonsListener;
import me.blackvein.quests.listeners.NpcListener; import me.blackvein.quests.listeners.NpcListener;
import me.blackvein.quests.listeners.PartiesListener; import me.blackvein.quests.listeners.PartiesListener;
import me.blackvein.quests.listeners.PlayerListener; import me.blackvein.quests.listeners.PlayerListener;
import me.blackvein.quests.prompts.QuestAcceptPrompt; import me.blackvein.quests.prompts.QuestOfferPrompt;
import me.blackvein.quests.util.ItemUtil; import me.blackvein.quests.util.ItemUtil;
import me.blackvein.quests.util.Lang; import me.blackvein.quests.util.Lang;
import me.blackvein.quests.util.LocaleQuery; import me.blackvein.quests.util.LocaleQuery;
@ -180,9 +180,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
// 9 - Setup conversation factory after timeout has loaded // 9 - Setup conversation factory after timeout has loaded
this.conversationFactory = new ConversationFactory(this).withModality(false).withPrefix(new QuestsPrefix()) this.conversationFactory = new ConversationFactory(this).withModality(false).withPrefix(new QuestsPrefix())
.withFirstPrompt(new QuestPrompt()).withTimeout(settings.getAcceptTimeout()) .withFirstPrompt(new QuestAcceptPrompt()).withTimeout(settings.getAcceptTimeout())
.thatExcludesNonPlayersWithMessage("Console may not perform this conversation!").addConversationAbandonedListener(this); .thatExcludesNonPlayersWithMessage("Console may not perform this conversation!").addConversationAbandonedListener(this);
this.npcConversationFactory = new ConversationFactory(this).withModality(false).withFirstPrompt(new QuestAcceptPrompt(this)) this.npcConversationFactory = new ConversationFactory(this).withModality(false).withFirstPrompt(new QuestOfferPrompt(this))
.withTimeout(settings.getAcceptTimeout()).withLocalEcho(false).addConversationAbandonedListener(this); .withTimeout(settings.getAcceptTimeout()).withLocalEcho(false).addConversationAbandonedListener(this);
// 10 - Register listeners // 10 - Register listeners
@ -347,7 +347,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
} }
} }
private class QuestPrompt extends StringPrompt { private class QuestAcceptPrompt extends StringPrompt {
@Override @Override
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
@ -378,7 +378,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
msg.replace("<yes>", Lang.get(player, "yesWord")); msg.replace("<yes>", Lang.get(player, "yesWord"));
msg.replace("<no>", Lang.get(player, "noWord")); msg.replace("<no>", Lang.get(player, "noWord"));
player.sendMessage(ChatColor.RED + msg); player.sendMessage(ChatColor.RED + msg);
return new QuestPrompt(); return new QuestAcceptPrompt();
} }
} }
} }

6
main/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java → main/src/main/java/me/blackvein/quests/prompts/QuestOfferPrompt.java
View File

@ -28,13 +28,13 @@ import me.blackvein.quests.Quester;
import me.blackvein.quests.Quests; import me.blackvein.quests.Quests;
import me.blackvein.quests.util.Lang; import me.blackvein.quests.util.Lang;
public class QuestAcceptPrompt extends StringPrompt { public class QuestOfferPrompt extends StringPrompt {
private final Quests plugin; private final Quests plugin;
private Quester quester; private Quester quester;
private LinkedList<Quest> quests; private LinkedList<Quest> quests;
public QuestAcceptPrompt(Quests plugin) { public QuestOfferPrompt(Quests plugin) {
this.plugin = plugin; this.plugin = plugin;
} }
@ -96,7 +96,7 @@ public class QuestAcceptPrompt extends StringPrompt {
} }
if (q == null) { if (q == null) {
cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("invalidOption")); cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("invalidOption"));
return new QuestAcceptPrompt(plugin); return new QuestOfferPrompt(plugin);
} else { } else {
Player player = quester.getPlayer(); Player player = quester.getPlayer();
if (!quester.getCompletedQuests().contains(q.getName())) { if (!quester.getCompletedQuests().contains(q.getName())) {