Better getter and setter naming for player sex.
This commit is contained in:
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6496,7 +6496,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7155,7 +7155,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12640,7 +12640,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12652,7 +12652,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
|
|||||||
final PlayerInstance player = m.getPlayerInstance();
|
final PlayerInstance player = m.getPlayerInstance();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect
|
packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect
|
||||||
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+1
-1
@@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
Vendored
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6502,7 +6502,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7162,7 +7162,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12647,7 +12647,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12659,7 +12659,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
|
|||||||
final PlayerInstance player = m.getPlayerInstance();
|
final PlayerInstance player = m.getPlayerInstance();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect
|
packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect
|
||||||
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+1
-1
@@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6504,7 +6504,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7164,7 +7164,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12649,7 +12649,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12661,7 +12661,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
|
|||||||
final PlayerInstance player = m.getPlayerInstance();
|
final PlayerInstance player = m.getPlayerInstance();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect
|
packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect
|
||||||
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+1
-1
@@ -146,7 +146,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
Vendored
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6498,7 +6498,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7158,7 +7158,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12628,7 +12628,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12640,7 +12640,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
+3
-3
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -102,7 +102,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
|
|||||||
final PlayerInstance player = m.getPlayerInstance();
|
final PlayerInstance player = m.getPlayerInstance();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
packet.writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect
|
packet.writeD(player.getAppearance().isFemale() ? 1 : 0); // no visible effect
|
||||||
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
packet.writeD(player.getRace().ordinal()); // packet.writeD(1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+1
-1
@@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6480,7 +6480,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7140,7 +7140,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12618,7 +12618,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12630,7 +12630,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6480,7 +6480,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7140,7 +7140,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12621,7 +12621,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12633,7 +12633,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
+2
-2
@@ -136,9 +136,9 @@ public class Hardin extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
// Ertheias can only be female
|
// Ertheias can only be female
|
||||||
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
final ClassId newClass = ClassId.getClassId(Integer.parseInt(event.replace("try_", "")));
|
||||||
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().getSex())
|
if ((newClass.getRace() == Race.ERTHEIA) && (player.getClassId().getRace() != Race.ERTHEIA) && !player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
// Change class
|
// Change class
|
||||||
player.setClassId(newClass.getId());
|
player.setClassId(newClass.getId());
|
||||||
|
|||||||
+1
-1
@@ -839,7 +839,7 @@ public class Raina extends AbstractNpcAI
|
|||||||
|
|
||||||
if (player.getRace() == Race.KAMAEL)
|
if (player.getRace() == Race.KAMAEL)
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
subclasses.remove(PlayerClass.femaleSoulbreaker);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+13
-6
@@ -396,9 +396,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 132: // Soul Hound (Male)
|
case 132: // Soul Hound (Male)
|
||||||
case 157: // Tyrr Doombringer
|
case 157: // Tyrr Doombringer
|
||||||
{
|
{
|
||||||
if (player.getAppearance().getSex())
|
if (player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(false);
|
player.getAppearance().setMale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -410,9 +410,9 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
case 134: // Trickster
|
case 134: // Trickster
|
||||||
case 165: // Yul Trickster
|
case 165: // Yul Trickster
|
||||||
{
|
{
|
||||||
if (!player.getAppearance().getSex())
|
if (!player.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -420,7 +420,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
}
|
}
|
||||||
if (player.getRace() == Race.ERTHEIA)
|
if (player.getRace() == Race.ERTHEIA)
|
||||||
{
|
{
|
||||||
player.getAppearance().setSex(true);
|
player.getAppearance().setFemale();
|
||||||
}
|
}
|
||||||
|
|
||||||
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
|
||||||
@@ -544,7 +544,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.broadcastUserInfo();
|
player.broadcastUserInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -37,6 +37,6 @@ public class CheckSexSkillCondition implements ISkillCondition
|
|||||||
@Override
|
@Override
|
||||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||||
{
|
{
|
||||||
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().getSex() == _isFemale);
|
return caster.isPlayer() && (caster.getActingPlayer().getAppearance().isFemale() == _isFemale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -141,11 +141,21 @@ public class PlayerAppearance
|
|||||||
/**
|
/**
|
||||||
* @return true if char is female
|
* @return true if char is female
|
||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setFemale()
|
||||||
|
{
|
||||||
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex of the char
|
* @return Sex of the char
|
||||||
*/
|
*/
|
||||||
@@ -154,14 +164,6 @@ public class PlayerAppearance
|
|||||||
return _sex ? Sex.FEMALE : Sex.MALE;
|
return _sex ? Sex.FEMALE : Sex.MALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param isfemale
|
|
||||||
*/
|
|
||||||
public void setSex(boolean isfemale)
|
|
||||||
{
|
|
||||||
_sex = isfemale;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNameColor()
|
public int getNameColor()
|
||||||
{
|
{
|
||||||
return _nameColor;
|
return _nameColor;
|
||||||
|
|||||||
+4
-4
@@ -6481,7 +6481,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(11, _appearance.getFace());
|
statement.setInt(11, _appearance.getFace());
|
||||||
statement.setInt(12, _appearance.getHairStyle());
|
statement.setInt(12, _appearance.getHairStyle());
|
||||||
statement.setInt(13, _appearance.getHairColor());
|
statement.setInt(13, _appearance.getHairColor());
|
||||||
statement.setInt(14, _appearance.getSex() ? 1 : 0);
|
statement.setInt(14, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setLong(15, getExp());
|
statement.setLong(15, getExp());
|
||||||
statement.setLong(16, getSp());
|
statement.setLong(16, getSp());
|
||||||
statement.setInt(17, getReputation());
|
statement.setInt(17, getReputation());
|
||||||
@@ -7141,7 +7141,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(8, _appearance.getFace());
|
statement.setInt(8, _appearance.getFace());
|
||||||
statement.setInt(9, _appearance.getHairStyle());
|
statement.setInt(9, _appearance.getHairStyle());
|
||||||
statement.setInt(10, _appearance.getHairColor());
|
statement.setInt(10, _appearance.getHairColor());
|
||||||
statement.setInt(11, _appearance.getSex() ? 1 : 0);
|
statement.setInt(11, _appearance.isFemale() ? 1 : 0);
|
||||||
statement.setInt(12, getHeading());
|
statement.setInt(12, getHeading());
|
||||||
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
statement.setInt(13, _lastLoc != null ? _lastLoc.getX() : getX());
|
||||||
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
statement.setInt(14, _lastLoc != null ? _lastLoc.getY() : getY());
|
||||||
@@ -12627,7 +12627,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionRadius = _appearance.getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
|
||||||
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12639,7 +12639,7 @@ public class PlayerInstance extends Playable
|
|||||||
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
final double defaultCollisionHeight = _appearance.getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
|
||||||
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ public class Transform implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (creature.isPlayer())
|
if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
return (creature.getActingPlayer().getAppearance().getSex() ? _femaleTemplate : _maleTemplate);
|
return (creature.getActingPlayer().getAppearance().isFemale() ? _femaleTemplate : _maleTemplate);
|
||||||
}
|
}
|
||||||
else if (creature.isNpc())
|
else if (creature.isNpc())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class ClanMember
|
|||||||
_title = player.getTitle();
|
_title = player.getTitle();
|
||||||
_sponsor = 0;
|
_sponsor = 0;
|
||||||
_apprentice = 0;
|
_apprentice = 0;
|
||||||
_sex = player.getAppearance().getSex();
|
_sex = player.getAppearance().isFemale();
|
||||||
_raceOrdinal = player.getRace().ordinal();
|
_raceOrdinal = player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,7 +122,7 @@ public class ClanMember
|
|||||||
_title = _player.getTitle();
|
_title = _player.getTitle();
|
||||||
_apprentice = _player.getApprentice();
|
_apprentice = _player.getApprentice();
|
||||||
_sponsor = _player.getSponsor();
|
_sponsor = _player.getSponsor();
|
||||||
_sex = _player.getAppearance().getSex();
|
_sex = _player.getAppearance().isFemale();
|
||||||
_raceOrdinal = _player.getRace().ordinal();
|
_raceOrdinal = _player.getRace().ordinal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -328,7 +328,7 @@ public class ClanMember
|
|||||||
*/
|
*/
|
||||||
public boolean getSex()
|
public boolean getSex()
|
||||||
{
|
{
|
||||||
return _player != null ? _player.getAppearance().getSex() : _sex;
|
return _player != null ? _player.getAppearance().isFemale() : _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,6 @@ public class ConditionPlayerSex extends Condition
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
|
return (effector.getActingPlayer().getAppearance().isFemale() ? 1 : 0) == _sex;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket
|
|||||||
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed
|
||||||
|
|
||||||
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
packet.writeH(_player.getRace().ordinal()); // Confirmed
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00); // Confirmed
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed
|
||||||
packet.writeD(_player.getBaseClass()); // Confirmed
|
packet.writeD(_player.getBaseClass()); // Confirmed
|
||||||
|
|
||||||
for (int slot : getPaperdollOrder())
|
for (int slot : getPaperdollOrder())
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ public class CharSelected implements IClientOutgoingPacket
|
|||||||
packet.writeD(_sessionId);
|
packet.writeD(_sessionId);
|
||||||
packet.writeD(_player.getClanId());
|
packet.writeD(_player.getClanId());
|
||||||
packet.writeD(0x00); // ??
|
packet.writeD(0x00); // ??
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(0x01); // active ??
|
packet.writeD(0x01); // active ??
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
|
|||||||
packet.writeD(_player.getObjectId());
|
packet.writeD(_player.getObjectId());
|
||||||
packet.writeS(_player.getName());
|
packet.writeS(_player.getName());
|
||||||
packet.writeD(_player.getRace().ordinal());
|
packet.writeD(_player.getRace().ordinal());
|
||||||
packet.writeD(_player.getAppearance().getSex() ? 1 : 0);
|
packet.writeD(_player.getAppearance().isFemale() ? 1 : 0);
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeD(_player.getLevel());
|
packet.writeD(_player.getLevel());
|
||||||
packet.writeQ(_player.getExp());
|
packet.writeQ(_player.getExp());
|
||||||
|
|||||||
+1
-1
@@ -147,7 +147,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
|
|||||||
packet.writeString(_player.getName());
|
packet.writeString(_player.getName());
|
||||||
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
packet.writeC(_player.isGM() ? 0x01 : 0x00);
|
||||||
packet.writeC(_player.getRace().ordinal());
|
packet.writeC(_player.getRace().ordinal());
|
||||||
packet.writeC(_player.getAppearance().getSex() ? 0x01 : 0x00);
|
packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00);
|
||||||
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId());
|
||||||
packet.writeD(_player.getClassId().getId());
|
packet.writeD(_player.getClassId().getId());
|
||||||
packet.writeC(_player.getLevel());
|
packet.writeC(_player.getLevel());
|
||||||
|
|||||||
+8
-1
@@ -587,7 +587,14 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
BuilderUtil.sendSysMessage(activeChar, "Select player before command");
|
BuilderUtil.sendSysMessage(activeChar, "Select player before command");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
player.getAppearance().setSex(player.getAppearance().getSex() ? false : true);
|
if (player.getAppearance().isFemale())
|
||||||
|
{
|
||||||
|
player.getAppearance().setMale();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player.getAppearance().setFemale();
|
||||||
|
}
|
||||||
PlayerInstance.setSexDB(player, 1);
|
PlayerInstance.setSexDB(player, 1);
|
||||||
player.sendMessage("Your gender has been changed by a GM");
|
player.sendMessage("Your gender has been changed by a GM");
|
||||||
player.decayMe();
|
player.decayMe();
|
||||||
|
|||||||
+1
-1
@@ -208,7 +208,7 @@ public class Wedding implements IVoicedCommandHandler
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ptarget.getAppearance().getSex() == activeChar.getAppearance().getSex()) && !Config.L2JMOD_WEDDING_SAMESEX)
|
if ((ptarget.getAppearance().isFemale() == activeChar.getAppearance().isFemale()) && !Config.L2JMOD_WEDDING_SAMESEX)
|
||||||
{
|
{
|
||||||
activeChar.sendMessage("Gay marriage is not allowed on this server!");
|
activeChar.sendMessage("Gay marriage is not allowed on this server!");
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
+8
-3
@@ -66,14 +66,19 @@ public class PlayerAppearance
|
|||||||
_hairStyle = (byte) value;
|
_hairStyle = (byte) value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getSex()
|
public boolean isFemale()
|
||||||
{
|
{
|
||||||
return _sex;
|
return _sex;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSex(boolean isfemale)
|
public void setFemale()
|
||||||
{
|
{
|
||||||
_sex = isfemale;
|
_sex = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMale()
|
||||||
|
{
|
||||||
|
_sex = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInvisible()
|
public void setInvisible()
|
||||||
|
|||||||
+2
-2
@@ -8906,7 +8906,7 @@ public class PlayerInstance extends Playable
|
|||||||
statement.setInt(28, getAppearance().getFace());
|
statement.setInt(28, getAppearance().getFace());
|
||||||
statement.setInt(29, getAppearance().getHairStyle());
|
statement.setInt(29, getAppearance().getHairStyle());
|
||||||
statement.setInt(30, getAppearance().getHairColor());
|
statement.setInt(30, getAppearance().getHairColor());
|
||||||
statement.setInt(31, getAppearance().getSex() ? 1 : 0);
|
statement.setInt(31, getAppearance().isFemale() ? 1 : 0);
|
||||||
statement.setDouble(32, 1/* getMovementMultiplier() */);
|
statement.setDouble(32, 1/* getMovementMultiplier() */);
|
||||||
statement.setDouble(33, 1/* getAttackSpeedMultiplier() */);
|
statement.setDouble(33, 1/* getAttackSpeedMultiplier() */);
|
||||||
statement.setDouble(34, getTemplate().collisionRadius/* getCollisionRadius() */);
|
statement.setDouble(34, getTemplate().collisionRadius/* getCollisionRadius() */);
|
||||||
@@ -17795,7 +17795,7 @@ public class PlayerInstance extends Playable
|
|||||||
try (Connection con = DatabaseFactory.getConnection())
|
try (Connection con = DatabaseFactory.getConnection())
|
||||||
{
|
{
|
||||||
final PreparedStatement statement = con.prepareStatement("UPDATE characters SET sex=? WHERE obj_Id=?");
|
final PreparedStatement statement = con.prepareStatement("UPDATE characters SET sex=? WHERE obj_Id=?");
|
||||||
statement.setInt(1, player.getAppearance().getSex() ? 1 : 0);
|
statement.setInt(1, player.getAppearance().isFemale() ? 1 : 0);
|
||||||
statement.setInt(2, player.getObjectId());
|
statement.setInt(2, player.getObjectId());
|
||||||
statement.execute();
|
statement.execute();
|
||||||
statement.close();
|
statement.close();
|
||||||
|
|||||||
+2
-2
@@ -138,13 +138,13 @@ public class WeddingManagerInstance extends NpcInstance
|
|||||||
player.setMarryAccepted(true);
|
player.setMarryAccepted(true);
|
||||||
|
|
||||||
int type;
|
int type;
|
||||||
if (player.getAppearance().getSex() && ptarget.getAppearance().getSex())
|
if (player.getAppearance().isFemale() && ptarget.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_LESBO);
|
player.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_LESBO);
|
||||||
ptarget.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_LESBO);
|
ptarget.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_LESBO);
|
||||||
type = 1;
|
type = 1;
|
||||||
}
|
}
|
||||||
else if (!player.getAppearance().getSex() && !ptarget.getAppearance().getSex())
|
else if (!player.getAppearance().isFemale() && !ptarget.getAppearance().isFemale())
|
||||||
{
|
{
|
||||||
player.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_GEY);
|
player.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_GEY);
|
||||||
ptarget.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_GEY);
|
ptarget.getAppearance().setNameColor(Config.L2JMOD_WEDDING_NAME_COLOR_GEY);
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user