Parcourir la source

BETA: Removing Appearance skill implementation.

Zoey76 il y a 12 ans
Parent
commit
cd71eab747

+ 32 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -257,6 +257,11 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	
 	private int _npcId = 0;
 	
+	// Appearance
+	private final int _faceId;
+	private final int _hairColorId;
+	private final int _hairStyleId;
+	
 	protected L2Skill(StatsSet set)
 	{
 		_id = set.getInteger("skill_id");
@@ -534,6 +539,9 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		_maxTargets = set.getInteger("maxTargets", -1);
 		_isStaticHeal = set.getBool("isStaticHeal", false);
 		_npcId = set.getInteger("npcId", 0);
+		_faceId = set.getInteger("faceId", -1);
+		_hairColorId = set.getInteger("hairColorId", -1);
+		_hairStyleId = set.getInteger("hairStyleId", -1);
 	}
 	
 	public abstract void useSkill(L2Character caster, L2Object[] targets);
@@ -2177,4 +2185,28 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	{
 		return _npcId;
 	}
+
+	/**
+	 * @return the _faceId
+	 */
+	public int getFaceId()
+	{
+		return _faceId;
+	}
+
+	/**
+	 * @return the _hairColorId
+	 */
+	public int getHairColorId()
+	{
+		return _hairColorId;
+	}
+
+	/**
+	 * @return the _hairStyleId
+	 */
+	public int getHairStyleId()
+	{
+		return _hairStyleId;
+	}
 }

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

@@ -21,7 +21,6 @@ package com.l2jserver.gameserver.model.skills;
 import java.lang.reflect.Constructor;
 
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.skills.l2skills.L2SkillAppearance;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillChangeWeapon;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillChargeDmg;
 import com.l2jserver.gameserver.model.skills.l2skills.L2SkillCreateItem;
@@ -189,8 +188,6 @@ public enum L2SkillType
 	// Skill is done within the core.
 	COREDONE,
 	
-	CHANGE_APPEARANCE(L2SkillAppearance.class),
-	
 	// Refuel airship
 	REFUEL,
 	// Nornil's Power (Nornil's Garden instance)

+ 0 - 76
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/l2skills/L2SkillAppearance.java

@@ -1,76 +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 java.util.logging.Level;
-
-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.skills.L2Skill;
-
-public class L2SkillAppearance extends L2Skill
-{
-	private final int _faceId;
-	private final int _hairColorId;
-	private final int _hairStyleId;
-	
-	public L2SkillAppearance(StatsSet set)
-	{
-		super(set);
-		
-		_faceId = set.getInteger("faceId", -1);
-		_hairColorId = set.getInteger("hairColorId", -1);
-		_hairStyleId = set.getInteger("hairStyleId", -1);
-	}
-	
-	@Override
-	public void useSkill(L2Character caster, L2Object[] targets)
-	{
-		try
-		{
-			for (L2Object target : targets)
-			{
-				if (target.isPlayer())
-				{
-					L2PcInstance targetPlayer = target.getActingPlayer();
-					if (_faceId >= 0)
-					{
-						targetPlayer.getAppearance().setFace(_faceId);
-					}
-					if (_hairColorId >= 0)
-					{
-						targetPlayer.getAppearance().setHairColor(_hairColorId);
-					}
-					if (_hairStyleId >= 0)
-					{
-						targetPlayer.getAppearance().setHairStyle(_hairStyleId);
-					}
-					
-					targetPlayer.broadcastUserInfo();
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.SEVERE, "", e);
-		}
-	}
-}