upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 02:37:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quest Kill Party

Browse Source
This commit is contained in:
Kam committed 2024-03-04 02:11:18 -05:00
1 parent 2689a3dead
commit 3e19a797e1
4 files changed
+128 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/quests/QuestDialog.java
+6 -1
View File
@@ -226,6 +226,11 @@ public class QuestDialog extends QuestInterface implements IQuestDialog {
public String getText() {
return this.dialog.title + (this.isCompleted() ? " (read)" : " (unread)");
}
}
@Override
public String getAdditionalText() {
return null;
}
}
}
src/main/java/noppes/npcs/quests/QuestItem.java
+9 -1
View File
@@ -186,6 +186,9 @@ public class QuestItem extends QuestInterface implements IQuestItem {
@Override
public boolean isPartyCompleted(Party party) {
if(party == null)
return false;
HashMap<Integer,ItemStack> map = getProcessSetParty(party);
for(ItemStack reqItem : items.items.values()){
boolean done = false;
@@ -315,5 +318,10 @@ public class QuestItem extends QuestInterface implements IQuestItem {
public String getText() {
return this.questItem.getDisplayName() + ": " + this.getProgress() + "/" + this.getMaxProgress();
}
}
@Override
public String getAdditionalText() {
return null;
}
}
}
src/main/java/noppes/npcs/quests/QuestKill.java
+110 -32
View File
@@ -5,6 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.data.IQuestKill;
import noppes.npcs.api.handler.data.IQuestObjective;
import noppes.npcs.constants.EnumPartyObjectives;
import noppes.npcs.constants.EnumQuestType;
import noppes.npcs.controllers.PartyController;
import noppes.npcs.controllers.PlayerDataController;
@@ -116,6 +117,13 @@ public class QuestKill extends QuestInterface implements IQuestKill {
return (IQuestObjective[])list.toArray(new IQuestObjective[list.size()]);
}
public HashMap<String, Integer> getPlayerKilled(QuestData data, String playerName) {
return NBTTags.getStringIntegerMap(data.extraData.getTagList(playerName + "Killed", 10));
}
public void setPlayerKilled(QuestData data, HashMap<String, Integer> killed, String playerName) {
data.extraData.setTag(playerName + "Killed", NBTTags.nbtStringIntegerMap(killed));
}
public IQuestObjective[] getPartyObjectives(Party party) {
List<IQuestObjective> list = new ArrayList();
Iterator var3 = this.targets.entrySet().iterator();
@@ -134,43 +142,86 @@ public class QuestKill extends QuestInterface implements IQuestKill {
QuestData data = party.getQuestData();
if(data == null)
return vec;
HashMap<String,Integer> killed = getKilled(data);
for(String entityName : targets.keySet()){
int amount = 0;
if(killed.containsKey(entityName))
amount = killed.get(entityName);
String state = amount + "/" + targets.get(entityName);
vec.add(entityName + ": " + state);
if(data.quest.partyOptions.objectiveRequirement == EnumPartyObjectives.All){
for(String entityName : targets.keySet()){
String firstLine = entityName + ": " + targets.get(entityName);
List<String> playerResults = new ArrayList<>();
for(String player : party.getPlayerNames()){
HashMap<String,Integer> killed = getPlayerKilled(data, player);
int amount = 0;
if(killed.containsKey(entityName))
amount = killed.get(entityName);
if(amount < targets.get(entityName)){
String state = player + ": " + amount;
playerResults.add(state);
}
}
if(!playerResults.isEmpty()){
vec.add(firstLine);
vec.add("[" + String.join(", ", playerResults) + "]");
}
else {
vec.add(firstLine + " (Done)");
}
}
}
else {
HashMap<String,Integer> killed = getKilled(data);
for(String entityName : targets.keySet()){
int amount = 0;
if(killed.containsKey(entityName))
amount = killed.get(entityName);
String state = amount + "/" + targets.get(entityName);
vec.add(entityName + ": " + state);
}
}
return vec;
}
@Override
public boolean isPartyCompleted(Party party) {
if(party == null)
return false;
QuestData data = party.getQuestData();
if(data == null)
return false;
HashMap<String,Integer> killed = getKilled(data);
int completed = 0;
for(String entityName : targets.keySet()){
int amount = 0;
if(killed.containsKey(entityName))
amount = killed.get(entityName);
if(amount >= targets.get(entityName)){
completed++;
if(data.quest.partyOptions.objectiveRequirement == EnumPartyObjectives.All){
for(String entityName : targets.keySet()){
for(String player : party.getPlayerNames()){
HashMap<String, Integer> killed = getPlayerKilled(data, player);
int amount = killed.getOrDefault(entityName, 0);
if(amount < targets.get(entityName)){
return false;
}
}
}
}
if(completed >= targets.keySet().size())
return true;
else {
int completed = 0;
HashMap<String,Integer> killed = getKilled(data);
for(String entityName : targets.keySet()){
int amount = 0;
if(killed.containsKey(entityName))
amount = killed.get(entityName);
if(amount >= targets.get(entityName)){
completed++;
}
}
if(completed >= targets.keySet().size())
return true;
if(killed.size() != targets.size())
return false;
for(String entity : killed.keySet()){
if(!targets.containsKey(entity) || targets.get(entity) > killed.get(entity))
if(killed.size() != targets.size())
return false;
for(String entity : killed.keySet()){
if(!targets.containsKey(entity) || targets.get(entity) > killed.get(entity))
return false;
}
}
return true;
@@ -220,15 +271,24 @@ public class QuestKill extends QuestInterface implements IQuestKill {
HashMap<String, Integer> killed = this.parent.getKilled(questdata);
return !killed.containsKey(this.entity) ? 0 : (Integer)killed.get(this.entity);
}
}
else if(party != null) {
} else if(party != null) {
QuestData questdata = party.getQuestData();
if(questdata != null){
HashMap<String, Integer> killed = this.parent.getKilled(questdata);
return !killed.containsKey(this.entity) ? 0 : (Integer)killed.get(this.entity);
if (questdata != null) {
if (questdata.quest.partyOptions.objectiveRequirement == EnumPartyObjectives.All) {
int progress = 0;
for (String player : party.getPlayerNames()) {
HashMap<String, Integer> killed = this.parent.getPlayerKilled(questdata, player);
int currentProgress = !killed.containsKey(this.entity) ? 0 : (Integer) killed.get(this.entity);
if(currentProgress >= this.amount)
progress += 1;
}
return progress;
} else {
HashMap<String, Integer> killed = this.parent.getKilled(questdata);
return !killed.containsKey(this.entity) ? 0 : (Integer) killed.get(this.entity);
}
}
}
return 0;
}
@@ -251,13 +311,26 @@ public class QuestKill extends QuestInterface implements IQuestKill {
} else if(party != null){
QuestData questdata = party.getQuestData();
if(questdata != null){
HashMap<String, Integer> killed = this.parent.getKilled(questdata);
if (!killed.containsKey(this.entity) || (Integer)killed.get(this.entity) != progress) {
killed.put(this.entity, progress);
this.parent.setKilled(questdata, killed);
if(questdata.quest.partyOptions.objectiveRequirement == EnumPartyObjectives.All){
for(String player : party.getPlayerNames()){
HashMap<String, Integer> killed = this.parent.getPlayerKilled(questdata, player);
if (!killed.containsKey(this.entity) || (Integer)killed.get(this.entity) != progress) {
killed.put(this.entity, progress);
this.parent.setPlayerKilled(questdata, killed, player);
}
}
PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[2]);
PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[4]);
}
else {
HashMap<String, Integer> killed = this.parent.getKilled(questdata);
if (!killed.containsKey(this.entity) || (Integer)killed.get(this.entity) != progress) {
killed.put(this.entity, progress);
this.parent.setKilled(questdata, killed);
PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[2]);
PartyController.Instance().checkQuestCompletion(party, EnumQuestType.values()[4]);
}
}
}
}
} else {
@@ -276,5 +349,10 @@ public class QuestKill extends QuestInterface implements IQuestKill {
public String getText() {
return this.entity + ": " + this.getProgress() + "/" + this.getMaxProgress();
}
}
@Override
public String getAdditionalText() {
return null;
}
}
}
src/main/java/noppes/npcs/quests/QuestLocation.java
+3
View File
@@ -262,6 +262,9 @@ public class QuestLocation extends QuestInterface implements IQuestLocation {
@Override
public boolean isPartyCompleted(Party party) {
if(party == null)
return false;
QuestData data = party.getQuestData();
if(data == null)
return false;