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

-Dropped Javolution.

Browse Source 
-Removal of Q00344_1000YearsTheEndOfLamentation.
-Fixed starting conditions for Q00144_PailakaInjuredDragon.
-Fixed starting conditions for last Seven Sign quests.
-Added missing MonasteryOfSilence.xml instance spawns and doors.
-Removed many catacomb spawns.
This commit is contained in:
mobius
2015-02-08 21:01:32 +00:00
parent 141cdc5efa
commit 012eb3ed65
201 changed files with 817 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,12 +20,11 @@ package instances.CrystalCaverns;
import instances.AbstractInstance;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javolution.util.FastList;
import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -84,15 +83,15 @@ public final class CrystalCaverns extends AbstractInstance
private class CCWorld extends InstanceWorld
{
public Map<L2Npc, Boolean> npcList1 = new FastMap<>();
public Map<L2Npc, Boolean> npcList1 = new HashMap<>();
public L2Npc tears;
public boolean isUsedInvulSkill = false;
public long dragonScaleStart = 0;
public int dragonScaleNeed = 0;
public int cleanedRooms = 0;
public long endTime = 0;
public List<L2Npc> copys = new FastList<>();
public Map<L2Npc, CrystalGolem> crystalGolems = new FastMap<>();
public List<L2Npc> copys = new ArrayList<>();
public Map<L2Npc, CrystalGolem> crystalGolems = new HashMap<>();
public int correctGolems = 0;
public boolean[] OracleTriggered =
{
@@ -108,18 +107,18 @@ public final class CrystalCaverns extends AbstractInstance
0,
0
}; // 0: not spawned, 1: spawned, 2: cleared
public Map<L2DoorInstance, L2PcInstance> openedDoors = new FastMap<>();
public Map<Integer, Map<L2Npc, Boolean>> npcList2 = new FastMap<>();
public Map<L2Npc, L2Npc> oracles = new FastMap<>();
public List<L2Npc> keyKeepers = new FastList<>();
public List<L2Npc> guards = new FastList<>();
public List<L2Npc> oracle = new FastList<>();
public Map<L2DoorInstance, L2PcInstance> openedDoors = new HashMap<>();
public Map<Integer, Map<L2Npc, Boolean>> npcList2 = new HashMap<>();
public Map<L2Npc, L2Npc> oracles = new HashMap<>();
public List<L2Npc> keyKeepers = new ArrayList<>();
public List<L2Npc> guards = new ArrayList<>();
public List<L2Npc> oracle = new ArrayList<>();
// baylor variables
protected final List<L2PcInstance> _raiders = new FastList<>();
protected final List<L2PcInstance> _raiders = new ArrayList<>();
protected int _raidStatus = 0;
protected long _dragonClawStart = 0;
protected int _dragonClawNeed = 0;
protected final List<L2Npc> _animationMobs = new FastList<>();
protected final List<L2Npc> _animationMobs = new ArrayList<>();
protected L2Npc _camera = null;
protected L2Npc _baylor = null;
protected L2Npc _alarm = null;
@@ -800,7 +799,7 @@ public final class CrystalCaverns extends AbstractInstance
{
world.setStatus(3);
Map<L2Npc, Boolean> spawnList = new FastMap<>();
Map<L2Npc, Boolean> spawnList = new HashMap<>();
for (int[] spawn : EMERALD_SPAWNS)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId());
@@ -811,7 +810,7 @@ public final class CrystalCaverns extends AbstractInstance
protected void runEmeraldRooms(CCWorld world, int[][] spawnList, int room)
{
Map<L2Npc, Boolean> spawned = new FastMap<>();
Map<L2Npc, Boolean> spawned = new HashMap<>();
for (int[] spawn : spawnList)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId());
@@ -839,7 +838,7 @@ public final class CrystalCaverns extends AbstractInstance
{
world.setStatus(status);
Map<L2Npc, Boolean> spawned = new FastMap<>();
Map<L2Npc, Boolean> spawned = new HashMap<>();
for (int[] spawn : spawnList)
{
L2Npc mob = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false, world.getInstanceId());
@@ -1380,7 +1379,7 @@ public final class CrystalCaverns extends AbstractInstance
return "";
}
CrystalGolem cryGolem = world.crystalGolems.get(npc);
List<L2Object> crystals = new FastList<>();
List<L2Object> crystals = new ArrayList<>();
for (L2Object object : L2World.getInstance().getVisibleObjects(npc, 300))
{
if ((object instanceof L2ItemInstance) && (object.getId() == CRYSTALFOOD))