lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed quest 10743 issues.

Browse Source
This commit is contained in:
MobiusDev
2015-08-14 19:54:34 +00:00
parent c55839cc68
commit 9adca50b56
2 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java vendored
View File

@@ -34,7 +34,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
*/ */
public class Q10742_AFurryFriend extends Quest public class Q10742_AFurryFriend extends Quest
{ {
// NPC's // NPCs
private static final int LEIRA = 33952; private static final int LEIRA = 33952;
private static final int KIKU_S_CAVE = 33995; private static final int KIKU_S_CAVE = 33995;
private static final int RICKY = 19552; private static final int RICKY = 19552;
@@ -58,6 +58,7 @@ public class Q10742_AFurryFriend extends Quest
super(10742, Q10742_AFurryFriend.class.getSimpleName(), "A Furry Friend"); super(10742, Q10742_AFurryFriend.class.getSimpleName(), "A Furry Friend");
addStartNpc(LEIRA); addStartNpc(LEIRA);
addTalkId(LEIRA, KIKU_S_CAVE); addTalkId(LEIRA, KIKU_S_CAVE);
addFirstTalkId(KIKU_S_CAVE);
addMoveFinishedId(RICKY); addMoveFinishedId(RICKY);
addCondRace(Race.ERTHEIA, "no_quest.html"); addCondRace(Race.ERTHEIA, "no_quest.html");
addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html");
@@ -98,25 +99,6 @@ public class Q10742_AFurryFriend extends Quest
npc.setScriptValue(0); npc.setScriptValue(0);
break; break;
} }
case "33995-03.html":
{
if (qs.isStarted())
{
if (!player.getKnownList().getKnownCharactersInRadius(500).stream().anyMatch(n -> (n.getId() == RICKY) && (n.getSummoner() == player)))
{
showOnScreenMsg(player, NpcStringId.TAKE_RICKY_TO_LEIRA_IN_UNDER_2_MINUTES, ExShowScreenMessage.MIDDLE_CENTER, 4500);
final L2Npc ricky = addSpawn(RICKY, player.getLocation());
ricky.setSummoner(player);
ricky.setTitle(player.getAppearance().getVisibleName());
ricky.setIsRunning(true);
ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
startQuestTimer("check_ricky_distance", 1000, ricky, player, true);
startQuestTimer("unspawn_ricky_failed", 120000, ricky, player);
player.sendPacket(new ExSendUIEvent(player, false, false, 0, 120, NpcStringId.REMAINING_TIME));
}
}
break;
}
case "check_ricky_distance": case "check_ricky_distance":
{ {
if (player == null) if (player == null)
@@ -128,8 +110,17 @@ public class Q10742_AFurryFriend extends Quest
// Follow was breaking sometimes, making sure it doesn't happen. // Follow was breaking sometimes, making sure it doesn't happen.
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
final double distanceToRicky = player.calculateDistance(npc, false, true); if ((L2Npc) npc.getKnownList().getKnownCharactersInRadius(300).stream().filter(n -> (n.getId() == LEIRA)).findFirst().orElse(null) != null)
{
qs.setCond(2, true);
showOnScreenMsg(player, NpcStringId.RICKY_HAS_FOUND_LEIRA, ExShowScreenMessage.TOP_CENTER, 4500);
player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.REMAINING_TIME));
startQuestTimer("unspawn_ricky", 2000, npc, player);
cancelQuestTimer("check_ricky_distance", npc, player);
break;
}
final double distanceToRicky = player.calculateDistance(npc, false, true);
if ((distanceToRicky > 200) && (distanceToRicky < 500)) if ((distanceToRicky > 200) && (distanceToRicky < 500))
{ {
showOnScreenMsg(player, NpcStringId.YOU_ARE_FAR_FROM_RICKY, ExShowScreenMessage.TOP_CENTER, 4500); showOnScreenMsg(player, NpcStringId.YOU_ARE_FAR_FROM_RICKY, ExShowScreenMessage.TOP_CENTER, 4500);
@@ -138,19 +129,6 @@ public class Q10742_AFurryFriend extends Quest
{ {
startQuestTimer("unspawn_ricky_failed", 120000, npc, player); startQuestTimer("unspawn_ricky_failed", 120000, npc, player);
} }
else
{
final L2Npc leira = (L2Npc) npc.getKnownList().getKnownCharactersInRadius(300).stream().filter(n -> (n.getId() == LEIRA)).findFirst().orElse(null);
if (leira != null)
{
qs.setCond(2, true);
showOnScreenMsg(player, NpcStringId.RICKY_HAS_FOUND_LEIRA, ExShowScreenMessage.TOP_CENTER, 4500);
player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.REMAINING_TIME));
startQuestTimer("unspawn_ricky", 2000, npc, player);
cancelQuestTimer("check_ricky_distance", npc, player);
}
break;
}
} }
break; break;
} }
@@ -178,42 +156,57 @@ public class Q10742_AFurryFriend extends Quest
if (qs.isCompleted()) if (qs.isCompleted())
{ {
htmltext = getAlreadyCompletedMsg(player); return getAlreadyCompletedMsg(player);
} }
switch (npc.getId()) if (npc.getId() == LEIRA)
{ {
case LEIRA: if (qs.isCreated())
{ {
if (qs.isCreated()) htmltext = "33952-01.htm";
{
htmltext = "33952-01.htm";
}
else if (qs.isCond(2))
{
giveAdena(player, 2500, true);
addExpAndSp(player, 52516, 5);
qs.exitQuest(false, true);
htmltext = "33952-04.html";
}
break;
} }
case KIKU_S_CAVE: else if (qs.isCond(2))
{ {
if (qs.isStarted()) cancelQuestTimer("start_move_ricky", npc, player);
{ cancelQuestTimer("check_ricky_distance", npc, player);
if (getRandomBoolean()) cancelQuestTimer("unspawn_ricky_failed", npc, player);
{ giveAdena(player, 2500, true);
htmltext = "33995-01.html"; addExpAndSp(player, 52516, 5);
} qs.exitQuest(false, true);
else htmltext = "33952-04.html";
{ }
addAttackPlayerDesire(addSpawn(KIKU, player.getLocation(), true, 120000), player); }
showOnScreenMsg(player, NpcStringId.RICKY_IS_NOT_HERE_NTRY_SEARCHING_ANOTHER_KIKU_S_CAVE, ExShowScreenMessage.TOP_CENTER, 4500);
htmltext = "33995-02.html"; return htmltext;
} }
}
break; @Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs.isStarted())
{
if (getRandomBoolean())
{
addAttackPlayerDesire(addSpawn(KIKU, player.getLocation(), true, 120000), player);
showOnScreenMsg(player, NpcStringId.RICKY_IS_NOT_HERE_NTRY_SEARCHING_ANOTHER_KIKU_S_CAVE, ExShowScreenMessage.TOP_CENTER, 4500);
htmltext = "33995-02.html";
}
else if (!player.getKnownList().getKnownCharactersInRadius(500).stream().anyMatch(n -> (n.getId() == RICKY) && (n.getSummoner() == player)))
{
showOnScreenMsg(player, NpcStringId.TAKE_RICKY_TO_LEIRA_IN_UNDER_2_MINUTES, ExShowScreenMessage.MIDDLE_CENTER, 4500);
final L2Npc ricky = addSpawn(RICKY, player.getLocation());
ricky.setSummoner(player);
ricky.setTitle(player.getAppearance().getVisibleName());
ricky.setIsRunning(true);
ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
ricky.setScriptValue(-1);
startQuestTimer("check_ricky_distance", 1000, ricky, player, true);
startQuestTimer("unspawn_ricky_failed", 120000, ricky, player);
player.sendPacket(new ExSendUIEvent(player, false, false, 0, 120, NpcStringId.REMAINING_TIME));
htmltext = "33995-03.html";
} }
} }
@@ -237,8 +230,11 @@ public class Q10742_AFurryFriend extends Quest
} }
case 3: case 3:
{ {
showOnScreenMsg(npc.getSummoner().getActingPlayer(), NpcStringId.RICKY_IS_ENTERING_KIKU_S_CAVE, ExShowScreenMessage.TOP_CENTER, 4500); if (npc.getScriptValue() != -1)
npc.deleteMe(); {
showOnScreenMsg(npc.getSummoner().getActingPlayer(), NpcStringId.RICKY_IS_ENTERING_KIKU_S_CAVE, ExShowScreenMessage.TOP_CENTER, 4500);
npc.deleteMe();
}
break; break;
} }
} }

2
trunk/dist/game/data/stats/npcs/19500-19599.xml vendored
View File

@@ -527,7 +527,7 @@
<height normal="40" /> <height normal="40" />
</collision> </collision>
</npc> </npc>
<npc id="19552" level="20" type="L2Npc" name="Ricky"> <npc id="19552" level="20" type="L2Npc" name="Ricky" usingServerSideTitle="true">
<!-- AUTO GENERATED NPC TODO: FIX IT --> <!-- AUTO GENERATED NPC TODO: FIX IT -->
<race>HUMAN</race> <race>HUMAN</race>
<sex>FEMALE</sex> <sex>FEMALE</sex>