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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/dist/game/data/scripts/hellbound/AI/Chimeras.java vendored
View File

@@ -18,6 +18,7 @@
*/
package hellbound.AI;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import hellbound.HellboundEngine;
/**
* Chimeras AI.
* @author DS

3
trunk/dist/game/data/scripts/hellbound/AI/HellboundCore.java vendored
View File

@@ -18,6 +18,7 @@
*/
package hellbound.AI;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import hellbound.HellboundEngine;
/**
* Manages Naia's cast on the Hellbound Core
* @author GKR

3
trunk/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java vendored
View File

@@ -18,13 +18,12 @@
*/
package hellbound.AI.NPC.Bernarde;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Bernarde AI.
* @author DS

3
trunk/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java vendored
View File

@@ -18,13 +18,12 @@
*/
package hellbound.AI.NPC.Buron;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Buron AI.
* @author DS

5
trunk/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java vendored
View File

@@ -18,14 +18,13 @@
*/
package hellbound.AI.NPC.Hude;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.MultisellData;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Hude AI.
* @author DS

3
trunk/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java vendored
View File

@@ -18,13 +18,12 @@
*/
package hellbound.AI.NPC.Jude;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Jude AI.
* @author DS

3
trunk/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java vendored
View File

@@ -18,13 +18,12 @@
*/
package hellbound.AI.NPC.Kief;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Kief AI.
* @author DS

9
trunk/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java vendored
View File

@@ -18,17 +18,16 @@
*/
package hellbound.AI.NPC.Natives;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import hellbound.HellboundEngine;
/**
* Natives AI.
* @author DS, GKR
@@ -116,7 +115,7 @@ public final class Natives extends AbstractNpcAI
for (int doorId : DOORS)
{
L2DoorInstance door = DoorTable.getInstance().getDoor(doorId);
L2DoorInstance door = DoorData.getInstance().getDoor(doorId);
if (door != null)
{
door.openMe();
@@ -139,7 +138,7 @@ public final class Natives extends AbstractNpcAI
{
for (int doorId : DOORS)
{
L2DoorInstance door = DoorTable.getInstance().getDoor(doorId);
L2DoorInstance door = DoorData.getInstance().getDoor(doorId);
if (door != null)
{
door.closeMe();

3
trunk/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java vendored
View File

@@ -18,6 +18,7 @@
*/
package hellbound.AI.NPC.Quarry;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -33,8 +34,6 @@ import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import hellbound.HellboundEngine;
/**
* Quarry AI.
* @author DS, GKR

3
trunk/dist/game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java vendored
View File

@@ -18,13 +18,12 @@
*/
package hellbound.AI.NPC.Solomon;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Solomon AI.
* @author DS

2
trunk/dist/game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java vendored
View File

@@ -116,4 +116,4 @@ public final class Warpgate extends AbstractNpcAI
return true;
}
}
}

7
trunk/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java vendored
View File

