Merge pull request #20 from ShiroySan/main

Multi mob rewards not found fix | Missing sceneTag Execs | Healing items by HP %

src/main/java/emu/grasscutter/game/player/PlayerBuffManager.java

@@ -110,7 +110,7 @@ public synchronized boolean addBuff(int buffId, float duration, Avatar target) {
 
                                             var maxHp = target.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
                                             var amount =
-                                                    ability.amount.get() + ability.amountByTargetMaxHPRatio.get() * maxHp;
+                                                    ability.amount.get() + ability.amountByCasterMaxHPRatio.get() * maxHp;
 
                                             target.getAsEntity().heal(amount);
                                             shouldHeal = true;

src/main/java/emu/grasscutter/game/quest/exec/ExecAddSceneTag.java

@@ -0,0 +1,20 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.QuestData;
+import emu.grasscutter.game.quest.*;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import emu.grasscutter.scripts.ScriptLib;
+import java.util.Arrays;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_ADD_SCENE_TAG)
+public final class ExecAddSceneTag extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var param =
+                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
+		quest.getOwner().getProgressManager().addSceneTag(param[0], param[1]);
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/quest/exec/ExecDelSceneTag.java

@@ -0,0 +1,19 @@
+package emu.grasscutter.game.quest.exec;
+
+import emu.grasscutter.data.excels.quest.QuestData;
+import emu.grasscutter.game.quest.*;
+import emu.grasscutter.game.quest.enums.QuestExec;
+import emu.grasscutter.game.quest.handlers.QuestExecHandler;
+import java.util.Arrays;
+
+@QuestValueExec(QuestExec.QUEST_EXEC_DEL_SCENE_TAG)
+public final class ExecDelSceneTag extends QuestExecHandler {
+    @Override
+    public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, String... paramStr) {
+        var param =
+                Arrays.stream(paramStr).filter(i -> !i.isBlank()).mapToInt(Integer::parseInt).toArray();
+		quest.getOwner().getProgressManager().delSceneTag(param[0], param[1]);
+
+        return true;
+    }
+}

src/main/java/emu/grasscutter/game/world/WorldDataSystem.java

@@ -52,7 +52,7 @@ public RewardPreviewData getRewardByBossId(int monsterId) {
         var investigationMonsterData =
                 GameData.getInvestigationMonsterDataMap().values().parallelStream()
                         .filter(imd -> imd.getMonsterIdList() != null && !imd.getMonsterIdList().isEmpty())
-                        .filter(imd -> imd.getMonsterIdList().get(0) == monsterId)
+                        .filter(imd -> imd.getMonsterIdList().contains(monsterId))
                         .findFirst();
 
         return investigationMonsterData