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

Code improvements.

Browse Source 
Contributed by Mathael.
This commit is contained in:
MobiusDev 2016-03-28 10:39:18 +00:00
parent fdafe7447e
commit 901d2a858b
10 changed files with 92 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
trunk/dist/game/data/scripts/ai/atelia_fortess/AteliaStatus/AteliaStatus.java vendored
View File

@ -409,28 +409,15 @@ final class AteliaStatus extends AbstractNpcAI
}
break;
}
// Quest Timer to Stages
case "TimeEnd":
{
if (npc != null)
{
npc.deleteMe();
}
break;
}
// Stronghold's
case "SH_1":
{
if (npc == null)
{
final L2Npc barton = addSpawn(BARTON, BARTON_LOC);
final L2Npc glenki = addSpawn(GLENKI, GLENKI_LOC);
final L2Npc flagone = addSpawn(FLAG, FLAG_1_LOC);
final L2Npc flagtwo = addSpawn(FLAG, FLAG_2_LOC);
startQuestTimer("TimeEnd", DESPAWN, barton, null);
startQuestTimer("TimeEnd", DESPAWN, glenki, null);
startQuestTimer("TimeEnd", DESPAWN, flagone, null);
startQuestTimer("TimeEnd", DESPAWN, flagtwo, null);
addSpawn(BARTON, BARTON_LOC, false, DESPAWN);
addSpawn(GLENKI, GLENKI_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_1_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_2_LOC, false, DESPAWN);
}
break;
}
@ -438,14 +425,10 @@ final class AteliaStatus extends AbstractNpcAI
{
if (npc == null)
{
final L2Npc hayuk = addSpawn(HAYUK, HAYUK_LOC);
final L2Npc hurak = addSpawn(HURAK, HURAK_LOC);
final L2Npc flagthree = addSpawn(FLAG, FLAG_3_LOC);
final L2Npc flagfour = addSpawn(FLAG, FLAG_4_LOC);
startQuestTimer("TimeEnd", DESPAWN, hayuk, null);
startQuestTimer("TimeEnd", DESPAWN, hurak, null);
startQuestTimer("TimeEnd", DESPAWN, flagthree, null);
startQuestTimer("TimeEnd", DESPAWN, flagfour, null);
addSpawn(HAYUK, HAYUK_LOC, false, DESPAWN);
addSpawn(HURAK, HURAK_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_3_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_4_LOC, false, DESPAWN);
}
break;
}
@ -453,18 +436,12 @@ final class AteliaStatus extends AbstractNpcAI
{
if (npc == null)
{
final L2Npc elise = addSpawn(ELISE, ELISE_LOC);
final L2Npc laffian = addSpawn(LAFFIAN, LAFFIAN_LOC);
final L2Npc julia = addSpawn(JULIA, JULIA_LOC);
final L2Npc mion = addSpawn(MION, MION_LOC);
final L2Npc flagfive = addSpawn(FLAG, FLAG_5_LOC);
final L2Npc flagsix = addSpawn(FLAG, FLAG_6_LOC);
startQuestTimer("TimeEnd", DESPAWN, elise, null);
startQuestTimer("TimeEnd", DESPAWN, laffian, null);
startQuestTimer("TimeEnd", DESPAWN, julia, null);
startQuestTimer("TimeEnd", DESPAWN, mion, null);
startQuestTimer("TimeEnd", DESPAWN, flagfive, null);
startQuestTimer("TimeEnd", DESPAWN, flagsix, null);
addSpawn(ELISE, ELISE_LOC, false, DESPAWN);
addSpawn(LAFFIAN, LAFFIAN_LOC, false, DESPAWN);
addSpawn(JULIA, JULIA_LOC, false, DESPAWN);
addSpawn(MION, MION_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_5_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_6_LOC, false, DESPAWN);
}
break;
}
@ -472,18 +449,12 @@ final class AteliaStatus extends AbstractNpcAI
{
if (npc == null)
{
final L2Npc eliyah = addSpawn(ELIYAH, ELIYAH_LOC);
final L2Npc sherry = addSpawn(SHERRY, SHERRY_LOC);
final L2Npc saylem = addSpawn(SAYLEM, SAYLEM_LOC);
final L2Npc nika = addSpawn(NIKA, NIKA_LOC);
final L2Npc flagseven = addSpawn(FLAG, FLAG_7_LOC);
final L2Npc flageight = addSpawn(FLAG, FLAG_8_LOC);
startQuestTimer("TimeEnd", DESPAWN, eliyah, null);
startQuestTimer("TimeEnd", DESPAWN, sherry, null);
startQuestTimer("TimeEnd", DESPAWN, saylem, null);
startQuestTimer("TimeEnd", DESPAWN, nika, null);
startQuestTimer("TimeEnd", DESPAWN, flagseven, null);
startQuestTimer("TimeEnd", DESPAWN, flageight, null);
addSpawn(ELIYAH, ELIYAH_LOC, false, DESPAWN);
addSpawn(SHERRY, SHERRY_LOC, false, DESPAWN);
addSpawn(SAYLEM, SAYLEM_LOC, false, DESPAWN);
addSpawn(NIKA, NIKA_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_7_LOC, false, DESPAWN);
addSpawn(FLAG, FLAG_8_LOC, false, DESPAWN);
}
break;
}
@ -586,14 +557,6 @@ final class AteliaStatus extends AbstractNpcAI
}
break;
}
case "DEVIANNE_CLEAR":
{
if (npc != null)
{
npc.deleteMe();
}
break;
}
case "SPY_CLEAR":
{
for (L2Npc spawn : FortessSpawns)
@ -701,8 +664,7 @@ final class AteliaStatus extends AbstractNpcAI
}
else if (npc.getId() == BURNSTEIN)
{
final L2Npc devianne = addSpawn(DEVIANNE, DEVIANNE_LOC);
startQuestTimer("DEVIANNE_CLEAR", DDESPAWN, devianne, null);
addSpawn(DEVIANNE, DEVIANNE_LOC, false, DDESPAWN);
startQuestTimer("SPY_CLEAR", 100, npc, null);
startQuestTimer("SB_3", 100, npc, killer);
}

