Changeset 1006

(2010/02/08 23:30) About 2 years ago

- Experimental instance support for Ascension quest. Now every player should get own instance for passing this quest. Later will be added instance support for other zones. Was tested with 2 players only.
- Removed channels from Verteron and Altgard. It's up to PS admin to configure number of channels.

Affected files

trunk/AE-go_GameServer/data/scripts/system/handlers/admincommands/MovePlayerToPlayer.java Download diff

	1005		1006
82	return;	82	return;
83	}	83	}
84		84
85	playerToMove.getController().teleportTo(playerDestination.getWorldId(), playerDestination.getX(), playerDestination.getY(), playerDestination.getZ(), playerDestination.getHeading(), 0);	85	playerToMove.getController().teleportTo(playerDestination.getWorldId(), playerDestination.getInstanceId(), playerDestination.getX(), playerDestination.getY(), playerDestination.getZ(), playerDestination.getHeading(), 0);
86		86
87	PacketSendUtility.sendMessage(admin, "Teleported player " + playerToMove.getName() + " to the location of player " + playerDestination.getName() + ".");	87	PacketSendUtility.sendMessage(admin, "Teleported player " + playerToMove.getName() + " to the location of player " + playerDestination.getName() + ".");
88	PacketSendUtility.sendMessage(playerToMove, "You have been teleported by an administrator.");	88	PacketSendUtility.sendMessage(playerToMove, "You have been teleported by an administrator.");

trunk/AE-go_GameServer/data/scripts/system/handlers/admincommands/MoveToMe.java Download diff

	1005		1006
76	return;	76	return;
77	}	77	}
78		78
79	playerToMove.getController().teleportTo(admin.getWorldId(), admin.getX(), admin.getY(), admin.getZ(), admin.getHeading(), 0);	79	playerToMove.getController().teleportTo(admin.getWorldId(), admin.getInstanceId(), admin.getX(), admin.getY(), admin.getZ(), admin.getHeading(), 0);
80	PacketSendUtility.sendMessage(admin, "Teleported player " + playerToMove.getName() + " to your location.");	80	PacketSendUtility.sendMessage(admin, "Teleported player " + playerToMove.getName() + " to your location.");
81	PacketSendUtility.sendMessage(playerToMove, "You have been teleported by " + admin.getName() + ".");	81	PacketSendUtility.sendMessage(playerToMove, "You have been teleported by " + admin.getName() + ".");
82	}	82	}

trunk/AE-go_GameServer/data/scripts/system/handlers/admincommands/MoveToPlayer.java Download diff

	1005		1006
76	return;	76	return;
77	}	77	}
78		78
79	admin.getController().teleportTo(player.getWorldId(), player.getX(), player.getY(), player.getZ(), player.getHeading(), 0);	79	admin.getController().teleportTo(player.getWorldId(), player.getInstanceId(), player.getX(), player.getY(), player.getZ(), player.getHeading(), 0);
80	PacketSendUtility.sendMessage(admin, "Teleported to player " + player.getName() + ".");	80	PacketSendUtility.sendMessage(admin, "Teleported to player " + player.getName() + ".");
81	}	81	}
82	}	82	}

trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_1006Ascension.java Download diff

 package quest.ascension;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import com.aionemu.gameserver.ai.events.Event;
 import com.aionemu.gameserver.configs.Config;
 public class _1006Ascension extends QuestHandler
 {
 	private final static int	questId			= 1006;
-	private int					activePlayerId	= 0;
+	//TODO [ATracer] - do we really need activePlayer ids in script body ???
-	private List<Npc>			mobs			= new ArrayList<Npc>();
+	private Map<Integer, Integer> activePlayers = new HashMap<Integer, Integer>();
+	private Map<Integer, List<Npc>> mobs = new HashMap<Integer, List<Npc>>();
 	public _1006Ascension()
 	{
 	public boolean onKillEvent(QuestEnv env)
 	{
 		Player player = env.getPlayer();
+		int instanceId = player.getInstanceId();
 		QuestState qs = player.getQuestStateList().getQuestState(questId);
 		if(qs == null || qs.getStatus() != QuestStatus.START)
 			return false;
 			{
 				qs.getQuestVars().setQuestVar(qs.getQuestVars().getQuestVars() + 1);
 				updateQuestStatus(player, qs);
-				if(mobs.contains(env.getVisibleObject()))
+				removeMobToInstance(instanceId, (Npc) env.getVisibleObject());
-					mobs.remove(env.getVisibleObject());
 				return true;
 			}
 			else if(var == 54)
 			{
 				qs.getQuestVars().setQuestVar(4);
 				updateQuestStatus(player, qs);
-				Monster mob = (Monster) QuestEngine.getInstance().addNewSpawn(310010000, 211043, (float) 226.7,
+				Monster mob = (Monster) QuestEngine.getInstance().addNewSpawn(310010000, instanceId, 211043, (float) 226.7,
 					(float) 251.5, (float) 205.5, (byte) 0, false);
 				//TODO: Tempt decrease P attack.
 				mob.getGameStats().setStat(StatEnum.MAIN_HAND_POWER, mob.getGameStats().getCurrentStat(StatEnum.MAIN_HAND_POWER)/3 );
 				mob.getAggroList().addDamageHate(player, 1000, 0);
 				mob.getAi().handleEvent(Event.ATTACKED);
-				mobs.add(mob);
+				addMobToInstance(instanceId, mob);
 				return true;
 			}
 		}
 	public boolean onDialogEvent(QuestEnv env)
 	{
 		final Player player = env.getPlayer();
+		final int instanceId = player.getInstanceId();
 		final QuestState qs = player.getQuestStateList().getQuestState(questId);
 		if(qs == null)
 			return false;
 							updateQuestStatus(player, qs);
 							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
 								.getObjectId(), 0));
-							player.getController().teleportTo(310010000, 52, 174, 229, 0);
+							int newInstanceId = player.getPosition().getWorld().getNextAvailableInstanceId(310010000);
+							player.getController().teleportTo(310010000, newInstanceId, 52, 174, 229, 0);
 							return true;
 						}
 					case 10003:
 					case 25:
 						if(var == 99)
 						{
-							if(activePlayerId != 0 && activePlayerId != player.getObjectId())
+							if(activePlayers.get(instanceId) != null && activePlayers.get(instanceId) != player.getObjectId())
 							{
 								World world = player.getActiveRegion().getWorld();
-								Player activePlayer = world.findPlayer(activePlayerId);
+								Player activePlayer = world.findPlayer(activePlayers.get(instanceId));
 								if(!(activePlayer == null || !activePlayer.isOnline() || activePlayer.getWorldId() != 310010000))
 									return false;
 							}
-							activePlayerId = player.getObjectId();
+							activePlayers.put(instanceId, player.getObjectId());
-							for(Npc mob : mobs)
+							clearMobsInInstance(instanceId);
-							{
-								mob.getController().onDelete();
-							}
-							mobs.clear();
 							PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 1001, 0));
 							qs.getQuestVars().setQuestVar(50);
 							updateQuestStatus(player, qs);
 								{
 									qs.getQuestVars().setQuestVar(51);
 									updateQuestStatus(player, qs);
-									mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(310010000, 211042,
+									addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(310010000, instanceId, 211042,
 										(float) 224.073, (float) 239.1, (float) 206.7, (byte) 0, false));
-									mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(310010000, 211042,
+									addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(310010000, instanceId, 211042,
 										(float) 233.5, (float) 241.04, (float) 206.365, (byte) 0, false));
-									mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(310010000, 211042,
+									addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(310010000, instanceId, 211042,
 										(float) 229.6, (float) 265.7, (float) 205.7, (byte) 0, false));
-									mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(310010000, 211042,
+									addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(310010000, instanceId, 211042,
 										(float) 222.8, (float) 262.5, (float) 205.7, (byte) 0, false));
-									for(Npc mob : mobs)
+									List<Npc> monsters = mobs.get(instanceId);
+									for(Npc mob : monsters)
 									{
 										//TODO: Tempt decrease P attack.
 										mob.getGameStats().setStat(StatEnum.MAIN_HAND_POWER, mob.getGameStats().getCurrentStat(StatEnum.MAIN_HAND_POWER)/3 );
 	public boolean onLvlUpEvent(QuestEnv env)
 	{
 		Player player = env.getPlayer();
+		int instanceId = player.getInstanceId();
 		QuestState qs = player.getQuestStateList().getQuestState(questId);
 		if(qs != null)
 		{
 			int var = qs.getQuestVars().getQuestVars();
 			if(var == 4 || (var >= 50 && var <= 55))
 			{
-				if(activePlayerId == player.getObjectId() && player.getWorldId() == 310010000)
+				if(activePlayers.get(instanceId) != null
+					&& activePlayers.get(instanceId)== player.getObjectId()
+					&& player.getWorldId() == 310010000)
 					return false;
 				else
 				{
 		if(movieId != 151)
 			return false;
 		Player player = env.getPlayer();
+		int instanceId = player.getInstanceId();
 		QuestState qs = player.getQuestStateList().getQuestState(questId);
 		if(qs == null || qs.getStatus() != QuestStatus.START || qs.getQuestVars().getQuestVars() != 4)
 			return false;
-		mobs.add((Npc) QuestEngine.getInstance().addNewSpawn(310010000, 790001, (float) 220.6, (float) 247.8,
+		addMobToInstance(instanceId, (Npc) QuestEngine.getInstance().addNewSpawn(310010000, instanceId, 790001, (float) 220.6, (float) 247.8,
 			(float) 206.0, (byte) 0, false));
 		qs.getQuestVars().setQuestVar(5);
 		updateQuestStatus(player, qs);
 		sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);
 		return true;
 	}
+	/**
+	 *
+	 * @param instanceId
+	 * @param npc
+	 */
+	private void addMobToInstance(int instanceId, Npc npc)
+	{
+		List<Npc> mobList = mobs.get(instanceId);
+		if(mobList == null)
+		{
+			mobList = new ArrayList<Npc>();
+			mobs.put(instanceId, mobList);
+		}
+		mobList.add(npc);
+	}
+	/**
+	 *
+	 * @param instanceId
+	 * @param npc
+	 */
+	private void removeMobToInstance(int instanceId, Npc npc)
+	{
+		List<Npc> mobList = mobs.get(instanceId);
+		if(mobList != null && mobList.contains(npc))
+			mobList.remove(npc);
+	}
+	/**
+	 *
+	 * @param instanceId
+	 */
+	private void clearMobsInInstance(int instanceId)
+	{
+		List<Npc> mobList = mobs.get(instanceId);
+		if(mobList != null)
+		{
+			for(Npc npc : mobList)
+			{
+				npc.getController().onDelete();
+			}
+			mobList.clear();
+		}
+	}
 }

trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_2008Ascension.java Download diff

	1005		1006
17	package quest.ascension;	17	package quest.ascension;
18		18
19	import java.util.ArrayList;	19	import java.util.ArrayList;
		20	import java.util.HashMap;
20	import java.util.List;	21	import java.util.List;
		22	import java.util.Map;
21		23
22	import com.aionemu.gameserver.ai.events.Event;	24	import com.aionemu.gameserver.ai.events.Event;
23	import com.aionemu.gameserver.configs.Config;	25	import com.aionemu.gameserver.configs.Config;
...		...
48	{	50	{
49		51
50	private final static int questId = 2008;	52	private final static int questId = 2008;
51	private int activePlayerId = 0;	53	//TODO [ATracer] - do we really need activePlayer ids in script body ???
52	private List<Npc> mobs = new ArrayList<Npc>();	54	private Map<Integer, Integer> activePlayers = new HashMap<Integer, Integer>();
		55	private Map<Integer, List<Npc>> mobs = new HashMap<Integer, List<Npc>>();
53		56
54	@Inject	57	@Inject
55	public _2008Ascension(SpawnsData spawnsData)	58	public _2008Ascension(SpawnsData spawnsData)
...		...
72	public boolean onKillEvent(QuestEnv env)	75	public boolean onKillEvent(QuestEnv env)
73	{	76	{
74	Player player = env.getPlayer();	77	Player player = env.getPlayer();
		78	int instanceId = player.getInstanceId();
75	QuestState qs = player.getQuestStateList().getQuestState(questId);	79	QuestState qs = player.getQuestStateList().getQuestState(questId);
76	if(qs == null \|\| qs.getStatus() != QuestStatus.START)	80	if(qs == null \|\| qs.getStatus() != QuestStatus.START)
77	return false;	81	return false;
...		...
87	{	91	{
88	qs.getQuestVars().setQuestVar(qs.getQuestVars().getQuestVars() + 1);	92	qs.getQuestVars().setQuestVar(qs.getQuestVars().getQuestVars() + 1);
89	updateQuestStatus(player, qs);	93	updateQuestStatus(player, qs);
90	if(mobs.contains(env.getVisibleObject()))	94	removeMobToInstance(instanceId, (Npc) env.getVisibleObject());;
91	mobs.remove(env.getVisibleObject());
92	return true;	95	return true;
93	}	96	}
94	else if(var == 54)	97	else if(var == 54)
95	{	98	{
96	qs.getQuestVars().setQuestVar(5);	99	qs.getQuestVars().setQuestVar(5);
97	updateQuestStatus(player, qs);	100	updateQuestStatus(player, qs);
98	Monster mob = (Monster) QuestEngine.getInstance().addNewSpawn(320010000, 205041, 301f,	101	Monster mob = (Monster) QuestEngine.getInstance().addNewSpawn(320010000, instanceId, 205041, 301f,
99	259f, 205.5f, (byte) 0, false);	102	259f, 205.5f, (byte) 0, false);
100	//TODO: Tempt decrease P attack.	103	//TODO: Tempt decrease P attack.
101	mob.getGameStats().setStat(StatEnum.MAIN_HAND_POWER, mob.getGameStats().getCurrentStat(StatEnum.MAIN_HAND_POWER)/3 );	104	mob.getGameStats().setStat(StatEnum.MAIN_HAND_POWER, mob.getGameStats().getCurrentStat(StatEnum.MAIN_HAND_POWER)/3 );
102	(mob).getAggroList().addDamageHate(player, 1000, 0);	105	(mob).getAggroList().addDamageHate(player, 1000, 0);
103	mob.getAi().handleEvent(Event.ATTACKED);	106	mob.getAi().handleEvent(Event.ATTACKED);
104	mobs.add(mob);	107	addMobToInstance(instanceId, mob);
105	return true;	108	return true;
106	}	109	}
107	}	110	}
...		...
133	public boolean onDialogEvent(QuestEnv env)	136	public boolean onDialogEvent(QuestEnv env)
134	{	137	{
135	final Player player = env.getPlayer();	138	final Player player = env.getPlayer();
		139	final int instanceId = player.getInstanceId();
136	final QuestState qs = player.getQuestStateList().getQuestState(questId);	140	final QuestState qs = player.getQuestStateList().getQuestState(questId);
137	if(qs == null)	141	if(qs == null)
138	return false;	142	return false;
...		...
180	updateQuestStatus(player, qs);	184	updateQuestStatus(player, qs);
181	PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()	185	PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject()
182	.getObjectId(), 0));	186	.getObjectId(), 0));
183	player.getController().teleportTo(320010000, 457.65f, 426.8f, 230.4f, 0);	187	int newInstanceId = player.getPosition().getWorld().getNextAvailableInstanceId(320010000);
		188	player.getController().teleportTo(320010000, newInstanceId, 457.65f, 426.8f, 230.4f, 0);
184	return true;	189	return true;
185	}	190	}
186	case 10005:	191	case 10005:
...		...
289	case 25:	294	case 25:
290	if(var == 99)	295	if(var == 99)
291	{	296	{
292	if(activePlayerId != 0 && activePlayerId != player.getObjectId())	297	if(activePlayers.get(instanceId) != null && activePlayers.get(instanceId) != player.getObjectId())
293	{	298	{
294	World world = player.getActiveRegion().getWorld();	299	World world = player.getActiveRegion().getWorld();
295	Player activePlayer = world.findPlayer(activePlayerId);	300	Player activePlayer = world.findPlayer(activePlayers.get(instanceId));
296	if(!(activePlayer == null \|\| !activePlayer.isOnline() \|\| activePlayer.getWorldId() != 310010000))	301	if(!(activePlayer == null \|\| !activePlayer.isOnline() \|\| activePlayer.getWorldId() != 310010000))
297	return false;	302	return false;
298	}	303	}
299	activePlayerId = player.getObjectId();	304	activePlayers.put(instanceId, player.getObjectId());
300	for(Npc mob : mobs)	305	clearMobsInInstance(instanceId);
301	mob.getController().onDelete();	306
302	mobs.clear();
303	PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 3001, 0));	307	PacketSendUtility.sendPacket(player, new SM_EMOTION(player, 6, 3001, 0));
304	qs.getQuestVars().setQuestVar(50);	308	qs.getQuestVars().setQuestVar(50);
305	updateQuestStatus(player, qs);	309	updateQuestStatus(player, qs);
...		...
309	{	313	{
310	qs.getQuestVars().setQuestVar(51);	314	qs.getQuestVars().setQuestVar(51);
311	updateQuestStatus(player, qs);	315	updateQuestStatus(player, qs);
312	mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(320010000, 205040,	316	addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(320010000, instanceId, 205040,
313	294f, 277f, 207f, (byte) 0, false));	317	294f, 277f, 207f, (byte) 0, false));
314	mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(320010000, 205040,	318	addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(320010000, instanceId, 205040,
315	305f, 279f, 206.5f, (byte) 0, false));	319	305f, 279f, 206.5f, (byte) 0, false));
316	mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(320010000, 205040,	320	addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(320010000, instanceId, 205040,
317	298f, 253f, 205.7f, (byte) 0, false));	321	298f, 253f, 205.7f, (byte) 0, false));
318	mobs.add((Monster) QuestEngine.getInstance().addNewSpawn(320010000, 205040,	322	addMobToInstance(instanceId, (Monster) QuestEngine.getInstance().addNewSpawn(320010000, instanceId, 205040,
319	306f, 251f, 206f, (byte) 0, false));	323	306f, 251f, 206f, (byte) 0, false));
320	for(Npc mob : mobs)	324	List<Npc> monsters = mobs.get(instanceId);
		325	for(Npc mob : monsters)
