Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

Added option to quests to prevent quest progress increase in restricted area

Browse Source 
https://github.com/Zrips/Jobs/issues/166#issuecomment-511266927
This commit is contained in:
montlikadani 2019-07-17 21:31:19 +02:00
parent 80ab006084
commit deba8e6f45
4 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -907,6 +907,7 @@ public class ConfigManager {
List<String> commands = sqsection.getStringList("RewardCommands");
List<String> desc = sqsection.getStringList("RewardDesc");
List<String> areas = sqsection.getStringList("RestrictedAreas");
if (sqsection.isInt("fromLevel"))
quest.setMinLvl(sqsection.getInt("fromLevel"));
@ -918,6 +919,7 @@ public class ConfigManager {
quest.setChance(chance);
quest.setRewardCmds(commands);
quest.setDescription(desc);
quest.setRestrictedArea(areas);
quests.add(quest);
} catch (Throwable e) {

9
src/main/java/com/gamingmesh/jobs/container/Quest.java
View File

@ -23,6 +23,7 @@ public class Quest {
private List<String> rewardCmds = new ArrayList<>();
private List<String> rewards = new ArrayList<>();
private List<String> area = new ArrayList<>();
private HashMap<String, QuestObjective> objectives = new HashMap<>();
private Set<ActionType> actions = new HashSet<>();
@ -48,6 +49,14 @@ public class Quest {
this.rewards = rewards;
}
public List<String> getRestrictedAreas() {
return area;
}
public void setRestrictedArea(List<String> area) {
this.area = area;
}
public Long getValidUntil() {
if (validUntil < System.currentTimeMillis()) {
int hour = Jobs.getGCManager().getResetTimeHour();

14
src/main/java/com/gamingmesh/jobs/container/QuestProgression.java
View File

@ -6,6 +6,8 @@ import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.event.server.ServerCommandEvent;
import com.gamingmesh.jobs.Jobs;
public class QuestProgression {
private Quest quest;
@ -79,13 +81,23 @@ public class QuestProgression {
}
public void processQuest(JobsPlayer jPlayer, ActionInfo action) {
if (!quest.hasAction(action.getType()))
return;
if (!quest.getObjectives().containsKey(action.getName()) && !quest.getObjectives().containsKey(action.getNameWithSub()))
return;
if (quest.getRestrictedAreas() != null && !quest.getRestrictedAreas().isEmpty()) {
for (String area : quest.getRestrictedAreas()) {
for (Entry<String, RestrictedArea> a : Jobs.getRestrictedAreaManager().getRestrictedAres().entrySet()) {
if (quest.getRestrictedAreas().contains(a.getKey()) && a.getKey().equalsIgnoreCase(area)
&& a.getValue().inRestrictedArea(jPlayer.getPlayer().getLocation())) {
return;
}
}
}
}
if (!isCompleted()) {
QuestObjective objective = quest.getObjectives().get(action.getName());
if (objective == null)

35
src/main/resources/jobConfig.yml
View File

@ -122,13 +122,18 @@ Jobs:
RewardDesc:
- "Break 300 Oak wood"
- "Get 500 bucks for this"
# Defines chance in getting this quest.
# Restricted areas to do not get income in quest in the player current location
RestrictedAreas:
- "Arenas"
- "myarena"
# Defines chance in getting this quest.
# If you have set 10 quests and player can have only 2, then quests with biggest chance will be picked most likely
# This will allow to have some rare quests with legendary rewards
Chance: 40
# Defines to which job level you want to give out this quest.
# Defines to which job level you want to give out this quest.
# Keep in mind that player will keep quest even if he is over level limit if he got new one while being under
# In example: player with level 2 takes quests and levels up to level 5, he still can finish this quest and after next quest reset (check general config file) he will no longer have option to get this quest
# In example: player with level 2 takes quests and levels up to level 5, he still can finish this quest and after next quest reset (check general config file)
# he will no longer have option to get this quest
toLevel: 5
# Defines from which level you want to give option to get this quest
# You can use both limitations to have limited quests for particular job level ranges
@ -569,8 +574,8 @@ Jobs:
income-progression-equation: baseincome+(baseincome*(joblevel-1)*0.01)-((baseincome+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
rejoinCooldown: 10
maxDailyQuests: 1
Quests:
1:
Name: "Woodpecker"
@ -883,7 +888,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Architect"
@ -1639,7 +1644,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Ground Mole"
@ -1708,7 +1713,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Regular Joe"
@ -2101,7 +2106,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Predator"
@ -2260,7 +2265,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Galileo"
@ -2312,7 +2317,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Master Crafter"
@ -2863,7 +2868,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Catcher"
@ -2913,7 +2918,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "War never ends"
@ -3065,7 +3070,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Heavy drinker"
@ -3164,7 +3169,7 @@ Jobs:
points-progression-equation: basepoints+(basepoints*(joblevel-1)*0.01)-((basepoints+(joblevel-1)*0.01) * ((numjobs-1)*0.05))
experience-progression-equation: baseexperience-(baseexperience*((numjobs-1) *0.01))
rejoinCooldown: 10
maxDailyQuests: 1
maxDailyQuests: 1
Quests:
1:
Name: "Harry the wizard"