18
trunk/dist/game/data/scripts/ai/atelia_fortess/Devianne.java vendored
View File

@ -35,7 +35,7 @@ final class Devianne extends AbstractNpcAI
// Location
private static final Location DEVIANNE_LOC = new Location(-50063, 49439, -1760, 40362);
// Other
private static final int DESPAWN = 3600000; // Time 1 Hour
private static final int DESPAWN_DELAY = 3600000; // Time 1 Hour
private Devianne()
{
@ -44,24 +44,10 @@ final class Devianne extends AbstractNpcAI
addSpawnId(DEVIANNE);
}
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
if (event.equals("devianne_despawn"))
{
if (npc != null)
{
npc.deleteMe();
}
}
return event;
}
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final L2Npc devianne = addSpawn(DEVIANNE, DEVIANNE_LOC);
startQuestTimer("devianne_despawn", DESPAWN, devianne, null);
addSpawn(DEVIANNE, DEVIANNE_LOC, false, DESPAWN_DELAY);
return super.onKill(npc, killer, isSummon);
}

5
trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java vendored
View File

@ -52,11 +52,6 @@ final class AltarOfSouls extends AbstractNpcAI
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
if (npc.getId() != ALTAR_OF_SOULS)
{
return null;
}
switch (event)
{
case "request_boss_88":

29
trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java vendored
View File

@ -46,25 +46,20 @@ final class Hardin extends AbstractNpcAI
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = null;
switch (npc.getId())
if ((player.getRace() != Race.ERTHEIA) && (player.getLevel() < MIN_LEVEL))
{
case HARDIN:
{
if ((player.getRace() != Race.ERTHEIA) && (player.getLevel() < MIN_LEVEL))
{
htmltext = "33870-01.html";
}
else if ((player.getRace() != Race.ERTHEIA) && (CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId())))
{
htmltext = "33870-02.html";
}
else if ((player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL))
{
htmltext = "33870-03.html";
}
break;
}
htmltext = "33870-01.html";
}
else if ((player.getRace() != Race.ERTHEIA) && (CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId())))
{
htmltext = "33870-02.html";
}
else if ((player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL))
{
htmltext = "33870-03.html";
}
return htmltext;
}

9
trunk/dist/game/data/scripts/quests/Q10338_SeizeYourDestiny/Q10338_SeizeYourDestiny.java vendored
View File

@ -208,13 +208,10 @@ public class Q10338_SeizeYourDestiny extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
if (npc.getId() == HARNAKS_WRAITH)
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(2))
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(2))
{
qs.setCond(3, true);
}
qs.setCond(3, true);
}
return super.onKill(npc, player, isSummon);
}