@@ -18,15 +18,14 @@
*/
package hellbound.AI;
import hellbound.HellboundEngine;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import hellbound.HellboundEngine;
/**
* Outpost Captain's AI.
* @author DS
@@ -78,7 +77,7 @@ public final class OutpostCaptain extends AbstractNpcAI
if (npc.getId() == CAPTAIN)
{
final L2DoorInstance door = DoorTable.getInstance().getDoor(20250001);
final L2DoorInstance door = DoorData.getInstance().getDoor(20250001);
if (door != null)
{
door.closeMe();

2
trunk/dist/game/data/scripts/hellbound/AI/Slaves.java vendored
View File

@@ -94,4 +94,4 @@ public final class Slaves extends AbstractNpcAI
}
return super.onKill(npc, killer, isSummon);
}
}
}

4
trunk/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java vendored
View File

@@ -18,6 +18,8 @@
*/
package hellbound.AI.Zones.AnomicFoundry;
import hellbound.HellboundEngine;
import java.util.Map;
import javolution.util.FastMap;
@@ -35,8 +37,6 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import hellbound.HellboundEngine;
/**
* Anomic Foundry.
* @author GKR

8
trunk/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java vendored
View File

@@ -23,7 +23,7 @@ import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -69,7 +69,7 @@ public final class BaseTower extends AbstractNpcAI
{
if (event.equalsIgnoreCase("CLOSE"))
{
DoorTable.getInstance().getDoor(20260004).closeMe();
DoorData.getInstance().getDoor(20260004).closeMe();
}
return super.onAdvEvent(event, npc, player);
}
@@ -95,8 +95,8 @@ public final class BaseTower extends AbstractNpcAI
{
// Should Kendal be despawned before Guzen's spawn? Or it will be crowd of Kendal's
addSpawn(KENDAL, npc.getSpawn().getLocation(), false, npc.getSpawn().getRespawnDelay(), false);
DoorTable.getInstance().getDoor(20260003).openMe();
DoorTable.getInstance().getDoor(20260004).openMe();
DoorData.getInstance().getDoor(20260003).openMe();
DoorData.getInstance().getDoor(20260004).openMe();
startQuestTimer("CLOSE", 60000, npc, null, false);
break;
}

4
trunk/dist/game/data/scripts/hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java vendored
View File

@@ -18,6 +18,8 @@
*/
package hellbound.AI.Zones.TowerOfInfinitum;
import hellbound.HellboundEngine;
import java.util.HashMap;
import java.util.Map;
@@ -29,8 +31,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.util.Util;
import hellbound.HellboundEngine;
/**
* Tower Of Infinitum.
* @author GKR

14
trunk/dist/game/data/scripts/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java vendored
View File

@@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -657,7 +657,7 @@ public final class TowerOfNaia extends AbstractNpcAI
if (spawned.isEmpty() && DOORS.containsKey(managerId))
{
int[] doorList = DOORS.get(managerId);
DoorTable.getInstance().getDoor(doorList[1]).openMe();
DoorData.getInstance().getDoor(doorList[1]).openMe();
_spawns.remove(managerId);
}
}
@@ -666,7 +666,7 @@ public final class TowerOfNaia extends AbstractNpcAI
{
_challengeState = STATE_SPORE_CHALLENGE_IN_PROGRESS;
markElpyRespawn();
DoorTable.getInstance().getDoor(18250025).closeMe();
DoorData.getInstance().getDoor(18250025).closeMe();
ZoneManager.getInstance().getZoneById(200100).setEnabled(true);
for (int i = 0; i < 10; i++)
@@ -762,7 +762,7 @@ public final class TowerOfNaia extends AbstractNpcAI
if (npcId == MUTATED_ELPY)
{
DoorTable.getInstance().getDoor(18250025).openMe();
DoorData.getInstance().getDoor(18250025).openMe();
ZoneManager.getInstance().getZoneById(200100).setEnabled(false);
ZoneManager.getInstance().getZoneById(200101).setEnabled(true);
ZoneManager.getInstance().getZoneById(200101).setEnabled(false);
@@ -808,8 +808,8 @@ public final class TowerOfNaia extends AbstractNpcAI
if (DOORS.containsKey(managerId))
{
int[] doorList = DOORS.get(managerId);
DoorTable.getInstance().getDoor(doorList[0]).openMe();
DoorTable.getInstance().getDoor(doorList[1]).closeMe();
DoorData.getInstance().getDoor(doorList[0]).openMe();
DoorData.getInstance().getDoor(doorList[1]).closeMe();
}
if (_spawns.containsKey(managerId) && (_spawns.get(managerId) != null))
@@ -896,7 +896,7 @@ public final class TowerOfNaia extends AbstractNpcAI
if (DOORS.containsKey(managerId))
{
int[] doorList = DOORS.get(managerId);
DoorTable.getInstance().getDoor(doorList[0]).closeMe();
DoorData.getInstance().getDoor(doorList[0]).closeMe();
}
if (SPAWNS.containsKey(managerId))

20
trunk/dist/game/data/scripts/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java vendored
View File

@@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager.StatusEnum;
@@ -740,7 +740,7 @@ public final class TullyWorkshop extends AbstractNpcAI
final int[] doors = TULLY_DOORLIST.get(npcId);
for (int doorId : doors)
{
DoorTable.getInstance().getDoor(doorId).closeMe();
DoorData.getInstance().getDoor(doorId).closeMe();
}
}
@@ -837,7 +837,7 @@ public final class TullyWorkshop extends AbstractNpcAI
final int[] doors = TULLY_DOORLIST.get(npcId);
for (int doorId : doors)
{
DoorTable.getInstance().getDoor(doorId).openMe();
DoorData.getInstance().getDoor(doorId).openMe();
}
startQuestTimer("close", 120000, npc, null);
@@ -1205,8 +1205,8 @@ public final class TullyWorkshop extends AbstractNpcAI
postMortemSpawn.add(spawnedNpc);
}
DoorTable.getInstance().getDoor(19260051).openMe();
DoorTable.getInstance().getDoor(19260052).openMe();
DoorData.getInstance().getDoor(19260051).openMe();
DoorData.getInstance().getDoor(19260052).openMe();
countdownTime = 600000;
_countdown = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() ->
@@ -1570,8 +1570,8 @@ public final class TullyWorkshop extends AbstractNpcAI
private void handleDoorsOnDeath()
{
DoorTable.getInstance().getDoor(20250005).openMe();
DoorTable.getInstance().getDoor(20250004).openMe();
DoorData.getInstance().getDoor(20250005).openMe();
DoorData.getInstance().getDoor(20250004).openMe();
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
{
20250006,
@@ -1594,8 +1594,8 @@ public final class TullyWorkshop extends AbstractNpcAI
private void handleDoorsOnRespawn()
{
DoorTable.getInstance().getDoor(20250009).closeMe();
DoorTable.getInstance().getDoor(20250008).closeMe();
DoorData.getInstance().getDoor(20250009).closeMe();
DoorData.getInstance().getDoor(20250008).closeMe();
ThreadPoolManager.getInstance().scheduleGeneral(new DoorTask(new int[]
{
20250777,
@@ -1627,7 +1627,7 @@ public final class TullyWorkshop extends AbstractNpcAI
L2DoorInstance door;
for (int doorId : _doorIds)
{
door = DoorTable.getInstance().getDoor(doorId);
door = DoorData.getInstance().getDoor(doorId);
if (door != null)
{
switch (_state)

4
trunk/dist/game/data/scripts/hellbound/HellboundEngine.java vendored
View File

@@ -21,7 +21,7 @@ package hellbound;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.DoorTable;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -268,7 +268,7 @@ public final class HellboundEngine extends AbstractNpcAI
{
try
{
L2DoorInstance door = DoorTable.getInstance().getDoor(doorData[0]);
L2DoorInstance door = DoorData.getInstance().getDoor(doorData[0]);
if (door.getOpen())
{
if (newLevel < doorData[1])

4
trunk/dist/game/data/scripts/hellbound/HellboundPointData.java vendored
View File

@@ -25,13 +25,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.data.xml.IXmlReader;
/**
* Point data parser.
* @author Zoey76
*/
public final class HellboundPointData implements DocumentParser
public final class HellboundPointData implements IXmlReader
{
private final Map<Integer, int[]> _pointsInfo = new HashMap<>();

6
trunk/dist/game/data/scripts/hellbound/HellboundSpawns.java vendored
View File

@@ -27,9 +27,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.engines.DocumentParser;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
* Hellbound Spawns parser.
* @author Zoey76
*/
public final class HellboundSpawns implements DocumentParser
public final class HellboundSpawns implements IXmlReader
{
private final List<L2Spawn> _spawns = new ArrayList<>();
private final Map<Integer, int[]> _spawnLevels = new HashMap<>();

4
trunk/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java vendored
View File

@@ -18,6 +18,8 @@
*/
package hellbound.Instances.UrbanArea;
import hellbound.HellboundEngine;
import java.util.concurrent.ScheduledFuture;
import ai.npc.AbstractNpcAI;
@@ -41,8 +43,6 @@ import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
import hellbound.HellboundEngine;
/**
* Urban Area instance zone.
* @author GKR