Преглед изворни кода

BETA: Removing Wedding Manager from core.

Zoey76 пре 11 година
родитељ
комит
399933e65c

+ 0 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/enums/InstanceType.java

@@ -107,7 +107,6 @@ public enum InstanceType
 	// Custom
 	// Custom
 	L2ClassMasterInstance(L2NpcInstance),
 	L2ClassMasterInstance(L2NpcInstance),
 	L2NpcBufferInstance(L2Npc),
 	L2NpcBufferInstance(L2Npc),
-	L2WeddingManagerInstance(L2Npc),
 	L2EventMobInstance(L2Npc);
 	L2EventMobInstance(L2Npc);
 	
 	
 	private final InstanceType _parent;
 	private final InstanceType _parent;

+ 0 - 253
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java

@@ -1,253 +0,0 @@
-/*
- * Copyright (C) 2004-2014 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.model.actor.instance;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.Announcements;
-import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.instancemanager.CoupleManager;
-import com.l2jserver.gameserver.model.L2World;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.entity.Couple;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.skills.CommonSkill;
-import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-
-/**
- * @author evill33t & squeezed
- */
-public class L2WeddingManagerInstance extends L2Npc
-{
-	public L2WeddingManagerInstance(int objectId, L2NpcTemplate template)
-	{
-		super(objectId, template);
-		setInstanceType(InstanceType.L2WeddingManagerInstance);
-	}
-	
-	@Override
-	public void showChatWindow(L2PcInstance player)
-	{
-		String filename = "data/html/mods/Wedding_start.htm";
-		String replace = String.valueOf(Config.L2JMOD_WEDDING_PRICE);
-		
-		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setFile(player.getHtmlPrefix(), filename);
-		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%replace%", replace);
-		html.replace("%npcname%", getName());
-		player.sendPacket(html);
-	}
-	
-	@Override
-	public void onBypassFeedback(L2PcInstance player, String command)
-	{
-		// Standard message
-		String filename = "data/html/mods/Wedding_start.htm";
-		String replace = "";
-		
-		// If player has no partner
-		if (player.getPartnerId() == 0)
-		{
-			filename = "data/html/mods/Wedding_nopartner.htm";
-			sendHtmlMessage(player, filename, replace);
-			return;
-		}
-		
-		final L2PcInstance ptarget = L2World.getInstance().getPlayer(player.getPartnerId());
-		// Is partner online?
-		if ((ptarget == null) || !ptarget.isOnline())
-		{
-			filename = "data/html/mods/Wedding_notfound.htm";
-			sendHtmlMessage(player, filename, replace);
-			return;
-		}
-		
-		// Is already married?
-		if (player.isMarried())
-		{
-			filename = "data/html/mods/Wedding_already.htm";
-			sendHtmlMessage(player, filename, replace);
-			return;
-		}
-		else if (player.isMarryAccepted())
-		{
-			filename = "data/html/mods/Wedding_waitforpartner.htm";
-			sendHtmlMessage(player, filename, replace);
-			return;
-		}
-		else if (command.startsWith("AcceptWedding"))
-		{
-			// Check for Formal Wear
-			if (!wearsFormalWear(player, ptarget))
-			{
-				filename = "data/html/mods/Wedding_noformal.htm";
-				sendHtmlMessage(ptarget, filename, replace);
-				sendHtmlMessage(player, filename, replace);
-				return;
-			}
-			
-			// Check and reduce wedding price
-			if ((player.getAdena() < Config.L2JMOD_WEDDING_PRICE) || (ptarget.getAdena() < Config.L2JMOD_WEDDING_PRICE))
-			{
-				filename = "data/html/mods/Wedding_adena.htm";
-				replace = String.valueOf(Config.L2JMOD_WEDDING_PRICE);
-				sendHtmlMessage(ptarget, filename, replace);
-				sendHtmlMessage(player, filename, replace);
-				return;
-			}
-			player.reduceAdena("Wedding", Config.L2JMOD_WEDDING_PRICE, player.getLastFolkNPC(), true);
-			ptarget.reduceAdena("Wedding", Config.L2JMOD_WEDDING_PRICE, player.getLastFolkNPC(), true);
-			
-			// Accept the wedding request
-			player.setMarryAccepted(true);
-			Couple couple = CoupleManager.getInstance().getCouple(player.getCoupleId());
-			couple.marry();
-			
-			// Messages to the couple
-			player.sendMessage("Congratulations you are married!");
-			player.setMarried(true);
-			player.setMarryRequest(false);
-			ptarget.sendMessage("Congratulations you are married!");
-			ptarget.setMarried(true);
-			ptarget.setMarryRequest(false);
-			
-			// Wedding march
-			MagicSkillUse MSU = new MagicSkillUse(player, player, 2230, 1, 1, 0);
-			player.broadcastPacket(MSU);
-			MSU = new MagicSkillUse(ptarget, ptarget, 2230, 1, 1, 0);
-			ptarget.broadcastPacket(MSU);
-			
-			// Fireworks
-			Skill skill = CommonSkill.LARGE_FIREWORK.getSkill();
-			if (skill != null)
-			{
-				MSU = new MagicSkillUse(player, player, 2025, 1, 1, 0);
-				player.sendPacket(MSU);
-				player.broadcastPacket(MSU);
-				player.useMagic(skill, false, false);
-				
-				MSU = new MagicSkillUse(ptarget, ptarget, 2025, 1, 1, 0);
-				ptarget.sendPacket(MSU);
-				ptarget.broadcastPacket(MSU);
-				ptarget.useMagic(skill, false, false);
-				
-			}
-			
-			Announcements.getInstance().announceToAll("Congratulations to " + player.getName() + " and " + ptarget.getName() + "! They have been married.");
-			
-			filename = "data/html/mods/Wedding_accepted.htm";
-			sendHtmlMessage(ptarget, filename, replace);
-			sendHtmlMessage(player, filename, replace);
-			
-			return;
-		}
-		else if (command.startsWith("DeclineWedding"))
-		{
-			player.setMarryRequest(false);
-			ptarget.setMarryRequest(false);
-			player.setMarryAccepted(false);
-			ptarget.setMarryAccepted(false);
-			
-			player.sendMessage("You declined your partner's marriage request.");
-			ptarget.sendMessage("Your partner declined your marriage request.");
-			
-			filename = "data/html/mods/Wedding_declined.htm";
-			sendHtmlMessage(ptarget, filename, replace);
-			sendHtmlMessage(player, filename, replace);
-			
-			return;
-		}
-		else if (player.isMarryRequest())
-		{
-			// Check for Formal Wear
-			if (!wearsFormalWear(player, ptarget))
-			{
-				filename = "data/html/mods/Wedding_noformal.htm";
-				sendHtmlMessage(ptarget, filename, replace);
-				sendHtmlMessage(player, filename, replace);
-				return;
-			}
-			filename = "data/html/mods/Wedding_ask.htm";
-			player.setMarryRequest(false);
-			ptarget.setMarryRequest(false);
-			replace = ptarget.getName();
-			sendHtmlMessage(player, filename, replace);
-			return;
-		}
-		else if (command.startsWith("AskWedding"))
-		{
-			// Check for Formal Wear
-			if (!wearsFormalWear(player, ptarget))
-			{
-				filename = "data/html/mods/Wedding_noformal.htm";
-				sendHtmlMessage(ptarget, filename, replace);
-				sendHtmlMessage(player, filename, replace);
-				return;
-			}
-			
-			player.setMarryAccepted(true);
-			ptarget.setMarryRequest(true);
-			
-			filename = "data/html/mods/Wedding_ask.htm";
-			replace = player.getName();
-			sendHtmlMessage(ptarget, filename, replace);
-			
-			filename = "data/html/mods/Wedding_requested.htm";
-			replace = ptarget.getName();
-			sendHtmlMessage(player, filename, replace);
-			
-			return;
-		}
-		sendHtmlMessage(player, filename, replace);
-	}
-	
-	/**
-	 * Are both partners wearing formal wear? If Formal Wear check is disabled, returns True in any case.<BR>
-	 * @param p1 L2PcInstance
-	 * @param p2 L2PcInstance
-	 * @return boolean
-	 */
-	private boolean wearsFormalWear(L2PcInstance p1, L2PcInstance p2)
-	{
-		if (Config.L2JMOD_WEDDING_FORMALWEAR)
-		{
-			L2ItemInstance fw1 = p1.getChestArmorInstance();
-			L2ItemInstance fw2 = p2.getChestArmorInstance();
-			
-			if ((fw1 == null) || (fw2 == null) || (fw1.getId() != 6408) || (fw2.getId() != 6408))
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	private void sendHtmlMessage(L2PcInstance player, String filename, String replace)
-	{
-		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
-		html.setFile(player.getHtmlPrefix(), filename);
-		html.replace("%objectId%", String.valueOf(getObjectId()));
-		html.replace("%replace%", replace);
-		html.replace("%npcname%", getName());
-		player.sendPacket(html);
-	}
-}