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))

9
trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java vendored
View File

@@ -19,8 +19,9 @@
package instances.DarkCloudMansion;
import instances.AbstractInstance;
import javolution.util.FastList;
import javolution.util.FastMap;
import java.util.ArrayList;
import java.util.HashMap;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
@@ -45,7 +46,7 @@ public final class DarkCloudMansion extends AbstractInstance
{
protected class DMCWorld extends InstanceWorld
{
protected FastMap<String, DMCRoom> rooms = new FastMap<>();
protected HashMap<String, DMCRoom> rooms = new HashMap<>();
}
// NPCs
@@ -229,7 +230,7 @@ public final class DarkCloudMansion extends AbstractInstance
protected static class DMCRoom
{
public FastList<DMCNpc> npcList = new FastList<>();
public ArrayList<DMCNpc> npcList = new ArrayList<>();
public int counter = 0;
public int reset = 0;
public int founded = 0;

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

@@ -20,10 +20,10 @@ package instances.DisciplesNecropolisPast;
import instances.AbstractInstance;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastList;
import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmperor;
import com.l2jserver.gameserver.enums.ChatType;
@@ -47,8 +47,8 @@ public final class DisciplesNecropolisPast extends AbstractInstance
{
protected class DNPWorld extends InstanceWorld
{
protected final FastList<L2Npc> anakimGroup = new FastList<>();
protected final FastList<L2Npc> lilithGroup = new FastList<>();
protected final ArrayList<L2Npc> anakimGroup = new ArrayList<>();
protected final ArrayList<L2Npc> lilithGroup = new ArrayList<>();
protected int countKill = 0;
}
@@ -180,7 +180,7 @@ public final class DisciplesNecropolisPast extends AbstractInstance
teleportPlayer(player, ENTER, world.getInstanceId());
}
private void makeCast(L2Npc npc, FastList<L2Npc> targets)
private void makeCast(L2Npc npc, ArrayList<L2Npc> targets)
{
npc.setTarget(targets.get(getRandom(targets.size())));
if (SKILLS.containsKey(npc.getId()))

21
trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java vendored
View File

@@ -21,9 +21,11 @@ package instances.FinalEmperialTomb;
import instances.AbstractInstance;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -31,9 +33,6 @@ import java.util.logging.Level;
import javax.xml.parsers.DocumentBuilderFactory;
import javolution.util.FastList;
import javolution.util.FastMap;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -86,7 +85,7 @@ public final class FinalEmperialTomb extends AbstractInstance
private class FETWorld extends InstanceWorld
{
protected Lock lock = new ReentrantLock();
protected FastList<L2Npc> npcList = new FastList<>();
protected CopyOnWriteArrayList<L2Npc> npcList = new CopyOnWriteArrayList<>();
protected int darkChoirPlayerCount = 0;
protected FrintezzaSong OnSong = null;
protected ScheduledFuture<?> songTask = null;
@@ -99,8 +98,8 @@ public final class FinalEmperialTomb extends AbstractInstance
protected L2Npc scarletDummy = null;
protected L2GrandBossInstance frintezza = null;
protected L2GrandBossInstance activeScarlet = null;
protected List<L2MonsterInstance> demons = new FastList<>();
protected Map<L2MonsterInstance, Integer> portraits = new FastMap<>();
protected List<L2MonsterInstance> demons = new ArrayList<>();
protected Map<L2MonsterInstance, Integer> portraits = new HashMap<>();
protected int scarlet_x = 0;
protected int scarlet_y = 0;
protected int scarlet_z = 0;
@@ -109,7 +108,6 @@ public final class FinalEmperialTomb extends AbstractInstance
protected FETWorld()
{
npcList.shared();
}
}
@@ -196,7 +194,7 @@ public final class FinalEmperialTomb extends AbstractInstance
private static final boolean debug = false;
private final Map<Integer, L2Territory> _spawnZoneList = new HashMap<>();
private final Map<Integer, List<FETSpawn>> _spawnList = new HashMap<>();
private final List<Integer> _mustKillMobsId = new FastList<>();
private final List<Integer> _mustKillMobsId = new ArrayList<>();
protected static final int[] FIRST_ROOM_DOORS =
{
17130051,
@@ -303,7 +301,7 @@ public final class FinalEmperialTomb extends AbstractInstance
int flag = Integer.parseInt(attrs.getNamedItem("flag").getNodeValue());
if (!_spawnList.containsKey(flag))
{
_spawnList.put(flag, new FastList<FETSpawn>());
_spawnList.put(flag, new ArrayList<FETSpawn>());
}
for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling())
@@ -850,7 +848,7 @@ public final class FinalEmperialTomb extends AbstractInstance
if ((_world.frintezza != null) && !_world.frintezza.isDead() && (_world.activeScarlet != null) && !_world.activeScarlet.isDead())
{
List<L2Character> targetList = new FastList<>();
List<L2Character> targetList = new ArrayList<>();
if (skill.hasEffectType(L2EffectType.STUN) || skill.isDebuff())
{
for (int objId : _world.getAllowed())
@@ -867,8 +865,7 @@ public final class FinalEmperialTomb extends AbstractInstance
{
targetList.add(pet);
}
player.getServitors().values().forEach(s ->
{
player.getServitors().values().forEach(s -> {
if (!s.isDead())
{
targetList.add(s);

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

@@ -18,10 +18,10 @@
*/
package instances.MonasteryOfSilence2;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javolution.util.FastList;
import javolution.util.FastMap;
import quests.Q10294_SevenSignsToTheMonasteryOfSilence.Q10294_SevenSignsToTheMonasteryOfSilence;
import quests.Q10295_SevenSignsSolinasTomb.Q10295_SevenSignsSolinasTomb;
import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal;
@@ -196,11 +196,11 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
6717
};
private final FastMap<Integer, InstanceHolder> instanceWorlds = new FastMap<>();
private final HashMap<Integer, InstanceHolder> instanceWorlds = new HashMap<>();
public static class InstanceHolder
{
List<L2Npc> mobs = new FastList<>();
List<L2Npc> mobs = new ArrayList<>();
}
private class MoSWorld2 extends InstanceWorld