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

6
trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java vendored
View File

@@ -19,9 +19,9 @@
package ai.fantasy_isle;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -166,8 +166,8 @@ public class MC_Show extends AbstractNpcAI
}
}
private static Map<String, ShoutInfo> talks = new FastMap<>();
private static Map<String, WalkInfo> walks = new FastMap<>();
private static Map<String, ShoutInfo> talks = new HashMap<>();
private static Map<String, WalkInfo> walks = new HashMap<>();
private MC_Show()
{

25
trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java vendored
View File

@@ -19,10 +19,9 @@
package ai.fantasy_isle;
import java.text.SimpleDateFormat;
import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GameTimeController;
@@ -118,16 +117,15 @@ public class Parade extends AbstractNpcAI
private final int[][] START5 = {{-57233, -53554, -2015, 57344},{-57290, -53610, -2015, 57344},{-57346, -53667, -2015, 57344}};
private final int[][] GOAL5 = {{-55338, -55435, -2015, 57344},{-55395, -55491, -2015, 57344},{-55451, -55547, -2015, 57344}};
protected final int[][][] START = {START1, START2, START3, START4, START5};
protected final int[][][] GOAL = {GOAL1, GOAL2, GOAL3, GOAL4, GOAL5};
final int[][][] START = {START1, START2, START3, START4, START5};
final int[][][] GOAL = {GOAL1, GOAL2, GOAL3, GOAL4, GOAL5};
// @formatter:on
protected ScheduledFuture<?> spawnTask;
protected ScheduledFuture<?> deleteTask;
protected ScheduledFuture<?> cleanTask;
protected int npcIndex;
protected FastList<L2Npc> spawns;
int npcIndex;
CopyOnWriteArrayList<L2Npc> spawns;
ScheduledFuture<?> spawnTask;
ScheduledFuture<?> deleteTask;
ScheduledFuture<?> cleanTask;
public Parade()
{
@@ -148,7 +146,7 @@ public class Parade extends AbstractNpcAI
protected void load()
{
npcIndex = 0;
spawns = new FastList<L2Npc>().shared();
spawns = new CopyOnWriteArrayList<>();
}
protected void clean()
@@ -220,15 +218,14 @@ public class Parade extends AbstractNpcAI
{
if (spawns.size() > 0)
{
for (Iterator<L2Npc> it = spawns.iterator(); it.hasNext();)
for (L2Npc actor : spawns)
{
L2Npc actor = it.next();
if (actor != null)
{
if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100))
{
actor.deleteMe();
it.remove();
spawns.remove(actor);
}
else if (!actor.isMoving())
{

8
trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java vendored
View File

@@ -19,10 +19,10 @@
package ai.group_template;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javolution.util.FastMap;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
import ai.npc.AbstractNpcAI;
@@ -104,8 +104,8 @@ public final class BeastFarm extends AbstractNpcAI
18900
};
private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
private static Map<Integer, Integer> _FeedInfo = new HashMap<>();
private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new HashMap<>();
private static List<TamedBeast> TAMED_BEAST_DATA = new ArrayList<>();
private BeastFarm()
@@ -395,7 +395,7 @@ public final class BeastFarm extends AbstractNpcAI
private final int _chance;
private final int _growthLevel;
private final int _tameNpcId;
private final Map<Integer, Integer> _skillSuccessNpcIdList = new FastMap<>();
private final Map<Integer, Integer> _skillSuccessNpcIdList = new HashMap<>();
public GrowthCapableMob(int chance, int growthLevel, int tameNpcId)
{

10
trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.group_template;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
import quests.Q00655_AGrandPlanForTamingWildBeasts.Q00655_AGrandPlanForTamingWildBeasts;
import ai.npc.AbstractNpcAI;
@@ -76,7 +76,7 @@ public final class FeedableBeasts extends AbstractNpcAI
};
// @formatter:on
private static final Map<Integer, Integer> MAD_COW_POLYMORPH = new FastMap<>();
private static final Map<Integer, Integer> MAD_COW_POLYMORPH = new HashMap<>();
static
{
MAD_COW_POLYMORPH.put(21824, 21468);
@@ -129,8 +129,8 @@ public final class FeedableBeasts extends AbstractNpcAI
NpcStringId.ANIMALS_NEED_LOVE_TOO
};
private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
private static Map<Integer, Integer> _FeedInfo = new HashMap<>();
private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new HashMap<>();
// all mobs that grow by eating
private static class GrowthCapableMob
@@ -138,7 +138,7 @@ public final class FeedableBeasts extends AbstractNpcAI
private final int _growthLevel;
private final int _chance;
private final Map<Integer, int[][]> _spiceToMob = new FastMap<>();
private final Map<Integer, int[][]> _spiceToMob = new HashMap<>();
public GrowthCapableMob(int growthLevel, int chance)
{

4
trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.group_template;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
*/
public final class PolymorphingAngel extends AbstractNpcAI
{
private static final Map<Integer, Integer> ANGELSPAWNS = new FastMap<>();
private static final Map<Integer, Integer> ANGELSPAWNS = new HashMap<>();
static
{
ANGELSPAWNS.put(20830, 20859);

4
trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.group_template;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
*/
public final class RandomSpawn extends AbstractNpcAI
{
private static Map<Integer, Location[]> SPAWN_POINTS = new FastMap<>();
private static Map<Integer, Location[]> SPAWN_POINTS = new HashMap<>();
static
{
// Keltas

4
trunk/dist/game/data/scripts/ai/individual/Core.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.individual;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -56,7 +56,7 @@ public final class Core extends AbstractNpcAI
private static boolean _FirstAttacked;
private final List<L2Attackable> Minions = new FastList<>();
private final List<L2Attackable> Minions = new ArrayList<>();
private Core()
{

6
trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java vendored
View File

@@ -18,11 +18,11 @@
*/
package ai.individual;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javolution.util.FastSet;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -43,8 +43,8 @@ public final class DarkWaterDragon extends AbstractNpcAI
private static final int FAFURION = 18482;
private static final int DETRACTOR1 = 22270;
private static final int DETRACTOR2 = 22271;
private static Set<Integer> SECOND_SPAWN = new FastSet<>(); // Used to track if second Shades were already spawned
private static Set<Integer> MY_TRACKING_SET = new FastSet<>(); // Used to track instances of npcs
private static Set<Integer> SECOND_SPAWN = new HashSet<>(); // Used to track if second Shades were already spawned
private static Set<Integer> MY_TRACKING_SET = new HashSet<>(); // Used to track instances of npcs
private static Map<Integer, L2PcInstance> ID_MAP = new ConcurrentHashMap<>(); // Used to track instances of npcs
private DarkWaterDragon()

4
trunk/dist/game/data/scripts/ai/individual/Orfen.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.individual;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -72,7 +72,7 @@ public final class Orfen extends AbstractNpcAI
private static final int RIBA_IREN = 29018;
private static boolean _IsTeleported;
private static List<L2Attackable> _Minions = new FastList<>();
private static List<L2Attackable> _Minions = new ArrayList<>();
private static L2BossZone ZONE;
private static final byte ALIVE = 0;

4
trunk/dist/game/data/scripts/ai/individual/QueenAnt.java vendored
View File

@@ -18,10 +18,10 @@
*/
package ai.individual;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.Config;
@@ -83,7 +83,7 @@ public final class QueenAnt extends AbstractNpcAI
L2MonsterInstance _queen = null;
private L2MonsterInstance _larva = null;
private final List<L2MonsterInstance> _nurses = new FastList<>(5);
private final List<L2MonsterInstance> _nurses = new ArrayList<>(5);
ScheduledFuture<?> _task = null;
private QueenAnt()

4
trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java vendored
View File

@@ -22,9 +22,9 @@ import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
import java.util.ArrayList;
import java.util.Collection;
import javolution.util.FastList;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GeoData;
@@ -217,7 +217,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
private L2Character getRandomTarget(L2Npc npc)
{
Collection<L2Object> objs = npc.getKnownList().getKnownObjects().values();
FastList<L2Character> result = new FastList<>();
ArrayList<L2Character> result = new ArrayList<>();
{
for (L2Object obj : objs)
{

4
trunk/dist/game/data/scripts/ai/individual/SinWardens.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.individual;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.enums.ChatType;
@@ -54,7 +54,7 @@ public final class SinWardens extends AbstractNpcAI
22438
};
private final Map<Integer, Integer> killedMinionsCount = new FastMap<>();
private final Map<Integer, Integer> killedMinionsCount = new HashMap<>();
private SinWardens()
{

5
trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java vendored
View File

@@ -20,10 +20,9 @@ package ai.npc.ForgeOfTheGods;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import javolution.util.FastList;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -192,7 +191,7 @@ public class TarBeetleSpawn implements IXmlReader
private final class SpawnZone
{
private final List<Zone> _zones = new ArrayList<>();
private final List<L2Npc> _spawn = new FastList<>();
private final List<L2Npc> _spawn = new CopyOnWriteArrayList<>();
private final int _maxNpcCount;
private final int _index;

4
trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java vendored
View File

@@ -18,9 +18,9 @@
*/
package ai.npc.Teleports.NewbieTravelToken;
import java.util.HashMap;
import java.util.Map;
import javolution.util.FastMap;
import ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
@@ -39,7 +39,7 @@ public final class NewbieTravelToken extends AbstractNpcAI
// Item
private static final int NEWBIE_TRAVEL_TOKEN = 8542;
// NPC Id - Teleport Location
private static final Map<Integer, Location> DATA = new FastMap<>();
private static final Map<Integer, Location> DATA = new HashMap<>();
private NewbieTravelToken()
{