321	{	326	{
322	//TODO: Tempt decrease P attack.	327	//TODO: Tempt decrease P attack.
323	mob.getGameStats().setStat(StatEnum.MAIN_HAND_POWER, mob.getGameStats().getCurrentStat(StatEnum.MAIN_HAND_POWER)/3 );	328	mob.getGameStats().setStat(StatEnum.MAIN_HAND_POWER, mob.getGameStats().getCurrentStat(StatEnum.MAIN_HAND_POWER)/3 );
...		...
348	public boolean onLvlUpEvent(QuestEnv env)	353	public boolean onLvlUpEvent(QuestEnv env)
349	{	354	{
350	Player player = env.getPlayer();	355	Player player = env.getPlayer();
		356	int instanceId = player.getInstanceId();
351	QuestState qs = player.getQuestStateList().getQuestState(questId);	357	QuestState qs = player.getQuestStateList().getQuestState(questId);
352	if(qs != null)	358	if(qs != null)
353	{	359	{
...		...
356	int var = qs.getQuestVars().getQuestVars();	362	int var = qs.getQuestVars().getQuestVars();
357	if(var == 5 \|\| (var >= 50 && var <= 55))	363	if(var == 5 \|\| (var >= 50 && var <= 55))
358	{	364	{
359	if(activePlayerId == player.getObjectId() && player.getWorldId() == 320010000)	365	if(activePlayers.get(instanceId) != null
		366	&& activePlayers.get(instanceId)== player.getObjectId()
		367	&& player.getWorldId() == 320010000)
360	return false;	368	return false;
361	else	369	else
362	{	370	{
...		...
386	if(movieId != 152)	394	if(movieId != 152)
387	return false;	395	return false;
388	Player player = env.getPlayer();	396	Player player = env.getPlayer();
		397	int instanceId = player.getInstanceId();
389	QuestState qs = player.getQuestStateList().getQuestState(questId);	398	QuestState qs = player.getQuestStateList().getQuestState(questId);
390	if(qs == null \|\| qs.getStatus() != QuestStatus.START \|\| qs.getQuestVars().getQuestVars() != 5)	399	if(qs == null \|\| qs.getStatus() != QuestStatus.START \|\| qs.getQuestVars().getQuestVars() != 5)
391	return false;	400	return false;
392	mobs.add((Npc) QuestEngine.getInstance().addNewSpawn(320010000, 203550, 301.92999f, 274.26001f, 205.7f, (byte) 0, false));	401	addMobToInstance(instanceId, (Npc) QuestEngine.getInstance().addNewSpawn(320010000, instanceId, 203550, 301.92999f, 274.26001f, 205.7f, (byte) 0, false));
393	qs.getQuestVars().setQuestVar(6);	402	qs.getQuestVars().setQuestVar(6);
394	updateQuestStatus(player, qs);	403	updateQuestStatus(player, qs);
395	return true;	404	return true;
...		...
405	sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);	414	sendQuestDialog(player, env.getVisibleObject().getObjectId(), 5);
406	return true;	415	return true;
407	}	416	}
		417
		418	/**
		419	*
		420	* @param instanceId
		421	* @param npc
		422	*/
		423	private void addMobToInstance(int instanceId, Npc npc)
		424	{
		425	List<Npc> mobList = mobs.get(instanceId);
		426	if(mobList == null)
		427	{
		428	mobList = new ArrayList<Npc>();
		429	mobs.put(instanceId, mobList);
		430	}
		431	mobList.add(npc);
		432	}
		433
		434	/**
		435	*
		436	* @param instanceId
		437	* @param npc
		438	*/
		439	private void removeMobToInstance(int instanceId, Npc npc)
		440	{
		441	List<Npc> mobList = mobs.get(instanceId);
		442	if(mobList != null && mobList.contains(npc))
		443	mobList.remove(npc);
		444	}
		445
		446	/**
		447	*
		448	* @param instanceId
		449	*/
		450	private void clearMobsInInstance(int instanceId)
		451	{
		452	List<Npc> mobList = mobs.get(instanceId);
		453	if(mobList != null)
		454	{
		455	for(Npc npc : mobList)
		456	{
		457	npc.getController().onDelete();
		458	}
		459	mobList.clear();
		460	}
		461	}
408	}	462	}

trunk/AE-go_GameServer/data/static_data/world_maps.xml Download diff

trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/CreatureController.java Download diff

 	}
 	/**
-	 *  Teleport Creature to the location using current heading
+	 *  Teleport Creature to the location using current heading and instanceId
 	 *
 	 * @param worldId
 	 * @param x
 	 */
 	public boolean teleportTo(int worldId, float x, float y, float z, int delay)
 	{
-		return teleportTo(worldId, x, y, z, getOwner().getHeading(), delay);
+		int instanceId = 1;
+		if(getOwner().getWorldId() == worldId)
+		{
+			instanceId = getOwner().getInstanceId();
+		}
+		return teleportTo(worldId, instanceId, x, y, z, delay);
 	}
 	/**
+	 *
+	 * @param worldId
+	 * @param instanceId
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param delay
+	 * @return
+	 */
+	public boolean teleportTo(int worldId, int instanceId, float x, float y, float z, int delay)
+	{
+		return teleportTo(worldId, instanceId, x, y, z, getOwner().getHeading(), delay);
+	}
+	/**
 	 *  Teleport Creature to the location using specific heading
 	 *
 	 * @param worldId
+	 * @param instanceId
 	 * @param x
 	 * @param y
 	 * @param z
 	 * @param delay
 	 * @return
 	 */
-	public boolean teleportTo(int worldId, float x, float y, float z, byte heading, int delay)
+	public boolean teleportTo(int worldId, int instanceId, float x, float y, float z, byte heading, int delay)
 	{
 		return true;
 	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/MonsterController.java Download diff

	1005		1006
137	{	137	{
138	Monster monster = getOwner();	138	Monster monster = getOwner();
139		139
140	if (monster == null \|\| monster.getLifeStats().isAlreadyDead())	140	if (monster == null \|\| monster.getLifeStats().isAlreadyDead() \|\| !monster.isSpawned())
141	return;	141	return;
142		142
143	if(!monster.canAttack())	143	if(!monster.canAttack())

trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/PlayerController.java Download diff

	1005		1006
295	}	295	}
296		296
297	@Override	297	@Override
298	public boolean teleportTo(final int worldId, final float x,	298	public boolean teleportTo(final int worldId, final int instanceId, final float x,
299	final float y, final float z, final byte heading, final int delay)	299	final float y, final float z, final byte heading, final int delay)
300	{	300	{
301	final Player player = getOwner();	301	final Player player = getOwner();
...		...
316	}	316	}
317	World world = player.getActiveRegion().getWorld();	317	World world = player.getActiveRegion().getWorld();
318	world.despawn(player);	318	world.despawn(player);
319	world.setPosition(player, worldId, x, y, z, heading);	319	world.setPosition(player, worldId, instanceId, x, y, z, heading);
320	player.setProtectionActive(true);	320	player.setProtectionActive(true);
321	PacketSendUtility.sendPacket(player, new SM_CHANNEL_INFO(player.getPosition()));	321	PacketSendUtility.sendPacket(player, new SM_CHANNEL_INFO(player.getPosition()));
322	PacketSendUtility.sendPacket(player, new SM_PLAYER_SPAWN(player));	322	PacketSendUtility.sendPacket(player, new SM_PLAYER_SPAWN(player));

trunk/AE-go_GameServer/src/com/aionemu/gameserver/questEngine/QuestEngine.java Download diff

	1005		1006
287	itemService.addItem(player, itemId, count, false);	287	itemService.addItem(player, itemId, count, false);
288	}	288	}
289		289
290	public VisibleObject addNewSpawn(int worldId, int templateId, float x, float y, float z, byte heading, boolean respawn)	290	public VisibleObject addNewSpawn(int worldId, int instanceId, int templateId, float x, float y, float z, byte heading, boolean respawn)
291	{	291	{
292	SpawnTemplate spawn = spawnEngine.addNewSpawn(worldId, 1, templateId, x, y, z, heading, 0, 0, respawn);	292	SpawnTemplate spawn = spawnEngine.addNewSpawn(worldId, instanceId, templateId, x, y, z, heading, 0, 0, respawn);
293	return spawnEngine.spawnObject(spawn, 1);	293	return spawnEngine.spawnObject(spawn, instanceId);
294	}	294	}
295		295
296	public void clear()	296	public void clear()

trunk/AE-go_GameServer/src/com/aionemu/gameserver/spawnengine/SpawnEngine.java Download diff

 		});
 	}
