diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java index a08317d416..2fad1910e3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java @@ -38,7 +38,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest private static final int ELISA = 30848; private static final int BELLA = 30256; private static final int DE_VILLAGE_TELEPORT_DEVICE = 30134; - // Reward's + // Rewards private static final long EXP = 231860550; private static final int SP = 231840; private static final int FP = 200; // Faction points @@ -129,7 +129,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest htmltext = event; break; } - case "34414-04.html": // DE_VILLAGE_TELEPORT_DEVICE + case "34414-04.html": // LEPATHIA { giveItems(player, SCROLL_OF_ESCAPE_TOWN_OF_ADEN, 1); htmltext = event; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm index 93da2c6862..64e87a0ca8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm @@ -1,5 +1,5 @@ Herphah:
-Even if you are killedm don't worry. Death doesn't mean the end. You can resurrect and start again. However, the gods can't always save you from death without any consequences.
+Even if you are killed don't worry. Death doesn't mean the end. You can resurrect and start again. However, the gods can't always save you from death without any consequences.
You must get familiar with the Death Penalty.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html similarity index 91% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html index 9fe7f864bc..3a51fad033 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html @@ -1,5 +1,5 @@ Herphah:
If you die from a serious wound in the battle, you will revive in a nearby village, but you should pay the cost. It is called the Death Penalty. You may lose some XP or experience the Death Penalty.
If you lose more than the specified limit of XP after you reach level 85, you may possibly experience a level down. B careful to avoid such disaster. Otherwise, you will lose what you've worked so hard to earn.
- + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html similarity index 89% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html index 650b2437f2..8c26e2c976 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html @@ -2,5 +2,5 @@ Are you worried? Relax. With the help of an ally, you can resurrect immediately where you died, without paying the Death Penalty.
A healer with the resurrection skill or someone with a resurrection item such as the Blessed Scroll of Resurrection can revive you.
Others can help you, but that means you can help others too. Keep that in mind.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html similarity index 86% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html index 99dd2cc770..b8f6734550 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html @@ -1,5 +1,5 @@ Penny:
Nice to see yiu again, Adventurer. Like I said before, the Adventure Guild is working hard to help you grow and settle down in Aden.
Let's work hard for our next goal. As you complete the missions I give you, we will grow closer as well.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-2.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-02.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-2.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-02.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html similarity index 73% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html index ae97b78415..243085afec 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html @@ -1,5 +1,5 @@ Penny:
You reached Amity Level 2 with our Adventure Guild? I should be able to tell Herphah then.
Thank you for your work.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-4.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-04.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-4.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-04.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java index 094d54cb9f..7ee433f43e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExTutorialShowId; import quests.Q10560_WayOfWanderingKnight.Q10560_WayOfWanderingKnight; /** - * Way Of Wandering Knight (10560) + * Across The DeathLine (10561) * @URL https://l2wiki.com/Across_the_Death_Line * @author NightBR */ @@ -38,7 +38,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest private static final int HERPHAH = 34362; private static final int PENNY = 34413; // Reward's - private static final long EXP = 1409345453; + private static final long EXP = 4409345453L; private static final int SP = 3968411; private static final int SOUL_SHOT_GRADE_R = 22433; private static final int BS_SHOT_GRADE_R = 22434; @@ -72,10 +72,8 @@ public final class Q10561_AcrossTheDeathLine extends Quest { case "34362-02.htm": case "34362-03.htm": - case "34362-05.htm": - case "34362-06.htm": - case "34362-11.html": - case "32327-2.htm": + case "34362-05.html": + case "34362-06.html": { htmltext = event; break; @@ -88,7 +86,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest htmltext = event; break; } - case "34362-07.htm": + case "34362-07.html": { qs.setCond(2, true); htmltext = event; @@ -96,6 +94,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest } case "34362-09.html": { + // Rewards giveItems(player, SOUL_SHOT_GRADE_R, 2500); giveItems(player, BS_SHOT_GRADE_R, 2500); giveItems(player, PA_ART_OF_SEDUCTION, 5); @@ -105,13 +104,13 @@ public final class Q10561_AcrossTheDeathLine extends Quest htmltext = event; break; } - case "34413-2.htm": + case "34413-02.html": { qs.setCond(3, true); htmltext = event; break; } - case "34413-4.htm": + case "34413-04.html": { qs.setCond(4, true); htmltext = event; @@ -144,17 +143,17 @@ public final class Q10561_AcrossTheDeathLine extends Quest { case HERPHAH: { - if (qs.isCond(3)) + if (qs.isCond(1)) { - htmltext = "34362-07.htm"; + htmltext = "34362-04.htm"; } else if (qs.isCond(4)) { htmltext = "34362-08.html"; } - else if (qs.isCond(5)) + else { - htmltext = "34362-13.html"; + htmltext = "34362-07.html"; } break; } @@ -162,7 +161,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest { if (qs.isCond(2)) { - htmltext = "34413-1.htm"; + htmltext = "34413-01.html"; } else if (qs.isCond(3)) { @@ -171,7 +170,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest // Checking if reached level 2 with Adventurer's Guild Faction if (player.getFactionLevel(Faction.ADVENTURE_GUILD) >= 2) { - htmltext = "34413-3.htm"; + htmltext = "34413-03.html"; } else { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java index a08317d416..2fad1910e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java @@ -38,7 +38,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest private static final int ELISA = 30848; private static final int BELLA = 30256; private static final int DE_VILLAGE_TELEPORT_DEVICE = 30134; - // Reward's + // Rewards private static final long EXP = 231860550; private static final int SP = 231840; private static final int FP = 200; // Faction points @@ -129,7 +129,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest htmltext = event; break; } - case "34414-04.html": // DE_VILLAGE_TELEPORT_DEVICE + case "34414-04.html": // LEPATHIA { giveItems(player, SCROLL_OF_ESCAPE_TOWN_OF_ADEN, 1); htmltext = event; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm index 93da2c6862..64e87a0ca8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm @@ -1,5 +1,5 @@ Herphah:
-Even if you are killedm don't worry. Death doesn't mean the end. You can resurrect and start again. However, the gods can't always save you from death without any consequences.
+Even if you are killed don't worry. Death doesn't mean the end. You can resurrect and start again. However, the gods can't always save you from death without any consequences.
You must get familiar with the Death Penalty.
- + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html similarity index 91% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html index 9fe7f864bc..3a51fad033 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html @@ -1,5 +1,5 @@ Herphah:
If you die from a serious wound in the battle, you will revive in a nearby village, but you should pay the cost. It is called the Death Penalty. You may lose some XP or experience the Death Penalty.
If you lose more than the specified limit of XP after you reach level 85, you may possibly experience a level down. B careful to avoid such disaster. Otherwise, you will lose what you've worked so hard to earn.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html similarity index 89% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html index 650b2437f2..8c26e2c976 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html @@ -2,5 +2,5 @@ Are you worried? Relax. With the help of an ally, you can resurrect immediately where you died, without paying the Death Penalty.
A healer with the resurrection skill or someone with a resurrection item such as the Blessed Scroll of Resurrection can revive you.
Others can help you, but that means you can help others too. Keep that in mind.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html similarity index 86% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html index 99dd2cc770..b8f6734550 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html @@ -1,5 +1,5 @@ Penny:
Nice to see yiu again, Adventurer. Like I said before, the Adventure Guild is working hard to help you grow and settle down in Aden.
Let's work hard for our next goal. As you complete the missions I give you, we will grow closer as well.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-2.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-02.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-2.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-02.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html similarity index 73% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html index ae97b78415..243085afec 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html @@ -1,5 +1,5 @@ Penny:
You reached Amity Level 2 with our Adventure Guild? I should be able to tell Herphah then.
Thank you for your work.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-4.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-04.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-4.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-04.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java index 094d54cb9f..7ee433f43e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExTutorialShowId; import quests.Q10560_WayOfWanderingKnight.Q10560_WayOfWanderingKnight; /** - * Way Of Wandering Knight (10560) + * Across The DeathLine (10561) * @URL https://l2wiki.com/Across_the_Death_Line * @author NightBR */ @@ -38,7 +38,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest private static final int HERPHAH = 34362; private static final int PENNY = 34413; // Reward's - private static final long EXP = 1409345453; + private static final long EXP = 4409345453L; private static final int SP = 3968411; private static final int SOUL_SHOT_GRADE_R = 22433; private static final int BS_SHOT_GRADE_R = 22434; @@ -72,10 +72,8 @@ public final class Q10561_AcrossTheDeathLine extends Quest { case "34362-02.htm": case "34362-03.htm": - case "34362-05.htm": - case "34362-06.htm": - case "34362-11.html": - case "32327-2.htm": + case "34362-05.html": + case "34362-06.html": { htmltext = event; break; @@ -88,7 +86,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest htmltext = event; break; } - case "34362-07.htm": + case "34362-07.html": { qs.setCond(2, true); htmltext = event; @@ -96,6 +94,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest } case "34362-09.html": { + // Rewards giveItems(player, SOUL_SHOT_GRADE_R, 2500); giveItems(player, BS_SHOT_GRADE_R, 2500); giveItems(player, PA_ART_OF_SEDUCTION, 5); @@ -105,13 +104,13 @@ public final class Q10561_AcrossTheDeathLine extends Quest htmltext = event; break; } - case "34413-2.htm": + case "34413-02.html": { qs.setCond(3, true); htmltext = event; break; } - case "34413-4.htm": + case "34413-04.html": { qs.setCond(4, true); htmltext = event; @@ -144,17 +143,17 @@ public final class Q10561_AcrossTheDeathLine extends Quest { case HERPHAH: { - if (qs.isCond(3)) + if (qs.isCond(1)) { - htmltext = "34362-07.htm"; + htmltext = "34362-04.htm"; } else if (qs.isCond(4)) { htmltext = "34362-08.html"; } - else if (qs.isCond(5)) + else { - htmltext = "34362-13.html"; + htmltext = "34362-07.html"; } break; } @@ -162,7 +161,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest { if (qs.isCond(2)) { - htmltext = "34413-1.htm"; + htmltext = "34413-01.html"; } else if (qs.isCond(3)) { @@ -171,7 +170,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest // Checking if reached level 2 with Adventurer's Guild Faction if (player.getFactionLevel(Faction.ADVENTURE_GUILD) >= 2) { - htmltext = "34413-3.htm"; + htmltext = "34413-03.html"; } else { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java index a08317d416..2fad1910e3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/Q00562_BasicMissionAltarOfEvil.java @@ -38,7 +38,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest private static final int ELISA = 30848; private static final int BELLA = 30256; private static final int DE_VILLAGE_TELEPORT_DEVICE = 30134; - // Reward's + // Rewards private static final long EXP = 231860550; private static final int SP = 231840; private static final int FP = 200; // Faction points @@ -129,7 +129,7 @@ public class Q00562_BasicMissionAltarOfEvil extends Quest htmltext = event; break; } - case "34414-04.html": // DE_VILLAGE_TELEPORT_DEVICE + case "34414-04.html": // LEPATHIA { giveItems(player, SCROLL_OF_ESCAPE_TOWN_OF_ADEN, 1); htmltext = event; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm index 93da2c6862..64e87a0ca8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-04.htm @@ -1,5 +1,5 @@ Herphah:
-Even if you are killedm don't worry. Death doesn't mean the end. You can resurrect and start again. However, the gods can't always save you from death without any consequences.
+Even if you are killed don't worry. Death doesn't mean the end. You can resurrect and start again. However, the gods can't always save you from death without any consequences.
You must get familiar with the Death Penalty.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html similarity index 91% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html index 9fe7f864bc..3a51fad033 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-05.html @@ -1,5 +1,5 @@ Herphah:
If you die from a serious wound in the battle, you will revive in a nearby village, but you should pay the cost. It is called the Death Penalty. You may lose some XP or experience the Death Penalty.
If you lose more than the specified limit of XP after you reach level 85, you may possibly experience a level down. B careful to avoid such disaster. Otherwise, you will lose what you've worked so hard to earn.
- + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html similarity index 89% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html index 650b2437f2..8c26e2c976 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-06.html @@ -2,5 +2,5 @@ Are you worried? Relax. With the help of an ally, you can resurrect immediately where you died, without paying the Death Penalty.
A healer with the resurrection skill or someone with a resurrection item such as the Blessed Scroll of Resurrection can revive you.
Others can help you, but that means you can help others too. Keep that in mind.
- + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34362-07.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html similarity index 86% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html index 99dd2cc770..b8f6734550 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-1.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-01.html @@ -1,5 +1,5 @@ Penny:
Nice to see yiu again, Adventurer. Like I said before, the Adventure Guild is working hard to help you grow and settle down in Aden.
Let's work hard for our next goal. As you complete the missions I give you, we will grow closer as well.
- + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-2.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-02.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-2.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-02.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html similarity index 73% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html index ae97b78415..243085afec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-3.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-03.html @@ -1,5 +1,5 @@ Penny:
You reached Amity Level 2 with our Adventure Guild? I should be able to tell Herphah then.
Thank you for your work.
- + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-4.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-04.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-4.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/34413-04.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java index 094d54cb9f..7ee433f43e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10561_AcrossTheDeathLine/Q10561_AcrossTheDeathLine.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExTutorialShowId; import quests.Q10560_WayOfWanderingKnight.Q10560_WayOfWanderingKnight; /** - * Way Of Wandering Knight (10560) + * Across The DeathLine (10561) * @URL https://l2wiki.com/Across_the_Death_Line * @author NightBR */ @@ -38,7 +38,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest private static final int HERPHAH = 34362; private static final int PENNY = 34413; // Reward's - private static final long EXP = 1409345453; + private static final long EXP = 4409345453L; private static final int SP = 3968411; private static final int SOUL_SHOT_GRADE_R = 22433; private static final int BS_SHOT_GRADE_R = 22434; @@ -72,10 +72,8 @@ public final class Q10561_AcrossTheDeathLine extends Quest { case "34362-02.htm": case "34362-03.htm": - case "34362-05.htm": - case "34362-06.htm": - case "34362-11.html": - case "32327-2.htm": + case "34362-05.html": + case "34362-06.html": { htmltext = event; break; @@ -88,7 +86,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest htmltext = event; break; } - case "34362-07.htm": + case "34362-07.html": { qs.setCond(2, true); htmltext = event; @@ -96,6 +94,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest } case "34362-09.html": { + // Rewards giveItems(player, SOUL_SHOT_GRADE_R, 2500); giveItems(player, BS_SHOT_GRADE_R, 2500); giveItems(player, PA_ART_OF_SEDUCTION, 5); @@ -105,13 +104,13 @@ public final class Q10561_AcrossTheDeathLine extends Quest htmltext = event; break; } - case "34413-2.htm": + case "34413-02.html": { qs.setCond(3, true); htmltext = event; break; } - case "34413-4.htm": + case "34413-04.html": { qs.setCond(4, true); htmltext = event; @@ -144,17 +143,17 @@ public final class Q10561_AcrossTheDeathLine extends Quest { case HERPHAH: { - if (qs.isCond(3)) + if (qs.isCond(1)) { - htmltext = "34362-07.htm"; + htmltext = "34362-04.htm"; } else if (qs.isCond(4)) { htmltext = "34362-08.html"; } - else if (qs.isCond(5)) + else { - htmltext = "34362-13.html"; + htmltext = "34362-07.html"; } break; } @@ -162,7 +161,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest { if (qs.isCond(2)) { - htmltext = "34413-1.htm"; + htmltext = "34413-01.html"; } else if (qs.isCond(3)) { @@ -171,7 +170,7 @@ public final class Q10561_AcrossTheDeathLine extends Quest // Checking if reached level 2 with Adventurer's Guild Faction if (player.getFactionLevel(Faction.ADVENTURE_GUILD) >= 2) { - htmltext = "34413-3.htm"; + htmltext = "34413-03.html"; } else {