Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-28 02:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Invoke the 'not equal' events

Browse Source
This commit is contained in:
KingRainbow44
2023-05-01 21:45:56 -04:00
parent b0605f6ac2
commit 8b84360724
4 changed files with 31 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
View File

@@ -4,9 +4,7 @@ import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_STATE_EQUAL;
import emu.grasscutter.data.excels.QuestData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.QuestValueCond;
import lombok.val;
@QuestValueCond(QUEST_COND_STATE_EQUAL)
public class ConditionStateEqual extends BaseCondition {
@@ -18,17 +16,10 @@ public class ConditionStateEqual extends BaseCondition {
QuestData.QuestAcceptCondition condition,
String paramStr,
int... params) {
val questId = condition.getParam()[0];
val questStateValue = condition.getParam()[1];
GameQuest checkQuest = owner.getQuestManager().getQuestById(questId);
if (checkQuest == null) {
/*
Will spam the console
*/
// Grasscutter.getLogger().debug("Warning: quest {} hasn't been started yet!",
// condition.getParam()[0]);
return false;
}
return checkQuest.getState().getValue() == questStateValue;
var questId = condition.getParam()[0];
var questStateValue = condition.getParam()[1];
var checkQuest = owner.getQuestManager().getQuestById(questId);
return checkQuest != null && checkQuest.getState().getValue() == questStateValue;
}
}

19
src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateNotEqual.java
View File

@@ -4,9 +4,7 @@ import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_STATE_NOT_EQ
import emu.grasscutter.data.excels.QuestData;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.quest.GameQuest;
import emu.grasscutter.game.quest.QuestValueCond;
import lombok.val;
@QuestValueCond(QUEST_COND_STATE_NOT_EQUAL)
public class ConditionStateNotEqual extends BaseCondition {
@@ -18,18 +16,11 @@ public class ConditionStateNotEqual extends BaseCondition {
QuestData.QuestAcceptCondition condition,
String paramStr,
int... params) {
val questId = condition.getParam()[0];
val questStateValue = condition.getParam()[1];
GameQuest checkQuest = owner.getQuestManager().getQuestById(questId);
if (checkQuest == null) {
/*
Will spam the console
*/
// Grasscutter.getLogger().debug("Warning: quest {} hasn't been started yet!",
// condition.getParam()[0]);
var questId = condition.getParam()[0];
var questStateValue = condition.getParam()[1];
var checkQuest = owner.getQuestManager().getQuestById(questId);
return false;
}
return checkQuest.getState().getValue() != questStateValue;
return checkQuest != null &&
checkQuest.getState().getValue() != questStateValue;
}
}