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

Removal of assorted empty lines.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-03 17:07:18 +00:00
parent ecaf8a1a66
commit 6d8addc784
14371 changed files with 304 additions and 44722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java vendored
View File

@@ -93,7 +93,6 @@ public class HotSprings extends Quest
final Effect info = creature.getFirstEffect(diseaseId);
final int skillLevel = (info == null) ? 1 : (info.getSkill().getLevel() < 10) ? info.getSkill().getLevel() + 1 : 10;
final Skill skill = SkillTable.getInstance().getInfo(diseaseId, skillLevel);
if ((skill != null) && !npc.isCastingNow() && !npc.isSkillDisabled(skill))
{
npc.setTarget(creature);

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java vendored
View File

@@ -239,7 +239,6 @@ public class Antharas extends Quest
}
Integer status = GrandBossManager.getInstance().getBossStatus(ANTHARASOLDID);
if (FWA_OLDANTHARAS || (status == WAITING))
{
final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARASOLDID);
@@ -282,11 +281,8 @@ public class Antharas extends Quest
else
{
final Integer statusWeak = GrandBossManager.getInstance().getBossStatus(ANTHARASWEAKID);
final Integer statusNormal = GrandBossManager.getInstance().getBossStatus(ANTHARASNORMALID);
final Integer statusStrong = GrandBossManager.getInstance().getBossStatus(ANTHARASSTRONGID);
int antharasId = 0;
if ((statusWeak == FIGHTING) || (statusWeak == DEAD))
{
@@ -957,7 +953,6 @@ public class Antharas extends Quest
if ((npc.getNpcId() == 29019) || (npc.getNpcId() == 29066) || (npc.getNpcId() == 29067) || (npc.getNpcId() == 29068))
{
npc.broadcastPacket(new PlaySound(1, "BS01_D", npc));
_cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000);
GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
final long respawnTime = (Config.ANTHARAS_RESP_FIRST + Rnd.get(Config.ANTHARAS_RESP_SECOND)) * 3600000;

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java vendored
View File

@@ -110,9 +110,7 @@ public class Baium extends Quest
addTalkId(ANGELIC_VORTEX);
_zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077);
final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
if (status == DEAD)
{
// load the unlock date and time for baium from DB
@@ -129,7 +127,6 @@ public class Baium extends Quest
// the time has already expired while the server was offline. Delete the saved time and
// immediately spawn the stone-baium. Also the state need not be changed from ASLEEP
addSpawn(STONE_BAIUM, 116033, 17447, 10104, 40188, false, 0);
if (Config.ANNOUNCE_TO_ALL_SPAWN_RB)
{
Announcements.getInstance().announceToAll("Raid boss Baium Stone spawned in world.");
@@ -205,9 +202,7 @@ public class Baium extends Quest
npc.broadcastPacket(new Earthquake(npc.getX(), npc.getY(), npc.getZ(), 40, 5));
// start monitoring baium's inactivity
_lastAttackVsBaiumTime = System.currentTimeMillis();
startQuestTimer("baium_despawn", 60000, npc, null, true);
if (player != null)
{
player.reduceCurrentHp(99999999, player);
@@ -299,7 +294,6 @@ public class Baium extends Quest
}
final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
if ((npcId == STONE_BAIUM) && (status == ASLEEP))
{
if (Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM || _zone.isPlayerAllowed(player))
@@ -416,7 +410,6 @@ public class Baium extends Quest
public String onKill(NpcInstance npc, PlayerInstance killer, boolean isPet)
{
npc.broadcastPacket(new PlaySound(1, "BS01_D", npc));
cancelQuestTimer("baium_despawn", npc, null);
// spawn the "Teleportation Cubic" for 15 minutes (to allow players to exit the lair)
addSpawn(29055, 115203, 16620, 10078, 0, false, 900000); // //should we teleport everyone out if the cubic despawns??
@@ -428,7 +421,6 @@ public class Baium extends Quest
final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(LIVE_BAIUM, info);
for (NpcInstance minion : _minions)
{
if (minion != null)

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java vendored
View File

@@ -229,7 +229,6 @@ public class Core extends Quest
npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, name, "System is being shut down..."));
npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, name, "......"));
_firstAttacked = false;
addSpawn(31842, 16502, 110165, -6394, 0, false, 900000);
addSpawn(31842, 18948, 110166, -6397, 0, false, 900000);
GrandBossManager.getInstance().setBossStatus(CORE, DEAD);

37
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java vendored
View File

@@ -539,7 +539,6 @@ public class Frintezza extends Quest
else if (event.equals("camera_1"))
{
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, FIGHTING);
_frintezzaDummy = addSpawn(29052, 174240, -89805, -5022, 16048, false, 0);
_frintezzaDummy.setInvul(true);
_frintezzaDummy.setImmobilized(true);
@@ -549,7 +548,6 @@ public class Frintezza extends Quest
_overheadDummy.setImmobilized(true);
_overheadDummy.setCollisionHeight(600);
_zone.broadcastPacket(new NpcInfo(_overheadDummy, null));
_portraitDummy1 = addSpawn(29052, 172450, -87890, -5100, 16048, false, 0);
_portraitDummy1.setImmobilized(true);
_portraitDummy1.setInvul(true);
@@ -578,7 +576,6 @@ public class Frintezza extends Quest
else if (event.equals("camera_3"))
{
_zone.broadcastPacket(new SpecialCamera(_overheadDummy.getObjectId(), 300, 90, -10, 6500, 7000));
_frintezza = (GrandBossInstance) addSpawn(FRINTEZZA, 174240, -89805, -5022, 16048, false, 0);
GrandBossManager.getInstance().addBoss(_frintezza);
_frintezza.setImmobilized(true);
@@ -649,7 +646,6 @@ public class Frintezza extends Quest
{
_zone.broadcastPacket(new SocialAction(_demon1.getObjectId(), 1));
_zone.broadcastPacket(new SocialAction(_demon4.getObjectId(), 1));
for (Creature pc : _zone.getCharactersInside())
{
if (pc instanceof PlayerInstance)
@@ -697,7 +693,6 @@ public class Frintezza extends Quest
_portraitDummy3.deleteMe();
_portraitDummy1 = null;
_portraitDummy3 = null;
startQuestTimer("camera_12", 4500, _frintezza, null);
}
else if (event.equals("camera_12"))
@@ -735,7 +730,6 @@ public class Frintezza extends Quest
{
_zone.broadcastPacket(new SpecialCamera(_overheadDummy.getObjectId(), 600, 180, -25, 0, 10000));
_zone.broadcastPacket(new MagicSkillUse(_scarletDummy, _overheadDummy, 5004, 1, 5800, 0));
_weakScarlet = (GrandBossInstance) addSpawn(SCARLET1, 174232, -88020, -5110, 16384, false, 0);
_weakScarlet.setInvul(true);
_weakScarlet.setImmobilized(true);
@@ -794,7 +788,6 @@ public class Frintezza extends Quest
_scarletDummy.deleteMe();
_overheadDummy = null;
_scarletDummy = null;
startQuestTimer("camera_23", 2000, _weakScarlet, null);
startQuestTimer("start_pc", 2000, _weakScarlet, null);
// startQuestTimer("loc_check", 60000, weakScarlet, null, true);
@@ -918,7 +911,6 @@ public class Frintezza extends Quest
_zone.broadcastPacket(new SpecialCamera(_frintezza.getObjectId(), 250, 120, 15, 0, 10000));
// cancelQuestTimer("loc_check");
_scarletX = _weakScarlet.getX();
_scarletY = _weakScarlet.getY();
_scarletZ = _weakScarlet.getZ();
@@ -960,7 +952,6 @@ public class Frintezza extends Quest
{
_weakScarlet.doDie(_weakScarlet);
_zone.broadcastPacket(new SpecialCamera(_weakScarlet.getObjectId(), 450, _angle, 14, 8000, 8000));
startQuestTimer("morph_12", 6250, _weakScarlet, null);
startQuestTimer("morph_13", 7200, _weakScarlet, null);
}
@@ -977,9 +968,7 @@ public class Frintezza extends Quest
_strongScarlet.disableAllSkills();
_zone.updateKnownList(_strongScarlet);
_activeScarlet = _strongScarlet;
_zone.broadcastPacket(new SpecialCamera(_strongScarlet.getObjectId(), 450, _angle, 12, 500, 14000));
startQuestTimer("morph_14", 3000, _strongScarlet, null);
// startQuestTimer("loc_check", 60000, strongScarlet, null, true);
}
@@ -1082,7 +1071,6 @@ public class Frintezza extends Quest
// Like L2OFF the skill name is printed on screen
_zone.broadcastPacket(new ExShowScreenMessage(songName, 6000));
if ((_onSong == 1) && (_thirdMorph == 1) && (_strongScarlet.getCurrentHp() < (_strongScarlet.getMaxHp() * 0.6)) && (Rnd.get(100) < 80))
{
_zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 1, 32000, 0));
@@ -1161,7 +1149,6 @@ public class Frintezza extends Quest
// Like L2OFF the skill name is printed on screen
_zone.broadcastPacket(new ExShowScreenMessage(songName, 6000));
if ((_onSong == 1) || (_onSong == 2) || (_onSong == 3))
{
/*
@@ -1222,7 +1209,6 @@ public class Frintezza extends Quest
cancelQuestTimer("skill03", npc, null);
cancelQuestTimer("songs_play", npc, null);
cancelQuestTimer("songs_effect", npc, null);
if (_frintezza != null)
{
_zone.broadcastPacket(new MagicSkillCanceld(_frintezza.getObjectId()));
@@ -1234,7 +1220,6 @@ public class Frintezza extends Quest
{
_onMorph = 1;
_zone.broadcastPacket(new PlaySound(1, "BS01_D", npc));
startQuestTimer("attack_stop", 0, _frintezza, null);
startQuestTimer("stop_pc", 0, npc, null);
startQuestTimer("stop_npc", 0, npc, null);
@@ -1291,7 +1276,6 @@ public class Frintezza extends Quest
_weakScarlet.doCast(skill);
}
startQuestTimer("skill02", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
if (i == 5)
{
_abnormal = 1;
@@ -1321,7 +1305,6 @@ public class Frintezza extends Quest
_strongScarlet.doCast(skill);
}
startQuestTimer("skill03", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
if (i == 10)
{
_abnormal = 1;
@@ -1373,7 +1356,6 @@ public class Frintezza extends Quest
startQuestTimer("close", 1000, npc, null);
startQuestTimer("room1_del", 1000, npc, null);
startQuestTimer("room2_del", 1000, npc, null);
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
}
else if (event.equals("frintezza_despawn"))
@@ -1394,9 +1376,7 @@ public class Frintezza extends Quest
startQuestTimer("room2_del", 1000, npc, null);
startQuestTimer("room3_del", 1000, npc, null);
startQuestTimer("minions_despawn", 1000, npc, null);
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DORMANT);
cancelQuestTimer("frintezza_despawn", null, null);
}
}
@@ -1459,7 +1439,6 @@ public class Frintezza extends Quest
String htmltext = "";
final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
if (status == DEAD)
{
htmltext = "<html><body>There is nothing beyond the Magic Force Field. Come back later.<br>(You may not enter because Frintezza is not inside the Imperial Tomb.)</body></html>";
@@ -1467,7 +1446,6 @@ public class Frintezza extends Quest
else if (status == DORMANT)
{
boolean partyCheckSuccess = true;
if (!Config.BYPASS_FRINTEZZA_PARTIES_CHECK)
{
if ((!player.isInParty() || !player.getParty().isLeader(player)) || (player.getParty().getCommandChannel() == null) || (player.getParty().getCommandChannel().getChannelLeader() != player))
@@ -1492,20 +1470,16 @@ public class Frintezza extends Quest
{
player.destroyItemByItemId("Quest", 8073, 1, player, true);
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
startQuestTimer("close", 0, npc, null);
startQuestTimer("room1_spawn", 5000, npc, null);
startQuestTimer("room_final", 2100000, null, null);
startQuestTimer("frintezza_despawn", 60000, null, null, true);
_lastAction = System.currentTimeMillis();
if (Config.BYPASS_FRINTEZZA_PARTIES_CHECK)
{
if (player.getParty() != null)
{
final CommandChannel cc = player.getParty().getCommandChannel();
if (cc != null)
{
// teleport all parties into CC
@@ -1554,7 +1528,6 @@ public class Frintezza extends Quest
{ // teleport just actual party
final Party party = player.getParty();
for (PlayerInstance member : party.getPartyMembers())
{
if ((member == null) || (member.getLevel() < 74))
@@ -1600,7 +1573,6 @@ public class Frintezza extends Quest
else
{
final CommandChannel cc = player.getParty().getCommandChannel();
for (Party party : cc.getParties())
{
if (party == null)
@@ -1664,14 +1636,11 @@ public class Frintezza extends Quest
}
final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
if ((npc.getNpcId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (status == FIGHTING))
{
startQuestTimer("attack_stop", 0, _frintezza, null);
_secondMorph = 1;
_onMorph = 1;
startQuestTimer("stop_pc", 1000, npc, null);
startQuestTimer("stop_npc", 1000, npc, null);
startQuestTimer("morph_01", 1100, npc, null);
@@ -1679,10 +1648,8 @@ public class Frintezza extends Quest
else if ((npc.getNpcId() == SCARLET1) && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (status == FIGHTING))
{
startQuestTimer("attack_stop", 0, _frintezza, null);
_thirdMorph = 1;
_onMorph = 1;
startQuestTimer("stop_pc", 2000, npc, null);
startQuestTimer("stop_npc", 2000, npc, null);
startQuestTimer("morph_05a", 2000, npc, null);
@@ -1713,7 +1680,6 @@ public class Frintezza extends Quest
public String onKill(NpcInstance npc, PlayerInstance killer, boolean isPet)
{
final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
if (npc.getNpcId() == FRINTEZZA)
{
return null;
@@ -1735,7 +1701,6 @@ public class Frintezza extends Quest
startQuestTimer("room3_del", 60000, npc, null);
startQuestTimer("minions_despawn", 60000, npc, null);
startQuestTimer("remove_players", 900000, npc, null);
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, DEAD);
final long respawnTime = (Config.FRINTEZZA_RESP_FIRST + Rnd.get(Config.FRINTEZZA_RESP_SECOND)) * 3600000;
startQuestTimer("frintezza_unlock", respawnTime, npc, null);
@@ -1758,7 +1723,6 @@ public class Frintezza extends Quest
{
startQuestTimer("room1_del", 100, npc, null);
startQuestTimer("room2_spawn", 100, npc, null);
DoorData.getInstance().getDoor(25150042).openMe();
DoorData.getInstance().getDoor(25150043).openMe();
}
@@ -1811,7 +1775,6 @@ public class Frintezza extends Quest
if (_killDarkChoirCaptain == 8)
{
startQuestTimer("room2_del", 100, npc, null);
DoorData.getInstance().getDoor(25150045).openMe();
DoorData.getInstance().getDoor(25150046).openMe();

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java vendored
View File

@@ -413,7 +413,6 @@ public class IceFairySirra extends Quest
public String getHtmlPath(int value)
{
String pom = "";
pom = "32029-" + value;
if (value == 0)
{
@@ -421,7 +420,6 @@ public class IceFairySirra extends Quest
}
final String temp = "data/html/default/" + pom + ".htm";
if (!Config.LAZY_CACHE)
{
// If not running lazy cache the file must be in the cache or it doesnt exist

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java vendored
View File

@@ -191,7 +191,6 @@ public class Orfen extends Quest
break;
}
}
return super.onAdvEvent(event, npc, player);
}
@@ -226,7 +225,6 @@ public class Orfen extends Quest
_firstAttacked = true;
}
}
return super.onAttack(npc, attacker, damage, isPet);
}
@@ -236,7 +234,6 @@ public class Orfen extends Quest
if (npc.getNpcId() == ORFEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
// time is 48hour +/- 20hour
final long respawnTime = (Config.ORFEN_RESP_FIRST + Rnd.get(Config.ORFEN_RESP_SECOND)) * 3600000;
@@ -247,7 +244,6 @@ public class Orfen extends Quest
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(ORFEN, info);
}
return super.onKill(npc, killer, isPet);
}

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java vendored
View File

@@ -92,7 +92,6 @@ public class QueenAnt extends Quest
_zone = GrandBossManager.getInstance().getZone(-21610, 181594, -5734);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
switch (status)
@@ -341,7 +340,6 @@ public class QueenAnt extends Quest
LOGGER.info("QUEEN: Not defined event: " + event + "!");
}
}
return super.onAdvEvent(event, npc, player);
}
@@ -361,13 +359,10 @@ public class QueenAnt extends Quest
public String onKill(NpcInstance npc, PlayerInstance killer, boolean isPet)
{
final int npcId = npc.getNpcId();
final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
if (npcId == QUEEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
// time is 36hour +/- 17hour
final long respawnTime = (Config.QA_RESP_FIRST + Rnd.get(Config.QA_RESP_SECOND)) * 3600000;
@@ -383,7 +378,6 @@ public class QueenAnt extends Quest
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(QUEEN, info);
startQuestTimer("DESPAWN_MINIONS", 10000, null, null);
}
else if ((status == LIVE) && ((npcId == ROYAL) || (npcId == NURSE)))

10
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java vendored
View File

@@ -92,9 +92,7 @@ public class Valakas extends Quest
lastAttackTime = System.currentTimeMillis();
_Zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
if (status == DEAD)
{
// load the unlock date and time for valakas from DB
@@ -121,7 +119,6 @@ public class Valakas extends Quest
final int loc_y = -114890;
final int loc_z = -1595;
final int heading = 0;
final int hp = info.getInt("currentHP");
final int mp = info.getInt("currentMP");
final GrandBossInstance valakas = (GrandBossInstance) addSpawn(VALAKAS, loc_x, loc_y, loc_z, heading, false, 0);
@@ -175,9 +172,7 @@ public class Valakas extends Quest
}
final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
temp = (System.currentTimeMillis() - lastAttackTime);
if ((status == FIGHTING) && (temp > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
@@ -337,7 +332,6 @@ public class Valakas extends Quest
final int loc_y = -114890;
final int loc_z = -1595;
final int heading = 0;
final GrandBossInstance valakas = (GrandBossInstance) addSpawn(VALAKAS, loc_x, loc_y, loc_z, heading, false, 0);
GrandBossManager.getInstance().addBoss(valakas);
@@ -426,7 +420,6 @@ public class Valakas extends Quest
}
}
int i1 = 0;
if (attacker == c_quest2)
{
if (((damage * 1000) + 1000) > i_quest2)
@@ -596,7 +589,6 @@ public class Valakas extends Quest
npc.broadcastPacket(new SpecialCamera(npc.getObjectId(), 1700, 2000, 130, -1, 0));
npc.broadcastPacket(new PlaySound(1, "B03_D", npc));
startQuestTimer("1111", 500, npc, null);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
final long respawnTime = (Config.VALAKAS_RESP_FIRST + Rnd.get(Config.VALAKAS_RESP_SECOND)) * 3600000;
@@ -605,7 +597,6 @@ public class Valakas extends Quest
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
info.set("respawn_time", (System.currentTimeMillis() + respawnTime));
GrandBossManager.getInstance().setStatSet(VALAKAS, info);
return super.onKill(npc, killer, isPet);
}
@@ -909,7 +900,6 @@ public class Valakas extends Quest
public void callSkillAI(NpcInstance npc, Creature c2, Skill skill)
{
final QuestTimer timer = getQuestTimer("launch_random_skill", npc, null);
if (npc == null)
{
if (timer != null)

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java vendored
View File

@@ -879,7 +879,6 @@ public class VanHalter extends Quest
if (loop)
{
_isLocked = false;
if (_closeDoorOfAltarTask != null)
{
_closeDoorOfAltarTask.cancel(false);
@@ -1015,7 +1014,6 @@ public class VanHalter extends Quest
_timeUpTask.cancel(false);
}
_timeUpTask = null;
_movieTask = ThreadPool.schedule(new Movie(1), Config.HPH_APPTIMEOFHALTER);
}
@@ -1030,7 +1028,6 @@ public class VanHalter extends Quest
final Map<Integer, PlayerInstance> targets = new HashMap<>();
int i = 0;
for (PlayerInstance pc : _vanHalter.getKnownList().getKnownPlayers().values())
{
i++;
@@ -1142,7 +1139,6 @@ public class VanHalter extends Quest
protected void addBleeding()
{
final Skill bleed = SkillTable.getInstance().getInfo(4615, 12);
for (NpcInstance tr : _triolRevelation)
{
if (!tr.getKnownList().getKnownPlayersInRadius(tr.getAggroRange()).iterator().hasNext() || tr.isDead())
@@ -1151,7 +1147,6 @@ public class VanHalter extends Quest
}
final List<PlayerInstance> bpc = new ArrayList<>();
for (PlayerInstance pc : tr.getKnownList().getKnownPlayersInRadius(tr.getAggroRange()))
{
if (pc.getFirstEffect(bleed) == null)
@@ -1273,7 +1268,6 @@ public class VanHalter extends Quest
}
final Integer status = GrandBossManager.getInstance().getBossStatus(29062);
if (status != INTERVAL)
{
final long interval = Rnd.get(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */;

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java vendored
View File

@@ -232,7 +232,6 @@ public class Zaken extends Quest
public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player)
{
final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
if (((status == DEAD) && (event == null)) || !event.equals("zaken_unlock"))
{
return super.onAdvEvent(event, npc, player);
@@ -666,7 +665,6 @@ public class Zaken extends Quest
int i1 = Rnd.get(15);
player.teleToLocation(X_COORDS[i1] + Rnd.get(650), Y_COORDS[i1] + Rnd.get(650), Z_COORDS[i1]);
((Attackable) npc).stopHating(player);
if ((c_quest0 != null) && (_quest0 > 0) && (c_quest0 != player) && (c_quest0.getZ() > (player.getZ() - 100)) && (c_quest0.getZ() < (player.getZ() + 100)))
{
if ((((c_quest0.getX() - player.getX()) * (c_quest0.getX() - player.getX())) + ((c_quest0.getY() - player.getY()) * (c_quest0.getY() - player.getY()))) > (250 * 250))
@@ -853,13 +851,10 @@ public class Zaken extends Quest
public String onKill(NpcInstance npc, PlayerInstance killer, boolean isPet)
{
final int npcId = npc.getNpcId();
final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
if (npcId == ZAKEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
// time is 36hour +/- 17hour
final long respawnTime = (Config.ZAKEN_RESP_FIRST + Rnd.get(Config.ZAKEN_RESP_SECOND)) * 3600000;

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java vendored
View File

@@ -64,7 +64,6 @@ public class CatsEyeBandit extends Quest
{
npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "I must do something about this shameful incident..."));
}
return super.onKill(npc, killer, isPet);
}

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java vendored
View File

@@ -142,7 +142,6 @@ public class FeedableBeasts extends Quest
{
return _spiceToMob.get(spice)[mobType][classType];
}
return null;
}
@@ -183,7 +182,6 @@ public class FeedableBeasts extends Quest
final int[][] Kookabura_1_Crystal_2 = {{ 21465, 21467 }};
final int[][] Kookabura_2_1 = {{ 21468, 21824}, { 16017, 16018 }};
final int[][] Kookabura_2_2 = {{ 21469, 21825}, { 16017, 16018 }};
final int[][] Buffalo_0_Gold = {{ 21471, 21472, 21473, 21474 }};
final int[][] Buffalo_0_Crystal = {{ 21475, 21476, 21477, 21478 }};
final int[][] Buffalo_1_Gold_1 = {{ 21479, 21481 }};
@@ -192,7 +190,6 @@ public class FeedableBeasts extends Quest
final int[][] Buffalo_1_Crystal_2 = {{ 21484, 21486 }};
final int[][] Buffalo_2_1 = {{ 21487,21826}, {16013, 16014 }};
final int[][] Buffalo_2_2 = {{ 21488,21827}, {16013, 16014 }};
final int[][] Cougar_0_Gold = {{ 21490, 21491, 21492, 21493 }};
final int[][] Cougar_0_Crystal = {{ 21494,21495, 21496, 21497 }};
final int[][] Cougar_1_Gold_1 = {{ 21498, 21500 }};
@@ -402,7 +399,6 @@ public class FeedableBeasts extends Quest
final NpcTemplate template = NpcTable.getInstance().getTemplate(nextNpcId);
final TamedBeastInstance nextNpc = new TamedBeastInstance(IdFactory.getNextId(), template, player, food, npc.getX(), npc.getY(), npc.getZ());
nextNpc.setRunning();
// If player has Q020 going, give quest item
@@ -425,7 +421,6 @@ public class FeedableBeasts extends Quest
// If not trained, the newly spawned mob will automatically be aggro against its feeder
// (what happened to "never bite the hand that feeds you" anyway?!)
final Attackable nextNpc = (Attackable) addSpawn(nextNpcId, npc);
if (MAD_COW_POLYMORPH.containsKey(nextNpcId))
{
startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player, false);
@@ -484,7 +479,6 @@ public class FeedableBeasts extends Quest
// First gather some values on local variables
final int objectId = npc.getObjectId();
int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in GROWTH_CAPABLE_MOBS, then it's at max growth (3)
if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
{
growthLevel = GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel();

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java vendored
View File

@@ -124,7 +124,6 @@ public class Monastery extends Quest
for (Object obj : characters)
{
final Playable target = (Playable) (obj instanceof PlayerInstance ? obj : ((Summon) obj).getOwner());
if ((target.getActiveWeaponInstance() == null) || ((target instanceof PlayerInstance) && ((PlayerInstance) target).isSilentMoving()) || ((target instanceof Summon) && ((Summon) target).getOwner().isSilentMoving()))
{
continue;

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java vendored
View File

@@ -183,7 +183,6 @@ public class NewbieHelper extends Quest
final int ex = qs2.getInt("Ex");
final int classId = qs1.getPlayer().getClassId().getId();
if (event.equalsIgnoreCase("TimerEx_NewbieHelper"))
{
if (ex == 0)
@@ -266,7 +265,6 @@ public class NewbieHelper extends Quest
final int level = player.getLevel();
final boolean isMage = player.isMageClass();
final boolean isOrcMage = player.getClassId().getId() == 49;
int npcType = 0;
int raceId = 0;
int item = 0;

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java vendored
View File

@@ -253,7 +253,6 @@ public class SummonMinions extends Quest
{
_attackersList.get(npcObjId).clear();
}
return super.onAttack(npc, attacker, damage, isPet);
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Tutorial/Tutorial.java vendored
View File

@@ -174,7 +174,6 @@ public class Tutorial extends Quest
final int classId = player.getClassId().getId();
final int ex = qs.getInt("Ex");
if (event.startsWith("UC"))
{
if ((player.getLevel() < 6) && (qs.getInt("onlyone") == 0))

9
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java vendored
View File

@@ -44,9 +44,7 @@ public class ZombieGatekeepers extends Quest
public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet)
{
final int npcObjId = npc.getObjectId();
final Creature target = isPet ? attacker.getPet() : attacker;
if (_attackersList.get(npcObjId) == null)
{
final List<Creature> player = new ArrayList<>();
@@ -57,7 +55,6 @@ public class ZombieGatekeepers extends Quest
{
_attackersList.get(npcObjId).add(target);
}
return super.onAttack(npc, attacker, damage, isPet);
}
@@ -65,17 +62,13 @@ public class ZombieGatekeepers extends Quest
public String onAggroRangeEnter(NpcInstance npc, PlayerInstance player, boolean isPet)
{
final int npcObjId = npc.getObjectId();
final Creature target = isPet ? player.getPet() : player;
final ItemInstance visitorsMark = player.getInventory().getItemByItemId(8064);
final ItemInstance fadedVisitorsMark = player.getInventory().getItemByItemId(8065);
final ItemInstance pagansMark = player.getInventory().getItemByItemId(8067);
final long mark1 = visitorsMark == null ? 0 : visitorsMark.getCount();
final long mark2 = fadedVisitorsMark == null ? 0 : fadedVisitorsMark.getCount();
final long mark3 = pagansMark == null ? 0 : pagansMark.getCount();
if ((mark1 == 0) && (mark2 == 0) && (mark3 == 0))
{
((Attackable) npc).addDamageHate(target, 0, 999);
@@ -90,7 +83,6 @@ public class ZombieGatekeepers extends Quest
((Attackable) npc).addDamageHate(target, 0, 999);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
}
return super.onAggroRangeEnter(npc, player, isPet);
}
@@ -102,7 +94,6 @@ public class ZombieGatekeepers extends Quest
{
_attackersList.get(npcObjId).clear();
}
return super.onKill(npc, killer, isPet);
}

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java vendored
View File

@@ -60,7 +60,6 @@ public class EchoCrystals extends Quest
{
String htmltext = "";
final QuestState st = player.getQuestState(getName());
if ((st != null) && Util.isDigit(event))
{
final int score = Integer.parseInt(event);
@@ -70,7 +69,6 @@ public class EchoCrystals extends Quest
final String ok = SCORES.get(score).getOkMsg();
final String noadena = SCORES.get(score).getNoAdenaMsg();
final String noscore = SCORES.get(score).getNoScoreMsg();
if (st.getQuestItemsCount(score) == 0)
{
htmltext = npc.getNpcId() + "-" + noscore + ".htm";
@@ -87,7 +85,6 @@ public class EchoCrystals extends Quest
}
}
}
return htmltext;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroWeapon/HeroWeapon.java vendored
View File

@@ -105,7 +105,6 @@ public class HeroWeapon extends Quest
return true;
}
}
return false;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java vendored
View File

@@ -358,7 +358,6 @@ public class KetraOrcSupport extends Quest
{
testKetraDemote(player);
}
return null;
}

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java vendored
View File

@@ -65,7 +65,6 @@ public class MissQueen extends Quest
{
String htmltext = event;
final QuestState st = player.getQuestState(getName());
if (event.equals("newbie_coupon"))
{
if ((player.getClassId().level() == 0) && (player.getLevel() >= 6) && (player.getLevel() <= 25) && (player.getPkKills() <= 0))
@@ -108,7 +107,6 @@ public class MissQueen extends Quest
htmltext = "31760-06.htm";
}
}
return htmltext;
}
@@ -120,7 +118,6 @@ public class MissQueen extends Quest
{
st = newQuestState(player);
}
return "31760.htm";
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java vendored
View File

@@ -226,7 +226,6 @@ public class NpcLocationInfo extends Quest
{
htmltext = null;
final int npcId = Integer.parseInt(event);
if (Util.contains(RADARS, npcId))
{
for (Spawn spawn : SpawnTable.getInstance().getSpawnTable().values())

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java vendored
View File

@@ -150,7 +150,6 @@ public class RaidbossInfo extends Quest
if (Util.isDigit(event))
{
final int rbid = Integer.parseInt(event);
if (RADARS.containsKey(rbid))
{
final Location loc = RADARS.get(rbid);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/ShadowWeapon/ShadowWeapon.java vendored
View File

@@ -56,7 +56,6 @@ public class ShadowWeapon extends Quest
final boolean hasD = st.hasQuestItems(D_COUPON);
final boolean hasC = st.hasQuestItems(C_COUPON);
if (hasD || hasC)
{
// let's assume character had both c & d-grade coupons, we'll confirm later

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java vendored
View File

@@ -357,7 +357,6 @@ public class VarkaSilenosSupport extends Quest
{
testVarkaDemote(player);
}
return null;
}

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java vendored
View File

@@ -99,7 +99,6 @@ public class Q004_LongliveThePaagrioLord extends Quest
case State.STARTED:
final int cond = st.getInt("cond");
final int npcId = npc.getNpcId();
if (npcId == 30578)
{
if (cond == 1)
@@ -130,7 +129,6 @@ public class Q004_LongliveThePaagrioLord extends Quest
{
st.giveItems(i, 1);
htmltext = npcId + "-01.htm";
int count = 0;
for (int item : NPC_GIFTS.values())
{

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q005_MinersFavor/Q005_MinersFavor.java vendored
View File

@@ -74,7 +74,6 @@ public class Q005_MinersFavor extends Quest
{
st.takeItems(BOLTERS_SMELLY_SOCKS, 1);
st.giveItems(MINERS_PICK, 1);
if (st.hasQuestItems(MINING_BOOTS, BOOMBOOM_POWDER, REDSTONE_BEER))
{
st.set("cond", "2");
@@ -133,7 +132,6 @@ public class Q005_MinersFavor extends Quest
{
htmltext = "30517-01.htm";
st.giveItems(BOOMBOOM_POWDER, 1);
if (st.hasQuestItems(MINING_BOOTS, MINERS_PICK, REDSTONE_BEER))
{
st.set("cond", "2");
@@ -155,7 +153,6 @@ public class Q005_MinersFavor extends Quest
{
htmltext = "30518-01.htm";
st.giveItems(MINING_BOOTS, 1);
if (st.hasQuestItems(MINERS_PICK, BOOMBOOM_POWDER, REDSTONE_BEER))
{
st.set("cond", "2");
@@ -177,7 +174,6 @@ public class Q005_MinersFavor extends Quest
{
htmltext = "30520-01.htm";
st.giveItems(REDSTONE_BEER, 1);
if (st.hasQuestItems(MINING_BOOTS, MINERS_PICK, BOOMBOOM_POWDER))
{
st.set("cond", "2");

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q016_TheComingDarkness/Q016_TheComingDarkness.java vendored
View File

@@ -146,7 +146,6 @@ public class Q016_TheComingDarkness extends Quest
case EVIL_ALTAR_4:
case EVIL_ALTAR_5:
final int condAltar = npcId - 31511;
if (cond == condAltar)
{
if (st.hasQuestItems(CRYSTAL_OF_SEAL))

12
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q021_HiddenTruth/Q021_HiddenTruth.java vendored
View File

@@ -104,30 +104,25 @@ public class Q021_HiddenTruth extends Quest
{
_page.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, PAGE_LOCS[0]);
_page.broadcastNpcSay("Follow me...");
startQuestTimer("2", 5000, _page, player, false);
return null;
}
else if (event.equals("2"))
{
_page.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, PAGE_LOCS[1]);
startQuestTimer("3", 12000, _page, player, false);
return null;
}
else if (event.equals("3"))
{
_page.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, PAGE_LOCS[2]);
startQuestTimer("4", 18000, _page, player, false);
return null;
}
else if (event.equals("4"))
{
st.set("end_walk", "1");
_page.broadcastNpcSay("Please check this bookcase, " + player.getName() + ".");
startQuestTimer("5", 47000, _page, player, false);
return null;
}
@@ -150,14 +145,12 @@ public class Q021_HiddenTruth extends Quest
{
_duke.deleteMe();
_duke = null;
return null;
}
else if (event.equals("pageDespawn"))
{
_page.deleteMe();
_page = null;
return null;
}
@@ -244,7 +237,6 @@ public class Q021_HiddenTruth extends Quest
if (((cond == 3) && (st.getInt("end_walk") == 1)) || (cond == 4))
{
htmltext = "31526-01.htm";
st.set("cond", "5");
st.playSound(QuestState.SOUND_MIDDLE);
@@ -252,7 +244,6 @@ public class Q021_HiddenTruth extends Quest
{
cancelQuestTimer("5", _page, player);
cancelQuestTimer("pageDespawn", _page, player);
_page.deleteMe();
_page = null;
}
@@ -260,7 +251,6 @@ public class Q021_HiddenTruth extends Quest
if (_duke != null)
{
cancelQuestTimer("dukeDespawn", _duke, player);
_duke.deleteMe();
_duke = null;
}
@@ -348,7 +338,6 @@ public class Q021_HiddenTruth extends Quest
{
_duke = addSpawn(VON_HELLMAN_DUKE, 51432, -54570, -3136, 0, false, 0);
_duke.broadcastNpcSay("Who awoke me?");
startQuestTimer("dukeDespawn", 300000, _duke, player, false);
}
}
@@ -359,7 +348,6 @@ public class Q021_HiddenTruth extends Quest
{
_page = addSpawn(VON_HELLMAN_PAGE, 51608, -54520, -3168, 0, false, 0);
_page.broadcastNpcSay("My master has instructed me to be your guide, " + player.getName() + ".");
startQuestTimer("1", 4000, _page, player, false);
startQuestTimer("pageDespawn", 90000, _page, player, false);
}

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java vendored
View File

@@ -124,7 +124,6 @@ public class Q022_TragedyInVonHellmannForest extends Quest
st.set("cond", "7");
st.playSound(QuestState.SOUND_MIDDLE);
st.takeItems(LOST_SKULL_OF_ELF, 1);
_ghostOfPriestInstance = addSpawn(GHOST_OF_PRIEST, 38418, -49894, -1104, 0, false, 120000);
_ghostOfPriestInstance.broadcastNpcSay("Did you call me, " + player.getName() + "?");
startQuestTimer("ghost_cleanup", 118000, null, player, false);
@@ -459,7 +458,6 @@ public class Q022_TragedyInVonHellmannForest extends Quest
else
{
cancelQuestTimer("attack_timer", null, player);
_soulOfWellInstance = null;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q024_InhabitantsOfTheForrestOfTheDead/Q024_InhabitantsOfTheForrestOfTheDead.java vendored
View File

@@ -273,7 +273,6 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest
qs.takeItems(SILVER_CROSS, -1);
qs.giveItems(BROKEN_SILVER_CROSS, 1);
qs.set("cond", "4");
for (PlayerInstance nearby : npc.getKnownList().getKnownPlayers().values())
{
nearby.sendPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), "That sign!"));

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java vendored
View File

@@ -170,7 +170,6 @@ public class Q038_DragonFangs extends Quest
if (st.getQuestItemsCount(TOOTH_OF_DRAGON) >= 50)
{
final int position = Rnd.get(REWARD.length);
htmltext = "30034-06.htm";
st.takeItems(TOOTH_OF_DRAGON, 50);
st.giveItems(REWARD[position][0], 1);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q039_RedEyedInvaders/Q039_RedEyedInvaders.java vendored
View File

@@ -208,7 +208,6 @@ public class Q039_RedEyedInvaders extends Quest
public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet)
{
final int npcId = npc.getNpcId();
PlayerInstance partyMember = getRandomPartyMember(player, npc, "2");
if ((partyMember != null) && (npcId != ARANEID))
{
@@ -231,7 +230,6 @@ public class Q039_RedEyedInvaders extends Quest
{
final QuestState st = partyMember.getQuestState(getName());
final int[] list = SECOND_DP.get(npcId);
if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30))
{
st.set("cond", "5");

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java vendored
View File

@@ -208,7 +208,6 @@ public class Q104_SpiritOfMirrors extends Quest
{
st.takeItems(GALLINS_OAK_WAND, 1);
st.giveItems(WAND_SPIRITBOUND_1, 1);
if (st.hasQuestItems(WAND_SPIRITBOUND_2, WAND_SPIRITBOUND_3))
{
st.set("cond", "3");
@@ -226,7 +225,6 @@ public class Q104_SpiritOfMirrors extends Quest
{
st.takeItems(GALLINS_OAK_WAND, 1);
st.giveItems(WAND_SPIRITBOUND_2, 1);
if (st.hasQuestItems(WAND_SPIRITBOUND_1, WAND_SPIRITBOUND_3))
{
st.set("cond", "3");
@@ -244,7 +242,6 @@ public class Q104_SpiritOfMirrors extends Quest
{
st.takeItems(GALLINS_OAK_WAND, 1);
st.giveItems(WAND_SPIRITBOUND_3, 1);
if (st.hasQuestItems(WAND_SPIRITBOUND_1, WAND_SPIRITBOUND_2))
{
st.set("cond", "3");

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java vendored
View File

@@ -215,7 +215,6 @@ public class Q107_MercilessPunishment extends Quest
}
final int cond = st.getInt("cond");
if (cond == 2)
{
st.set("cond", "3");

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q114_ResurrectionOfAnOldManager/Q114_ResurrectionOfAnOldManager.java vendored
View File

@@ -89,7 +89,6 @@ public class Q114_ResurrectionOfAnOldManager extends Quest
else if (event.equals("32041-10.htm"))
{
final int choice = st.getInt("choice");
if (choice == 1)
{
htmltext = "32041-10.htm";
@@ -160,7 +159,6 @@ public class Q114_ResurrectionOfAnOldManager extends Quest
{
final int talk = st.getInt("talk");
final int talk1 = st.getInt("talk1");
if ((talk == 1) && (talk1 == 1))
{
htmltext = "32047-04.htm";
@@ -233,7 +231,6 @@ public class Q114_ResurrectionOfAnOldManager extends Quest
golem.broadcastNpcSay("You, " + player.getName() + ", you attacked Wendy. Prepare to die!");
((Attackable) golem).addDamageHate(player, 0, 999);
golem.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
st.set("golemSpawned", "1");
startQuestTimer("golemDespawn", 900000, golem, player, false);
}
@@ -270,7 +267,6 @@ public class Q114_ResurrectionOfAnOldManager extends Quest
else if (event.equals("32047-33.htm"))
{
final int cond = st.getInt("cond");
if (cond == 7)
{
st.set("cond", "8");
@@ -451,7 +447,6 @@ public class Q114_ResurrectionOfAnOldManager extends Quest
else if (cond == 6)
{
final int choice = st.getInt("choice");
if (choice == 1)
{
if (talk == 0)
@@ -618,7 +613,6 @@ public class Q114_ResurrectionOfAnOldManager extends Quest
}
npc.broadcastNpcSay("This enemy is far too powerful for me to fight. I must withdraw!");
st.set("cond", "11");
st.unset("golemSpawned");
st.playSound(QuestState.SOUND_MIDDLE);

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java vendored
View File

@@ -122,7 +122,6 @@ public class Q153_DeliverGoods extends Quest
htmltext = "30002-01.htm";
st.takeItems(HEAVY_WOOD_BOX, 1);
st.giveItems(JACKSON_RECEIPT, 1);
if (st.hasQuestItems(SILVIA_RECEIPT, RANT_RECEIPT))
{
st.set("cond", "2");
@@ -146,7 +145,6 @@ public class Q153_DeliverGoods extends Quest
st.takeItems(CLOTH_BUNDLE, 1);
st.giveItems(SILVIA_RECEIPT, 1);
st.giveItems(SOULSHOT_NO_GRADE, 3);
if (st.hasQuestItems(JACKSON_RECEIPT, RANT_RECEIPT))
{
st.set("cond", "2");
@@ -169,7 +167,6 @@ public class Q153_DeliverGoods extends Quest
htmltext = "30054-01.htm";
st.takeItems(CLAY_POT, 1);
st.giveItems(RANT_RECEIPT, 1);
if (st.hasQuestItems(JACKSON_RECEIPT, SILVIA_RECEIPT))
{
st.set("cond", "2");

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java vendored
View File

@@ -123,7 +123,6 @@ public class Q166_MassOfDarkness extends Quest
{
htmltext = "30135-01.htm";
st.giveItems(CEREMONIAL_DAGGER, 1);
if (st.hasQuestItems(DREVIANT_WINE, GARMIEL_SCRIPTURE))
{
st.set("cond", "2");
@@ -145,7 +144,6 @@ public class Q166_MassOfDarkness extends Quest
{
htmltext = "30139-01.htm";
st.giveItems(DREVIANT_WINE, 1);
if (st.hasQuestItems(CEREMONIAL_DAGGER, GARMIEL_SCRIPTURE))
{
st.set("cond", "2");
@@ -167,7 +165,6 @@ public class Q166_MassOfDarkness extends Quest
{
htmltext = "30143-01.htm";
st.giveItems(GARMIEL_SCRIPTURE, 1);
if (st.hasQuestItems(CEREMONIAL_DAGGER, DREVIANT_WINE))
{
st.set("cond", "2");

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java vendored
View File

@@ -148,7 +148,6 @@ public class Q234_FatesWhisper extends Quest
if (st.hasQuestItems(itemId))
{
final int aGradeItemId = Integer.parseInt(event.replace("selectAGrade_", ""));
htmltext = getHtmlText("31002-12.htm").replace("%weaponname%", ItemTable.getInstance().getTemplate(aGradeItemId).getName());
st.takeItems(itemId, 1);
st.giveItems(aGradeItemId, 1);
@@ -411,7 +410,6 @@ public class Q234_FatesWhisper extends Quest
public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet)
{
addSpawn(CHEST_SPAWN.get(npc.getNpcId()), npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 120000);
return null;
}
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q235_MimirsElixir/Q235_MimirsElixir.java vendored
View File

@@ -80,7 +80,6 @@ public class Q235_MimirsElixir extends Quest
else if (event.equals("30721-16.htm") && st.hasQuestItems(MIMIR_ELIXIR))
{
player.broadcastPacket(new MagicSkillUse(player, player, 4339, 1, 1, 1));
st.takeItems(MAGISTER_MIXING_STONE, -1);
st.takeItems(MIMIR_ELIXIR, -1);
st.takeItems(STAR_OF_DESTINY, -1);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java vendored
View File

@@ -251,11 +251,9 @@ public class Q246_PossessorOfAPreciousSoul extends Quest
if (Rnd.get(10) < 2)
{
final int neklaceOrRing = (npcId == PILGRIM_OF_SPLENDOR) ? WATERBINDER : EVERGREEN;
if (!st.hasQuestItems(neklaceOrRing))
{
st.giveItems(neklaceOrRing, 1);
if (!st.hasQuestItems((npcId == PILGRIM_OF_SPLENDOR) ? EVERGREEN : WATERBINDER))
{
st.playSound(QuestState.SOUND_ITEMGET);

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java vendored
View File

@@ -100,7 +100,6 @@ public class Q273_InvadersOfTheHolyLand extends Quest
case State.STARTED:
final int red = st.getQuestItemsCount(RED_SOULSTONE);
final int black = st.getQuestItemsCount(BLACK_SOULSTONE);
if ((red + black) == 0)
{
htmltext = "30566-04.htm";
@@ -117,11 +116,9 @@ public class Q273_InvadersOfTheHolyLand extends Quest
}
final int reward = (black * 3) + (red * 10) + ((black >= 10) ? ((red >= 1) ? 1800 : 1500) : 0);
st.takeItems(BLACK_SOULSTONE, -1);
st.takeItems(RED_SOULSTONE, -1);
st.rewardItems(57, reward);
if (player.isNewbie() && (st.getInt("Reward") == 0))
{
st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
@@ -145,7 +142,6 @@ public class Q273_InvadersOfTheHolyLand extends Quest
}
final int npcId = npc.getNpcId();
int probability = 77;
if (npcId == 20311)
{

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java vendored
View File

@@ -107,11 +107,9 @@ public class Q274_SkirmishWithTheWerewolves extends Quest
htmltext = "30569-05.htm";
final int amount = 3500 + (st.getQuestItemsCount(MARAKU_WOLFMEN_TOTEM) * 600);
st.takeItems(MARAKU_WEREWOLF_HEAD, -1);
st.takeItems(MARAKU_WOLFMEN_TOTEM, -1);
st.rewardItems(57, amount);
st.playSound(QuestState.SOUND_FINISH);
st.exitQuest(true);
}

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java vendored
View File

@@ -133,7 +133,6 @@ public class Q275_DarkWingedSpies extends Quest
{
// Spawn of Varangka Tracker on the npc position.
addSpawn(VARANGKA_TRACKER, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0);
st.giveItems(VARANGKA_PARASITE, 1);
}
break;
@@ -142,7 +141,6 @@ public class Q275_DarkWingedSpies extends Quest
if (st.hasQuestItems(VARANGKA_PARASITE))
{
st.takeItems(VARANGKA_PARASITE, -1);
if (st.dropItemsAlways(DARKWING_BAT_FANG, 5, 70))
{
st.set("cond", "2");

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java vendored
View File

@@ -130,7 +130,6 @@ public class Q276_TotemOfTheHestui extends Quest
case 20479:
final int count = st.getQuestItemsCount(KASHA_PARASITE);
final int random = Rnd.get(100);
if ((count >= 79) || ((count >= 69) && (random <= 20)) || ((count >= 59) && (random <= 15)) || ((count >= 49) && (random <= 10)) || ((count >= 39) && (random < 2)))
{
addSpawn(27044, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 0);

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java vendored
View File

@@ -116,11 +116,8 @@ public class Q292_BrigandsSweep extends Quest
final int goblinPendants = st.getQuestItemsCount(GOBLIN_PENDANT);
final int goblinLordPendants = st.getQuestItemsCount(GOBLIN_LORD_PENDANT);
final int suspiciousMemos = st.getQuestItemsCount(SUSPICIOUS_MEMO);
final int countAll = goblinNecklaces + goblinPendants + goblinLordPendants;
final boolean hasContract = st.hasQuestItems(SUSPICIOUS_CONTRACT);
if (countAll == 0)
{
htmltext = "30532-04.htm";
@@ -150,7 +147,6 @@ public class Q292_BrigandsSweep extends Quest
st.takeItems(GOBLIN_NECKLACE, -1);
st.takeItems(GOBLIN_PENDANT, -1);
st.takeItems(GOBLIN_LORD_PENDANT, -1);
if (hasContract)
{
st.set("cond", "1");
@@ -191,7 +187,6 @@ public class Q292_BrigandsSweep extends Quest
}
final int chance = Rnd.get(10);
if (chance > 5)
{
switch (npc.getNpcId())

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java vendored
View File

@@ -123,7 +123,6 @@ public class Q293_TheHiddenVeins extends Quest
case FILAUR:
final int chrysoliteOres = st.getQuestItemsCount(CHRYSOLITE_ORE);
final int hiddenVeinMaps = st.getQuestItemsCount(HIDDEN_VEIN_MAP);
if ((chrysoliteOres + hiddenVeinMaps) == 0)
{
htmltext = "30535-04.htm";
@@ -147,11 +146,9 @@ public class Q293_TheHiddenVeins extends Quest
}
final int reward = (chrysoliteOres * 5) + (hiddenVeinMaps * 500) + ((chrysoliteOres >= 10) ? 2000 : 0);
st.takeItems(CHRYSOLITE_ORE, -1);
st.takeItems(HIDDEN_VEIN_MAP, -1);
st.rewardItems(57, reward);
if (player.isNewbie() && (st.getInt("Reward") == 0))
{
st.giveItems(SOULSHOT_FOR_BEGINNERS, 6000);
@@ -181,7 +178,6 @@ public class Q293_TheHiddenVeins extends Quest
}
final int chance = Rnd.get(100);
if (chance > 50)
{
st.dropItemsAlways(CHRYSOLITE_ORE, 1, 0);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java vendored
View File

@@ -101,7 +101,6 @@ public class Q316_DestroyPlagueCarriers extends Quest
case State.STARTED:
final int ratFangs = st.getQuestItemsCount(WERERAT_FANG);
final int varoolFangs = st.getQuestItemsCount(VAROOL_FOULCLAW_FANG);
if ((ratFangs + varoolFangs) == 0)
{
htmltext = "30155-05.htm";

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java vendored
View File

@@ -89,16 +89,13 @@ public class Q326_VanquishRemnants extends Quest
final int redBadges = st.getQuestItemsCount(RED_CROSS_BADGE);
final int blueBadges = st.getQuestItemsCount(BLUE_CROSS_BADGE);
final int blackBadges = st.getQuestItemsCount(BLACK_CROSS_BADGE);
final int badgesSum = redBadges + blueBadges + blackBadges;
if (badgesSum > 0)
{
st.takeItems(RED_CROSS_BADGE, -1);
st.takeItems(BLUE_CROSS_BADGE, -1);
st.takeItems(BLACK_CROSS_BADGE, -1);
st.rewardItems(57, ((redBadges * 46) + (blueBadges * 52) + (blackBadges * 58) + ((badgesSum >= 10) ? 4320 : 0)));
if (badgesSum >= 100)
{
if (!st.hasQuestItems(BLACK_LION_MARK))

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java vendored
View File

@@ -284,7 +284,6 @@ public class Q327_RecoverTheFarmland extends Quest
else if (event.equals("30034-07.htm"))
{
boolean isRewarded = false;
for (int i = 1852; i < 1856; i++)
{
final int n = st.getQuestItemsCount(i);
@@ -404,7 +403,6 @@ public class Q327_RecoverTheFarmland extends Quest
final int dogtag = st.getQuestItemsCount(TUREK_DOGTAG);
final int medallion = st.getQuestItemsCount(TUREK_MEDALLION);
st.takeItems(TUREK_DOGTAG, -1);
st.takeItems(TUREK_MEDALLION, -1);
st.rewardItems(ADENA, (dogtag * 40) + (medallion * 50) + (((dogtag + medallion) >= 10) ? 619 : 0));

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java vendored
View File

@@ -102,9 +102,7 @@ public class Q328_SenseForBusiness extends Quest
final int carcasses = st.getQuestItemsCount(MONSTER_EYE_CARCASS);
final int lenses = st.getQuestItemsCount(MONSTER_EYE_LENS);
final int gizzards = st.getQuestItemsCount(BASILISK_GIZZARD);
final int all = carcasses + lenses + gizzards;
if (all == 0)
{
htmltext = "30436-04.htm";
@@ -134,7 +132,6 @@ public class Q328_SenseForBusiness extends Quest
final int npcId = npc.getNpcId();
final int chance = CHANCES.get(npcId);
if (npcId < 20069)
{
final int rnd = Rnd.get(100);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java vendored
View File

@@ -83,7 +83,6 @@ public class Q329_CuriosityOfADwarf extends Quest
case State.STARTED:
final int golem = st.getQuestItemsCount(GOLEM_HEARTSTONE);
final int broken = st.getQuestItemsCount(BROKEN_HEARTSTONE);
if ((golem + broken) == 0)
{
htmltext = "30437-04.htm";

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java vendored
View File

@@ -148,7 +148,6 @@ public class Q330_AdeptOfTaste extends Quest
st.takeItems(RED_MANDRAGORA_ROOT, -1);
st.takeItems(WHITE_MANDRAGORA_ROOT, -1);
st.giveItems(RED_MANDRAGORA_SAP, 1);
}
else if (event.equals("30073-05.htm"))
{
@@ -201,7 +200,6 @@ public class Q330_AdeptOfTaste extends Quest
int dish;
final int specialIngredientsNumber = st.getQuestItemsCount(WHITE_MANDRAGORA_SAP) + st.getQuestItemsCount(GOLDEN_HONEY) + st.getQuestItemsCount(BROWN_MOSS_BUNDLE);
if (Rnd.nextBoolean())
{
htmltext = "30469-05t" + Integer.toString(specialIngredientsNumber + 2) + ".htm";
@@ -215,7 +213,6 @@ public class Q330_AdeptOfTaste extends Quest
// Sound according dish.
st.playSound((dish == JONAS_STEAK_DISH_5) ? QuestState.SOUND_JACKPOT : QuestState.SOUND_ITEMGET);
st.takeItems(INGREDIENT_LIST, 1);
st.takeItems(RED_MANDRAGORA_SAP, 1);
st.takeItems(WHITE_MANDRAGORA_SAP, 1);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java vendored
View File

@@ -411,7 +411,6 @@ public class Q333_HuntOfTheBlackLion extends Quest
final boolean cargo2 = st.hasQuestItems(CARGO_BOX_2);
final boolean cargo3 = st.hasQuestItems(CARGO_BOX_3);
final boolean cargo4 = st.hasQuestItems(CARGO_BOX_4);
if ((cargo1 || cargo2 || cargo3 || cargo4) && (player.getAdena() > 649))
{
st.takeItems(ADENA, 650);
@@ -714,7 +713,6 @@ public class Q333_HuntOfTheBlackLion extends Quest
final boolean cargo2 = st.hasQuestItems(CARGO_BOX_2);
final boolean cargo3 = st.hasQuestItems(CARGO_BOX_3);
final boolean cargo4 = st.hasQuestItems(CARGO_BOX_4);
if (cargo1 || cargo2 || cargo3 || cargo4)
{
if (cargo1)

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java vendored
View File

@@ -535,7 +535,6 @@ public class Q337_AudienceWithTheLandDragon extends Quest
}
final int npcId = npc.getNpcId();
for (int[] npcInfo : DROP_ON_ATTACK)
{
if (npcInfo[0] != npcId)

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java vendored
View File

@@ -58,7 +58,6 @@ public class Q338_AlligatorHunter extends Quest
else if (event.equals("30892-05.htm"))
{
final int pelts = st.getQuestItemsCount(ALLIGATOR_PELT);
int reward = pelts * 60;
if (pelts > 10)
{

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java vendored
View File

@@ -260,7 +260,6 @@ public class Q348_AnArrogantSearch extends Quest
else if (cond == 26)
{
final int count = st.getQuestItemsCount(BLOODED_FABRIC);
if ((count + st.getQuestItemsCount(WHITE_FABRIC_ANGELS)) < 10)
{
htmltext = "30864-54.htm";
@@ -304,7 +303,6 @@ public class Q348_AnArrogantSearch extends Quest
else if (cond == 29)
{
final int count = st.getQuestItemsCount(BLOODED_FABRIC);
if ((count + st.getQuestItemsCount(WHITE_FABRIC_ANGELS)) < 10)
{
htmltext = "30864-54.htm";
@@ -636,7 +634,6 @@ public class Q348_AnArrogantSearch extends Quest
npc.broadcastNpcSay("I have the key, do you wish to steal it?");
break;
}
return null;
}

5
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java vendored
View File

@@ -85,7 +85,6 @@ public class Q352_HelpRoodRaiseANewPet extends Quest
case State.STARTED:
final int eggs1 = st.getQuestItemsCount(LIENRIK_EGG_1);
final int eggs2 = st.getQuestItemsCount(LIENRIK_EGG_2);
if ((eggs1 + eggs2) == 0)
{
htmltext = "31067-05.htm";
@@ -97,7 +96,6 @@ public class Q352_HelpRoodRaiseANewPet extends Quest
{
htmltext = "31067-06.htm";
reward += eggs1 * 34;
st.takeItems(LIENRIK_EGG_1, -1);
st.rewardItems(57, reward);
}
@@ -105,7 +103,6 @@ public class Q352_HelpRoodRaiseANewPet extends Quest
{
htmltext = "31067-08.htm";
reward += eggs2 * 1025;
st.takeItems(LIENRIK_EGG_2, -1);
st.rewardItems(57, reward);
}
@@ -113,7 +110,6 @@ public class Q352_HelpRoodRaiseANewPet extends Quest
{
htmltext = "31067-08.htm";
reward += (eggs1 * 34) + (eggs2 * 1025) + 2000;
st.takeItems(LIENRIK_EGG_1, -1);
st.takeItems(LIENRIK_EGG_2, -1);
st.rewardItems(57, reward);
@@ -137,7 +133,6 @@ public class Q352_HelpRoodRaiseANewPet extends Quest
final int npcId = npc.getNpcId();
final int random = Rnd.get(100);
final int chance = ((npcId == 20786) || (npcId == 21644)) ? 44 : 58;
if (random < chance)
{
st.dropItemsAlways(LIENRIK_EGG_1, 1, 0);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java vendored
View File

@@ -210,7 +210,6 @@ public class Q355_FamilyHonor extends Quest
final int[] chances = CHANCES.get(npc.getNpcId());
final int random = Rnd.get(100);
if (random < chances[1])
{
st.dropItemsAlways((random < chances[0]) ? GALIBREDO_BUST : WORK_OF_BERONA, 1, 0);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q360_PlunderTheirSupplies/Q360_PlunderTheirSupplies.java vendored
View File

@@ -126,7 +126,6 @@ public class Q360_PlunderTheirSupplies extends Quest
else
{
final int reward = 6000 + (supplyItems * 100) + (st.getQuestItemsCount(RECIPE_OF_SUPPLY) * 6000);
htmltext = "30873-5.htm";
st.takeItems(SUPPLY_ITEM, -1);
st.takeItems(RECIPE_OF_SUPPLY, -1);
@@ -148,7 +147,6 @@ public class Q360_PlunderTheirSupplies extends Quest
}
st.dropMultipleItems(DROPLIST[(npc.getNpcId() == 20666) ? 0 : 1]);
if (st.getQuestItemsCount(SUSPICIOUS_DOCUMENT) == 5)
{
st.takeItems(SUSPICIOUS_DOCUMENT, 5);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java vendored
View File

@@ -178,10 +178,8 @@ public class Q367_ElectrifyingRecharge extends Quest
if (st.hasQuestItems(LORAIN_LAMP))
{
final int randomItem = Rnd.get(5876, 5880);
st.takeItems(LORAIN_LAMP, 1);
st.giveItems(randomItem, 1);
if (randomItem == 5879)
{
st.set("cond", "2");

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q368_TrespassingIntoTheSacredArea/Q368_TrespassingIntoTheSacredArea.java vendored
View File

@@ -105,7 +105,6 @@ public class Q368_TrespassingIntoTheSacredArea extends Quest
else
{
final int reward = (250 * fangs) + (fangs > 10 ? 5730 : 2000);
htmltext = "30926-04.htm";
st.takeItems(5881, -1);
st.rewardItems(57, reward);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q369_CollectorOfJewels/Q369_CollectorOfJewels.java vendored
View File

@@ -137,7 +137,6 @@ public class Q369_CollectorOfJewels extends Quest
final int cond = st.getInt("cond");
final int flare = st.getQuestItemsCount(FLARE_SHARD);
final int freezing = st.getQuestItemsCount(FREEZING_SHARD);
if (cond == 1)
{
htmltext = "30376-04.htm";
@@ -187,7 +186,6 @@ public class Q369_CollectorOfJewels extends Quest
final int cond = st.getInt("cond");
final int[] drop = DROPLIST.get(npc.getNpcId());
if (cond == 1)
{
if (st.dropItems(drop[0], 1, 50, drop[1]) && (st.getQuestItemsCount((drop[0] == FLARE_SHARD) ? FREEZING_SHARD : FLARE_SHARD) >= 50))

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java vendored
View File

@@ -113,9 +113,7 @@ public class Q371_ShriekOfGhosts extends Quest
if (st.hasQuestItems(PORCELAIN))
{
final int chance = Rnd.get(100);
st.takeItems(PORCELAIN, 1);
if (chance < 2)
{
st.giveItems(6003, 1);
@@ -207,7 +205,6 @@ public class Q371_ShriekOfGhosts extends Quest
final int[] chances = CHANCES.get(npc.getNpcId());
final int random = Rnd.get(100);
if (random < chances[1])
{
st.dropItemsAlways((random < chances[0]) ? URN : PORCELAIN, 1, 0);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java vendored
View File

@@ -393,7 +393,6 @@ public class Q372_LegacyOfInsolence extends Quest
}
final int npcId = npc.getNpcId();
for (int i = 0; i < MONSTERS_DROPS[0].length; i++)
{
if (MONSTERS_DROPS[0][i] == npcId)
@@ -428,7 +427,6 @@ public class Q372_LegacyOfInsolence extends Quest
// Retrieve array with rewards.
final int[][] rewards = REWARDS_MATRICE[rewardType];
final int chance = Rnd.get(100);
for (int[] reward : rewards)
{
if (chance < reward[0])

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java vendored
View File

@@ -343,7 +343,6 @@ public class Q373_SupplierOfReagents extends Quest
{
final int regent = st.getInt(INGREDIENT);
final int catalyst = st.getInt(CATALYST);
for (int[] formula : FORMULAS)
{
if ((formula[1] != regent) || (formula[2] != catalyst))

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java vendored
View File

@@ -116,7 +116,6 @@ public class Q379_FantasyWine extends Quest
case State.STARTED:
final int leaf = st.getQuestItemsCount(LEAF);
final int stone = st.getQuestItemsCount(STONE);
if ((leaf == 80) && (stone == 100))
{
htmltext = "30074-5.htm";

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java vendored
View File

@@ -100,7 +100,6 @@ public class Q383_SearchingForTreasure extends Quest
// Adena reward.
int i1 = 0;
int i0 = Rnd.get(100);
if (i0 < 5)
{
@@ -234,7 +233,6 @@ public class Q383_SearchingForTreasure extends Quest
}
st.rewardItems(57, i1);
st.playSound(QuestState.SOUND_FINISH);
st.exitQuest(true);
}

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java vendored
View File

@@ -296,7 +296,6 @@ public class Q384_WarehouseKeepersPastime extends Quest
{
// Stores the final String.
st.set("playerArray", playerArray.concat(number));
htmltext = fillBoard(st, getHtmlText(npcId + "-" + String.valueOf(11 + (2 * (playerArray.length() + 1))) + ".htm"));
}
}
@@ -323,7 +322,6 @@ public class Q384_WarehouseKeepersPastime extends Quest
// test for all line combination
int winningLines = 0;
for (int[] map : INDEX_MAP)
{
// test line combination
@@ -439,12 +437,10 @@ public class Q384_WarehouseKeepersPastime extends Quest
{
final String[] playerArray = st.getString("playerArray").split("");
final String[] board = st.getString("board").split("");
for (int i = 1; i < 10; i++)
{
htmltext = htmltext.replace("<?Cell" + i + "?>", (Util.contains(playerArray, board[i])) ? board[i] : "?");
}
return htmltext;
}
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java vendored
View File

@@ -136,7 +136,6 @@ public class Q402_PathToAHumanKnight extends Quest
else if (event.equals("30417-13.htm") || event.equals("30417-14.htm"))
{
final int coinCount = st.getQuestItemsCount(COIN_OF_LORDS_1) + st.getQuestItemsCount(COIN_OF_LORDS_2) + st.getQuestItemsCount(COIN_OF_LORDS_3) + st.getQuestItemsCount(COIN_OF_LORDS_4) + st.getQuestItemsCount(COIN_OF_LORDS_5) + st.getQuestItemsCount(COIN_OF_LORDS_6);
st.takeItems(COIN_OF_LORDS_1, -1);
st.takeItems(COIN_OF_LORDS_2, -1);
st.takeItems(COIN_OF_LORDS_3, -1);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java vendored
View File

@@ -232,11 +232,9 @@ public class Q403_PathToARogue extends Quest
if (st.getInt("cond") == 5)
{
final int randomItem = Rnd.get(STOLEN_JEWELRY, STOLEN_NECKLACE);
if (!st.hasQuestItems(randomItem))
{
st.giveItems(randomItem, 1);
if (st.hasQuestItems(STOLEN_JEWELRY, STOLEN_TOMES, STOLEN_RING, STOLEN_NECKLACE))
{
st.set("cond", "6");

4
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java vendored
View File

@@ -155,7 +155,6 @@ public class Q419_GetAPet extends Quest
if (event.equals("task"))
{
final int race = player.getRace().ordinal();
htmltext = "30731-0" + (race + 4) + ".htm";
st.setState(State.STARTED);
st.set("cond", "1");
@@ -295,7 +294,6 @@ public class Q419_GetAPet extends Quest
}
final int[] drop = DROPLIST.get(npc.getNpcId());
if (st.hasQuestItems(drop[0] - 5))
{
st.dropItems(drop[0], 1, 50, drop[1]);
@@ -312,11 +310,9 @@ public class Q419_GetAPet extends Quest
final String[] questions = st.getString("quiz").split(" ");
final int index = Rnd.get(questions.length - 1);
final String question = questions[index];
if (questions.length > (10 - answers))
{
questions[index] = questions[questions.length - 1];
st.set("quiz", String.join(" ", Arrays.copyOf(questions, questions.length - 1)));
}
return "30731-" + question + ".htm";

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java vendored
View File

@@ -277,11 +277,9 @@ public class Q421_LittleWingsBigAdventure extends Quest
{
final int idMask = (int) Math.pow(2, (npc.getNpcId() - 27182) - 1);
final int iCond = st.getInt("iCond");
if ((iCond | idMask) != iCond)
{
st.set("iCond", String.valueOf(iCond | idMask));
npc.broadcastNpcSay("Give me a Fairy Leaf...!");
st.takeItems(FAIRY_LEAF, 1);
npc.broadcastNpcSay("Leave now, before you incur the wrath of the guardian ghost...");
@@ -322,7 +320,6 @@ public class Q421_LittleWingsBigAdventure extends Quest
for (int i = 0; i < 20; i++)
{
final Attackable newNpc = (Attackable) addSpawn(27189, npc.getX(), npc.getY(), npc.getZ(), Rnd.get(65536), true, 300000);
newNpc.setRunning();
newNpc.addDamageHate(originalKiller, 0, 999);
newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalKiller);

19
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java vendored
View File

@@ -143,7 +143,6 @@ public class Q501_ProofOfClanAlliance extends Quest
String htmltext = event;
final QuestState st = player.getQuestState(getName());
final QuestState st2 = getClanLeaderQuestState(player, npc);
if (st == null)
{
return htmltext;
@@ -180,9 +179,7 @@ public class Q501_ProofOfClanAlliance extends Quest
{
st.setState(State.STARTED);
st.set("symbol", "1");
st2.set("symbols", String.valueOf(st2.getInt("symbols") + 1));
st.giveItems(SYMBOL_OF_LOYALTY, 1);
st.playSound(QuestState.SOUND_ACCEPT);
htmltext = "30757-04.htm";
@@ -200,9 +197,7 @@ public class Q501_ProofOfClanAlliance extends Quest
st2.set("state", "4");
st2.set("bingo", "0");
st2.set("chests", "0");
st.takeItems(ADENA, 10000);
for (int[] coords : CHESTS_SPAWN)
{
st.addSpawn(CHESTS_ID.get(Rnd.get(CHESTS_ID.size())), coords[0], coords[1], coords[2], 0, false, 0);
@@ -235,9 +230,7 @@ public class Q501_ProofOfClanAlliance extends Quest
{
st.setState(State.STARTED);
st.set("symbol", "1");
st2.set("symbols", String.valueOf(st2.getInt("symbols") + 1));
st.giveItems(SYMBOL_OF_LOYALTY, 1);
st.playSound(QuestState.SOUND_ACCEPT);
return null;
@@ -267,7 +260,6 @@ public class Q501_ProofOfClanAlliance extends Quest
String htmltext = getNoQuestMsg();
final QuestState st = player.getQuestState(getName());
final QuestState cl = getClanLeaderQuestState(player, npc);
if (st == null)
{
return htmltext;
@@ -454,20 +446,16 @@ public class Q501_ProofOfClanAlliance extends Quest
{
final QuestState st = player.getQuestState(getName());
final QuestState cl = getClanLeaderQuestState(player, npc);
if ((st == null) || (cl == null))
{
return null;
}
final int npcId = npc.getNpcId();
if (DROP.containsKey(npcId) && (cl.getInt("state") == 3))
{
final int itemId = DROP.get(npcId);
final List<Integer> herbs = getHerbs(cl.getString("herbs"));
if ((Rnd.get(10) == 1) && !st.hasQuestItems(itemId) && !hasOtherItems(st, itemId) && !herbs.contains(itemId))
{
if (herbs.isEmpty())
@@ -486,7 +474,6 @@ public class Q501_ProofOfClanAlliance extends Quest
{
final int chests = cl.getInt("chests");
final int bingo = cl.getInt("bingo");
if ((((chests == 15) && (bingo == 3)) || ((chests == 14) && (bingo == 2)) || ((chests == 13) && (bingo == 1)) || ((chests == 12) && (bingo == 0))) || ((bingo < 4) && (Rnd.get(4) == 0)))
{
npc.broadcastNpcSay("##########Bingo!##########");
@@ -494,7 +481,6 @@ public class Q501_ProofOfClanAlliance extends Quest
}
cl.set("chests", String.valueOf(chests + 1));
if (chests == 16)
{
_isSpawned = false;
@@ -543,17 +529,14 @@ public class Q501_ProofOfClanAlliance extends Quest
private static List<Integer> getHerbs(String list)
{
final List<Integer> array = new ArrayList<>();
if (list != null)
{
final String[] herbs = list.split(";");
for (String herb : herbs)
{
array.add(Integer.parseInt(herb));
}
}
return array;
}
@@ -562,13 +545,11 @@ public class Q501_ProofOfClanAlliance extends Quest
if (list != null)
{
final String[] herbs = list.split(";");
if (st.hasQuestItems(Integer.parseInt(herbs[0])))
{
return true;
}
}
return false;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java vendored
View File

@@ -707,7 +707,6 @@ public class Q503_PursuitOfClanAmbition extends Quest
attacker.teleToLocation(185462, 20342, -3250);
}
}
return super.onAttack(npc, attacker, damage, isPet);
}
}

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java vendored
View File

@@ -156,7 +156,6 @@ public class Q508_AClansReputation extends Quest
final int x = radar[evt - 1][0];
final int y = radar[evt - 1][1];
final int z = radar[evt - 1][2];
if ((x + y + z) > 0)
{
st.addRadar(x, y, z);
@@ -213,7 +212,6 @@ public class Q508_AClansReputation extends Quest
final int item = REWARD_LIST[raid - 1][1];
final int count = st.getQuestItemsCount(item);
final int reward = Rnd.get(REWARD_LIST[raid - 1][2], REWARD_LIST[raid - 1][3]);
if (count == 0)
{
htmltext = "30868-" + raid + "a.htm";

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java vendored
View File

@@ -143,7 +143,6 @@ public class Q509_TheClansPrestige extends Quest
final int x = radar[evt - 1][0];
final int y = radar[evt - 1][1];
final int z = radar[evt - 1][2];
if ((x + y + z) > 0)
{
st.addRadar(x, y, z);
@@ -200,7 +199,6 @@ public class Q509_TheClansPrestige extends Quest
final int item = REWARD_LIST[raid - 1][1];
final int count = st.getQuestItemsCount(item);
final int reward = Rnd.get(REWARD_LIST[raid - 1][2], REWARD_LIST[raid - 1][3]);
if (count == 0)
{
htmltext = "31331-" + raid + "a.htm";

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java vendored
View File

@@ -115,7 +115,6 @@ public class Q510_AClansReputation extends Quest
clan.setReputationScore(clan.getReputationScore() + reward, true);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLAN_S_REPUTATION_SCORE).addNumber(reward));
clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
htmltext = "31331-7.htm";
}
else

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java vendored
View File

@@ -98,7 +98,6 @@ public class Q601_WatchingEyes extends Quest
if (random < element[2])
{
st.rewardItems(57, element[1]);
if (element[0] != 0)
{
st.giveItems(element[0], 5);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java vendored
View File

@@ -294,7 +294,6 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest
return true;
}
return false;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java vendored
View File

@@ -274,7 +274,6 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest
return true;
}
return false;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java vendored
View File

@@ -284,7 +284,6 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest
return true;
}
return false;
}

14
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java vendored
View File

@@ -143,7 +143,6 @@ public class Q620_FourGoblets extends Quest
if (st.hasQuestItems(SEALED_BOX))
{
st.takeItems(SEALED_BOX, 1);
if (!calculateBoxReward(st))
{
htmltext = (Rnd.nextBoolean()) ? "31454-09.htm" : "31454-10.htm";
@@ -193,7 +192,6 @@ public class Q620_FourGoblets extends Quest
if (st.hasQuestItems(SEALED_BOX))
{
st.takeItems(SEALED_BOX, 1);
if (!calculateBoxReward(st))
{
htmltext = (Rnd.nextBoolean()) ? "31919-04.htm" : "31919-05.htm";
@@ -236,7 +234,6 @@ public class Q620_FourGoblets extends Quest
final int npcId = npc.getNpcId();
final int id = st.getState();
final int cond = st.getInt("cond");
if (id == State.CREATED)
{
st.set("cond", "0");
@@ -272,7 +269,6 @@ public class Q620_FourGoblets extends Quest
{
// Possibilities : 0 = nothing, 1 = seal boxes only, 2 = relics only, 3 = both, 4/5/6/7 = "4 goblets" versions of 0/1/2/3.
int index = 0;
if (st.hasQuestItems(GOBLET_OF_ALECTIA, GOBLET_OF_TISHAS, GOBLET_OF_MEKARA, GOBLET_OF_MORIGUL))
{
index = 4;
@@ -280,7 +276,6 @@ public class Q620_FourGoblets extends Quest
final boolean gotSealBoxes = st.hasQuestItems(SEALED_BOX);
final boolean gotEnoughRelics = st.getQuestItemsCount(RELIC) >= 1000;
if (gotSealBoxes && gotEnoughRelics)
{
index += 3;
@@ -326,7 +321,6 @@ public class Q620_FourGoblets extends Quest
{
boolean reward = false;
final int rnd = Rnd.get(5);
if (rnd == 0)
{
st.giveItems(57, 10000);
@@ -338,7 +332,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 43)
{
st.giveItems(1884, 42);
@@ -385,7 +378,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 335)
{
st.giveItems(1888, 1);
@@ -422,7 +414,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 148)
{
st.giveItems(1878, 8);
@@ -469,7 +460,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 350)
{
st.giveItems(1887, 1);
@@ -506,7 +496,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 223)
{
st.giveItems(730, 1);
@@ -525,7 +514,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 202)
{
st.giveItems(729, 1);
@@ -546,7 +534,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 88)
{
st.giveItems(6698, 1);
@@ -621,7 +608,6 @@ public class Q620_FourGoblets extends Quest
{
reward = true;
final int i = Rnd.get(1000);
if (i < 100)
{
st.giveItems(6688, 1);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java vendored
View File

@@ -288,7 +288,6 @@ public class Q625_TheFinestIngredients_Part2 extends Quest
return true;
}
return false;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q633_InTheForgottenVillage/Q633_InTheForgottenVillage.java vendored
View File

@@ -165,7 +165,6 @@ public class Q633_InTheForgottenVillage extends Quest
public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet)
{
final int npcId = npc.getNpcId();
if (UNDEADS.containsKey(npcId))
{
final PlayerInstance partyMember = getRandomPartyMemberState(player, npc, State.STARTED);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q639_GuardiansOfTheHolyGrail/Q639_GuardiansOfTheHolyGrail.java vendored
View File

@@ -91,7 +91,6 @@ public class Q639_GuardiansOfTheHolyGrail extends Quest
else if (event.equals("31350-08.htm"))
{
final int count = st.getQuestItemsCount(SCRIPTURE);
st.takeItems(SCRIPTURE, -1);
st.rewardItems(57, (1625 * count) + ((count >= 10) ? 33940 : 0));
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q640_TheZeroHour/Q640_TheZeroHour.java vendored
View File

@@ -126,7 +126,6 @@ public class Q640_TheZeroHour extends Quest
else if (Util.isDigit(event))
{
final int[] reward = REWARDS[Integer.parseInt(event)];
if (st.getQuestItemsCount(FANG_OF_STAKATO) >= reward[0])
{
htmltext = "31554-09.htm";

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java vendored
View File

@@ -101,7 +101,6 @@ public class Q642_APowerfulPrimevalCreature extends Quest
if ((st.getQuestItemsCount(DINOSAUR_TISSUE) >= 150) && st.hasQuestItems(DINOSAUR_EGG))
{
htmltext = "32105-07.htm";
st.takeItems(DINOSAUR_TISSUE, 150);
st.takeItems(DINOSAUR_EGG, 1);
st.rewardItems(57, 44000);
@@ -154,7 +153,6 @@ public class Q642_APowerfulPrimevalCreature extends Quest
if (Rnd.get(100) < 1)
{
st.giveItems(DINOSAUR_EGG, 1);
if (st.getQuestItemsCount(DINOSAUR_TISSUE) >= 150)
{
st.playSound(QuestState.SOUND_MIDDLE);
@@ -168,7 +166,6 @@ public class Q642_APowerfulPrimevalCreature extends Quest
else if (Rnd.get(100) < 33)
{
st.rewardItems(DINOSAUR_TISSUE, 1);
if ((st.getQuestItemsCount(DINOSAUR_TISSUE) >= 150) && st.hasQuestItems(DINOSAUR_EGG))
{
st.playSound(QuestState.SOUND_MIDDLE);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java vendored
View File

@@ -63,7 +63,6 @@ public class Q643_RiseAndFallOfTheElrokiTribe extends Quest
else if (event.equals("32106-07.htm"))
{
final int count = st.getQuestItemsCount(BONES);
st.takeItems(BONES, count);
st.rewardItems(57, count * 1374);
}

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java vendored
View File

@@ -289,7 +289,6 @@ public class Q660_AidingTheFloranVillage extends Quest
final int eyes = st.getQuestItemsCount(WATCHING_EYES);
final int scale = st.getQuestItemsCount(LIZARDMEN_SCALE);
final int shard = st.getQuestItemsCount(GOLEM_SHARD);
if ((eyes + scale + shard) < numberToVerify)
{
return false;
@@ -302,7 +301,6 @@ public class Q660_AidingTheFloranVillage extends Quest
else
{
int currentNumber = numberToVerify - eyes;
st.takeItems(WATCHING_EYES, -1);
if (scale >= currentNumber)
{

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q661_MakingTheHarvestGroundsSafe/Q661_MakingTheHarvestGroundsSafe.java vendored
View File

@@ -74,9 +74,7 @@ public class Q661_MakingTheHarvestGroundsSafe extends Quest
final int item2 = st.getQuestItemsCount(CLOUDY_GEM);
final int item3 = st.getQuestItemsCount(TALON_OF_YOUNG_ARANEID);
int sum = 0;
sum = (item1 * 57) + (item2 * 56) + (item3 * 60);
if ((item1 + item2 + item3) >= 10)
{
sum += 2871;

12
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java vendored
View File

@@ -149,7 +149,6 @@ public class Q662_AGameOfCards extends Quest
{
final int state = st.getInt("state");
final int stateEx = st.getInt("stateEx");
if ((state == 0) && (stateEx == 0) && (st.getQuestItemsCount(RED_GEM) >= 50))
{
htmltext = "30845-05.htm";
@@ -164,7 +163,6 @@ public class Q662_AGameOfCards extends Quest
{
final int state = st.getInt("state");
final int stateEx = st.getInt("stateEx");
if ((state == 0) && (stateEx == 0) && (st.getQuestItemsCount(RED_GEM) >= 50))
{
int i1 = Rnd.get(70) + 1;
@@ -172,7 +170,6 @@ public class Q662_AGameOfCards extends Quest
int i3 = Rnd.get(70) + 1;
int i4 = Rnd.get(70) + 1;
int i5 = Rnd.get(70) + 1;
if (i1 >= 57)
{
i1 = i1 - 56;
@@ -260,7 +257,6 @@ public class Q662_AGameOfCards extends Quest
st.set("state", String.valueOf((i4 * 1000000) + (i3 * 10000) + (i2 * 100) + i1));
st.set("stateEx", String.valueOf(i5));
st.takeItems(RED_GEM, 50);
}
}
@@ -268,7 +264,6 @@ public class Q662_AGameOfCards extends Quest
{
final int state = st.getInt("state");
final int stateEx = st.getInt("stateEx");
int i0;
int i1;
int i2;
@@ -278,7 +273,6 @@ public class Q662_AGameOfCards extends Quest
int i6;
int i8;
int i9;
i0 = state;
i1 = stateEx;
i5 = i1 % 100;
@@ -287,7 +281,6 @@ public class Q662_AGameOfCards extends Quest
i2 = (i0 % 10000) / 100;
i3 = (i0 % 1000000) / 10000;
i4 = (i0 % 100000000) / 1000000;
if (event.equals("First"))
{
if ((i9 % 2) < 1)
@@ -333,7 +326,6 @@ public class Q662_AGameOfCards extends Quest
{
i6 = 0;
i8 = 0;
if ((i1 >= 1) && (i1 <= 14) && (i2 >= 1) && (i2 <= 14) && (i3 >= 1) && (i3 <= 14) && (i4 >= 1) && (i4 <= 14) && (i5 >= 1) && (i5 <= 14))
{
if (i1 == i2)
@@ -546,7 +538,6 @@ public class Q662_AGameOfCards extends Quest
case State.STARTED:
final int state = st.getInt("state");
final int stateEx = st.getInt("stateEx");
if ((state == 0) && (stateEx == 0))
{
htmltext = (st.getQuestItemsCount(RED_GEM) < 50) ? "30845-04.htm" : "30845-05.htm";
@@ -560,7 +551,6 @@ public class Q662_AGameOfCards extends Quest
int i4;
int i5;
int i9;
i0 = state;
i1 = stateEx;
i5 = i1 % 100;
@@ -569,7 +559,6 @@ public class Q662_AGameOfCards extends Quest
i2 = (i0 % 10000) / 100;
i3 = (i0 % 1000000) / 10000;
i4 = (i0 % 100000000) / 1000000;
htmltext = getHtmlText("30845-11a.htm");
htmltext = htmltext.replace("%FontColor1%", ((i9 % 2) < 1) ? "ffff00" : "ff6f6f").replace("%Cell1%", ((i9 % 2) < 1) ? CARDS.get(0) : CARDS.get(i1));
htmltext = htmltext.replace("%FontColor2%", ((i9 % 4) < 2) ? "ffff00" : "ff6f6f").replace("%Cell2%", ((i9 % 4) < 2) ? CARDS.get(0) : CARDS.get(i2));
@@ -599,7 +588,6 @@ public class Q662_AGameOfCards extends Quest
private void giveReward(QuestState st, int item, int count)
{
final Item template = ItemTable.getInstance().getTemplate(item);
if (template.isStackable())
{
st.giveItems(item, count);

22
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java vendored
View File

@@ -147,7 +147,6 @@ public class Q663_SeductiveWhispers extends Quest
}
final int state = st.getInt("state");
if (event.equals("30846-03.htm"))
{
st.setState(State.STARTED);
@@ -179,21 +178,15 @@ public class Q663_SeductiveWhispers extends Quest
else if (event.equals("30846-14.htm") && ((state % 10) == 5) && ((state / 1000) == 0))
{
final int i0 = st.getInt("stateEx");
final int i1 = i0 % 10;
final int i2 = (i0 - i1) / 10;
final int param1 = Rnd.get(2) + 1;
final int param2 = Rnd.get(5) + 1;
final int i5 = state / 10;
final int param3 = (param1 * 10) + param2;
if (param1 == i2)
{
final int i3 = param2 + i1;
if (((i3 % 5) == 0) && (i3 != 10))
{
if (((state % 100) / 10) >= 7)
@@ -248,18 +241,14 @@ public class Q663_SeductiveWhispers extends Quest
else if (event.equals("30846-19.htm") && ((state % 10) == 6) && ((state / 1000) == 0))
{
final int i0 = st.getInt("stateEx");
final int i1 = i0 % 10;
final int i2 = (i0 - i1) / 10;
final int param1 = Rnd.get(2) + 1;
final int param2 = Rnd.get(5) + 1;
final int param3 = (param1 * 10) + param2;
if (param1 == i2)
{
final int i3 = param1 + i1;
if (((i3 % 5) == 0) && (i3 != 10))
{
st.set("state", "1");
@@ -296,7 +285,6 @@ public class Q663_SeductiveWhispers extends Quest
else if (event.equals("30846-21.htm") && ((state % 10) == 7) && ((state / 1000) == 0))
{
final int round = state / 10;
if (round == 0)
{
st.rewardItems(ADENA, 40000);
@@ -352,18 +340,14 @@ public class Q663_SeductiveWhispers extends Quest
else if (event.equals("30846-25.htm") && (state == 1005))
{
final int i0 = st.getInt("stateEx");
final int i1 = i0 % 10;
final int i2 = (i0 - i1) / 10;
final int param1 = Rnd.get(2) + 1;
final int param2 = Rnd.get(5) + 1;
final int param3 = (param1 * 10) + param2;
if (param1 == i2)
{
final int i3 = param2 + i1;
if (((i3 % 5) == 0) && (i3 != 10))
{
st.set("state", "1");
@@ -398,18 +382,14 @@ public class Q663_SeductiveWhispers extends Quest
else if (event.equals("30846-29.htm") && (state == 1006))
{
final int i0 = st.getInt("stateEx");
final int i1 = i0 % 10;
final int i2 = (i0 - i1) / 10;
final int param1 = Rnd.get(2) + 1;
final int param2 = Rnd.get(5) + 1;
final int param3 = (param1 * 10) + param2;
if (param1 == i2)
{
final int i3 = param2 + i1;
if (((i3 % 5) == 0) && (i3 != 10))
{
st.set("state", "1");
@@ -467,7 +447,6 @@ public class Q663_SeductiveWhispers extends Quest
case State.STARTED:
final int state = st.getInt("state");
if (state < 4)
{
if (st.hasQuestItems(SPIRIT_BEAD))
@@ -494,7 +473,6 @@ public class Q663_SeductiveWhispers extends Quest
else if ((state % 10) == 7)
{
final int round = (state % 100) / 10;
if (round >= 7)
{
st.rewardItems(ADENA, 2384000);

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q688_DefeatTheElrokianRaiders/Q688_DefeatTheElrokianRaiders.java vendored
View File

@@ -75,7 +75,6 @@ public class Q688_DefeatTheElrokianRaiders extends Quest
else if (event.equals("32105-06.htm"))
{
final int count = st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE);
st.takeItems(DINOSAUR_FANG_NECKLACE, -1);
st.rewardItems(57, count * 3000);
}

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java vendored
View File

@@ -90,7 +90,6 @@ public class GrandBossTeleporters extends Quest
{
final int npcId = npc.getNpcId();
String htmltext = null;
if (npcId == 13001) // heart of warding
{
if (antharasAI() != null)
@@ -231,7 +230,6 @@ public class GrandBossTeleporters extends Quest
final int y = -57720 + Rnd.get(500);
player.teleToLocation(x, y, -2976);
}
return htmltext;
}

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java vendored
View File

@@ -85,7 +85,6 @@ public class NewbieTravelToken extends Quest
final int x = data.get(event)[0];
final int y = data.get(event)[1];
final int z = data.get(event)[2];
if (st.getQuestItemsCount(TOKEN) != 0)
{
st.takeItems(TOKEN, 1);
@@ -106,7 +105,6 @@ public class NewbieTravelToken extends Quest
String htmltext = "";
final QuestState st = player.getQuestState(getName());
final int npcId = npc.getNpcId();
if (player.getLevel() >= 20)
{
htmltext = "wronglevel.htm";
@@ -116,7 +114,6 @@ public class NewbieTravelToken extends Quest
{
htmltext = npcId + ".htm";
}
return htmltext;
}

1
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NoblesseTeleport/NoblesseTeleport.java vendored
View File

@@ -37,7 +37,6 @@ public class NoblesseTeleport extends Quest
{
return "noble.htm";
}
return "nobleteleporter-no.htm";
}

3
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java vendored
View File

@@ -258,7 +258,6 @@ public class OracleTeleport extends Quest
{
String htmltext = "";
final QuestState st = player.getQuestState(getName());
final int npcId = npc.getNpcId();
if (event.equalsIgnoreCase("Return"))
{
@@ -380,9 +379,7 @@ public class OracleTeleport extends Quest
{
String htmltext = "";
final QuestState st = player.getQuestState(getName());
final int npcId = npc.getNpcId();
if (Util.contains(TOWN_DAWN, npcId))
{
st.setState(State.STARTED);

2
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/RaceTrack/RaceTrack.java vendored
View File

@@ -59,7 +59,6 @@ public class RaceTrack extends Quest
public String onTalk(NpcInstance npc, PlayerInstance player)
{
final QuestState st = player.getQuestState(getName());
if (RETURN_LOCATIONS.containsKey(npc.getNpcId()))
{
player.teleToLocation(12661, 181687, -3560);
@@ -72,7 +71,6 @@ public class RaceTrack extends Quest
player.teleToLocation(loc.getX(), loc.getY(), loc.getZ());
st.exitQuest(true);
}
return null;
}

Some files were not shown because too many files have changed in this diff Show More