38
trunk/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java vendored
View File

@ -84,32 +84,26 @@ public class Q10382_DayOfLiberation extends Quest
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
if (qs.isCreated())
{
case SIZRAK:
htmltext = "sofa_sizraku_q10382_01.htm";
}
else if (qs.isStarted())
{
if (qs.isCond(1))
{
if (qs.isCreated())
{
htmltext = "sofa_sizraku_q10382_01.htm";
}
else if (qs.isStarted())
{
if (qs.isCond(1))
{
htmltext = "sofa_sizraku_q10382_07.html";
}
else if (qs.isCond(2))
{
htmltext = "sofa_sizraku_q10382_08.html";
}
}
else if (qs.isCompleted())
{
htmltext = "sofa_sizraku_q10382_06.html";
}
break;
htmltext = "sofa_sizraku_q10382_07.html";
}
else if (qs.isCond(2))
{
htmltext = "sofa_sizraku_q10382_08.html";
}
}
else if (qs.isCompleted())
{
htmltext = "sofa_sizraku_q10382_06.html";
}
return htmltext;
}

37
trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@ -283,31 +283,30 @@ public class Q10734_DoOrDie extends Quest
{
return super.onKill(npc, killer, isSummon);
}
if (npc.getId() == TRAINING_DUMMY)
if (qs.isCond(1))
{
if (qs.isCond(1))
if (killer.isMageClass())
{
if (killer.isMageClass())
{
qs.setCond(2, true);
}
else
{
qs.setCond(3, true);
}
qs.setCond(2, true);
}
else if (qs.isCond(6))
else
{
if (killer.isMageClass())
{
qs.setCond(7, true);
}
else
{
qs.setCond(8, true);
}
qs.setCond(3, true);
}
}
else if (qs.isCond(6))
{
if (killer.isMageClass())
{
qs.setCond(7, true);
}
else
{
qs.setCond(8, true);
}
}
return super.onKill(npc, killer, isSummon);
}
}

42
trunk/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java vendored
View File

@ -101,40 +101,34 @@ public class Q10756_AnInterdimensionalDraft extends Quest
htmltext = getAlreadyCompletedMsg(player);
}
switch (npc.getId())
if (qs.isCreated())
{
case PIO:
htmltext = "33963-01.htm";
}
else if (qs.isStarted())
{
switch (qs.getCond())
{
if (qs.isCreated())
case 1:
{
htmltext = "33963-01.htm";
htmltext = "33963-05.htm";
break;
}
else if (qs.isStarted())
case 2:
{
switch (qs.getCond())
if (qs.isCond(2) && (getQuestItemsCount(player, UNWORLDLY_WIND) >= 30))
{
case 1:
{
htmltext = "33963-05.htm";
break;
}
case 2:
{
if (qs.isCond(2) && (getQuestItemsCount(player, UNWORLDLY_WIND) >= 30))
{
takeItems(player, UNWORLDLY_WIND, 30);
giveItems(player, STEEL_DOOR_GUILD_COIN);
addExpAndSp(player, 174222, 41);
qs.exitQuest(false, true);
htmltext = "33963-07.html";
}
break;
}
takeItems(player, UNWORLDLY_WIND, 30);
giveItems(player, STEEL_DOOR_GUILD_COIN);
addExpAndSp(player, 174222, 41);
qs.exitQuest(false, true);
htmltext = "33963-07.html";
}
break;
}
break;
}
}
return htmltext;
}

6
trunk/dist/game/data/scripts/quests/Q10760_LettersFromTheQueen_OrcBarracs/Q10760_LettersFromTheQueen_OrcBarracs.java vendored
View File

@ -145,11 +145,7 @@ public class Q10760_LettersFromTheQueen_OrcBarracs extends Quest implements IByp
}
case PIOTUR:
{
if (player.getRace() != Race.ERTHEIA)
{
htmltext = getNoQuestMsg(player);
}
else if (qs.isCreated())
if (qs.isCreated())
{
htmltext = getNoQuestMsg(player);
}

6
trunk/java/com/l2jmobius/gameserver/model/L2Spawn.java
View File

@ -87,7 +87,7 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
private String _areaName;
private int _globalMapId;
private String _title = "";
private final String _title = "";
/** The task launching the function doSpawn() */
class SpawnTask implements Runnable
@ -694,10 +694,6 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
mob.setTitle(_title);
}
// Reset summoner
mob.setSummoner(null);
// Reset summoned list