Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-03-02 11:31:10 +01:00
Code Issues Projects Releases Wiki Activity

Implement new repeat-effect, per #92. Bump version number

Browse Source
This commit is contained in:
HappyPikachu 2017-08-25 00:43:19 -04:00
parent 71f60acff5
commit 7ce33b3909
4 changed files with 190 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
<name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging>

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

File diff suppressed because it is too large Load Diff

17
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 maxQuests = 0;
public static String effect = "note";
public static String repeatEffect = "enchant";
public static String repeatEffect = "angry_villager";
public final Map<UUID, Quester> questers = new HashMap<UUID, Quester>();
public final List<String> questerBlacklist = new LinkedList<String>();
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);
npcEffects = config.getBoolean("npc-effects.enabled", true);
effect = config.getString("npc-effects.new-quest", "note");
repeatEffect = config.getString("npc-effects.repeatable-quest", "note");
repeatEffect = config.getString("npc-effects.repeat-quest", "angry_villager");
killDelay = config.getInt("kill-delay", 600);
acceptTimeout = config.getInt("accept-timeout", 20);
convertData = config.getBoolean("convert-data-on-startup", false);
@ -3874,6 +3874,19 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
return false;
}
public boolean hasCompletedQuest(NPC npc, Quester quester) {
for (Quest q : quests) {
if (q.npcStart != null && quester.completedQuests.contains(q.name) == true) {
if (q.npcStart.getId() == npc.getId()) {
if (ignoreLockedQuests == false || ignoreLockedQuests == true && q.testRequirements(quester) == true) {
return true;
}
}
}
}
return false;
}
public static int getMCMMOSkillLevel(SkillType st, String player) {
McMMOPlayer mPlayer = UserManager.getPlayer(player);
if (mPlayer == null) {

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

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