From 727c668980c12b01e9d8465b1300b57ea3138b54 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 22 Jul 2016 20:12:02 +0000 Subject: [PATCH] Brothers Bound in Chains quest improvements. Contributed by Mathael. --- .../dist/game/data/html/teleporter/33900.htm | 4 -- .../effecthandlers/SummonAgathion.java | 4 ++ .../Q00500_BrothersBoundInChains/30981-01.htm | 21 ++----- .../Q00500_BrothersBoundInChains/30981-02.htm | 12 +--- .../Q00500_BrothersBoundInChains/30981-03.htm | 10 +-- .../Q00500_BrothersBoundInChains/30981-04.htm | 10 +-- .../30981-05.html | 8 +-- .../Q00500_BrothersBoundInChains/30981-06.htm | 8 +-- .../30981-07.html | 10 +-- .../30981-08.html | 10 +-- .../30981-09.html | 5 +- .../30981-nopk.htm | 14 +---- .../Q00500_BrothersBoundInChains.java | 39 ++++++++++-- .../dist/game/data/stats/npcs/16000-16099.xml | 4 +- .../dist/game/data/stats/npcs/16100-16199.xml | 6 +- .../game/data/stats/skills/09600-09699.xml | 61 ++++++++++++++++--- .../model/events/AbstractScript.java | 8 +++ .../gameserver/model/events/EventType.java | 2 + .../player/OnPlayerSummonAgathion.java | 52 ++++++++++++++++ .../gameserver/model/quest/Quest.java | 22 +++++++ 20 files changed, 209 insertions(+), 101 deletions(-) delete mode 100644 trunk/dist/game/data/html/teleporter/33900.htm create mode 100644 trunk/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSummonAgathion.java diff --git a/trunk/dist/game/data/html/teleporter/33900.htm b/trunk/dist/game/data/html/teleporter/33900.htm deleted file mode 100644 index 21f70c993b..0000000000 --- a/trunk/dist/game/data/html/teleporter/33900.htm +++ /dev/null @@ -1,4 +0,0 @@ -Warp Gate:
-(Use this gate to go to the Refugee Camp in Hellbound.)
- - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index 436bd20af2..0413240e4f 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -20,6 +20,8 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.events.EventDispatcher; +import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonAgathion; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; @@ -56,6 +58,8 @@ public final class SummonAgathion extends AbstractEffect return; } + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerSummonAgathion(effector.getActingPlayer(), _npcId)); + final L2PcInstance player = effected.getActingPlayer(); player.setAgathionId(_npcId); diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-01.htm b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-01.htm index a68bc98e76..75ffb431ea 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-01.htm +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-01.htm @@ -1,18 +1,5 @@ - - -Dark Judge: -

-I may look like this now, but I was once an angel of light. -But the light was put to sleep, and darkness filled the lands... -we fought, all of us angels, but it was a losing battle. -Then, when I was growing weary, the god of chaos beckoned. -"Chaos is the ultimate peace and silence," he whispered, and I did not have the strength to resist him. -
-
-But I ended up regretting my decision in the end. -So I made another deal with the god of chaos; I would bring him enough -"sins" to cancel out my own. So here's my offer to you: I will buy your sin. -After all, penitence is the only path to light. Will you accept? +Dark Judge:
+I may look like this now, but I was once an angel of light. But the light was put to sleep, and darkness filled the lands... we fought, all of us angels, but it was a losing battle. Then, when I was growing weary, the god of chaos beckoned. "Chaos is the ultimate peace and silence," he whispered, and I did not have the strength to resist him.
+But I ended up regretting my decision in the end. So I made another deal with the god of chaos; I would bring him enough "sins" to cancel out my own. So here's my offer to you: I will buy your sin. After all, penitence is the only path to light. Will you accept?
- - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-02.htm b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-02.htm index d5df6cbae7..22b6436df8 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-02.htm @@ -1,10 +1,4 @@ - - -Dark Judge: -

-Do you wish to return to the light? -Then you, too, must bring back enough sens to cancel out your own. -To that end, you need tangible evidence for your penitence. +Dark Judge:
+Do you wish to return to the light? Then you, too, must bring back enough sens to cancel out your own. To that end, you need tangible evidence for your penitence.
- - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-03.htm b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-03.htm index 7ea3e4df6b..b1ea337320 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-03.htm +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-03.htm @@ -1,8 +1,4 @@ - - -Dark Judge: -

