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

Minor instance changes.

Browse Source
This commit is contained in:
MobiusDev 2016-02-14 07:00:34 +00:00
parent e379b0948f
commit ff13d9e0f4
22 changed files with 137 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java vendored
View File

@ -30,10 +30,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
*/
public final class SecretArea extends Quest
{
class SAWorld extends InstanceWorld
{
}
private static final int TEMPLATE_ID = 117;
private static final int GINBY = 32566;
private static final int LELRIKIA = 32567;
@ -45,6 +41,10 @@ public final class SecretArea extends Quest
new Location(-185057, 242821, 1576)
};
class SAWorld extends InstanceWorld
{
}
public SecretArea()
{
super(-1, SecretArea.class.getSimpleName(), "gracia/instances");

5
trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java vendored
View File

@ -514,10 +514,7 @@ public final class CrystalCaverns extends AbstractInstance
{
if (debug || player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS))
{
if (debug)
{
return true;
}
return true;
}
final L2Party party = player.getParty();

15
trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java vendored
View File

@ -43,13 +43,6 @@ import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmpero
*/
public final class DisciplesNecropolisPast extends AbstractInstance
{
class DNPWorld extends InstanceWorld
{
final List<L2Npc> anakimGroup = new ArrayList<>();
final List<L2Npc> lilithGroup = new ArrayList<>();
int countKill = 0;
}
// NPCs
private static final int SEAL_DEVICE = 27384;
private static final int PROMISE_OF_MAMMON = 32585;
@ -88,7 +81,6 @@ public final class DisciplesNecropolisPast extends AbstractInstance
SKILLS.put(32720, new SkillHolder(6194, 1)); // Presentation - Anakim's Guard Battle
SKILLS.put(32721, new SkillHolder(6195, 1)); // Presentation - Anakim's Executor Battle
}
// Locations
private static final Location ENTER = new Location(-89554, 216078, -7488, 0, 0);
private static final Location EXIT = new Location(171895, -17501, -4903, 0, 0);
@ -120,6 +112,13 @@ public final class DisciplesNecropolisPast extends AbstractInstance
ANAKIM_SPAWN.put(ANAKIMS_EXECUTOR, new Location(-83031, 216604, -7492, 17071));
}
class DNPWorld extends InstanceWorld
{
final List<L2Npc> anakimGroup = new ArrayList<>();
final List<L2Npc> lilithGroup = new ArrayList<>();
int countKill = 0;
}
public DisciplesNecropolisPast()
{
super(DisciplesNecropolisPast.class.getSimpleName());

8
trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java vendored
View File

@ -35,10 +35,6 @@ import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal;
*/
public final class ElcadiasTent extends AbstractInstance
{
class ETWorld extends InstanceWorld
{
}
// NPCs
private static final int ELCADIA = 32784;
private static final int GRUFF_LOOKING_MAN = 32862;
@ -48,6 +44,10 @@ public final class ElcadiasTent extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 158;
class ETWorld extends InstanceWorld
{
}
public ElcadiasTent()
{
super(ElcadiasTent.class.getSimpleName());

2
trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java vendored
View File

@ -34,7 +34,7 @@ import quests.Q10736_ASpecialPower.Q10736_ASpecialPower;
*/
public final class FaeronTrainingGrounds2 extends AbstractInstance
{
// NPC's
// NPCs
private static final int KATALIN = 33943;
private static final int KATALIN_2 = 33945;
// Locations

8
trunk/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java vendored
View File

@ -30,10 +30,6 @@ import instances.AbstractInstance;
*/
public final class HideoutOfTheDawn extends AbstractInstance
{
class HotDWorld extends InstanceWorld
{
}
// NPCs
private static final int WOOD = 32593;
private static final int JAINA = 32617;
@ -43,6 +39,10 @@ public final class HideoutOfTheDawn extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 113;
class HotDWorld extends InstanceWorld
{
}
public HideoutOfTheDawn()
{
super(HideoutOfTheDawn.class.getSimpleName());

10
trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java vendored
View File

@ -40,11 +40,6 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
*/
public final class IceQueensCastle extends AbstractInstance
{
class IQCWorld extends InstanceWorld
{
L2PcInstance player = null;
}
// NPCs
private static final int FREYA = 18847;
private static final int BATTALION_LEADER = 18848;
@ -63,6 +58,11 @@ public final class IceQueensCastle extends AbstractInstance
private static final int ICE_QUEEN_DOOR = 23140101;
private static final int MIN_LV = 82;
class IQCWorld extends InstanceWorld
{
L2PcInstance player = null;
}
public IceQueensCastle()
{
super(IceQueensCastle.class.getSimpleName());

28
trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@ -62,20 +62,6 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
*/
public final class IceQueensCastleBattle extends AbstractInstance
{
class IQCNBWorld extends InstanceWorld
{
final List<L2PcInstance> playersInside = new ArrayList<>();
final List<L2Npc> knightStatues = new ArrayList<>();
final List<L2Attackable> spawnedMobs = new CopyOnWriteArrayList<>();
L2NpcInstance controller = null;
L2GrandBossInstance freya = null;
L2QuestGuardInstance supp_Jinia = null;
L2QuestGuardInstance supp_Kegor = null;
boolean isSupportActive = false;
boolean canSpawnMobs = true;
boolean isHardCore = false;
}
// Npcs
private static final int FREYA_THRONE = 29177; // First freya
private static final int FREYA_SPELLING = 29178; // Second freya
@ -177,6 +163,20 @@ public final class IceQueensCastleBattle extends AbstractInstance
23140216,
};
class IQCNBWorld extends InstanceWorld
{
final List<L2PcInstance> playersInside = new ArrayList<>();
final List<L2Npc> knightStatues = new ArrayList<>();
final List<L2Attackable> spawnedMobs = new CopyOnWriteArrayList<>();
L2NpcInstance controller = null;
L2GrandBossInstance freya = null;
L2QuestGuardInstance supp_Jinia = null;
L2QuestGuardInstance supp_Kegor = null;
boolean isSupportActive = false;
boolean canSpawnMobs = true;
boolean isHardCore = false;
}
public IceQueensCastleBattle()
{
super(IceQueensCastleBattle.class.getSimpleName());

8
trunk/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java vendored
View File

@ -31,10 +31,6 @@ import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword;
*/
public final class JiniaGuildHideout1 extends AbstractInstance
{
class JGH1World extends InstanceWorld
{
}
// NPC
private static final int RAFFORTY = 32020;
// Location
@ -42,6 +38,10 @@ public final class JiniaGuildHideout1 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 140;
class JGH1World extends InstanceWorld
{
}
public JiniaGuildHideout1()
{
super(JiniaGuildHideout1.class.getSimpleName());

8
trunk/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java vendored
View File

@ -31,10 +31,6 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
*/
public final class JiniaGuildHideout2 extends AbstractInstance
{
class JGH2World extends InstanceWorld
{
}
// NPC
private static final int RAFFORTY = 32020;
// Location
@ -42,6 +38,10 @@ public final class JiniaGuildHideout2 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 141;
class JGH2World extends InstanceWorld
{
}
public JiniaGuildHideout2()
{
super(JiniaGuildHideout2.class.getSimpleName());

8
trunk/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java vendored
View File

@ -31,10 +31,6 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
*/
public final class JiniaGuildHideout3 extends AbstractInstance
{
class JGH3World extends InstanceWorld
{
}
// NPC
private static final int RAFFORTY = 32020;
// Location
@ -42,6 +38,10 @@ public final class JiniaGuildHideout3 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 145;
class JGH3World extends InstanceWorld
{
}
public JiniaGuildHideout3()
{
super(JiniaGuildHideout3.class.getSimpleName());

8
trunk/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java vendored
View File

@ -31,10 +31,6 @@ import quests.Q10287_StoryOfThoseLeft.Q10287_StoryOfThoseLeft;
*/
public final class JiniaGuildHideout4 extends AbstractInstance
{
class JGH4World extends InstanceWorld
{
}
// NPC
private static final int RAFFORTY = 32020;
// Location
@ -42,6 +38,10 @@ public final class JiniaGuildHideout4 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 146;
class JGH4World extends InstanceWorld
{
}
public JiniaGuildHideout4()
{
super(JiniaGuildHideout4.class.getSimpleName());

2
trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java vendored
View File

@ -31,7 +31,7 @@ import quests.Q10745_TheSecretIngredients.Q10745_TheSecretIngredients;
*/
public class KaraphonHabitat extends AbstractInstance
{
// Npcs
// NPCs
private static final int DOLKIN = 33954;
private static final int DOLKIN_INSTANCE = 34002;
// Locations

14
trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java vendored
View File

@ -44,7 +44,7 @@ import quests.Q10331_StartOfFate.Q10331_StartOfFate;
*/
public final class LabyrinthOfBelis extends AbstractInstance
{
// Npcs
// NPCs
private static final int OFFICER = 19155;
private static final int NEMERTESS = 22984;
private static final int EMBRYO_HANDYMAN = 22997;
@ -100,14 +100,13 @@ public final class LabyrinthOfBelis extends AbstractInstance
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState qs = player.getQuestState(Q10331_StartOfFate.class.getSimpleName());
if (qs == null)
{
return null;
}
if (event.equals("enter_instance"))
{
final QuestState qs = player.getQuestState(Q10331_StartOfFate.class.getSimpleName());
if (qs == null)
{
return null;
}
enterInstance(player, new LOBWorld(), "LabyrinthOfBelis.xml", TEMPLATE_ID);
return null;
}
@ -117,7 +116,6 @@ public final class LabyrinthOfBelis extends AbstractInstance
{
return null;
}
final LOBWorld world = (LOBWorld) tmpworld;
switch (event)

10
trunk/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java vendored
View File

@ -32,11 +32,6 @@ import instances.AbstractInstance;
*/
public final class LibraryOfSages extends AbstractInstance
{
class LoSWorld extends InstanceWorld
{
L2Npc elcadia = null;
}
// NPCs
private static final int SOPHIA1 = 32596;
private static final int PILE_OF_BOOKS1 = 32809;
@ -62,6 +57,11 @@ public final class LibraryOfSages extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 156;
class LoSWorld extends InstanceWorld
{
L2Npc elcadia = null;
}
public LibraryOfSages()
{
super(LibraryOfSages.class.getSimpleName());

10
trunk/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java vendored
View File

@ -33,11 +33,6 @@ import instances.AbstractInstance;
*/
public final class MonasteryOfSilence1 extends AbstractInstance
{
static final class MoSWorld extends InstanceWorld
{
L2Npc elcadia = null;
}
// NPCs
private static final int ELCADIA_INSTANCE = 32787;
private static final int ERIS_EVIL_THOUGHTS = 32792;
@ -77,6 +72,11 @@ public final class MonasteryOfSilence1 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 151;
static final class MoSWorld extends InstanceWorld
{
L2Npc elcadia = null;
}
public MonasteryOfSilence1()
{
super(MonasteryOfSilence1.class.getSimpleName());

15
trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java vendored
View File

@ -43,9 +43,7 @@ import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal;
public class MonasteryOfSilence2 extends AbstractNpcAI
{
// Values
private static final int INSTANCE_ID = 151;
// NPC's
// NPCs
private static final int OddGlobe = 32815;
private static final int Elcadia_First_Room = 32787;
private static final int Elcadia_Support = 32785;
@ -69,7 +67,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
private static final int AltarOfHallows_Sword = 32858;
private static final int AltarOfHallows_Scroll = 32859;
private static final int AltarOfHallows_Shield = 32860;
// Teleport's
// Teleports
private static final int ENTER = 0;
private static final int HOLYGRAL = 1;
private static final int EXIT = 2;
@ -152,7 +150,6 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
}
// EtisEtina
};
private static final int[] TALK =
{
OddGlobe,
@ -178,7 +175,6 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
AltarOfHallows_Scroll,
AltarOfHallows_Shield
};
private static final int[] MageBuff =
{
6725,
@ -193,7 +189,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
6716,
6717
};
private static final int INSTANCE_ID = 151;
private final HashMap<Integer, InstanceHolder> instanceWorlds = new HashMap<>();
static class InstanceHolder
@ -201,11 +197,8 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
final List<L2Npc> mobs = new ArrayList<>();
}
private class MoSWorld2 extends InstanceWorld
class MoSWorld2 extends InstanceWorld
{
public MoSWorld2()
{
}
}
public MonasteryOfSilence2()

2
trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java vendored
View File

@ -41,7 +41,7 @@ import quests.Q10327_IntruderWhoWantsTheBookOfGiants.Q10327_IntruderWhoWantsTheB
*/
public final class MuseumDungeon extends AbstractInstance
{
// Npcs
// NPCs
private static final int PANTHEON = 32972;
private static final int TOYRON = 33004;
private static final int DESK = 33126;

76
trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
View File

@ -43,15 +43,6 @@ import instances.AbstractInstance;
*/
public final class NornilsGarden extends AbstractInstance
{
class NornilsWorld extends InstanceWorld
{
L2Npc first_npc = null;
boolean spawned_1 = false;
boolean spawned_2 = false;
boolean spawned_3 = false;
boolean spawned_4 = false;
}
// NPCs
private static final int _garden_guard = 32330;
private static final int[] _final_gates =
@ -165,36 +156,13 @@ public final class NornilsGarden extends AbstractInstance
};
// @formatter:on
private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
class NornilsWorld extends InstanceWorld
{
final int chance = getRandom(100);
for (int[] element : drop)
{
if (chance < element[2])
{
mob.dropItem(player, element[0], element[1]);
}
}
}
private static final void giveBuffs(L2Character ch)
{
if (skill1 != null)
{
skill1.applyEffects(ch, ch);
}
if (skill2 != null)
{
skill2.applyEffects(ch, ch);
}
if (skill3 != null)
{
skill3.applyEffects(ch, ch);
}
if (skill4 != null)
{
skill4.applyEffects(ch, ch);
}
L2Npc first_npc = null;
boolean spawned_1 = false;
boolean spawned_2 = false;
boolean spawned_3 = false;
boolean spawned_4 = false;
}
public NornilsGarden()
@ -460,6 +428,38 @@ public final class NornilsGarden extends AbstractInstance
return "ok";
}
private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
{
final int chance = getRandom(100);
for (int[] element : drop)
{
if (chance < element[2])
{
mob.dropItem(player, element[0], element[1]);
}
}
}
private static final void giveBuffs(L2Character ch)
{
if (skill1 != null)
{
skill1.applyEffects(ch, ch);
}
if (skill2 != null)
{
skill2.applyEffects(ch, ch);
}
if (skill3 != null)
{
skill3.applyEffects(ch, ch);
}
if (skill4 != null)
{
skill4.applyEffects(ch, ch);
}
}
@Override
public String onEnterZone(L2Character character, L2ZoneType zone)
{

12
trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java vendored
View File

@ -41,12 +41,6 @@ import quests.Q00129_PailakaDevilsLegacy.Q00129_PailakaDevilsLegacy;
*/
public final class PailakaDevilsLegacy extends AbstractInstance
{
class DIWorld extends InstanceWorld
{
L2Attackable _lematanNpc = null;
final List<L2Attackable> _followerslist = new CopyOnWriteArrayList<>();
}
// NPCs
private static final int LEMATAN = 18633; // Lematan
private static final int SURVIVOR = 32498; // Devil's Isle Survivor
@ -89,6 +83,12 @@ public final class PailakaDevilsLegacy extends AbstractInstance
private static final int TIGRESS_LVL1 = 14916;
private static final int TIGRESS_LVL2 = 14917;
class DIWorld extends InstanceWorld
{
L2Attackable _lematanNpc = null;
final List<L2Attackable> _followerslist = new CopyOnWriteArrayList<>();
}
public PailakaDevilsLegacy()
{
super(PailakaDevilsLegacy.class.getSimpleName());

8
trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java vendored
View File

@ -34,10 +34,6 @@ import instances.AbstractInstance;
*/
public final class PailakaSongOfIceAndFire extends AbstractInstance
{
class PSoIWorld extends InstanceWorld
{
}
// NPCs
private static final int ADLER1 = 32497;
private static final int GARGOS = 18607;
@ -55,6 +51,10 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance
private static final int TEMPLATE_ID = 43;
private static final int ZONE = 20108;
class PSoIWorld extends InstanceWorld
{
}
public PailakaSongOfIceAndFire()
{
super(PailakaSongOfIceAndFire.class.getSimpleName());

22
trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java vendored
View File

@ -43,17 +43,6 @@ import quests.Q00195_SevenSignsSecretRitualOfThePriests.Q00195_SevenSignsSecretR
*/
public final class SanctumOftheLordsOfDawn extends AbstractInstance
{
static final class HSWorld extends InstanceWorld
{
int doorst = 0;
final static Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
static Map<Integer, List<L2Npc>> getMonsters()
{
return _save_point;
}
}
// NPCs
private static final int GUARDS_OF_THE_DAWN = 18834;
private static final int GUARDS_OF_THE_DAWN_2 = 18835;
@ -83,6 +72,17 @@ public final class SanctumOftheLordsOfDawn extends AbstractInstance
new Location(-79939, 205857, -7888),
};
static final class HSWorld extends InstanceWorld
{
int doorst = 0;
final static Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
static Map<Integer, List<L2Npc>> getMonsters()
{
return _save_point;
}
}
public SanctumOftheLordsOfDawn()
{
super(SanctumOftheLordsOfDawn.class.getSimpleName());