From 36b365fa808fc7d815405c26c03be3c4b95baf55 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 13 Jul 2016 16:01:25 +0000
Subject: [PATCH] Third class quests rework.
---
.../EvilIncubator/EvilIncubator.java | 2 +-
.../{33147-01.html => 33165-01.html} | 0
.../32221-04.htm | 2 +-
.../{33147-01.html => 33165-01.html} | 0
.../quests/ThirdClassTransferQuest.java | 57 +++++++++++++++++--
5 files changed, 54 insertions(+), 7 deletions(-)
rename trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/{33147-01.html => 33165-01.html} (100%)
rename trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/{33147-01.html => 33165-01.html} (100%)
diff --git a/trunk/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/trunk/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
index 2dc401e78e..abed6a07f3 100644
--- a/trunk/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
+++ b/trunk/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java
@@ -437,7 +437,7 @@ public final class EvilIncubator extends AbstractInstance
}
else if (waveId < 8)
{
- if (world.getAliveNpcs(MONSTERS).isEmpty())
+ if (world.getAliveNpcs(MONSTERS).size() <= 1)
{
getTimers().addTimer("SPAWN_WAVE", 5000, e -> manageWaveSpawn(world));
}
diff --git a/trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/33147-01.html b/trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/33165-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/33147-01.html
rename to trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/33165-01.html
diff --git a/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/32221-04.htm b/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/32221-04.htm
index 14b7078aa7..a62b59985b 100644
--- a/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/32221-04.htm
+++ b/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/32221-04.htm
@@ -1,4 +1,4 @@
Grand Master Brome:
Remember, your destiny is blocked until you face this challenge.
Go now to Shilen's Seal and find Aden Vanguard. Help them to fulfill their mission.
-
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/33147-01.html b/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/33165-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/33147-01.html
rename to trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/33165-01.html
diff --git a/trunk/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/trunk/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 8adae6f0a3..e3980c6cef 100644
--- a/trunk/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/trunk/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -55,7 +55,12 @@ public abstract class ThirdClassTransferQuest extends Quest
33169,
};
// Items
- private static final int SOLDIER_TAG = 17750; // Vanguard Soldier's Dog Tags
+ private static final int SOLDIER_TAG_HUMAN = 17748;
+ private static final int SOLDIER_TAG_ELF = 17749;
+ private static final int SOLDIER_TAG_DARK_ELF = 17750;
+ private static final int SOLDIER_TAG_ORC = 17751;
+ private static final int SOLDIER_TAG_DWARF = 17752;
+ private static final int SOLDIER_TAG_KAMAEL = 17753;
private static final int STEEL_DOOR_COIN = 37045;
private static final int SOUL_SHOT_PACK = 22576;
private static final int SPIRIT_SHOT_PACK = 22607;
@@ -71,7 +76,13 @@ public abstract class ThirdClassTransferQuest extends Quest
addTalkId(QUARTERMASTER, VANGUARD_MEMBER);
addTalkId(VANGUARDS);
//@formatter:off
- registerQuestItems(SOLDIER_TAG,
+ registerQuestItems(
+ SOLDIER_TAG_HUMAN,
+ SOLDIER_TAG_ELF,
+ SOLDIER_TAG_DARK_ELF,
+ SOLDIER_TAG_ORC,
+ SOLDIER_TAG_DWARF,
+ SOLDIER_TAG_KAMAEL,
17484, // Cry of Destiny - Gladiator
17485, // Cry of Destiny - Warlord
17486, // Cry of Destiny - Paladin
@@ -140,7 +151,7 @@ public abstract class ThirdClassTransferQuest extends Quest
{
st.setCond(4, true);
st.unset("vanguard");
- takeItems(player, SOLDIER_TAG, -1);
+ takeItems(player, getSoldierTag(player), -1);
htmltext = event;
}
break;
@@ -162,10 +173,10 @@ public abstract class ThirdClassTransferQuest extends Quest
final int vanguard = st.getInt("vanguard");
if ((vanguard & bit) != bit)
{
- giveItems(player, SOLDIER_TAG, 1);
+ giveItems(player, getSoldierTag(player), 1);
st.set("vanguard", vanguard | bit);
- if (getQuestItemsCount(player, SOLDIER_TAG) == 4)
+ if (getQuestItemsCount(player, getSoldierTag(player)) == 4)
{
st.setCond(3, true);
htmltext = "vanguard-04.html";
@@ -234,6 +245,42 @@ public abstract class ThirdClassTransferQuest extends Quest
return htmltext;
}
+ /**
+ * @param player
+ * @return
+ */
+ private int getSoldierTag(L2PcInstance player)
+ {
+ switch (player.getRace())
+ {
+ case HUMAN:
+ {
+ return SOLDIER_TAG_HUMAN;
+ }
+ case ELF:
+ {
+ return SOLDIER_TAG_ELF;
+ }
+ case DARK_ELF:
+ {
+ return SOLDIER_TAG_DARK_ELF;
+ }
+ case ORC:
+ {
+ return SOLDIER_TAG_ORC;
+ }
+ case DWARF:
+ {
+ return SOLDIER_TAG_DWARF;
+ }
+ case KAMAEL:
+ {
+ return SOLDIER_TAG_KAMAEL;
+ }
+ }
+ return 0;
+ }
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated)
{