Removed level related byte casts.
This commit is contained in:
parent
0782cfcdba
commit
62e806f672
@ -278,7 +278,7 @@ public class Config
|
|||||||
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
||||||
public static boolean INITIAL_EQUIPMENT_EVENT;
|
public static boolean INITIAL_EQUIPMENT_EVENT;
|
||||||
public static long STARTING_ADENA;
|
public static long STARTING_ADENA;
|
||||||
public static byte STARTING_LEVEL;
|
public static int STARTING_LEVEL;
|
||||||
public static int STARTING_SP;
|
public static int STARTING_SP;
|
||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
@ -1906,7 +1906,7 @@ public class Config
|
|||||||
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
||||||
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
||||||
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
||||||
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);
|
STARTING_LEVEL = Character.getInt("StartingLevel", 1);
|
||||||
STARTING_SP = Character.getInt("StartingSP", 0);
|
STARTING_SP = Character.getInt("StartingSP", 0);
|
||||||
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
||||||
if (MAX_ADENA < 0)
|
if (MAX_ADENA < 0)
|
||||||
|
@ -231,7 +231,7 @@ public class PetInstance extends Summon
|
|||||||
pet.setTitle(owner.getName());
|
pet.setTitle(owner.getName());
|
||||||
if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel()))
|
if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel()))
|
||||||
{
|
{
|
||||||
final byte availableLevel = (byte) Math.min(data.getMaxLevel(), owner.getLevel());
|
final int availableLevel = Math.min(data.getMaxLevel(), owner.getLevel());
|
||||||
pet.getStat().setLevel(availableLevel);
|
pet.getStat().setLevel(availableLevel);
|
||||||
pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel));
|
pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel));
|
||||||
}
|
}
|
||||||
@ -248,7 +248,7 @@ public class PetInstance extends Summon
|
|||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
||||||
{
|
{
|
||||||
this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()));
|
this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -258,13 +258,13 @@ public class PetInstance extends Summon
|
|||||||
* @param control
|
* @param control
|
||||||
* @param level
|
* @param level
|
||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level)
|
||||||
{
|
{
|
||||||
super(template, owner);
|
super(template, owner);
|
||||||
setInstanceType(InstanceType.PetInstance);
|
setInstanceType(InstanceType.PetInstance);
|
||||||
|
|
||||||
_controlObjectId = control.getObjectId();
|
_controlObjectId = control.getObjectId();
|
||||||
getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
||||||
_inventory = new PetInventory(this);
|
_inventory = new PetInventory(this);
|
||||||
_inventory.restore();
|
_inventory.restore();
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat
|
|||||||
@Override
|
@Override
|
||||||
public int getLevel()
|
public int getLevel()
|
||||||
{
|
{
|
||||||
return (byte) getActiveChar().getLevel();
|
return getActiveChar().getLevel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -284,7 +284,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
if (balthusKnights)
|
if (balthusKnights)
|
||||||
{
|
{
|
||||||
newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL));
|
newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL));
|
||||||
newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL);
|
newChar.getStat().setLevel(Config.BALTHUS_KNIGHTS_LEVEL);
|
||||||
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
|
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
|
||||||
{
|
{
|
||||||
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
|
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
|
||||||
@ -330,7 +330,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Config.STARTING_LEVEL > 1)
|
if (Config.STARTING_LEVEL > 1)
|
||||||
{
|
{
|
||||||
newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1));
|
newChar.getStat().addLevel(Config.STARTING_LEVEL - 1);
|
||||||
}
|
}
|
||||||
if (Config.STARTING_SP > 0)
|
if (Config.STARTING_SP > 0)
|
||||||
{
|
{
|
||||||
|
@ -278,7 +278,7 @@ public class Config
|
|||||||
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
||||||
public static boolean INITIAL_EQUIPMENT_EVENT;
|
public static boolean INITIAL_EQUIPMENT_EVENT;
|
||||||
public static long STARTING_ADENA;
|
public static long STARTING_ADENA;
|
||||||
public static byte STARTING_LEVEL;
|
public static int STARTING_LEVEL;
|
||||||
public static int STARTING_SP;
|
public static int STARTING_SP;
|
||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
@ -1906,7 +1906,7 @@ public class Config
|
|||||||
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
||||||
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
||||||
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
||||||
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);
|
STARTING_LEVEL = Character.getInt("StartingLevel", 1);
|
||||||
STARTING_SP = Character.getInt("StartingSP", 0);
|
STARTING_SP = Character.getInt("StartingSP", 0);
|
||||||
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
||||||
if (MAX_ADENA < 0)
|
if (MAX_ADENA < 0)
|
||||||
|
@ -231,7 +231,7 @@ public class PetInstance extends Summon
|
|||||||
pet.setTitle(owner.getName());
|
pet.setTitle(owner.getName());
|
||||||
if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel()))
|
if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel()))
|
||||||
{
|
{
|
||||||
final byte availableLevel = (byte) Math.min(data.getMaxLevel(), owner.getLevel());
|
final int availableLevel = Math.min(data.getMaxLevel(), owner.getLevel());
|
||||||
pet.getStat().setLevel(availableLevel);
|
pet.getStat().setLevel(availableLevel);
|
||||||
pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel));
|
pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel));
|
||||||
}
|
}
|
||||||
@ -248,7 +248,7 @@ public class PetInstance extends Summon
|
|||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
||||||
{
|
{
|
||||||
this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()));
|
this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -258,13 +258,13 @@ public class PetInstance extends Summon
|
|||||||
* @param control
|
* @param control
|
||||||
* @param level
|
* @param level
|
||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level)
|
||||||
{
|
{
|
||||||
super(template, owner);
|
super(template, owner);
|
||||||
setInstanceType(InstanceType.PetInstance);
|
setInstanceType(InstanceType.PetInstance);
|
||||||
|
|
||||||
_controlObjectId = control.getObjectId();
|
_controlObjectId = control.getObjectId();
|
||||||
getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
||||||
_inventory = new PetInventory(this);
|
_inventory = new PetInventory(this);
|
||||||
_inventory.restore();
|
_inventory.restore();
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat
|
|||||||
@Override
|
@Override
|
||||||
public int getLevel()
|
public int getLevel()
|
||||||
{
|
{
|
||||||
return (byte) getActiveChar().getLevel();
|
return getActiveChar().getLevel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -284,7 +284,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
if (balthusKnights)
|
if (balthusKnights)
|
||||||
{
|
{
|
||||||
newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL));
|
newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL));
|
||||||
newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL);
|
newChar.getStat().setLevel(Config.BALTHUS_KNIGHTS_LEVEL);
|
||||||
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
|
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
|
||||||
{
|
{
|
||||||
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
|
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
|
||||||
@ -330,7 +330,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Config.STARTING_LEVEL > 1)
|
if (Config.STARTING_LEVEL > 1)
|
||||||
{
|
{
|
||||||
newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1));
|
newChar.getStat().addLevel(Config.STARTING_LEVEL - 1);
|
||||||
}
|
}
|
||||||
if (Config.STARTING_SP > 0)
|
if (Config.STARTING_SP > 0)
|
||||||
{
|
{
|
||||||
|
@ -278,7 +278,7 @@ public class Config
|
|||||||
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
||||||
public static boolean INITIAL_EQUIPMENT_EVENT;
|
public static boolean INITIAL_EQUIPMENT_EVENT;
|
||||||
public static long STARTING_ADENA;
|
public static long STARTING_ADENA;
|
||||||
public static byte STARTING_LEVEL;
|
public static int STARTING_LEVEL;
|
||||||
public static int STARTING_SP;
|
public static int STARTING_SP;
|
||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
@ -1906,7 +1906,7 @@ public class Config
|
|||||||
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
||||||
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
||||||
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
||||||
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);
|
STARTING_LEVEL = Character.getInt("StartingLevel", 1);
|
||||||
STARTING_SP = Character.getInt("StartingSP", 0);
|
STARTING_SP = Character.getInt("StartingSP", 0);
|
||||||
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
||||||
if (MAX_ADENA < 0)
|
if (MAX_ADENA < 0)
|
||||||
|
@ -231,7 +231,7 @@ public class PetInstance extends Summon
|
|||||||
pet.setTitle(owner.getName());
|
pet.setTitle(owner.getName());
|
||||||
if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel()))
|
if (data.isSynchLevel() && (pet.getLevel() != owner.getLevel()))
|
||||||
{
|
{
|
||||||
final byte availableLevel = (byte) Math.min(data.getMaxLevel(), owner.getLevel());
|
final int availableLevel = Math.min(data.getMaxLevel(), owner.getLevel());
|
||||||
pet.getStat().setLevel(availableLevel);
|
pet.getStat().setLevel(availableLevel);
|
||||||
pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel));
|
pet.getStat().setExp(pet.getStat().getExpForLevel(availableLevel));
|
||||||
}
|
}
|
||||||
@ -248,7 +248,7 @@ public class PetInstance extends Summon
|
|||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
||||||
{
|
{
|
||||||
this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()));
|
this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -258,13 +258,13 @@ public class PetInstance extends Summon
|
|||||||
* @param control
|
* @param control
|
||||||
* @param level
|
* @param level
|
||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level)
|
||||||
{
|
{
|
||||||
super(template, owner);
|
super(template, owner);
|
||||||
setInstanceType(InstanceType.PetInstance);
|
setInstanceType(InstanceType.PetInstance);
|
||||||
|
|
||||||
_controlObjectId = control.getObjectId();
|
_controlObjectId = control.getObjectId();
|
||||||
getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
||||||
_inventory = new PetInventory(this);
|
_inventory = new PetInventory(this);
|
||||||
_inventory.restore();
|
_inventory.restore();
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat
|
|||||||
@Override
|
@Override
|
||||||
public int getLevel()
|
public int getLevel()
|
||||||
{
|
{
|
||||||
return (byte) getActiveChar().getLevel();
|
return getActiveChar().getLevel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -284,7 +284,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
if (balthusKnights)
|
if (balthusKnights)
|
||||||
{
|
{
|
||||||
newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL));
|
newChar.setExp(ExperienceData.getInstance().getExpForLevel(Config.BALTHUS_KNIGHTS_LEVEL));
|
||||||
newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL);
|
newChar.getStat().setLevel(Config.BALTHUS_KNIGHTS_LEVEL);
|
||||||
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
|
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
|
||||||
{
|
{
|
||||||
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
|
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
|
||||||
@ -330,7 +330,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Config.STARTING_LEVEL > 1)
|
if (Config.STARTING_LEVEL > 1)
|
||||||
{
|
{
|
||||||
newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1));
|
newChar.getStat().addLevel(Config.STARTING_LEVEL - 1);
|
||||||
}
|
}
|
||||||
if (Config.STARTING_SP > 0)
|
if (Config.STARTING_SP > 0)
|
||||||
{
|
{
|
||||||
|
@ -279,7 +279,7 @@ public class Config
|
|||||||
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
||||||
public static boolean INITIAL_EQUIPMENT_EVENT;
|
public static boolean INITIAL_EQUIPMENT_EVENT;
|
||||||
public static long STARTING_ADENA;
|
public static long STARTING_ADENA;
|
||||||
public static byte STARTING_LEVEL;
|
public static int STARTING_LEVEL;
|
||||||
public static int STARTING_SP;
|
public static int STARTING_SP;
|
||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
@ -1838,7 +1838,7 @@ public class Config
|
|||||||
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
||||||
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
||||||
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
||||||
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);
|
STARTING_LEVEL = Character.getInt("StartingLevel", 1);
|
||||||
STARTING_SP = Character.getInt("StartingSP", 0);
|
STARTING_SP = Character.getInt("StartingSP", 0);
|
||||||
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
||||||
if (MAX_ADENA < 0)
|
if (MAX_ADENA < 0)
|
||||||
|
@ -368,7 +368,7 @@ public class PetInstance extends Summon
|
|||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
||||||
{
|
{
|
||||||
this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : 1));
|
this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -378,13 +378,13 @@ public class PetInstance extends Summon
|
|||||||
* @param control
|
* @param control
|
||||||
* @param level
|
* @param level
|
||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level)
|
||||||
{
|
{
|
||||||
super(template, owner);
|
super(template, owner);
|
||||||
setInstanceType(InstanceType.PetInstance);
|
setInstanceType(InstanceType.PetInstance);
|
||||||
|
|
||||||
_controlObjectId = control.getObjectId();
|
_controlObjectId = control.getObjectId();
|
||||||
getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
||||||
_inventory = new PetInventory(this);
|
_inventory = new PetInventory(this);
|
||||||
_inventory.restore();
|
_inventory.restore();
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat
|
|||||||
@Override
|
@Override
|
||||||
public int getLevel()
|
public int getLevel()
|
||||||
{
|
{
|
||||||
return (byte) getActiveChar().getLevel();
|
return getActiveChar().getLevel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -288,7 +288,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Config.STARTING_LEVEL > 1)
|
if (Config.STARTING_LEVEL > 1)
|
||||||
{
|
{
|
||||||
newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1));
|
newChar.getStat().addLevel(Config.STARTING_LEVEL - 1);
|
||||||
}
|
}
|
||||||
if (Config.STARTING_SP > 0)
|
if (Config.STARTING_SP > 0)
|
||||||
{
|
{
|
||||||
|
@ -279,7 +279,7 @@ public class Config
|
|||||||
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
||||||
public static boolean INITIAL_EQUIPMENT_EVENT;
|
public static boolean INITIAL_EQUIPMENT_EVENT;
|
||||||
public static long STARTING_ADENA;
|
public static long STARTING_ADENA;
|
||||||
public static byte STARTING_LEVEL;
|
public static int STARTING_LEVEL;
|
||||||
public static int STARTING_SP;
|
public static int STARTING_SP;
|
||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
@ -1841,7 +1841,7 @@ public class Config
|
|||||||
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
||||||
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
||||||
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
||||||
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);
|
STARTING_LEVEL = Character.getInt("StartingLevel", 1);
|
||||||
STARTING_SP = Character.getInt("StartingSP", 0);
|
STARTING_SP = Character.getInt("StartingSP", 0);
|
||||||
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
||||||
if (MAX_ADENA < 0)
|
if (MAX_ADENA < 0)
|
||||||
|
@ -368,7 +368,7 @@ public class PetInstance extends Summon
|
|||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
||||||
{
|
{
|
||||||
this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : 1));
|
this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -378,13 +378,13 @@ public class PetInstance extends Summon
|
|||||||
* @param control
|
* @param control
|
||||||
* @param level
|
* @param level
|
||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level)
|
||||||
{
|
{
|
||||||
super(template, owner);
|
super(template, owner);
|
||||||
setInstanceType(InstanceType.PetInstance);
|
setInstanceType(InstanceType.PetInstance);
|
||||||
|
|
||||||
_controlObjectId = control.getObjectId();
|
_controlObjectId = control.getObjectId();
|
||||||
getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
||||||
_inventory = new PetInventory(this);
|
_inventory = new PetInventory(this);
|
||||||
_inventory.restore();
|
_inventory.restore();
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat
|
|||||||
@Override
|
@Override
|
||||||
public int getLevel()
|
public int getLevel()
|
||||||
{
|
{
|
||||||
return (byte) getActiveChar().getLevel();
|
return getActiveChar().getLevel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -297,7 +297,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Config.STARTING_LEVEL > 1)
|
if (Config.STARTING_LEVEL > 1)
|
||||||
{
|
{
|
||||||
newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1));
|
newChar.getStat().addLevel(Config.STARTING_LEVEL - 1);
|
||||||
}
|
}
|
||||||
if (Config.STARTING_SP > 0)
|
if (Config.STARTING_SP > 0)
|
||||||
{
|
{
|
||||||
|
@ -279,7 +279,7 @@ public class Config
|
|||||||
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
public static boolean ALT_COMMAND_CHANNEL_FRIENDS;
|
||||||
public static boolean INITIAL_EQUIPMENT_EVENT;
|
public static boolean INITIAL_EQUIPMENT_EVENT;
|
||||||
public static long STARTING_ADENA;
|
public static long STARTING_ADENA;
|
||||||
public static byte STARTING_LEVEL;
|
public static int STARTING_LEVEL;
|
||||||
public static int STARTING_SP;
|
public static int STARTING_SP;
|
||||||
public static long MAX_ADENA;
|
public static long MAX_ADENA;
|
||||||
public static boolean AUTO_LOOT;
|
public static boolean AUTO_LOOT;
|
||||||
@ -1841,7 +1841,7 @@ public class Config
|
|||||||
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
ALT_COMMAND_CHANNEL_FRIENDS = Character.getBoolean("AltCommandChannelFriends", false);
|
||||||
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
INITIAL_EQUIPMENT_EVENT = Character.getBoolean("InitialEquipmentEvent", false);
|
||||||
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
STARTING_ADENA = Character.getLong("StartingAdena", 0);
|
||||||
STARTING_LEVEL = Character.getByte("StartingLevel", (byte) 1);
|
STARTING_LEVEL = Character.getInt("StartingLevel", 1);
|
||||||
STARTING_SP = Character.getInt("StartingSP", 0);
|
STARTING_SP = Character.getInt("StartingSP", 0);
|
||||||
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
MAX_ADENA = Character.getLong("MaxAdena", 99900000000L);
|
||||||
if (MAX_ADENA < 0)
|
if (MAX_ADENA < 0)
|
||||||
|
@ -368,7 +368,7 @@ public class PetInstance extends Summon
|
|||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control)
|
||||||
{
|
{
|
||||||
this(template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : 1));
|
this(template, owner, control, template.getDisplayId() == 12564 ? owner.getLevel() : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -378,13 +378,13 @@ public class PetInstance extends Summon
|
|||||||
* @param control
|
* @param control
|
||||||
* @param level
|
* @param level
|
||||||
*/
|
*/
|
||||||
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, byte level)
|
public PetInstance(NpcTemplate template, PlayerInstance owner, ItemInstance control, int level)
|
||||||
{
|
{
|
||||||
super(template, owner);
|
super(template, owner);
|
||||||
setInstanceType(InstanceType.PetInstance);
|
setInstanceType(InstanceType.PetInstance);
|
||||||
|
|
||||||
_controlObjectId = control.getObjectId();
|
_controlObjectId = control.getObjectId();
|
||||||
getStat().setLevel((byte) Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
getStat().setLevel(Math.max(level, PetDataTable.getInstance().getPetMinLevel(template.getId())));
|
||||||
_inventory = new PetInventory(this);
|
_inventory = new PetInventory(this);
|
||||||
_inventory.restore();
|
_inventory.restore();
|
||||||
|
|
||||||
|
@ -34,6 +34,6 @@ public class StaticObjectStat extends CreatureStat
|
|||||||
@Override
|
@Override
|
||||||
public int getLevel()
|
public int getLevel()
|
||||||
{
|
{
|
||||||
return (byte) getActiveChar().getLevel();
|
return getActiveChar().getLevel();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -297,7 +297,7 @@ public class CharacterCreate implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
if (Config.STARTING_LEVEL > 1)
|
if (Config.STARTING_LEVEL > 1)
|
||||||
{
|
{
|
||||||
newChar.getStat().addLevel((byte) (Config.STARTING_LEVEL - 1));
|
newChar.getStat().addLevel(Config.STARTING_LEVEL - 1);
|
||||||
}
|
}
|
||||||
if (Config.STARTING_SP > 0)
|
if (Config.STARTING_SP > 0)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user