Home Explore Help
Register Sign In
L2j
/
l2j-server-datapack
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

BETA: Observation fix/update:
* Fix TvT problem
* Missing check for summon + retail message
* Some protections add
* Performance improvements

Reported by: momo61
Tested by: Pandragon, Konstantinos
Reviewed by: UnAfraid

Zealar 10 years ago
parent
b857255e00
commit
21acfea48f
13 changed files with 123 additions and 61 deletions
Unified View Show Diff Stats
  1. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-1.htm
  2. 3 3
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-10.htm
  3. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-2.htm
  4. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-3.htm
  5. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-4.htm
  6. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-5.htm
  7. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-6.htm
  8. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-7.htm
  9. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-8.htm
  10. 2 2
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-9.htm
  11. 5 5
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-Oracle-1.htm
  12. 5 5
      L2J_DataPack_BETA/dist/game/data/html/observation/31031-Oracle-2.htm
  13. 92 30
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-1.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 -18347 114000 -2360">&$620; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 -18347 113255 -2447">&$621; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 0">&$620; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 1">&$621; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/html/observation/31031-10.htm
View File 

@@ -1,5 +1,5 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observe 80 148416 46724 -3000">&$634; - 80 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observe 80 149500 46724 -3000">&$635; - 80 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observe 80 150511 46724 -3000">&$636; - 80 &$469;</a>

+<a action="bypass -h npc_%objectId%_observe 18">&$634; - 80 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observe 19">&$635; - 80 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observe 20">&$636; - 80 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-2.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 22321 155785 -2604">&$622; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 22321 156492 -2627">&$623; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 2">&$622; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 3">&$623; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-3.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 112000 144864 -2445">&$624; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 112657 144864 -2525">&$625; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 4">&$624; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 5">&$625; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-4.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 116260 244600 -775">&$626; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 116260 245264 -721">&$627; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 6">&$626; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 7">&$627; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-5.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 78100 36950 -2242">&$628; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 78744 36950 -2244">&$629; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 8">&$628; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 9">&$629; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-6.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 147457 9601 -233">&$630; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 147457 8720 -252">&$631; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 10">&$630; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 11">&$631; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-7.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 147542 -43543 -1328">&$1244; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 147465 -45259 -1328">&$1245; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 12">&$1244; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 13">&$1245; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-8.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 20598 -49113 -300">&$1421; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 18702 -49150 -600">&$1422; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 14">&$1421; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 15">&$1422; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/html/observation/31031-9.htm
View File 

@@ -1,4 +1,4 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeSiege 500 77541 -147447 353">&$1424; - 500 &$469;</a><br1>

-<a action="bypass -h npc_%objectId%_observeSiege 500 77541 -149245 353">&$1425; - 500 &$469;</a>

+<a action="bypass -h npc_%objectId%_observeSiege 16">&$1424; - 500 &$469;</a><br1>

+<a action="bypass -h npc_%objectId%_observeSiege 17">&$1425; - 500 &$469;</a>

 </body></html>
 
 </body></html>

+ 5 - 5
L2J_DataPack_BETA/dist/game/data/html/observation/31031-Oracle-1.htm
View File 

@@ -1,7 +1,7 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -80210 87400 -4800">Level 31 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -77200 88500 -4800">Level 42 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -75320 87135 -4800">Level 53 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -76840 85770 -4800">Level 64 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -79950 85165 -4800">No Level Limit - 500 Adena</a>

+<a action="bypass -h npc_%objectId%_observeOracle 21">Level 31 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 22">Level 42 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 23">Level 53 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 24">Level 64 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 25">No Level Limit - 500 Adena</a>

 </body></html>
 
 </body></html>

+ 5 - 5
L2J_DataPack_BETA/dist/game/data/html/observation/31031-Oracle-2.htm
View File 

