Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java (revision 7680)
- +++ java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java (working copy)
- @@ -28,6 +28,7 @@
- import org.l2jmobius.commons.util.Rnd;
- import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult;
- +import org.l2jmobius.gameserver.enums.QuestSound;
- import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
- import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
- import org.l2jmobius.gameserver.instancemanager.InstanceManager;
- @@ -40,6 +41,7 @@
- import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
- import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
- import org.l2jmobius.gameserver.model.eventengine.AbstractEvent;
- +import org.l2jmobius.gameserver.model.events.AbstractScript;
- import org.l2jmobius.gameserver.model.events.EventDispatcher;
- import org.l2jmobius.gameserver.model.events.EventType;
- import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
- @@ -51,6 +53,7 @@
- import org.l2jmobius.gameserver.model.holders.SkillHolder;
- import org.l2jmobius.gameserver.model.instancezone.Instance;
- import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
- +import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.skills.Skill;
- import org.l2jmobius.gameserver.model.variables.PlayerVariables;
- import org.l2jmobius.gameserver.network.SystemMessageId;
- @@ -401,6 +404,7 @@
- // Send result
- player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));
- members.add(member);
- +
- }
- }
- getTimers().cancelTimer("update", null, null);
- @@ -408,6 +412,51 @@
- params.set("time", 30);
- getTimers().addTimer("match_end_countdown", params, 30 * 1000, null, null);
- EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members));
- +
- + // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
- + for (CeremonyOfChaosMember member : getMembers().values())
- + {
- + final QuestState qs = member.getPlayer().getQuestState("Q10813_ForGlory");
- + final QuestState qs1 = member.getPlayer().getQuestState("Q10819_ForHonor");
- + final QuestState qs2 = member.getPlayer().getQuestState("Q10825_ForVictory");
- + final int PROOF_OF_BATTLE_1 = 45872;
- + final int PROOF_OF_BATTLE_2 = 45873;
- + final int PROOF_OF_SETTLEMENT = 80825;
- + if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
- + {
- + LOGGER.warning("Character: " + member.getPlayer().getName() + " has received reward for Q10813_ForGlory!");
- + AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_1, 1);
- + AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
- + if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_1) >= 10)
- + {
- + qs.setCond(2, true);
- + }
- + }
- + else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
- + {
- + LOGGER.warning("Character: " + member.getPlayer().getName() + " has received reward for Q10819_ForHonor!");
- + AbstractScript.giveItems(member.getPlayer(), PROOF_OF_BATTLE_2, 1);
- + AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
- + if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_BATTLE_2) >= 20)
- + {
- + qs1.setCond(2, true);
- + }
- + }
- + else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3))
- + {
- + LOGGER.warning("Characater: " + member.getPlayer().getName() + " has received reward for Q10825_ForVictory!");
- + AbstractScript.giveItems(member.getPlayer(), PROOF_OF_SETTLEMENT, 1);
- + AbstractScript.playSound(member.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET);
- + if (AbstractScript.getQuestItemsCount(member.getPlayer(), PROOF_OF_SETTLEMENT) >= 30)
- + {
- + qs2.setCond(4, true);
- + }
- + }
- + else
- + {
- + LOGGER.warning("Characater: " + member.getPlayer().getName() + " has not started exalted quests already!");
- + }
- + }
- }
- private void teleportPlayersOut()
- Index: java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java (revision 7680)
- +++ java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java (working copy)
- @@ -22,6 +22,7 @@
- import org.l2jmobius.Config;
- import org.l2jmobius.gameserver.ai.CtrlIntention;
- +import org.l2jmobius.gameserver.enums.QuestSound;
- import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
- import org.l2jmobius.gameserver.instancemanager.CastleManager;
- import org.l2jmobius.gameserver.instancemanager.FortManager;
- @@ -31,9 +32,11 @@
- import org.l2jmobius.gameserver.model.actor.Creature;
- import org.l2jmobius.gameserver.model.actor.Summon;
- import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
- +import org.l2jmobius.gameserver.model.events.AbstractScript;
- import org.l2jmobius.gameserver.model.holders.ItemHolder;
- import org.l2jmobius.gameserver.model.instancezone.Instance;
- import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
- +import org.l2jmobius.gameserver.model.quest.QuestState;
- import org.l2jmobius.gameserver.model.skills.Skill;
- import org.l2jmobius.gameserver.network.SystemMessageId;
- import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
- @@ -408,6 +411,51 @@
- }
- }
- + // XXX: ML2 Rewards ForGlory, ForHonor and ForVictory quests
- + public static void rewardQuests(PlayerInstance player)
- + {
- + final QuestState qs = player.getQuestState("Q10813_ForGlory");
- + final QuestState qs1 = player.getQuestState("Q10819_ForHonor");
- + final QuestState qs2 = player.getQuestState("Q10825_ForVictory");
- + final int PROOF_OF_BATTLE_1 = 45872;
- + final int PROOF_OF_BATTLE_2 = 45873;
- + final int PROOF_OF_SETTLEMENT = 80825;
- + if ((qs != null) && !qs.isCompleted() && qs.isCond(1))
- + {
- + LOGGER.warning("Character: " + player.getName() + " has received reward for Q10813_ForGlory!");
- + AbstractScript.giveItems(player, PROOF_OF_BATTLE_1, 1);
- + AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
- + if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_1) >= 10)
- + {
- + qs.setCond(2, true);
- + }
- + }
- + else if ((qs1 != null) && !qs1.isCompleted() && qs1.isCond(1))
- + {
- + LOGGER.warning("Character: " + player.getName() + " has received reward for Q10819_ForHonor!");
- + AbstractScript.giveItems(player, PROOF_OF_BATTLE_2, 1);
- + AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
- + if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE_2) >= 20)
- + {
- + qs1.setCond(2, true);
- + }
- + }
- + else if ((qs2 != null) && !qs2.isCompleted() && qs2.isCond(3))
- + {
- + LOGGER.warning("Characater: " + player.getName() + " has received reward for Q10825_ForVictory!");
- + AbstractScript.giveItems(player, PROOF_OF_SETTLEMENT, 1);
- + AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
- + if (AbstractScript.getQuestItemsCount(player, PROOF_OF_SETTLEMENT) >= 30)
- + {
- + qs2.setCond(4, true);
- + }
- + }
- + else
- + {
- + LOGGER.warning("Characater: " + player.getName() + " has not started exalted quests already!");
- + }
- + }
- +
- public static void rewardParticipant(PlayerInstance player, List<ItemHolder> list)
- {
- if ((player == null) || !player.isOnline() || (list == null))
- Index: java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
- ===================================================================
- --- java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java (revision 7680)
- +++ java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java (working copy)
- @@ -458,6 +458,7 @@
- winside = 1;
- rewardParticipant(_playerOne.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
- + rewardQuests(_playerOne.getPlayer());
- if (Config.ALT_OLY_LOG_FIGHTS)
- {
- @@ -484,6 +485,7 @@
- winside = 2;
- rewardParticipant(_playerTwo.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
- + rewardQuests(_playerTwo.getPlayer());
- if (Config.ALT_OLY_LOG_FIGHTS)
- {
- @@ -600,6 +602,8 @@
- rewardParticipant(_playerOne.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
- rewardParticipant(_playerTwo.getPlayer(), Config.ALT_OLY_LOSER_REWARD); // Loser
- + rewardQuests(_playerOne.getPlayer());
- + rewardQuests(_playerTwo.getPlayer());
- // Notify to scripts
- EventDispatcher.getInstance().notifyEventAsync(new OnOlympiadMatchResult(_playerOne, _playerTwo, getType()), Olympiad.getInstance());
- @@ -627,6 +631,8 @@
- rewardParticipant(_playerTwo.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
- rewardParticipant(_playerOne.getPlayer(), Config.ALT_OLY_LOSER_REWARD); // Loser
- + rewardQuests(_playerOne.getPlayer());
- + rewardQuests(_playerTwo.getPlayer());
- // Notify to scripts
- EventDispatcher.getInstance().notifyEventAsync(new OnOlympiadMatchResult(_playerTwo, _playerOne, getType()), Olympiad.getInstance());
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement