Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-15 07:05:51 +01:00
Code Issues Projects Releases Wiki Activity

Consistency with redo-delay

Browse Source
This commit is contained in:
HappyPikachu 2017-08-27 21:36:02 -04:00
parent c424f8fc26
commit 6fa4329ac7
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/blackvein/quests/NpcEffectThread.java
View File

@ -40,7 +40,7 @@ public class NpcEffectThread implements Runnable {
if (plugin.hasQuest(npc, quester)) { if (plugin.hasQuest(npc, quester)) {
showEffect(player, npc, Quests.effect); showEffect(player, npc, Quests.effect);
} else if (plugin.hasCompletedQuest(npc, quester)) { } else if (plugin.hasCompletedQuest(npc, quester)) {
showEffect(player, npc, Quests.repeatEffect); showEffect(player, npc, Quests.redoEffect);
} }
} }
} }

2
src/main/java/me/blackvein/quests/Quester.java
View File

@ -2504,7 +2504,7 @@ public class Quester {
ItemMeta meta = display.getItemMeta(); ItemMeta meta = display.getItemMeta();
if (completedQuests.contains(quests.get(i).name)) { if (completedQuests.contains(quests.get(i).name)) {
meta.setDisplayName(ChatColor.DARK_PURPLE + Quests.parseString(quests.get(i).getName() meta.setDisplayName(ChatColor.DARK_PURPLE + Quests.parseString(quests.get(i).getName()
+ " " + ChatColor.GREEN + Lang.get("completedTag"), npc)); + " " + ChatColor.GREEN + Lang.get("redoCompleted"), npc));
} else { } else {
meta.setDisplayName(ChatColor.DARK_PURPLE + Quests.parseString(quests.get(i).getName(), npc)); meta.setDisplayName(ChatColor.DARK_PURPLE + Quests.parseString(quests.get(i).getName(), npc));
} }

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

@ -101,7 +101,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
public static int acceptTimeout = 20; public static int acceptTimeout = 20;
public static int maxQuests = 0; public static int maxQuests = 0;
public static String effect = "note"; public static String effect = "note";
public static String repeatEffect = "angry_villager"; public static String redoEffect = "angry_villager";
public final Map<UUID, Quester> questers = new HashMap<UUID, Quester>(); public final Map<UUID, Quester> questers = new HashMap<UUID, Quester>();
public final List<String> questerBlacklist = new LinkedList<String>(); public final List<String> questerBlacklist = new LinkedList<String>();
public final List<CustomRequirement> customRequirements = new LinkedList<CustomRequirement>(); public final List<CustomRequirement> customRequirements = new LinkedList<CustomRequirement>();
@ -394,7 +394,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
genFilesOnJoin = config.getBoolean("generate-files-on-join", true); genFilesOnJoin = config.getBoolean("generate-files-on-join", true);
npcEffects = config.getBoolean("npc-effects.enabled", true); npcEffects = config.getBoolean("npc-effects.enabled", true);
effect = config.getString("npc-effects.new-quest", "note"); effect = config.getString("npc-effects.new-quest", "note");
repeatEffect = config.getString("npc-effects.repeat-quest", "angry_villager"); redoEffect = config.getString("npc-effects.redo-quest", "angry_villager");
killDelay = config.getInt("kill-delay", 600); killDelay = config.getInt("kill-delay", 600);
acceptTimeout = config.getInt("accept-timeout", 20); acceptTimeout = config.getInt("accept-timeout", 20);
convertData = config.getBoolean("convert-data-on-startup", false); convertData = config.getBoolean("convert-data-on-startup", false);

2
src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java
View File

@ -38,7 +38,7 @@ public class QuestAcceptPrompt extends StringPrompt {
for (int i = 1; i <= quests.size(); i++) { for (int i = 1; i <= quests.size(); i++) {
Quest quest = quests.get(i - 1); Quest quest = quests.get(i - 1);
if (quester.completedQuests.contains(quest.getName())) { if (quester.completedQuests.contains(quest.getName())) {
menu += ChatColor.DARK_GREEN + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.GREEN + "" + ChatColor.ITALIC + quest.getName() + ChatColor.RESET + "" + ChatColor.GREEN + " " + Lang.get("completedTag") + "\n"; menu += ChatColor.DARK_GREEN + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.GREEN + "" + ChatColor.ITALIC + quest.getName() + ChatColor.RESET + "" + ChatColor.GREEN + " " + Lang.get("redoCompleted") + "\n";
} else { } else {
menu += ChatColor.GOLD + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.YELLOW + "" + ChatColor.ITALIC + quest.getName() + "\n"; menu += ChatColor.GOLD + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.YELLOW + "" + ChatColor.ITALIC + quest.getName() + "\n";
} }

2
src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -753,7 +753,7 @@ public class Lang {
langMap.put("shearSheep", "Shear <color> sheep"); langMap.put("shearSheep", "Shear <color> sheep");
langMap.put("goTo", "Go to <location>"); langMap.put("goTo", "Go to <location>");
langMap.put("completed", "Completed"); langMap.put("completed", "Completed");
langMap.put("completedTag", "(Completed)"); langMap.put("redoCompleted", "(Completed)");
// //
langMap.put("invalidSelection", "Invalid selection!"); langMap.put("invalidSelection", "Invalid selection!");
langMap.put("noActiveQuest", "You do not currently have any active Quests."); langMap.put("noActiveQuest", "You do not currently have any active Quests.");

2
src/main/resources/config.yml
View File

@ -12,7 +12,7 @@ kill-delay: 600
npc-effects: npc-effects:
enabled: true enabled: true
new-quest: note new-quest: note
repeat-quest: angry_villager redo-quest: angry_villager
max-quests: 0 max-quests: 0
convert-data-on-startup: false convert-data-on-startup: false
quester-blacklist: quester-blacklist: