Fix whitespace [skip actions]

This commit is contained in:
github-actions
2022-08-21 11:33:54 +00:00
parent a746d11b6f
commit c517b8a2c9
919 changed files with 754457 additions and 3136 deletions

View File

@@ -29,33 +29,33 @@ import java.util.Map;
@Entity
public class GameQuest {
@Transient @Getter @Setter private GameMainQuest mainQuest;
@Transient @Getter private QuestData questData;
@Transient @Getter @Setter private GameMainQuest mainQuest;
@Transient @Getter private QuestData questData;
@Getter private int subQuestId;
@Getter private int mainQuestId;
@Getter @Setter
@Getter private int subQuestId;
@Getter private int mainQuestId;
@Getter @Setter
private QuestState state;
@Getter @Setter private int startTime;
@Getter @Setter private int acceptTime;
@Getter @Setter private int finishTime;
@Getter @Setter private int startTime;
@Getter @Setter private int acceptTime;
@Getter @Setter private int finishTime;
@Getter private int[] finishProgressList;
@Getter private int[] failProgressList;
@Getter private int[] finishProgressList;
@Getter private int[] failProgressList;
@Transient @Getter private Map<String, TriggerExcelConfigData> triggerData;
@Getter private Map<String, Boolean> triggers;
private transient Bindings bindings;
@Deprecated // Morphia only. Do not use.
public GameQuest() {}
@Deprecated // Morphia only. Do not use.
public GameQuest() {}
public GameQuest(GameMainQuest mainQuest, QuestData questData) {
this.mainQuest = mainQuest;
this.subQuestId = questData.getId();
this.mainQuestId = questData.getMainId();
this.questData = questData;
this.state = QuestState.QUEST_STATE_UNSTARTED;
public GameQuest(GameMainQuest mainQuest, QuestData questData) {
this.mainQuest = mainQuest;
this.subQuestId = questData.getId();
this.mainQuestId = questData.getMainId();
this.questData = questData;
this.state = QuestState.QUEST_STATE_UNSTARTED;
this.triggerData = new HashMap<>();
this.triggers = new HashMap<>();
}
@@ -66,11 +66,11 @@ public class GameQuest {
this.state = QuestState.QUEST_STATE_UNFINISHED;
List<QuestData.QuestCondition> triggerCond = questData.getFinishCond().stream()
.filter(p -> p.getType() == QuestTrigger.QUEST_CONTENT_TRIGGER_FIRE).toList();
if(triggerCond.size() > 0) {
if (triggerCond.size() > 0) {
for (QuestData.QuestCondition cond : triggerCond) {
TriggerExcelConfigData newTrigger = GameData.getTriggerExcelConfigDataMap().get(cond.getParam()[0]);
if(newTrigger != null) {
if(this.triggerData == null) {
if (newTrigger != null) {
if (this.triggerData == null) {
this.triggerData = new HashMap<>();
}
triggerData.put(newTrigger.getTriggerName(), newTrigger);
@@ -92,7 +92,7 @@ public class GameQuest {
getQuestData().getBeginExec().forEach(e -> getOwner().getServer().getQuestSystem().triggerExec(this, e, e.getParam()));
if (ChapterData.beginQuestChapterMap.containsKey(subQuestId)){
if (ChapterData.beginQuestChapterMap.containsKey(subQuestId)) {
mainQuest.getOwner().sendPacket(new PacketChapterStateNotify(
ChapterData.beginQuestChapterMap.get(subQuestId).getId(),
ChapterStateOuterClass.ChapterState.CHAPTER_STATE_BEGIN
@@ -108,7 +108,7 @@ public class GameQuest {
public String getTriggerNameById(int id) {
TriggerExcelConfigData trigger = GameData.getTriggerExcelConfigDataMap().get(id);
if(trigger != null) {
if (trigger != null) {
String triggerName = trigger.getTriggerName();
return triggerName;
}
@@ -116,38 +116,38 @@ public class GameQuest {
return "";
}
public Player getOwner() {
return this.getMainQuest().getOwner();
}
public Player getOwner() {
return this.getMainQuest().getOwner();
}
public void setConfig(QuestData config) {
if (getSubQuestId() != config.getId()) return;
this.questData = config;
}
public void setConfig(QuestData config) {
if (getSubQuestId() != config.getId()) return;
this.questData = config;
}
public void setFinishProgress(int index, int value) {
finishProgressList[index] = value;
}
public void setFinishProgress(int index, int value) {
finishProgressList[index] = value;
}
public void setFailProgress(int index, int value) {
failProgressList[index] = value;
}
public void setFailProgress(int index, int value) {
failProgressList[index] = value;
}
public void finish() {
this.state = QuestState.QUEST_STATE_FINISHED;
this.finishTime = Utils.getCurrentSeconds();
public void finish() {
this.state = QuestState.QUEST_STATE_FINISHED;
this.finishTime = Utils.getCurrentSeconds();
if (getQuestData().finishParent()) {
// This quest finishes the questline - the main quest will also save the quest to db, so we don't have to call save() here
getMainQuest().finish();
}
if (getQuestData().finishParent()) {
// This quest finishes the questline - the main quest will also save the quest to db, so we don't have to call save() here
getMainQuest().finish();
}
getQuestData().getFinishExec().forEach(e -> getOwner().getServer().getQuestSystem().triggerExec(this, e, e.getParam()));
//Some subQuests have conditions that subQuests are finished (even from different MainQuests)
getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_CONTENT_QUEST_STATE_EQUAL, this.subQuestId, this.state.getValue(),0,0,0);
getOwner().getQuestManager().triggerEvent(QuestTrigger.QUEST_COND_STATE_EQUAL, this.subQuestId, this.state.getValue(),0,0,0);
if (ChapterData.endQuestChapterMap.containsKey(subQuestId)){
if (ChapterData.endQuestChapterMap.containsKey(subQuestId)) {
mainQuest.getOwner().sendPacket(new PacketChapterStateNotify(
ChapterData.endQuestChapterMap.get(subQuestId).getId(),
ChapterStateOuterClass.ChapterState.CHAPTER_STATE_END
@@ -155,7 +155,7 @@ public class GameQuest {
}
Grasscutter.getLogger().debug("Quest {} is finished", subQuestId);
}
}
//TODO
public void fail() {
@@ -171,9 +171,9 @@ public class GameQuest {
// Return true if ParentQuest should rewind to this childQuest
public boolean rewind(GameQuest nextRewind) {
if (questData.isRewind()) {
if(nextRewind == null) {return true;}
if (nextRewind == null) {return true;}
// if the next isRewind subQuest is none or unstarted, reset all subQuests with order higher than this one, and restart this quest
if(nextRewind.getState() == QuestState.QUEST_STATE_NONE|| nextRewind.getState() == QuestState.QUEST_STATE_UNSTARTED) {
if (nextRewind.getState() == QuestState.QUEST_STATE_NONE|| nextRewind.getState() == QuestState.QUEST_STATE_UNSTARTED) {
getMainQuest().getChildQuests().values().stream().filter(p -> p.getQuestData().getOrder() > this.getQuestData().getOrder()).forEach(q -> q.setState(QuestState.QUEST_STATE_UNSTARTED));
this.start();
return true;
@@ -181,31 +181,31 @@ public class GameQuest {
}
return false;
}
public void save() {
getMainQuest().save();
}
public void save() {
getMainQuest().save();
}
public Quest toProto() {
Quest.Builder proto = Quest.newBuilder()
.setQuestId(getSubQuestId())
.setState(getState().getValue())
.setParentQuestId(getMainQuestId())
.setStartTime(getStartTime())
.setStartGameTime(438)
.setAcceptTime(getAcceptTime());
public Quest toProto() {
Quest.Builder proto = Quest.newBuilder()
.setQuestId(getSubQuestId())
.setState(getState().getValue())
.setParentQuestId(getMainQuestId())
.setStartTime(getStartTime())
.setStartGameTime(438)
.setAcceptTime(getAcceptTime());
if (getFinishProgressList() != null) {
for (int i : getFinishProgressList()) {
proto.addFinishProgressList(i);
}
}
if (getFinishProgressList() != null) {
for (int i : getFinishProgressList()) {
proto.addFinishProgressList(i);
}
}
if (getFailProgressList() != null) {
for (int i : getFailProgressList()) {
proto.addFailProgressList(i);
}
}
if (getFailProgressList() != null) {
for (int i : getFailProgressList()) {
proto.addFailProgressList(i);
}
}
return proto.build();
}
return proto.build();
}
}