From bad6f88270d71c1e7a43787467e903cda5b66cfa Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 6 Mar 2024 20:20:37 -0500 Subject: [PATCH] Quest Dialog working for Parties --- .../noppes/npcs/controllers/data/Party.java | 10 + .../java/noppes/npcs/quests/QuestDialog.java | 348 ++++++++++++++---- 2 files changed, 292 insertions(+), 66 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 8b3ff133f..d5475a438 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -14,6 +14,7 @@ import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerQuestData; import noppes.npcs.api.handler.data.IParty; import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumPartyRequirements; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; @@ -91,6 +92,15 @@ public class Party implements IParty { return questData; } + public EnumPartyObjectives getObjectiveRequirement() { + if(getQuestData() != null){ + if(getQuestData().quest != null){ + return getQuestData().quest.partyOptions.objectiveRequirement; + } + } + return null; + } + @Override public int getCurrentQuestID() { return currentQuestID; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index 3254b1794..3bfe83537 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -9,8 +9,10 @@ import noppes.npcs.Server; import noppes.npcs.api.handler.data.IQuestDialog; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPacketClient; +import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.Party; @@ -66,6 +68,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { return vec; } + @Override public IQuestObjective[] getObjectives(EntityPlayer player) { List list = new ArrayList(); @@ -100,12 +103,169 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { @Override public Vector getPartyQuestLogStatus(Party party) { Vector vec = new Vector(); - for(int dialogId : dialogs.values()){ - Dialog dialog = DialogController.Instance.dialogs.get(dialogId); - if(dialog == null) - continue; + if(party == null) + return vec; - ArrayList unread = new ArrayList<>(); + if(party.getQuestData() == null) + return vec; + + if(party.getQuestData().quest == null) + return vec; + + EnumPartyObjectives objectives = party.getQuestData().quest.partyOptions.objectiveRequirement; + if(objectives == EnumPartyObjectives.All){ + for(int dialogId : dialogs.values()){ + Dialog dialog = DialogController.Instance.dialogs.get(dialogId); + if(dialog == null) + continue; + + ArrayList unread = new ArrayList<>(); + for (UUID uuid: party.getPlayerUUIDs()) { + EntityPlayer player = NoppesUtilServer.getPlayer(uuid); + PlayerData playerData; + if(player != null){ + playerData = PlayerDataController.Instance.getPlayerData(player); + } + else { + playerData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); + } + if(playerData != null){ + if(!playerData.dialogData.dialogsRead.contains(dialogId)) + unread.add(playerData.playername); + } + } + + String title = dialog.title; + if(!unread.isEmpty()){ + title += " (unread)"; + } + else { + title += " (read)"; + } + vec.add(title); + + if(!unread.isEmpty()){ + StringBuilder unreaders = new StringBuilder("> "); + for(String name : unread){ + unreaders.append(" ").append(name); + } + vec.add(unreaders.toString()); + } + } + return vec; + } else if(objectives == EnumPartyObjectives.Leader){ + EntityPlayer leader = NoppesUtilServer.getPlayer(party.getLeaderUUID()); + PlayerData playerData; + if(leader != null){ + playerData = PlayerDataController.Instance.getPlayerData(leader); + } + else { + playerData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); + } + if(playerData == null) + return vec; + for(int dialogId : dialogs.values()){ + Dialog dialog = DialogController.Instance.dialogs.get(dialogId); + if(dialog == null) + continue; + String title = dialog.title; + if(playerData.dialogData.dialogsRead.contains(dialogId)) + title += " (read)"; + else + title += " (unread)"; + vec.add(title); + } + return vec; + } else { + Set readValues = new HashSet<>(); + for(int dialogId : dialogs.values()){ + Dialog dialog = DialogController.Instance.dialogs.get(dialogId); + if(dialog == null) + continue; + for (UUID uuid: party.getPlayerUUIDs()) { + EntityPlayer player = NoppesUtilServer.getPlayer(uuid); + PlayerData sharedData; + if(player != null){ + sharedData = PlayerDataController.Instance.getPlayerData(player); + } + else { + sharedData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); + } + if(sharedData != null){ + if(sharedData.dialogData.dialogsRead.contains(dialogId)) + readValues.add(dialogId); + } + } + } + for(int dialogId : dialogs.values()){ + Dialog dialog = DialogController.Instance.dialogs.get(dialogId); + if(dialog == null) + continue; + String title = dialog.title; + if(readValues.contains(dialogId)) + title += " (read)"; + else + title += " (unread)"; + vec.add(title); + } + return vec; + } + } + + @Override + public boolean isPartyCompleted(Party party) { + if(party == null) + return false; + + if(party.getQuestData() == null) + return false; + + if(party.getQuestData().quest == null) + return false; + + EnumPartyObjectives objectives = party.getQuestData().quest.partyOptions.objectiveRequirement; + if(objectives == EnumPartyObjectives.All){ + List incomplete = new ArrayList<>(); + for (UUID uuid: party.getPlayerUUIDs()) { + EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); + PlayerData individualData; + if(individual != null){ + individualData = PlayerDataController.Instance.getPlayerData(individual); + } + else { + individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); + } + if(individualData != null){ + for(int dialogId : dialogs.values()){ + if(!individualData.dialogData.dialogsRead.contains(dialogId)){ + incomplete.add(individualData.playername); + break; + } + } + } + } + return incomplete.isEmpty(); + } else if(objectives == EnumPartyObjectives.Leader){ + EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); + PlayerData leaderData; + if(leaderPlayer != null){ + leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + } + else { + leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); + } + if(leaderData != null){ + for(int dialogId : dialogs.values()){ + if(!leaderData.dialogData.dialogsRead.contains(dialogId)){ + return false; + } + } + } else { + return false; + } + return true; + } else { + HashMap readValues = new HashMap<>(); for (UUID uuid: party.getPlayerUUIDs()) { EntityPlayer player = NoppesUtilServer.getPlayer(uuid); PlayerData playerData; @@ -116,57 +276,19 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { playerData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } if(playerData != null){ - if(!playerData.dialogData.dialogsRead.contains(dialogId)) - unread.add(playerData.playername); - } - } - - String title = dialog.title; - if(!unread.isEmpty()){ - title += " (unread)"; - } - else { - title += " (read)"; - } - vec.add(title); - - if(!unread.isEmpty()){ - StringBuilder unreaders = new StringBuilder("> "); - for(String name : unread){ - unreaders.append(" ").append(name); - } - vec.add(unreaders.toString()); - } - } - - return vec; - } - - @Override - public boolean isPartyCompleted(Party party) { - if(party == null) - return false; - - for (UUID uuid: party.getPlayerUUIDs()) { - EntityPlayer player = NoppesUtilServer.getPlayer(uuid); - PlayerData playerData; - if(player != null){ - playerData = PlayerDataController.Instance.getPlayerData(player); - } - else { - playerData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); - } - if(playerData != null){ - for(int dialogId : dialogs.values()){ - if(!playerData.dialogData.dialogsRead.contains(dialogId)){ - return false; + for(int dialogId : dialogs.values()){ + if(playerData.dialogData.dialogsRead.contains(dialogId)){ + readValues.put(dialogId, true); + } } } - } else { - return false; } + for(boolean result : readValues.values()){ + if(!result) + return false; + } + return true; } - return true; } class QuestDialogObjective implements IQuestObjective { @@ -195,20 +317,72 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { public void setProgress(int progress) { if (progress >= 0 && progress <= 1) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); - boolean completed = data.dialogData.dialogsRead.contains(this.dialog.id); - if (progress == 0 && completed) { - data.dialogData.dialogsRead.remove(this.dialog.id); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[1]); - data.save(); - } + if(player != null){ + PlayerData data = PlayerDataController.Instance.getPlayerData(player); + boolean completed = data.dialogData.dialogsRead.contains(this.dialog.id); + if (progress == 0 && completed) { + data.dialogData.dialogsRead.remove(this.dialog.id); + data.questData.checkQuestCompletion(data, EnumQuestType.values()[1]); + data.save(); + } - if (progress == 1 && !completed) { - data.dialogData.dialogsRead.add(this.dialog.id); - data.questData.checkQuestCompletion(data, EnumQuestType.values()[1]); - data.save(); - } + if (progress == 1 && !completed) { + data.dialogData.dialogsRead.add(this.dialog.id); + data.questData.checkQuestCompletion(data, EnumQuestType.values()[1]); + data.save(); + } + } else if (party != null){ + if(party.getObjectiveRequirement() != null){ + EnumPartyObjectives objectives = party.getObjectiveRequirement(); + if(objectives == EnumPartyObjectives.Leader){ + EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); + PlayerData leaderData; + if(leaderPlayer != null){ + leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + } + else { + leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); + } + if(leaderData == null) + return; + boolean completed = leaderData.dialogData.dialogsRead.contains(this.dialog.id); + if (progress == 0 && completed) { + leaderData.dialogData.dialogsRead.remove(this.dialog.id); + PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[1]); + leaderData.save(); + } + if (progress == 1 && !completed) { + leaderData.dialogData.dialogsRead.add(this.dialog.id); + PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[1]); + leaderData.save(); + } + } else { + for (UUID uuid: party.getPlayerUUIDs()) { + EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); + PlayerData individualData; + if(individual != null){ + individualData = PlayerDataController.Instance.getPlayerData(individual); + } + else { + individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); + } + if(individualData != null){ + boolean completed = individualData.dialogData.dialogsRead.contains(this.dialog.id); + if (progress == 0 && completed) { + individualData.dialogData.dialogsRead.remove(this.dialog.id); + individualData.save(); + } + if (progress == 1 && !completed) { + individualData.dialogData.dialogsRead.add(this.dialog.id); + individualData.save(); + } + } + } + PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[1]); + } + } + } } else { throw new CustomNPCsException("Progress has to be 0 or 1", new Object[0]); } @@ -219,8 +393,50 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { } public boolean isCompleted() { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); - return data.dialogData.dialogsRead.contains(this.dialog.id); + if(player != null){ + PlayerData data = PlayerDataController.Instance.getPlayerData(player); + return data.dialogData.dialogsRead.contains(this.dialog.id); + } + else if (party != null){ + if(party.getObjectiveRequirement() != null){ + EnumPartyObjectives objectives = party.getObjectiveRequirement(); + if(objectives == EnumPartyObjectives.Leader){ + EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); + PlayerData leaderData; + if(leaderPlayer != null){ + leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + } + else { + leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); + } + if(leaderData == null) + return false; + return leaderData.dialogData.dialogsRead.contains(this.dialog.id); + } else { + boolean requiresOneRead = objectives == EnumPartyObjectives.Shared; + for (UUID uuid: party.getPlayerUUIDs()) { + EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); + PlayerData individualData; + if(individual != null){ + individualData = PlayerDataController.Instance.getPlayerData(individual); + } + else { + individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); + } + if(individualData != null){ + boolean read = individualData.dialogData.dialogsRead.contains(this.dialog.id); + if(requiresOneRead && read){ + return true; + } else if(!requiresOneRead && !read){ + return false; + } + } + } + return !requiresOneRead; + } + } + } + return true; } public String getText() {