-	private void spawnInstance(int worldId, int instanceIndex)
+	/**
+	 *
+	 * @param worldId
+	 * @param instanceIndex
+	 */
+	public void spawnInstance(int worldId, int instanceIndex)
 	{
 		List<SpawnGroup> worldSpawns = spawnsData.getSpawnsForWorld(worldId);

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/MapRegion.java Download diff

 import javolution.util.FastMap;
 import com.aionemu.gameserver.model.gameobjects.VisibleObject;
+import com.aionemu.gameserver.model.gameobjects.player.Player;
 /**
  * Just some part of map.
 	void add(VisibleObject object)
 	{
 		objects.put(object.getObjectId(), object);
+		if(object instanceof Player)
+			parent.onPlayerEnter();
 	}
 	/**
 	void remove(VisibleObject object)
 	{
 		objects.remove(object.getObjectId());
+		if(object instanceof Player)
+			parent.onPlayerLeave();
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/World.java Download diff

 import com.aionemu.gameserver.model.gameobjects.VisibleObject;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.templates.WorldMapTemplate;
+import com.aionemu.gameserver.spawnengine.SpawnEngine;
 import com.aionemu.gameserver.utils.idfactory.IDFactory;
 import com.aionemu.gameserver.utils.idfactory.IDFactoryAionObject;
 import com.aionemu.gameserver.world.container.PlayerContainer;
 	private final Map<Integer, WorldMap>	worldMaps	= new HashMap<Integer, WorldMap>();
 	private IDFactory						aionObjectsIDFactory;
+	@Inject
+	private SpawnEngine						spawnEngine;
 	/**
 	 * Constructor.
 	}
 	/**
+	 * @return the spawnEngine
+	 */
+	public SpawnEngine getSpawnEngine()
+	{
+		return spawnEngine;
+	}
+	/**
 	 * Return World Map by id
 	 *
 	 * @param id
 			throw new WorldMapNotExistException("Map: " + id + " not exist!");
 		return map;
 	}
+	/**
+	 *
+	 * @param worldId
+	 * @return
+	 */
+	public int getNextAvailableInstanceId(int worldId)
+	{
+		WorldMap map = worldMaps.get(worldId);
+		return map.getNextFreeInstanceIndex();
+	}
 	/**
 	 * Update position of VisibleObject [used when object is moving on one map instance]. Check if active map region
 	 */
 	public void setPosition(VisibleObject object, int mapId, float x, float y, float z, byte heading)
 	{
-		int instanceIndex = 1;
+		int instanceId = 1;
 		if(object.getWorldId() == mapId)
 		{
-			instanceIndex = object.getInstanceId();
+			instanceId = object.getInstanceId();
 		}
-		this.setPosition(object, mapId, instanceIndex, x, y, z, heading);
+		this.setPosition(object, mapId, instanceId, x, y, z, heading);
 	}
 	/**

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/WorldMap.java Download diff

 import java.util.HashMap;
 import java.util.Map;
+import org.apache.log4j.Logger;
 import com.aionemu.gameserver.model.templates.WorldMapTemplate;
 /**
  */
 public class WorldMap
 {
+	private static Logger log = Logger.getLogger(WorldMap.class);
 	private WorldMapTemplate				worldMapTemplate;
 	/**
 		int twinCount = worldMapTemplate.getTwinCount();
 		return twinCount > 0 ? twinCount : 1;
 	}
+	/**
+	 *  Will create new instance if there are not free yet and spawn according to xml data
+	 *  //TODO limit
+	 *  //TODO dispose unused instances (lifecycle)
+	 * @return
+	 */
+	public synchronized int getNextFreeInstanceIndex()
+	{
+		for(WorldMapInstance instance : instances.values())
+		{
+			if(!instance.isInUse())
+				return instance.getInstanceId();
+		}
+		//create new instance
+		int nextInstanceId = instances.size() + 1;
+		log.info("Creating new instance: " + worldMapTemplate.getMapId() + " " + nextInstanceId );
+		instances.put(nextInstanceId, new WorldMapInstance(this, nextInstanceId));
+		world.getSpawnEngine().spawnInstance(worldMapTemplate.getMapId(), nextInstanceId);
+		return nextInstanceId;
+	}
 	/**
 	 * Return a WorldMapInstance - depends on map configuration one map may have twins instances to balance player. This
 		}
 		return getWorldMapInstance(instanceId);
 	}
-	/**
-	 *
-	 * @return
-	 */
-	public WorldMapInstance getNextFreeInstance()
-	{
-		//TODO
-		if(worldMapTemplate.getTwinCount() !=0)
-		{
-			for(WorldMapInstance instance : instances.values())
-			{
-				if(instance.getCurrentPlayerCount() == 0)
-					return instance;
-			}
-		}
-		return null;
-	}
 	/**
 	 * Returns WorldMapInstance by instanceId.

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/WorldMapInstance.java Download diff

 	{
 		currentPlayerCount--;
 	}
+	public boolean isInUse()
+	{
+		return currentPlayerCount > 0;
+	}
 	/**
 	 * @return the instanceIndex

	1005		1006
4	<map id="110010000" name="Sanctum" />	4	<map id="110010000" name="Sanctum" />
5	<map id="120010000" name="Pandaemonium" />	5	<map id="120010000" name="Pandaemonium" />
6	<map id="210010000" name="Poeta" max_user="200" twin_count="2"/>	6	<map id="210010000" name="Poeta" max_user="200" twin_count="2"/>
7	<map id="210030000" name="Verteron" max_user="200" twin_count="2" />	7	<map id="210030000" name="Verteron" max_user="200"/>
8	<map id="210020000" name="Eltnen" />	8	<map id="210020000" name="Eltnen" />
9	<map id="210060000" name="Theomobos" />	9	<map id="210060000" name="Theomobos" />
10	<map id="210040000" name="Heiron" />	10	<map id="210040000" name="Heiron" />
11	<map id="220010000" name="Ishalgen" max_user="200" twin_count="2" />	11	<map id="220010000" name="Ishalgen" max_user="200" twin_count="2" />
12	<map id="220030000" name="Altgard" max_user="200" twin_count="2"/>	12	<map id="220030000" name="Altgard" max_user="200"/>
13	<map id="220020000" name="Morheim" />	13	<map id="220020000" name="Morheim" />
14	<map id="220050000" name="Brusthonin" />	14	<map id="220050000" name="Brusthonin" />
15	<map id="220040000" name="Beluslan" />	15	<map id="220040000" name="Beluslan" />
16		16
17	<map id="300010000" name="IDAbPro" />	17	<map id="300010000" name="IDAbPro" />
18	<map id="310010000" twin_count="2" name="IDAbProL1" />	18	<map id="310010000" name="IDAbProL1" />
19	<map id="310020000" name="IDAbProL2" />	19	<map id="310020000" name="IDAbProL2" />
20	<map id="310030000" name="IDAbGateL1" />	20	<map id="310030000" name="IDAbGateL1" />
21	<map id="310040000" name="IDAbGateL2" />	21	<map id="310040000" name="IDAbGateL2" />
...		...
25	<map id="310080000" name="IDLC1_arena" />	25	<map id="310080000" name="IDLC1_arena" />
26	<map id="310090000" name="IDLF3_Castle_indratoo" />	26	<map id="310090000" name="IDLF3_Castle_indratoo" />
27	<map id="310100000" name="IDLF3_Castle_Lehpar" />	27	<map id="310100000" name="IDLF3_Castle_Lehpar" />
28	<map id="320010000" twin_count="2" name="IDAbProD1" />	28	<map id="320010000" name="IDAbProD1" />
29	<map id="320020000" name="IDAbProD2" />	29	<map id="320020000" name="IDAbProD2" />
30	<map id="320030000" name="IDAbGateD1" />	30	<map id="320030000" name="IDAbGateD1" />
31	<map id="320040000" name="IDAbGateD2" />	31	<map id="320040000" name="IDAbGateD2" />