@@ -1,7 +1,7 @@
 
 <html><body>&$650;<br><br>

 <html><body>&$650;<br><br>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -79185 112725 -4300">Level 31 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -76175 113330 -4300">Level 42 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -74305 111965 -4300">Level 53 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -75915 110600 -4300">Level 64 and Below - 500 Adena</a><br1>

-<a action="bypass -h npc_%objectId%_observeOracle 500 -78930 110005 -4300">No Level Limit - 500 Adena</a>

+<a action="bypass -h npc_%objectId%_observeOracle 26">Level 31 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 27">Level 42 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 28">Level 53 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 29">Level 64 and Below - 500 Adena</a><br1>

+<a action="bypass -h npc_%objectId%_observeOracle 30">No Level Limit - 500 Adena</a>

 </body></html>
 
 </body></html>

+ 92 - 30
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java
View File 

@@ -18,7 +18,6 @@
 
  */

  */

 package handlers.bypasshandlers;

 package handlers.bypasshandlers;

 

 

-import java.util.StringTokenizer;

 import java.util.logging.Level;

 import java.util.logging.Level;

 

 

 import com.l2jserver.gameserver.handler.IBypassHandler;

 import com.l2jserver.gameserver.handler.IBypassHandler;

@@ -26,6 +25,7 @@ import com.l2jserver.gameserver.instancemanager.SiegeManager;
 
 import com.l2jserver.gameserver.model.Location;

 import com.l2jserver.gameserver.model.Location;

 import com.l2jserver.gameserver.model.actor.L2Character;

 import com.l2jserver.gameserver.model.actor.L2Character;

 import com.l2jserver.gameserver.model.actor.L2Npc;

 import com.l2jserver.gameserver.model.actor.L2Npc;

+import com.l2jserver.gameserver.model.actor.instance.L2ObservationInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

 import com.l2jserver.gameserver.network.SystemMessageId;

 import com.l2jserver.gameserver.network.SystemMessageId;

 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;

@@ -40,25 +40,102 @@ public class Observation implements IBypassHandler
 
 		"observe"

 		"observe"

 	};

 	};

 	

 	

+	private static final int[][] LOCATIONS = new int[][]

+	{

+		//@formatter:off

+		// Gludio

+		{-18347, 114000, -2360, 500},

+		{-18347, 113255, -2447, 500},

+		// Dion

+		{22321, 155785, -2604, 500},

+		{22321, 156492, -2627, 500},

+		// Giran

+		{112000, 144864, -2445, 500},

+		{112657, 144864, -2525, 500},

+		// Innadril

+		{116260, 244600, -775, 500},

+		{116260, 245264, -721, 500},

+		// Oren

+		{78100, 36950, -2242, 500},

+		{78744, 36950, -2244, 500},

+		// Aden

+		{147457, 9601, -233, 500},

+		{147457, 8720, -252, 500},

+		// Goddard

+		{147542, -43543, -1328, 500},

+		{147465, -45259, -1328, 500},

+		// Rune

+		{20598, -49113, -300, 500},

+		{18702, -49150, -600, 500},

+		// Schuttgart

+		{77541, -147447, 353, 500},

+		{77541, -149245, 353, 500},

+		// Coliseum

+		{148416, 46724, -3000, 80},

+		{149500, 46724, -3000, 80},

+		{150511, 46724, -3000, 80},

+		// Dusk

+		{-77200, 88500, -4800, 500},

+		{-75320, 87135, -4800, 500},

+		{-76840, 85770, -4800, 500},

+		{-76840, 85770, -4800, 500},

+		{-79950, 85165, -4800, 500},

+		// Dawn

+		{-79185, 112725, -4300, 500},

+		{-76175, 113330, -4300, 500},

+		{-74305, 111965, -4300, 500},

+		{-75915, 110600, -4300, 500},

+		{-78930, 110005, -4300, 500}

+		//@formatter:on

+	};

