浏览代码

BETA: DP-Part for [L5963]
* Note: XML part will be committed later.

Rumen Nikiforov 12 年之前
父节点
当前提交
2f3c3736c1

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java

@@ -5,7 +5,7 @@ import java.util.List;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
@@ -111,7 +111,7 @@ public class AvantGarde extends AbstractNpcAI
 			{
 				if (RequestAcquireSkill.canTransform(player))
 				{
-					MultiSell.getInstance().separateAndSend(32323001, player, npc, false);
+					MultisellData.getInstance().separateAndSend(32323001, player, npc, false);
 				}
 				else
 				{

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java

@@ -24,7 +24,7 @@ import java.util.StringTokenizer;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.TerritoryNPCSpawn;
@@ -170,7 +170,7 @@ public class MercenaryCaptain extends AbstractNpcAI
 					else
 					{
 						final int listId = 676 + npc.getCastle().getCastleId();
-						MultiSell.getInstance().separateAndSend(listId, player, npc, false);
+						MultisellData.getInstance().separateAndSend(listId, player, npc, false);
 					}
 					break;
 				}
@@ -183,7 +183,7 @@ public class MercenaryCaptain extends AbstractNpcAI
 					else
 					{
 						final int listId = 685 + npc.getCastle().getCastleId();
-						MultiSell.getInstance().separateAndSend(listId, player, npc, false);
+						MultisellData.getInstance().separateAndSend(listId, player, npc, false);
 					}
 					break;
 				}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java

@@ -20,7 +20,7 @@ package ai.npc.TerritoryManagers;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
@@ -99,7 +99,7 @@ public class TerritoryManagers extends AbstractNpcAI
 				{
 					// If the player has at least one Territory Badges then show the multisell.
 					final int multiSellId = 364900001 + ((npcId - 36490) * 10000);
-					MultiSell.getInstance().separateAndSend(multiSellId, player, npc, false);
+					MultisellData.getInstance().separateAndSend(multiSellId, player, npc, false);
 				}
 				else
 				{

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java

@@ -18,7 +18,7 @@
  */
 package custom.NewbieCoupons;
 
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -135,7 +135,7 @@ public class NewbieCoupons extends Quest
 		{
 			if ((level >= 6) && (level <= 39) && (pkkills == 0) && (occupation_level == 0))
 			{
-				MultiSell.getInstance().separateAndSend(WEAPON_MULTISELL, player, npc, false);
+				MultisellData.getInstance().separateAndSend(WEAPON_MULTISELL, player, npc, false);
 				return null;
 			}
 			htmltext = "30598-7.htm"; // you're not eligible to use warehouse
@@ -144,7 +144,7 @@ public class NewbieCoupons extends Quest
 		{
 			if ((level >= 6) && (level <= 39) && (pkkills == 0) && (occupation_level > 0))
 			{
-				MultiSell.getInstance().separateAndSend(ACCESORIES_MULTISELL, player, npc, false);
+				MultisellData.getInstance().separateAndSend(ACCESORIES_MULTISELL, player, npc, false);
 				return null;
 			}
 			htmltext = "30598-8.htm"; // you're not eligible to use warehouse

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.AdminTable;
 import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -227,7 +227,7 @@ public class AdminAdmin implements IAdminCommandHandler
 			{
 				if (type.equals("multisell"))
 				{
-					MultiSell.getInstance().reload();
+					MultisellData.getInstance().load();
 					activeChar.sendMessage("All Multisells have been reloaded");
 				}
 				else if (type.startsWith("teleport"))

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java

@@ -20,7 +20,7 @@ package handlers.bypasshandlers;
 
 import java.util.logging.Level;
 
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -48,13 +48,13 @@ public class Multisell implements IBypassHandler
 			if (command.toLowerCase().startsWith(COMMANDS[0])) // multisell
 			{
 				listId = Integer.parseInt(command.substring(9).trim());
-				MultiSell.getInstance().separateAndSend(listId, activeChar, (L2Npc) target, false);
+				MultisellData.getInstance().separateAndSend(listId, activeChar, (L2Npc) target, false);
 				return true;
 			}
 			else if (command.toLowerCase().startsWith(COMMANDS[1])) // exc_multisell
 			{
 				listId = Integer.parseInt(command.substring(13).trim());
-				MultiSell.getInstance().separateAndSend(listId, activeChar, (L2Npc) target, true);
+				MultisellData.getInstance().separateAndSend(listId, activeChar, (L2Npc) target, true);
 				return true;
 			}
 			return false;

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.logging.Level;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.datatables.NpcBufferTable;
 import com.l2jserver.gameserver.datatables.NpcBufferTable.NpcBufferData;
 import com.l2jserver.gameserver.handler.IBypassHandler;
@@ -190,10 +190,10 @@ public class OlympiadManagerLink implements IBypassHandler
 						}
 						break;
 					case 7: // Equipment Rewards
-						MultiSell.getInstance().separateAndSend(102, activeChar, (L2Npc) target, false);
+						MultisellData.getInstance().separateAndSend(102, activeChar, (L2Npc) target, false);
 						break;
 					case 8: // Misc. Rewards
-						MultiSell.getInstance().separateAndSend(103, activeChar, (L2Npc) target, false);
+						MultisellData.getInstance().separateAndSend(103, activeChar, (L2Npc) target, false);
 						break;
 					case 9: // Your Grand Olympiad Score from the previous period is %points% point(s) | TODO: cleanup (not used anymore)
 						int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId());

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/ReloadHandler.java

@@ -27,7 +27,7 @@ import javax.script.ScriptException;
 
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.datatables.ItemTable;
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -63,7 +63,7 @@ public class ReloadHandler implements ITelnetHandler
 				if (type.equals("multisell"))
 				{
 					_print.print("Reloading multisell... ");
-					MultiSell.getInstance().reload();
+					MultisellData.getInstance().load();
 					_print.println("done");
 				}
 				else if (type.equals("skill"))

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Hude/Hude.java

@@ -18,7 +18,7 @@
  */
 package hellbound.Hude;
 
-import com.l2jserver.gameserver.datatables.MultiSell;
+import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.instancemanager.HellboundManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -84,14 +84,14 @@ public class Hude extends Quest
 		{
 			if (qs.hasQuestItems(STANDART_CERT) || qs.hasQuestItems(PREMIUM_CERT))
 			{
-				MultiSell.getInstance().separateAndSend(322980001, player, npc, false);
+				MultisellData.getInstance().separateAndSend(322980001, player, npc, false);
 			}
 		}
 		else if ("multisell2".equalsIgnoreCase(event))
 		{
 			if (qs.hasQuestItems(PREMIUM_CERT))
 			{
-				MultiSell.getInstance().separateAndSend(322980002, player, npc, false);
+				MultisellData.getInstance().separateAndSend(322980002, player, npc, false);
 			}
 		}
 		return null;