Browse Source

BETA: More skills cleanup:
* Removing L2SkillMount skill implementation and MOUNT skill type.
* Removing L2SkillChangeWeapon skill implementation and CHANGEWEAPON skill type.

Zoey76 12 years ago
parent
commit
75093e02da

+ 0 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -95,7 +95,6 @@ import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.funcs.Func;
-import com.l2jserver.gameserver.model.skills.l2skills.L2SkillMount;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSummon;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.stats.BaseStats;
@@ -6160,11 +6159,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 			}
 			if (isPlayer())
 			{
-				if ((oldSkill instanceof L2SkillMount) && getActingPlayer().isMounted())
-				{
-					getActingPlayer().dismount();
-				}
-				
 				// TODO: Unhardcode it!
 				if ((oldSkill instanceof L2SkillSummon) && (oldSkill.getId() == 710) && hasSummon() && (getSummon().getNpcId() == 14870))
 				{

+ 0 - 5
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2SkillType.java

@@ -21,14 +21,12 @@ package com.l2jserver.gameserver.model.skills;
 import java.lang.reflect.Constructor;
 
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.skills.l2skills.L2SkillChangeWeapon;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillChargeDmg;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillCreateItem;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDecoy;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDefault;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillDrain;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillLearnSkill;
-import com.l2jserver.gameserver.model.skills.l2skills.L2SkillMount;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSiegeFlag;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignet;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillSignetCasttime;
@@ -103,7 +101,6 @@ public enum L2SkillType
 	DELUXE_KEY_UNLOCK,
 	SOW,
 	GET_PLAYER,
-	MOUNT(L2SkillMount.class),
 	INSTANT_JUMP,
 	DETECTION,
 	DUMMY,
@@ -143,8 +140,6 @@ public enum L2SkillType
 	DETECT_TRAP,
 	REMOVE_TRAP,
 	SHIFT_TARGET,
-	// Kamael WeaponChange
-	CHANGEWEAPON(L2SkillChangeWeapon.class),
 	
 	STEAL_BUFF,
 	

+ 0 - 186
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillChangeWeapon.java

@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2004-2013 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.skills.l2skills;
-
-import com.l2jserver.gameserver.model.Elementals;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.itemcontainer.Inventory;
-import com.l2jserver.gameserver.model.items.L2Weapon;
-import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
-/**
- * @author nBd
- */
-public class L2SkillChangeWeapon extends L2Skill
-{
-	public L2SkillChangeWeapon(StatsSet set)
-	{
-		super(set);
-	}
-	
-	@Override
-	public void useSkill(L2Character caster, L2Object[] targets)
-	{
-		if (caster.isAlikeDead())
-		{
-			return;
-		}
-		
-		if (!caster.isPlayer())
-		{
-			return;
-		}
-		
-		final L2PcInstance player = caster.getActingPlayer();
-		if (player.isEnchanting())
-		{
-			return;
-		}
-		
-		final L2Weapon weaponItem = player.getActiveWeaponItem();
-		if (weaponItem == null)
-		{
-			return;
-		}
-		
-		L2ItemInstance wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
-		if (wpn == null)
-		{
-			wpn = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
-		}
-		
-		if (wpn != null)
-		{
-			if (wpn.isAugmented())
-			{
-				return;
-			}
-			
-			int newItemId = 0;
-			int enchantLevel = 0;
-			Elementals elementals = null;
-			
-			if (weaponItem.getChangeWeaponId() != 0)
-			{
-				newItemId = weaponItem.getChangeWeaponId();
-				enchantLevel = wpn.getEnchantLevel();
-				elementals = wpn.getElementals() == null ? null : wpn.getElementals()[0];
-				
-				if (newItemId == -1)
-				{
-					return;
-				}
-				
-				L2ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
-				InventoryUpdate iu = new InventoryUpdate();
-				for (L2ItemInstance item : unequiped)
-				{
-					iu.addModifiedItem(item);
-				}
-				
-				player.sendPacket(iu);
-				
-				if (unequiped.length > 0)
-				{
-					byte count = 0;
-					
-					for (L2ItemInstance item : unequiped)
-					{
-						if (!(item.getItem() instanceof L2Weapon))
-						{
-							count++;
-							continue;
-						}
-						
-						SystemMessage sm = null;
-						if (item.getEnchantLevel() > 0)
-						{
-							sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-							sm.addNumber(item.getEnchantLevel());
-							sm.addItemName(item);
-						}
-						else
-						{
-							sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
-							sm.addItemName(item);
-						}
-						player.sendPacket(sm);
-					}
-					
-					if (count == unequiped.length)
-					{
-						return;
-					}
-				}
-				else
-				{
-					return;
-				}
-				
-				L2ItemInstance destroyItem = player.getInventory().destroyItem("ChangeWeapon", wpn, player, null);
-				if (destroyItem == null)
-				{
-					return;
-				}
-				
-				L2ItemInstance newItem = player.getInventory().addItem("ChangeWeapon", newItemId, 1, player, destroyItem);
-				if (newItem == null)
-				{
-					return;
-				}
-				
-				if ((elementals != null) && (elementals.getElement() != -1) && (elementals.getValue() != -1))
-				{
-					newItem.setElementAttr(elementals.getElement(), elementals.getValue());
-				}
-				newItem.setEnchantLevel(enchantLevel);
-				player.getInventory().equipItem(newItem);
-				
-				SystemMessage msg = null;
-				
-				if (newItem.getEnchantLevel() > 0)
-				{
-					msg = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_EQUIPPED);
-					msg.addNumber(newItem.getEnchantLevel());
-					msg.addItemName(newItem);
-				}
-				else
-				{
-					msg = SystemMessage.getSystemMessage(SystemMessageId.S1_EQUIPPED);
-					msg.addItemName(newItem);
-				}
-				player.sendPacket(msg);
-				
-				InventoryUpdate u = new InventoryUpdate();
-				u.addRemovedItem(destroyItem);
-				u.addItem(newItem);
-				player.sendPacket(u);
-				
-				player.broadcastUserInfo();
-			}
-		}
-	}
-}

+ 0 - 102
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillMount.java

@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2004-2013 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.skills.l2skills;
-
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.entity.TvTEvent;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.network.SystemMessageId;
-
-public class L2SkillMount extends L2Skill
-{
-	private final int _itemId;
-	
-	public L2SkillMount(StatsSet set)
-	{
-		super(set);
-		_itemId = set.getInteger("itemId", 0);
-	}
-	
-	@Override
-	public void useSkill(L2Character caster, L2Object[] targets)
-	{
-		if (!caster.isPlayer())
-		{
-			return;
-		}
-		
-		if (!TvTEvent.onItemSummon(caster.getObjectId()))
-		{
-			return;
-		}
-		
-		L2PcInstance activePlayer = caster.getActingPlayer();
-		
-		if (!activePlayer.getFloodProtectors().getItemPetSummon().tryPerformAction("mount"))
-		{
-			return;
-		}
-		
-		// Dismount Action
-		if (getNpcId() == 0)
-		{
-			activePlayer.dismount();
-			return;
-		}
-		
-		if (activePlayer.isSitting())
-		{
-			activePlayer.sendPacket(SystemMessageId.CANT_MOVE_SITTING);
-			return;
-		}
-		
-		if (activePlayer.inObserverMode())
-		{
-			return;
-		}
-		
-		if (activePlayer.isInOlympiadMode())
-		{
-			activePlayer.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
-			return;
-		}
-		
-		if (activePlayer.hasSummon() || activePlayer.isMounted())
-		{
-			activePlayer.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
-			return;
-		}
-		
-		if (activePlayer.isAttackingNow())
-		{
-			activePlayer.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT);
-			return;
-		}
-		
-		if (activePlayer.isCursedWeaponEquipped())
-		{
-			return;
-		}
-		
-		activePlayer.mount(getNpcId(), _itemId, false);
-	}
-}