+	

 	@Override

 	@Override

 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)

 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)

 	{

 	{

-		if (!target.isNpc())

+		if (!(target instanceof L2ObservationInstance))

 		{

 		{

 			return false;

 			return false;

 		}

 		}

 		

 		

+		if (activeChar.hasSummon())

+		{

+			activeChar.sendPacket(SystemMessageId.NO_OBSERVE_WITH_PET);

+			return false;

+		}

+		if (activeChar.isOnEvent())

+		{

+			activeChar.sendMessage("Cannot use while current Event");

+			return false;

+		}

+		

+		String _command = command.split(" ")[0].toLowerCase();

+		final int param;

 		try

 		try

 		{

 		{

-			if (command.toLowerCase().startsWith(COMMANDS[0])) // siege

+			param = Integer.parseInt(command.split(" ")[1]);

+		}

+		catch (NumberFormatException nfe)

+		{

+			_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), nfe);

+			return false;

+		}

+		

+		if ((param < 0) || (param > (LOCATIONS.length - 1)))

+		{

+			return false;

+		}

+		final int[] locCost = LOCATIONS[param];

+		

+		Location loc = new Location(locCost[0], locCost[1], locCost[2]);

+		final long cost = locCost[3];

+		

+		switch (_command)

+		{

+			case "observesiege":

 			{

 			{

-				String val = command.substring(13);

-				StringTokenizer st = new StringTokenizer(val);

-				st.nextToken(); // Bypass cost

-				

-				if (SiegeManager.getInstance().getSiege(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken())) != null)

+				if (SiegeManager.getInstance().getSiege(loc) != null)

 				{

 				{

-					doObserve(activeChar, (L2Npc) target, val);

+					doObserve(activeChar, (L2Npc) target, loc, cost);

 				}

 				}

 				else

 				else

 				{

 				{

@@ -66,41 +143,26 @@ public class Observation implements IBypassHandler
 
 				}

 				}

 				return true;

 				return true;

 			}

 			}

-			else if (command.toLowerCase().startsWith(COMMANDS[1])) // oracle

+			case "observeoracle": // Oracle Dusk/Dawn

 			{

 			{

-				String val = command.substring(13);

-				StringTokenizer st = new StringTokenizer(val);

-				st.nextToken(); // Bypass cost

-				doObserve(activeChar, (L2Npc) target, val);

+				doObserve(activeChar, (L2Npc) target, loc, cost);

 				return true;

 				return true;

 			}

 			}

-			else if (command.toLowerCase().startsWith(COMMANDS[2])) // observe

+			case "observe": // Observe

 			{

 			{

-				doObserve(activeChar, (L2Npc) target, command.substring(8));

+				doObserve(activeChar, (L2Npc) target, loc, cost);

 				return true;

 				return true;

 			}

 			}

-			

-			return false;

-		}

-		catch (Exception e)

-		{

-			_log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e);

 		}

 		}

 		return false;

 		return false;

 	}

 	}

 	

 	

-	private static final void doObserve(L2PcInstance player, L2Npc npc, String val)

+	private static final void doObserve(final L2PcInstance player, final L2Npc npc, final Location pos, final long cost)

 	{

 	{

-		StringTokenizer st = new StringTokenizer(val);

-		long cost = Long.parseLong(st.nextToken());

-		int x = Integer.parseInt(st.nextToken());

-		int y = Integer.parseInt(st.nextToken());

-		int z = Integer.parseInt(st.nextToken());

-		

 		if (player.reduceAdena("Broadcast", cost, npc, true))

 		if (player.reduceAdena("Broadcast", cost, npc, true))

 		{

 		{

 			// enter mode

 			// enter mode

-			player.enterObserverMode(new Location(x, y, z));

+			player.enterObserverMode(pos);

 			player.sendPacket(new ItemList(player, false));

 			player.sendPacket(new ItemList(player, false));

 		}

 		}

 		player.sendPacket(ActionFailed.STATIC_PACKET);

 		player.sendPacket(ActionFailed.STATIC_PACKET);