-The evidence is called Crumbs of Penitence, and you can get them through Sin Eater summoned with Penitent's Menacles. I can make Penitent's Manacles for you if you bring 200 Gemstones (B-Grade) from the village merchant. +Dark Judge:
+The evidence is called Crumbs of Penitence, and you can get them through Sin Eater summoned with Penitent's Menacles. I can make Penitent's Manacles for you if you bring 200 Gemstones (B-Grade) from the village merchant.
- - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-04.htm b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-04.htm index 129f025876..a5eec285e2 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-04.htm +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-04.htm @@ -1,8 +1,4 @@ - - -Dark Judge: -

-I will give you Penitent's Manacles so that you can summon the Sin Eater. Summoning the Sin Eater begins the Hour of Penitence, during which you can obtain Crumbs of Penitence by defeating as many monsters as possible. Bring me 10 Crumbs of Penitence, and I will free you of your sin. +Dark Judge:
+I will give you Penitent's Manacles so that you can summon the Sin Eater. Summoning the Sin Eater begins the Hour of Penitence, during which you can obtain Crumbs of Penitence by defeating as many monsters as possible. Bring me 10 Crumbs of Penitence, and I will free you of your sin.
- - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-05.html b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-05.html index 19792bedd5..5ecba1f152 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-05.html +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-05.html @@ -1,7 +1,3 @@ - - -Dark Judge: -

+Dark Judge:
It seems you don't have enough Gemstone (B-Grade). You can get them from a village grocer. Remember, you need 200 of them. - - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-06.htm b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-06.htm index 7d8a93c803..9c7e044087 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-06.htm +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-06.htm @@ -1,7 +1,3 @@ - - -Dark Judge: -

+Dark Judge:
Do not tarry; bring me 10 Crumbs of Penitence so that I can free you from your sin. But remember, bringing more than 10 will do no good, for not all sins can be cleared in one day. - - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-07.html b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-07.html index dbbc06f602..54ae131920 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-07.html +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-07.html @@ -1,7 +1,3 @@ - - -Dark Judge: -

-It seems ou don't have enough Crumbs of Penitence yet. Did you forget how to obtain them ? Equip the Penitent's Manacles I have given you, summon Sin Eater, and defeat as many monsters as you can during the Hour of Penitence. You need 10 Crumbs of Penitence obtained from the battle. - - \ No newline at end of file +Dark Judge:
+It seems you don't have enough Crumbs of Penitence yet. Did you forget how to obtain them Equip the Penitent's Manacles I have given you, summon Sin Eater, and defeat as many monsters as you can during the Hour of Penitence. You need 10 Crumbs of Penitence obtained from the battle. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-08.html b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-08.html index d66f25096a..4b72edd065 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-08.html +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-08.html @@ -1,8 +1,4 @@ - - -Dark Judge: -
-What did you learn while gathering Crumbs of Penitence? Committing sin is easy, but reversing it is much less so. Never forget that every choice has consequence. Now, give me what you have gathered, and the Penitent's Manacles. I will clear away your sin. +Dark Judge:
+What did you learn while gathering Crumbs of Penitence? Committing sin is easy, but reversing it is much less so. Never forget that every choice has consequence. Now, give me what you have gathered, and the Penitent's Manacles. I will clear away your sin.
- - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-09.html b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-09.html index c1d56c4ff2..2c83854968 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-09.html +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-09.html @@ -1 +1,4 @@ -Dark Judge:
Now, your sins are forgiven. But not all sins can be forgiven in a day; there is only so much I can forgive today.
Never forget the regret and suffering you went through for your mistakes. \ No newline at end of file +Dark Judge:
+Now, your sins are forgiven. But not all sins can be forgiven in a day; there is only so much I can forgive today.
+Never forget the regret and suffering you went through for your mistakes. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-nopk.htm b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-nopk.htm index dc1297bc03..218676e9df 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-nopk.htm +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/30981-nopk.htm @@ -1,12 +1,4 @@ - - -Black Judge: -

-Everyone commits sin, whether great or small. And when the sin becomes great, -you move away from the light until you become darkness. Sin is close to your nature, -and can only be eliminated when your soul is string. Come again sometime, -and I will help you step closer to the light. -

