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

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

@@ -18,9 +18,9 @@
*/
package hellbound.AI;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -46,7 +46,7 @@ public final class DemonPrince extends AbstractNpcAI
new SkillHolder(5376, 6),
};
private static final Map<Integer, Boolean> ATTACK_STATE = new FastMap<>();
private static final Map<Integer, Boolean> ATTACK_STATE = new HashMap<>();
public DemonPrince()
{

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

@@ -19,8 +19,8 @@
package hellbound.AI;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import javolution.util.FastSet;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.enums.ChatType;
@@ -42,7 +42,7 @@ public final class Ranku extends AbstractNpcAI
private static final int MINION = 32305;
private static final int MINION_2 = 25543;
// Misc
private static final Set<Integer> MY_TRACKING_SET = new FastSet<Integer>().shared();
private static final Set<Integer> MY_TRACKING_SET = new CopyOnWriteArraySet<>();
public Ranku()
{

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

@@ -20,9 +20,9 @@ package hellbound.AI.Zones.AnomicFoundry;
import hellbound.HellboundEngine;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -49,7 +49,7 @@ public final class AnomicFoundry extends AbstractNpcAI
private static int LESSER_EVIL = 22398;
private static int GREATER_EVIL = 22399;
// Misc
private final Map<Integer, Integer> _atkIndex = new FastMap<>();
private final Map<Integer, Integer> _atkIndex = new HashMap<>();
// npcId, x, y, z, heading, max count
//@formatter:off
private static int[][] SPAWNS =

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

@@ -18,9 +18,9 @@
*/
package hellbound.AI.Zones.BaseTower;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
@@ -42,7 +42,7 @@ public final class BaseTower extends AbstractNpcAI
// Skills
private static final SkillHolder DEATH_WORD = new SkillHolder(5256, 1);
// Misc
private static final Map<Integer, L2PcInstance> BODY_DESTROYER_TARGET_LIST = new FastMap<>();
private static final Map<Integer, L2PcInstance> BODY_DESTROYER_TARGET_LIST = new HashMap<>();
public BaseTower()
{

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

@@ -18,14 +18,14 @@
*/
package hellbound.AI.Zones.TowerOfNaia;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import javolution.util.FastList;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -157,9 +157,9 @@ public final class TowerOfNaia extends AbstractNpcAI
private int _challengeState;
private int _winIndex;
private final Map<Integer, Boolean> _activeRooms = new FastMap<>();
private final Map<Integer, List<L2Npc>> _spawns = new FastMap<>();
private final FastList<L2Npc> _sporeSpawn = new FastList<L2Npc>().shared();
private final Map<Integer, Boolean> _activeRooms = new HashMap<>();
private final Map<Integer, List<L2Npc>> _spawns = new HashMap<>();
private final CopyOnWriteArrayList<L2Npc> _sporeSpawn = new CopyOnWriteArrayList<>();
static
{
// Format: entrance_door, exit_door
@@ -902,7 +902,7 @@ public final class TowerOfNaia extends AbstractNpcAI
if (SPAWNS.containsKey(managerId))
{
int[][] spawnList = SPAWNS.get(managerId);
List<L2Npc> spawned = new FastList<>();
List<L2Npc> spawned = new ArrayList<>();
for (int[] spawn : spawnList)
{
L2Npc spawnedNpc = addSpawn(spawn[0], spawn[1], spawn[2], spawn[3], spawn[4], false, 0, false);

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

@@ -18,15 +18,15 @@
*/
package hellbound.AI.Zones.TullyWorkshop;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import javolution.util.FastList;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -111,8 +111,8 @@ public final class TullyWorkshop extends AbstractNpcAI
22383
};
private static final Map<Integer, int[]> TULLY_DOORLIST = new FastMap<>();
private static final Map<Integer, Location[]> TELE_COORDS = new FastMap<>();
private static final Map<Integer, int[]> TULLY_DOORLIST = new HashMap<>();
private static final Map<Integer, Location[]> TELE_COORDS = new HashMap<>();
protected int countdownTime;
private int nextServantIdx = 0;
@@ -125,14 +125,14 @@ public final class TullyWorkshop extends AbstractNpcAI
protected ScheduledFuture<?> _countdown = null;
// NPC's, spawned after Tully's death are stored here
protected static List<L2Npc> postMortemSpawn = new FastList<>();
protected static List<L2Npc> postMortemSpawn = new ArrayList<>();
// TODO: Zoey76: Not thread-safe, probably will lead to problems.
protected static Set<Integer> brokenContraptions = new HashSet<>();
protected static Set<Integer> rewardedContraptions = new HashSet<>();
protected static Set<Integer> talkedContraptions = new HashSet<>();
private final List<L2MonsterInstance> spawnedFollowers = new FastList<>();
private final List<L2MonsterInstance> spawnedFollowerMinions = new FastList<>();
private final List<L2MonsterInstance> spawnedFollowers = new ArrayList<>();
private final List<L2MonsterInstance> spawnedFollowerMinions = new ArrayList<>();
private L2Npc spawnedAgent = null;
private L2Spawn pillarSpawn = null;