lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Beauty shop should work for Death Knight dualclass.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-30 22:07:05 +00:00
parent d19d9c74ea
commit a20b209802
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java vendored
View File

@@ -16,6 +16,8 @@
*/ */
package ai.others.LaVieEnRose; package ai.others.LaVieEnRose;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
@@ -133,7 +135,7 @@ public class LaVieEnRose extends AbstractNpcAI
return false; return false;
} }
if (player.isDeathKnight()) if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()))
{ {
player.sendPacket(SystemMessageId.DEATH_KNIGHT_CLASSES_ARE_UNAVAILABLE); player.sendPacket(SystemMessageId.DEATH_KNIGHT_CLASSES_ARE_UNAVAILABLE);
return false; return false;

14
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
View File

@@ -16,6 +16,8 @@
*/ */
package org.l2jmobius.gameserver.model; package org.l2jmobius.gameserver.model;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.model.variables.PlayerVariables;
@@ -207,6 +209,10 @@ public class CharSelectInfoPackage
public int getFace() public int getFace()
{ {
if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _classId))
{
return _face;
}
return _vars.getInt("visualFaceId", _face); return _vars.getInt("visualFaceId", _face);
} }
@@ -217,6 +223,10 @@ public class CharSelectInfoPackage
public int getHairColor() public int getHairColor()
{ {
if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _classId))
{
return _hairColor;
}
return _vars.getInt("visualHairColorId", _hairColor); return _vars.getInt("visualHairColorId", _hairColor);
} }
@@ -227,6 +237,10 @@ public class CharSelectInfoPackage
public int getHairStyle() public int getHairStyle()
{ {
if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _classId))
{
return _hairStyle;
}
return _vars.getInt("visualHairId", _hairStyle); return _vars.getInt("visualHairId", _hairStyle);
} }

12
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -13698,6 +13698,10 @@ public class Player extends Playable
*/ */
public int getVisualHair() public int getVisualHair()
{ {
if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, getClassId().getId()))
{
return _appearance.getHairStyle();
}
return getVariables().getInt("visualHairId", _appearance.getHairStyle()); return getVariables().getInt("visualHairId", _appearance.getHairStyle());
} }
@@ -13706,6 +13710,10 @@ public class Player extends Playable
*/ */
public int getVisualHairColor() public int getVisualHairColor()
{ {
if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, getClassId().getId()))
{
return _appearance.getHairColor();
}
return getVariables().getInt("visualHairColorId", _appearance.getHairColor()); return getVariables().getInt("visualHairColorId", _appearance.getHairColor());
} }
@@ -13714,6 +13722,10 @@ public class Player extends Playable
*/ */
public int getVisualFace() public int getVisualFace()
{ {
if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, getClassId().getId()))
{
return _appearance.getFace();
}
return getVariables().getInt("visualFaceId", _appearance.getFace()); return getVariables().getInt("visualFaceId", _appearance.getFace());
} }