+Black Judge:
+Everyone commits sin, whether great or small. And when the sin becomes great, you move away from the light until you become darkness. Sin is close to your nature, and can only be eliminated when your soul is string. Come again sometime, and I will help you step closer to the light.
(This quest is available only to main class characters who are level 61 or above, and have a PK count above 0.) - - \ No newline at end of file + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java index 1fe09a1926..a042edc97e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java +++ b/trunk/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java @@ -16,7 +16,10 @@ */ package quests.Q00500_BrothersBoundInChains; +import java.util.stream.IntStream; + import com.l2jmobius.commons.util.Rnd; +import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.QuestType; import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -29,6 +32,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.npc.OnAttackableKill import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; +import com.l2jmobius.gameserver.model.skills.Skill; /** * @author Mathael @@ -37,14 +41,13 @@ import com.l2jmobius.gameserver.model.quest.State; */ public class Q00500_BrothersBoundInChains extends Quest { - // NPCs + // NPC private static final int DARK_JUDGE = 30981; // Items private static final int GEMSTONE_B = 2132; - private static final int PENITENT_MANACLES = 36060; // TODO: check: multiple items with this name + private static final int PENITENT_MANACLES = 36060; // TODO: check: why multiple items with this name private static final int CRUMBS_OF_PENITENCE = 36077; - private static final int DROP_QI_CHANCE = 1; // in % TODO: check - // Misc + // Skills private static final int HOUR_OF_PENITENCE[] = { 15325, @@ -53,6 +56,17 @@ public class Q00500_BrothersBoundInChains extends Quest 15328, 15329 }; + // Agathion + private static final int SIN_EATER[] = + { + 16098, + 16099, + 16100, + 16101, + 16102 + }; + // Misc + private static final int DROP_QI_CHANCE = 1; // in % TODO: check that value private static final int MIN_LEVEL = 60; public Q00500_BrothersBoundInChains() @@ -60,6 +74,7 @@ public class Q00500_BrothersBoundInChains extends Quest super(500); addStartNpc(DARK_JUDGE); addTalkId(DARK_JUDGE); + addSummonAgathion(); registerQuestItems(PENITENT_MANACLES, CRUMBS_OF_PENITENCE); addCondMinLevel(MIN_LEVEL, "30981-nopk.htm"); } @@ -75,6 +90,16 @@ public class Q00500_BrothersBoundInChains extends Quest switch (event) { + case "buff": + { + if ((player != null) && IntStream.of(SIN_EATER).anyMatch(x -> x == player.getAgathionId())) + { + final Skill skill = SkillData.getInstance().getSkill(15325, 1); // Hour of Penitence + skill.activateSkill(player, player); + startQuestTimer("buff", 270000, null, player); // Rebuff every 4min30 (retail like) + } + break; + } case "30981-02.htm": case "30981-03.htm": { @@ -170,6 +195,12 @@ public class Q00500_BrothersBoundInChains extends Quest return htmltext; } + @Override + public void onSummonAgathion(L2PcInstance player, int agathionId) + { + startQuestTimer("buff", 2500, null, player); + } + @RegisterEvent(EventType.ON_ATTACKABLE_KILL) @RegisterType(ListenerRegisterType.GLOBAL_MONSTERS) public void onAttackableKill(OnAttackableKill event) diff --git a/trunk/dist/game/data/stats/npcs/16000-16099.xml b/trunk/dist/game/data/stats/npcs/16000-16099.xml index 4f7952f9f1..3f56ffb5f3 100644 --- a/trunk/dist/game/data/stats/npcs/16000-16099.xml +++ b/trunk/dist/game/data/stats/npcs/16000-16099.xml @@ -4671,7 +4671,7 @@ - + DEMONIC MALE @@ -4699,7 +4699,7 @@ - + DEMONIC MALE diff --git a/trunk/dist/game/data/stats/npcs/16100-16199.xml b/trunk/dist/game/data/stats/npcs/16100-16199.xml index c7b2b91b57..307a57a24f 100644 --- a/trunk/dist/game/data/stats/npcs/16100-16199.xml +++ b/trunk/dist/game/data/stats/npcs/16100-16199.xml @@ -1,6 +1,6 @@ - + DEMONIC MALE @@ -28,7 +28,7 @@ - + DEMONIC MALE @@ -56,7 +56,7 @@ - + DEMONIC MALE diff --git a/trunk/dist/game/data/stats/skills/09600-09699.xml b/trunk/dist/game/data/stats/skills/09600-09699.xml index b18ab32f88..79a134a321 100644 --- a/trunk/dist/game/data/stats/skills/09600-09699.xml +++ b/trunk/dist/game/data/stats/skills/09600-09699.xml @@ -30,6 +30,7 @@ icon.etc_summon_aga_agit_i00 A1 + 2 3000 NONE;STRIDER;WYVERN;WOLF 5 @@ -46,11 +47,17 @@ + + + 16098 + + icon.etc_summon_aga_agit_i00 + 2 A1 3000 NONE;STRIDER;WYVERN;WOLF @@ -68,11 +75,17 @@ + + + 16099 + + icon.etc_summon_aga_agit_i00 + 2 A1 3000 NONE;STRIDER;WYVERN;WOLF @@ -90,11 +103,17 @@ + + + 16100 + + icon.etc_summon_aga_agit_i00 + 2 A1 3000 NONE;STRIDER;WYVERN;WOLF @@ -106,17 +125,23 @@ SINGLE - 61 - 99 + 60 + 106 CASTER + + + 16101 + + icon.etc_summon_aga_agit_i00 + 2 A1 3000 NONE;STRIDER;WYVERN;WOLF @@ -134,6 +159,11 @@ + + + 16102 + + @@ -152,6 +182,9 @@ true SELF SINGLE + + + @@ -358,22 +391,30 @@ - etc_whiteday_candy_i05 P - 5 - 1 - 500 + 1 + CANDY_BUFF + + + 1.25 + PER + + - etc_whiteday_candy_i06 P - 5 - 1 - 500 + 1 + CANDY_BUFF + + + 1.25 + PER + + diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index 4d9d312843..78ec6037f5 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -99,6 +99,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSkillLearn; +import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonAgathion; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonSpawn; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonTalk; import com.l2jmobius.gameserver.model.events.impl.character.player.OnTrapAction; @@ -1382,6 +1383,13 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime return registerConsumer(callback, EventType.ON_INSTANCE_STATUS_CHANGE, ListenerRegisterType.INSTANCE, templateIds); } + // --------------------------------------------------------------------------------------------------------------------------- + + protected final List setPlayerSummonAgathion(Consumer callback) + { + return registerConsumer(callback, EventType.ON_PLAYER_SUMMON_AGATHION, ListenerRegisterType.GLOBAL); + } + // -------------------------------------------------------------------------------------------------- // --------------------------------Default listener register methods--------------------------------- // -------------------------------------------------------------------------------------------------- diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/EventType.java b/trunk/java/com/l2jmobius/gameserver/model/events/EventType.java index 7c46364d5e..75642db50f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/EventType.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/EventType.java @@ -105,6 +105,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSelec import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSkillLearn; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSocialAction; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSubChange; +import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonAgathion; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonSpawn; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSummonTalk; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerTransform; @@ -266,6 +267,7 @@ public enum EventType ON_PLAYER_SUB_CHANGE(OnPlayerSubChange.class, void.class), ON_PLAYER_QUEST_ABORT(OnPlayerQuestAbort.class, void.class), ON_PLAYER_QUEST_COMPLETE(OnPlayerQuestComplete.class, void.class), + ON_PLAYER_SUMMON_AGATHION(OnPlayerSummonAgathion.class, void.class), // Trap events ON_TRAP_ACTION(OnTrapAction.class, void.class), diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSummonAgathion.java b/trunk/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSummonAgathion.java new file mode 100644 index 0000000000..6e08ef8f9a --- /dev/null +++ b/trunk/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSummonAgathion.java @@ -0,0 +1,52 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.l2jmobius.gameserver.model.events.impl.character.player; + +import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; +import com.l2jmobius.gameserver.model.events.EventType; +import com.l2jmobius.gameserver.model.events.impl.IBaseEvent; + +/** + * @author Mathael + */ +public class OnPlayerSummonAgathion implements IBaseEvent +{ + private final L2PcInstance _player; + private final int _agathionId; + + public OnPlayerSummonAgathion(L2PcInstance player, int agathionId) + { + _player = player; + _agathionId = agathionId; + } + + public L2PcInstance getPlayer() + { + return _player; + } + + public int getAgathionId() + { + return _agathionId; + } + + @Override + public EventType getType() + { + return EventType.ON_PLAYER_SUMMON_AGATHION; + } +} diff --git a/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java b/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java index 027e8dacc8..c3be02e06a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -990,6 +990,19 @@ public class Quest extends AbstractScript implements IIdentifiable return false; } + public final void notifySummonAgathion(L2PcInstance player, int npcId) + { + try + { + onSummonAgathion(player, npcId); + } + catch (Exception e) + { + _log.log(Level.WARNING, "Exception on onSummonAgathion() in notifySummonAgathion(): " + e.getMessage(), e); + return; + } + } + // These are methods that java calls to invoke scripts. /** @@ -1468,6 +1481,10 @@ public class Quest extends AbstractScript implements IIdentifiable { } + public void onSummonAgathion(L2PcInstance player, int agathionId) + { + } + /** * @param npc * @param player @@ -2473,6 +2490,11 @@ public class Quest extends AbstractScript implements IIdentifiable setInstanceLeaveId(event -> onInstanceLeave(event.getPlayer(), event.getInstanceWorld()), templateIds); } + public void addSummonAgathion() + { + setPlayerSummonAgathion(event -> notifySummonAgathion(event.getPlayer(), event.getAgathionId())); + } + /** * Use this method to get a random party member from a player's party.
* Useful when distributing rewards after killing an NPC.