diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Kamael/MimirsForest.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Kamael/MimirsForest.xml
index 2cfb6e8621..681a064085 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Kamael/MimirsForest.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Kamael/MimirsForest.xml
@@ -299,7 +299,6 @@
-
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml
index 1ebfc27904..e205ab0c90 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,7 +1,6 @@
-
-
+
HUMAN
FEMALE
@@ -10,15 +9,18 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -27,15 +29,18 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -44,16 +49,19 @@
+
+
+
+
+
-
-
-
- HUMAN
+
+ HUMANOID
FEMALE
@@ -61,8 +69,12 @@
+
+
+
+
+
-
@@ -72,9 +84,8 @@
-
-
- HUMAN
+
+ ELEMENTAL
FEMALE
@@ -82,8 +93,12 @@
+
+
+
+
+
-
@@ -93,9 +108,8 @@
-
-
- HUMAN
+
+ DEMONIC
FEMALE
@@ -103,8 +117,12 @@
+
+
+
+
+
-
@@ -114,8 +132,7 @@
-
-
+
HUMAN
FEMALE
@@ -124,15 +141,18 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -141,15 +161,18 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -158,16 +181,19 @@
+
+
+
+
+
-
-
-
- HUMAN
+
+ BUG
FEMALE
@@ -175,8 +201,12 @@
+
+
+
+
+
-
@@ -186,8 +216,7 @@
-
-
+
HUMAN
FEMALE
@@ -196,15 +225,18 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -213,32 +245,39 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
+
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -247,8 +286,12 @@
+
+
+
+
+
-
@@ -288,8 +331,7 @@
-
-
+
HUMAN
FEMALE
@@ -298,15 +340,18 @@
+
+
+
+
+
-
-
-
+
HUMAN
FEMALE
@@ -315,8 +360,12 @@
+
+
+
+
+
-
@@ -344,7 +393,7 @@
-
+
HUMANOID
MALE
@@ -353,8 +402,12 @@
+
+
+
+
+
-
@@ -364,9 +417,9 @@
-
+
- HUMAN
+ BEAST
FEMALE
@@ -384,10 +437,23 @@
+
+
+
-
-
+
GIANT
-
+
+
+
+
+
+
@@ -30,8 +34,8 @@
-The annoying group called Embryo failed to get me on their side. So now they want to recruit Daimon. If they succeed... well.
+The energy of the beasts in the valley around here has subsided significantly. Is it you that has slain them? ...Interesting...
Give me some time to think about what to do.
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-03.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-03.htm
index f6d55541c1..30aecc8288 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-03.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-03.htm
@@ -1,5 +1,5 @@
Giant's Minion Janitt:
-So far, Argos isn't exactly falling all over himself to support Embryo. The problem is, he doesn't trust us either. I managed to get him to agree to give me a chance; I have to send someone brave and wise to convince him.
-Are you brave enough and wise enough? We're on a time limit here, so I don't know that we have the time to find out. I need you to go talk to him.
-
+Yes, that's right! So far, Argos isn't exactly falling all over himself to support Embryo. The problem is, he doesn't trust us either. I managed to get him to agree to give me a chance; I have to send someone brave and wise to convince him.
+You may be qualified. Come on, it should be worth trying.
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-04.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-04.htm
index 9552961840..7737d2826f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-04.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-04.htm
@@ -1,3 +1,4 @@
Giant's Minion Janitt:
-Hurry, then. I'll mark the location of the Eye of Argos on your map. Go talk to him right away.
+Though you're a stranger to wisdom, obviously, the best way to prove your bravery would be to slay the monsters around here, correct? Slay the Canyon Antelope, Canyon Bandersnatch, Valley Buffalo, Valley Grendel, Canyon Antelope Slave, Canyon Bandersnatch Slave, Valley Buffalo Slave, and Valley Grendel Slave. In the process, Argos may recognize your bravery. Desperate times call for desperate measures.
+If you feel you've done enough, teleport to where the Eye of Argos is, and try to have a conversation.
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-05.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-05.html
index 9552961840..02a670ddd0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-05.html
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/33851-05.html
@@ -1,3 +1,4 @@
Giant's Minion Janitt:
-Hurry, then. I'll mark the location of the Eye of Argos on your map. Go talk to him right away.
+Let's try to prove your bravery, why don't we. Slay the Canyon Antelope, Canyon Bandersnatch, Valley Buffalo, Valley Grendel, Canyon Antelope Slave, Canyon Bandersnatch Slave, Valley Buffalo Slave, and Valley Grendel Slave. In the process, Argos may recognize your bravery. Desperate times call for desperate measures.
+If you feel you've done enough, teleport to where the Eye of Argos is, and try to have a conversation.
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
index 2c9939160d..95a9df2d20 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java
@@ -16,12 +16,19 @@
*/
package quests.Q10416_InSearchOfTheEyeOfArgos;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.l2jmobius.gameserver.enums.QuestSound;
+import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.holders.NpcLogListHolder;
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.network.NpcStringId;
/**
* In Search of the Eye of Argos (10416)
@@ -32,17 +39,29 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest
// NPCs
private static final int JANITT = 33851;
private static final int EYE_OF_ARGOS = 31683;
- // Items
- private static final int EAA = 730; // Scroll: Enchant Armor (A-grade)
+ // Monsters
+ private static final int[] MONSTERS =
+ {
+ 21294, // Canyon Antelope
+ 21296, // Canyon Bandersnatch
+ 23311, // Valley Buffalo
+ 23312, // Valley Grendel
+ 21295, // Canyon Antelope Slave
+ 21297, // Canyon Bandersnatch Slave
+ 21299, // Valley Buffalo Slave
+ 21304 // Valley Grendel Slave
+ };
// Misc
private static final int MIN_LEVEL = 70;
private static final int MAX_LEVEL = 75;
+ private static final String KILL_COUNT_VAR = "KillCount";
public Q10416_InSearchOfTheEyeOfArgos()
{
super(10416);
addStartNpc(JANITT);
addTalkId(JANITT, EYE_OF_ARGOS);
+ addKillId(MONSTERS);
addCondNotRace(Race.ERTHEIA, "33851-06.html");
addCondLevel(MIN_LEVEL, MAX_LEVEL, "33851-07.htm");
}
@@ -73,16 +92,19 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest
}
case "31683-02.html":
{
- if (st.isCond(1))
+ if (st.isCond(2))
{
- st.exitQuest(false, true);
- giveItems(player, EAA, 2);
- giveStoryQuestReward(npc, player);
- if (player.getLevel() > MIN_LEVEL)
+ if (player.getLevel() >= MIN_LEVEL)
{
- addExpAndSp(player, 1_088_640, 261);
+ addExpAndSp(player, 178_732_196, 261);
+ giveStoryQuestReward(npc, player);
+ st.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
}
- htmltext = event;
}
break;
}
@@ -108,9 +130,13 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest
}
case State.STARTED:
{
- if (st.isCond(1))
+ if (st.isCond(1) && (npc.getId() == JANITT))
{
- htmltext = npc.getId() == JANITT ? "33851-05.html" : "31683-01.html";
+ htmltext = "33851-05.html";
+ }
+ if (st.isCond(2) && (npc.getId() == EYE_OF_ARGOS))
+ {
+ htmltext = "31683-01.html";
}
break;
}
@@ -125,4 +151,42 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest
}
return htmltext;
}
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+ if ((qs != null) && qs.isCond(1))
+ {
+ int count = qs.getInt(KILL_COUNT_VAR);
+ qs.set(KILL_COUNT_VAR, ++count);
+ if (count >= 200)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ sendNpcLogList(killer);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public Set getNpcLogList(L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isCond(1))
+ {
+ final int killCount = qs.getInt(KILL_COUNT_VAR);
+ if (killCount > 0)
+ {
+ final Set holder = new HashSet<>();
+ holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_BEASTS_OF_THE_VALLEY, killCount));
+ return holder;
+ }
+ }
+ return super.getNpcLogList(player);
+ }
}
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
index c7eecaa201..0e26b2bf10 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java
@@ -16,12 +16,19 @@
*/
package quests.Q10797_CrossingFate;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.l2jmobius.commons.util.CommonUtil;
+import com.l2jmobius.gameserver.enums.QuestSound;
+import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.holders.NpcLogListHolder;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.util.Util;
+import com.l2jmobius.gameserver.network.NpcStringId;
import quests.Q10796_TheEyeThatDefiedTheGods.Q10796_TheEyeThatDefiedTheGods;
@@ -35,11 +42,21 @@ public class Q10797_CrossingFate extends Quest
// NPCs
private static final int EYE_OF_ARGOS = 31683;
private static final int DAIMON_THE_WHITE_EYED = 27499;
- // Items
- private static final int EAA = 730;
+ private static final int[] MONSTERS =
+ {
+ 21294, // Canyon Antelope
+ 21296, // Canyon Bandersnatch
+ 23311, // Valley Buffalo
+ 23312, // Valley Grendel
+ 21295, // Canyon Antelope Slave
+ 21297, // Canyon Bandersnatch Slave
+ 21299, // Valley Buffalo Slave
+ 21304 // Valley Grendel Slave
+ };
// Misc
private static final int MIN_LEVEL = 70;
private static final int MAX_LEVEL = 75;
+ private static final String KILL_COUNT_VAR = "KillCount";
public Q10797_CrossingFate()
{
@@ -47,8 +64,9 @@ public class Q10797_CrossingFate extends Quest
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS);
addKillId(DAIMON_THE_WHITE_EYED);
+ addKillId(MONSTERS);
addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html");
- addCondRace(Race.ERTHEIA, "noErtheya.html");
+ addCondRace(Race.ERTHEIA, "noErtheia.html");
addCondCompletedQuest(Q10796_TheEyeThatDefiedTheGods.class.getSimpleName(), "restriction.html");
}
@@ -75,14 +93,21 @@ public class Q10797_CrossingFate extends Quest
}
case "31683-07.html":
{
- if (qs.isCond(2))
+ if (qs.isCond(3))
{
- addExpAndSp(player, 2721600, 653);
- giveStoryQuestReward(npc, player);
- giveItems(player, EAA, 5);
- qs.exitQuest(false, true);
- break;
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ addExpAndSp(player, 306_167_814, 653);
+ giveStoryQuestReward(npc, player);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
}
+ break;
}
}
return htmltext;
@@ -97,11 +122,11 @@ public class Q10797_CrossingFate extends Quest
{
htmltext = "31683-01.htm";
}
- else if (qs.isCond(1))
+ else if (qs.isCond(1) || qs.isCond(2))
{
htmltext = "31683-05.html";
}
- else if (qs.isCond(2))
+ else if (qs.isCond(3))
{
htmltext = "31683-06.html";
}
@@ -116,10 +141,41 @@ public class Q10797_CrossingFate extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
- if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
+ if ((qs != null) && qs.isCond(1) && CommonUtil.contains(MONSTERS, npc.getId()))
{
- qs.setCond(2, true);
+ int count = qs.getInt(KILL_COUNT_VAR);
+ qs.set(KILL_COUNT_VAR, ++count);
+ if (count >= 100)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ sendNpcLogList(killer);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ if ((qs != null) && qs.isCond(2) && (npc.getId() == DAIMON_THE_WHITE_EYED))
+ {
+ qs.setCond(3, true);
}
return super.onKill(npc, killer, isSummon);
}
+
+ @Override
+ public Set getNpcLogList(L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isCond(1))
+ {
+ final int killCount = qs.getInt(KILL_COUNT_VAR);
+ if (killCount > 0)
+ {
+ final Set holder = new HashSet<>();
+ holder.add(new NpcLogListHolder(NpcStringId.DEFEAT_THE_BEASTS_OF_THE_VALLEY4, killCount));
+ return holder;
+ }
+ }
+ return super.getNpcLogList(player);
+ }
}
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Kamael/MimirsForest.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Kamael/MimirsForest.xml
index 2cfb6e8621..681a064085 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Kamael/MimirsForest.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Kamael/MimirsForest.xml
@@ -299,7 +299,6 @@
-
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/RaidbossSpawns.xml
index dd31a57edc..3fe67c2cbf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/RaidbossSpawns.xml
@@ -1666,235 +1666,271 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1908,11 +1944,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
@@ -1938,9 +1995,6 @@
-
-
-
@@ -1953,6 +2007,9 @@
+
+
+
@@ -1962,7 +2019,4 @@
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml
index 8c7a38b683..3c68a3a11c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23700-23799.xml
@@ -1,7 +1,6 @@
-
HUMAN
FEMALE
@@ -10,15 +9,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -27,15 +29,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -44,15 +49,18 @@
+
+
+
+
+
-
-
HUMANOID
FEMALE
@@ -61,8 +69,12 @@
+
+
+
+
+
-
@@ -73,7 +85,6 @@
-
ELEMENTAL
FEMALE
@@ -82,8 +93,12 @@
+
+
+
+
+
-
@@ -94,7 +109,6 @@
-
DEMONIC
FEMALE
@@ -103,8 +117,12 @@
+
+
+
+
+
-
@@ -115,7 +133,6 @@
-
HUMAN
FEMALE
@@ -124,15 +141,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -141,15 +161,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -158,15 +181,18 @@
+
+
+
+
+
-
-
BUG
FEMALE
@@ -175,8 +201,12 @@
+
+
+
+
+
-
@@ -187,7 +217,6 @@
-
HUMAN
FEMALE
@@ -196,15 +225,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -213,15 +245,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -231,15 +266,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -248,8 +286,12 @@
+
+
+
+
+
-
@@ -290,7 +332,6 @@
-
HUMAN
FEMALE
@@ -299,15 +340,18 @@
+
+
+
+
+
-
-
HUMAN
FEMALE
@@ -316,8 +360,12 @@
+
+
+
+
+
-
@@ -354,8 +402,12 @@
+
+
+
+
+
-
@@ -401,7 +453,6 @@
-
BEAST
FEMALE
@@ -410,8 +461,12 @@
+
+
+
+
+
-
@@ -469,7 +524,6 @@
-
ANIMAL
FEMALE
@@ -478,8 +532,12 @@
+
+
+
+
+
-
@@ -569,7 +627,6 @@
-
ELEMENTAL
FEMALE
@@ -578,8 +635,12 @@
+
+
+
+
+
-
@@ -848,6 +909,11 @@
+
+
+
+
+
@@ -2252,8 +2318,8 @@
-
-
+
+
@@ -2312,8 +2378,8 @@
-
-
+
+
@@ -2371,8 +2437,8 @@
-
-
+
+
@@ -2431,8 +2497,8 @@
-
-
+
+
@@ -2492,8 +2558,8 @@
-
-
+
+
@@ -2550,8 +2616,8 @@
-
-
+
+
@@ -2608,8 +2674,8 @@
-
-
+
+
@@ -2671,8 +2737,8 @@
-
-
+
+
@@ -2731,8 +2797,8 @@
-
-
+
+
@@ -2791,8 +2857,8 @@
-
-
+
+
@@ -2893,8 +2959,8 @@
-
-
+
+
@@ -2935,8 +3001,8 @@
-
-
+
+
@@ -2977,8 +3043,8 @@
-
-
+
+
@@ -3017,8 +3083,8 @@
-
-
+
+
@@ -3235,8 +3301,11 @@
-
-
+
+
+
+
+
@@ -3284,8 +3353,11 @@
-
-
+
+
+
+
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23800-23899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23800-23899.xml
index 71e3b6271e..50585c59f1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23800-23899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/23800-23899.xml
@@ -1,7 +1,6 @@
-
GIANT
@@ -10,6 +9,11 @@
+
+
+
+
+
@@ -119,8 +123,7 @@
-
-
+
DIVINE
@@ -130,6 +133,11 @@
+
+
+
+
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25900-25999.xml
index 9e034f9f31..3cba732633 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/25900-25999.xml
@@ -146,12 +146,15 @@
-
+
+
+
+
CONSTRUCT
MALE
@@ -245,7 +248,6 @@
-
@@ -280,7 +282,6 @@
-
@@ -1762,7 +1763,13 @@
-
+
+
+
+
+
+
+
HUMANOID
FEMALE
@@ -1778,7 +1785,6 @@
-
@@ -1868,7 +1874,6 @@
-
BEAST
FEMALE
@@ -1883,7 +1888,6 @@
-
@@ -1894,7 +1898,6 @@
-
ANIMAL
FEMALE
@@ -1909,7 +1912,6 @@
-
@@ -1920,7 +1922,6 @@
-
HUMANOID
FEMALE
@@ -1935,7 +1936,6 @@
-
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
index 019d349a84..c627e4028f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/26100-26199.xml
@@ -2260,6 +2260,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GIANT
@@ -2271,8 +2286,11 @@
-
+
+
+
+
@@ -2359,13 +2377,17 @@