rendered paste bodyIndex: E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/actor/stat/PetStat.java
===================================================================
--- E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/actor/stat/PetStat.java (revision 1597)
+++ E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/actor/stat/PetStat.java (working copy)
@@ -69,7 +69,7 @@
return levelIncreased;
}
- public final int getExpForLevel(int level) { return L2PetDataTable.getInstance().getPetData(getActiveChar().getNpcId(), level).getPetExp(); }
+ public final int getExpForLevel(int level) { return L2PetDataTable.getInstance().getPetData(getActiveChar().getNpcId(), level).getPetMaxExp(); }
// =========================================================
// Method - Private
@@ -95,9 +95,9 @@
public final int getMaxFeed() { return (int)getActiveChar().getPetData().getPetMaxFeed(); }
- public int getMaxHp() { return (int)calcStat(Stats.MAX_HP, getActiveChar().getPetData().getPetHP(), null, null); }
+ public int getMaxHp() { return (int)calcStat(Stats.MAX_HP, getActiveChar().getPetData().getPetMaxHP(), null, null); }
- public int getMaxMp() { return (int)calcStat(Stats.MAX_MP, getActiveChar().getPetData().getPetMP(), null, null); }
+ public int getMaxMp() { return (int)calcStat(Stats.MAX_MP, getActiveChar().getPetData().getPetMaxMP(), null, null); }
public int getMAtk(L2Character target, L2Skill skill)
{
Index: E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2PetDataTable.java
===================================================================
--- E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2PetDataTable.java (revision 1597)
+++ E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2PetDataTable.java (working copy)
@@ -20,11 +20,20 @@
import java.util.Collection;
import java.util.Map;
+import net.sf.l2j.L2DatabaseFactory;
+import net.sf.l2j.gameserver.model.actor.instance.L2PetInstance;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.logging.Logger;
import javolution.util.FastMap;
public class L2PetDataTable
{
+ protected static Logger _log = Logger.getLogger(L2PetInstance.class.getName());
+
+ private static final int[] petList = { 12077, 12312, 12313, 12311, 12527, 12528, 12526 };
+
private static L2PetDataTable _instance;
private static Map<Integer, Map<Integer, L2PetData>> petTable;
@@ -43,6 +52,80 @@
petTable = new FastMap<Integer, Map<Integer, L2PetData>>();
}
+ public void loadPetsData()
+ {
+ for (int i = 0; i < petList.length; i++)
+ {
+ int pet = petList[i];
+
+ L2PetData[] petLevelsList = new L2PetData[80];
+
+ for (int level = 1; level <= 80; level++)
+ {
+
+ petLevelsList[level - 1] = new L2PetData();
+ petLevelsList[level - 1].setPetID(pet);
+ petLevelsList[level - 1].setPetLevel(level);
+
+ // System.out.println( " " + petLevelsList[level - 1].getPetID() + " - " + petLevelsList[level - 1].getPetLevel() );
+ // starting the SQL thingie (reading stats)
+ java.sql.Connection conStats = null;
+
+ try
+ {
+ conStats = L2DatabaseFactory.getInstance().getConnection();
+
+ PreparedStatement statementStats = conStats.prepareStatement("SELECT expMax, hpMax, mpMax, patk, pdef, matk, mdef, accuracy, evasion, critical, speed, atk_speed, cast_speed, feedMax, feedbattle, feednormal, loadMax, hpregen, mpregen FROM pets_stats WHERE typeID=? AND level=?");
+
+ statementStats.setInt(1, pet );
+ statementStats.setInt(2, level );
+
+ ResultSet rsetStats = statementStats.executeQuery();
+
+ if (!rsetStats.next()) { return; }
+
+ // reading sql
+ //petLevelsList[level - 1].setPetID(pet);
+ //petLevelsList[level - 1].setPetLevel(level);
+ //petLevelsList[level - 1].setPetExp( -1 );
+ petLevelsList[level - 1].setPetMaxExp( rsetStats.getInt("expMax") );
+ //petLevelsList[level - 1].setPetMaxHP( -1 );
+ petLevelsList[level - 1].setPetMaxHP( rsetStats.getInt("hpMax") );
+ //petLevelsList[level - 1].setPetMaxMP( -1 );
+ petLevelsList[level - 1].setPetMaxMP( rsetStats.getInt("mpMax") );
+ petLevelsList[level - 1].setPetPAtk( rsetStats.getInt("patk") );
+ petLevelsList[level - 1].setPetPDef( rsetStats.getInt("pdef") );
+ petLevelsList[level - 1].setPetMAtk( rsetStats.getInt("matk") );
+ petLevelsList[level - 1].setPetMDef( rsetStats.getInt("mdef") );
+ petLevelsList[level - 1].setPetAccuracy( rsetStats.getInt("accuracy") );
+ petLevelsList[level - 1].setPetEvasion( rsetStats.getInt("evasion") );
+ petLevelsList[level - 1].setPetCritical( rsetStats.getInt("critical") );
+ petLevelsList[level - 1].setPetSpeed( rsetStats.getInt("speed") );
+ petLevelsList[level - 1].setPetAtkSpeed( rsetStats.getInt("atk_speed") );
+ petLevelsList[level - 1].setPetCastSpeed( rsetStats.getInt("cast_speed") );
+ //petLevelsList[level - 1].setPetFeed( -1 );
+ petLevelsList[level - 1].setPetMaxFeed( rsetStats.getInt("feedMax") );
+ petLevelsList[level - 1].setPetFeedNormal( rsetStats.getInt("feednormal") );
+ petLevelsList[level - 1].setPetFeedBattle( rsetStats.getInt("feedbattle") );
+ //petLevelsList[level - 1].setPetLoad( -1 );
+ petLevelsList[level - 1].setPetMaxLoad( rsetStats.getInt("loadMax") );
+ petLevelsList[level - 1].setPetRegenHP( rsetStats.getInt("hpregen") );
+ petLevelsList[level - 1].setPetRegenMP( rsetStats.getInt("mpregen") );
+
+ rsetStats.close();
+ statementStats.close();
+
+ } catch (Exception e) {
+ _log.warning("Could not load pets stats: "+ e);
+ } finally {
+ try { conStats.close(); } catch (Exception e) {}
+ }
+ }
+
+ L2PetDataTable.getInstance().addPetData(petLevelsList);
+ }
+ }
+
public void addPetData(L2PetData petData)
{
//System.out.println("looking if hashmap for id "+petData.getPetID()+" created");
@@ -54,7 +137,6 @@
statTable.put(petData.getPetLevel(), petData);
//System.out.println("adding petdata for level "+petData.getPetLevel()+" created");
petTable.put(petData.getPetID(), statTable);
- //System.out.println("added id: "+petData.getPetID());
}
else
@@ -66,24 +148,22 @@
}
+ /*
public void addPetData(Collection<L2PetData> list)
{
+ System.out.println("addPetData(Collection<L2PetData> list)");
for (L2PetData petData : list)
{
+ System.out.println(petData);
addPetData(petData);
}
- }
-
- public void addPetData(L2PetData[] list)
+ } */
+ public void addPetData(L2PetData[] petLevelsList)
{
- for (int i = 0; i<list.length; i++)
- {//if (petData.getPetLevel() == 35)System.out.println(petData);
- addPetData(list[i]);
- //if (petData.getPetLevel() == 35)System.out.println(getPetData(petData.getPetID(), petData.getPetLevel()));
- //if (list[i].getPetLevel() == 35)System.out.println(list[i].getPetID()+" "+ list[i].getPetLevel());
- //if (list[i].getPetLevel() == 35)System.out.println(getPetData(list[i].getPetID(), list[i].getPetLevel()).getPetExp());
+ for (int i = 0; i < petLevelsList.length; i++)
+ {
+ addPetData(petLevelsList[i]);
}
- //System.out.println(getPetData(12311, 35).getPetExp());
}
public L2PetData getPetData(int petID, int petLevel)
Index: E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2PetData.java
===================================================================
--- E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2PetData.java (revision 1597)
+++ E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2PetData.java (working copy)
@@ -20,242 +20,220 @@
public class L2PetData
{
- public static final String PET_MAX_FEED = "MaxFeed";
- public static final String PET_FEED_BATTLE = "FeedBattle";
- public static final String PET_FEED_NORMAL = "FeedNormal";
- public static final String PET_PATK = "PAtk";
- public static final String PET_PDEF = "PDef";
- public static final String PET_MATK = "MAtk";
- public static final String PET_MDEF = "MDef";
- public static final String PET_HP = "HP";
- public static final String PET_MP = "MP";
- public static final String PET_REGEN_HP = "RegenHP";
- public static final String PET_REGEN_MP = "RegenMP";
- public static final String PET_EXP = "Exp";
+ public static final String PET_TYPE = "typeID";
+ public static final String PET_LEVEL = "level";
+ // public static final String PET_EXP = "exp";
+ public static final String PET_MAX_EXP = "expMax";
+ // public static final String PET_HP = "hp";
+ public static final String PET_MAX_HP = "hpMax";
+ // public static final String PET_MP = "mp";
+ public static final String PET_MAX_MP = "mpMax";
+ public static final String PET_PATK = "patk";
+ public static final String PET_PDEF = "pdef";
+ public static final String PET_MATK = "matk";
+ public static final String PET_MDEF = "mdef";
+ public static final String PET_ACCURACY = "accuracy";
+ public static final String PET_EVASION = "evasion";
+ public static final String PET_CRITICAL = "critical";
+ public static final String PET_SPEED = "speed";
+ public static final String PET_ATK_SPEED = "atk_speed";
+ public static final String PET_CAST_SPEED = "cast_speed";
+ // public static final String PET_FEED = "feed";
+ public static final String PET_MAX_FEED = "feedMax";
+ public static final String PET_FEED_BATTLE = "feedbattle";
+ public static final String PET_FEED_NORMAL = "feednormal";
+ // public static final String PET_LOAD = "load";
+ public static final String PET_MAX_LOAD = "loadMax";
+ public static final String PET_REGEN_HP = "hpregen";
+ public static final String PET_REGEN_MP = "mpregen";
private int petID;
private int petLevel;
+ // private int petExp;
+ private int petMaxExp;
+ // private int petHP;
+ private int petMaxHP;
+ // private int petMP;
+ private int petMaxMP;
+ private int petPAtk;
+ private int petPDef;
+ private int petMAtk;
+ private int petMDef;
+ private int petAccuracy;
+ private int petEvasion;
+ private int petCritical;
+ private int petSpeed;
+ private int petAtkSpeed;
+ private int petCastSpeed;
+ // private int petFeed;
private int petMaxFeed;
private int petFeedBattle;
private int petFeedNormal;
- private int petPAtk;
- private int petPDef;
- private int petMAtk;
- private int petMDef;
- private int petHP;
- private int petMP;
+ // private int petLoad;
+ private int petMaxLoad;
private int petRegenHP;
private int petRegenMP;
- private int petExp;
public void setStat(String stat, int value)
{
- if (stat.equalsIgnoreCase(PET_MAX_FEED))
- {
- this.setPetMaxFeed(value);
- }
- else if (stat.equalsIgnoreCase(PET_FEED_BATTLE))
- {
- this.setPetFeedBattle(value);
- }
- else if (stat.equalsIgnoreCase(PET_FEED_NORMAL))
- {
- this.setPetFeedNormal(value);
- }
- else if (stat.equalsIgnoreCase(PET_PATK))
- {
- this.setPetPAtk(value);
- }
- else if (stat.equalsIgnoreCase(PET_PDEF))
- {
- this.setPetPDef(value);
- }
- else if (stat.equalsIgnoreCase(PET_MATK))
- {
- this.setPetMAtk(value);
- }
- else if (stat.equalsIgnoreCase(PET_MDEF))
- {
- this.setPetMDef(value);
- }
- else if (stat.equalsIgnoreCase(PET_HP))
- {
- this.setPetHP(value);
- }
- else if (stat.equalsIgnoreCase(PET_MP))
- {
- this.setPetMP(value);
- }
- else if (stat.equalsIgnoreCase(PET_REGEN_HP))
- {
- this.setPetRegenHP(value);
- }
- else if (stat.equalsIgnoreCase(PET_REGEN_MP))
- {
- this.setPetRegenMP(value);
- }
- else if (stat.equalsIgnoreCase(PET_EXP))
- {
- this.setPetExp(value);
- }
+ // if (stat.equalsIgnoreCase(PET_EXP)) { this.setPetExp(value); }
+ if (stat.equalsIgnoreCase(PET_MAX_EXP)) { this.setPetMaxExp(value); }
+ // else if (stat.equalsIgnoreCase(PET_HP)) { this.setPetHP(value); }
+ else if (stat.equalsIgnoreCase(PET_MAX_HP)) { this.setPetMaxHP(value); }
+ // else if (stat.equalsIgnoreCase(PET_MP)) { this.setPetMP(value); }
+ else if (stat.equalsIgnoreCase(PET_MAX_MP)) { this.setPetMaxMP(value); }
+ else if (stat.equalsIgnoreCase(PET_PATK)) { this.setPetPAtk(value); }
+ else if (stat.equalsIgnoreCase(PET_PDEF)) { this.setPetPDef(value); }
+ else if (stat.equalsIgnoreCase(PET_MATK)) { this.setPetMAtk(value); }
+ else if (stat.equalsIgnoreCase(PET_MDEF)) { this.setPetMDef(value); }
+ else if (stat.equalsIgnoreCase(PET_ACCURACY)) { this.setPetAccuracy(value); }
+ else if (stat.equalsIgnoreCase(PET_EVASION)) { this.setPetEvasion(value); }
+ else if (stat.equalsIgnoreCase(PET_CRITICAL)) { this.setPetCritical(value); }
+ else if (stat.equalsIgnoreCase(PET_SPEED)) { this.setPetSpeed(value); }
+ else if (stat.equalsIgnoreCase(PET_ATK_SPEED)) { this.setPetAtkSpeed(value); }
+ else if (stat.equalsIgnoreCase(PET_CAST_SPEED)) { this.setPetCastSpeed(value); }
+ // else if (stat.equalsIgnoreCase(PET_FEED)) { this.setPetFeed(value); }
+ else if (stat.equalsIgnoreCase(PET_MAX_FEED)) { this.setPetMaxFeed(value); }
+ else if (stat.equalsIgnoreCase(PET_FEED_NORMAL)) { this.setPetFeedNormal(value); }
+ else if (stat.equalsIgnoreCase(PET_FEED_BATTLE)) { this.setPetFeedBattle(value); }
+ // else if (stat.equalsIgnoreCase(PET_LOAD)) { this.setPetLoad(value); }
+ else if (stat.equalsIgnoreCase(PET_MAX_LOAD)) { this.setPetMaxLoad(value); }
+ else if (stat.equalsIgnoreCase(PET_REGEN_HP)) { this.setPetRegenHP(value); }
+ else if (stat.equalsIgnoreCase(PET_REGEN_MP)) { this.setPetRegenMP(value); }
}
- public int getPetFeedBattle()
- {
- return petFeedBattle;
- }
+ // ID
+ public int getPetID() { return petID; }
+ public void setPetID(int petID) { this.petID = petID; }
+
+ // Level
+ public int getPetLevel() { return petLevel; }
+ public void setPetLevel(int petLevel) { this.petLevel = petLevel; }
+
+ // Exp
+ // public int getPetExp() { return petExp; }
+ // public void setPetExp(int petExp) { this.petExp = petExp; }
+
+ // Max Exp
+ public int getPetMaxExp() { return petMaxExp; }
+ public void setPetMaxExp(int petMaxExp) { this.petMaxExp = petMaxExp; }
+
+ // HP
+ // public int getPetHP() { return petHP; }
+ // public void setPetHP(int petHP) { this.petHP = petHP; }
+
+ // Max HP
+ public int getPetMaxHP() { return petMaxHP; }
+ public void setPetMaxHP(int petMaxHP) { this.petMaxHP = petMaxHP; }
+
+ // Mp
+ // public int getPetMP() { return petMP; }
+ // public void setPetMP(int petMP) { this.petMP = petMP; }
+
+ // Max Mp
+ public int getPetMaxMP() { return petMaxMP; }
+ public void setPetMaxMP(int petMaxMP) { this.petMaxMP = petMaxMP; }
+
+ // PAtk
+ public int getPetPAtk() { return petPAtk; }
+ public void setPetPAtk(int petPAtk) { this.petPAtk = petPAtk; }
+
+ // PDef
+ public int getPetPDef() { return petPDef;}
+ public void setPetPDef(int petPDef) { this.petPDef = petPDef; }
+
+ // MAtk
+ public int getPetMAtk(){ return petMAtk; }
+ public void setPetMAtk(int petMAtk){ this.petMAtk = petMAtk; }
+
+ // MDef
+ public int getPetMDef() { return petMDef; }
+ public void setPetMDef(int petMDef) { this.petMDef = petMDef; }
+
+ // Accuracy
+ public int getPetAccuracy() { return petAccuracy; }
+ public void setPetAccuracy(int petAccuracy) { this.petAccuracy = petAccuracy; }
+
+ // Evasion
+ public int getPetEvasion() { return petEvasion; }
+ public void setPetEvasion(int petEvasion) { this.petEvasion = petEvasion; }
+
+ // Critical
+ public int getPetCritical() { return petCritical; }
+ public void setPetCritical(int petCritical) { this.petCritical = petCritical; }
+
+ // Speed
+ public int getPetSpeed() { return petSpeed; }
+ public void setPetSpeed(int petSpeed) { this.petSpeed = petSpeed; }
+
+ // Atk Speed
+ public int getPetAtkSpeed() { return petAtkSpeed; }
+ public void setPetAtkSpeed(int petAtkSpeed) { this.petAtkSpeed = petAtkSpeed; }
+
+ // Cast Speed
+ public int getPetCastSpeed() { return petCastSpeed; }
+ public void setPetCastSpeed(int petCastSpeed) { this.petCastSpeed = petCastSpeed; }
+
+ // Feed
+ // public int getPetFeed(){ return petFeed; }
+ // public void setPetFeed(int petFeed) { this.petFeed = petFeed; }
+
+ // MaxFeed
+ public int getPetMaxFeed(){ return petMaxFeed; }
+ public void setPetMaxFeed(int petMaxFeed) { this.petMaxFeed = petMaxFeed; }
+
+ // Normal Feed
+ public int getPetFeedNormal() { return petFeedNormal; }
+ public void setPetFeedNormal(int petFeedNormal) { this.petFeedNormal = petFeedNormal; }
+
+ // Battle Feed
+ public int getPetFeedBattle() { return petFeedBattle; }
+ public void setPetFeedBattle(int petFeedBattle) { this.petFeedBattle = petFeedBattle; }
+
+ // Load
+ // public int getPetLoad() { return petLoad; }
+ // public void setPetLoad(int petLoad) { this.petLoad = petLoad; }
+
+ // Max Load
+ public int getPetMaxLoad() { return petMaxLoad; }
+ public void setPetMaxLoad(int petMaxLoad) { this.petMaxLoad = petMaxLoad; }
+
+ // Regen HP
+ public int getPetRegenHP() { return petRegenHP; }
+ public void setPetRegenHP(int petRegenHP){ this.petRegenHP = petRegenHP;}
+
+ // Regen MP
+ public int getPetRegenMP() { return petRegenMP; }
+ public void setPetRegenMP(int petRegenMP) { this.petRegenMP = petRegenMP; }
- public void setPetFeedBattle(int petFeedBattle)
- {
- this.petFeedBattle = petFeedBattle;
- }
-
- public int getPetFeedNormal()
- {
- return petFeedNormal;
- }
-
- public void setPetFeedNormal(int petFeedNormal)
- {
- this.petFeedNormal = petFeedNormal;
- }
-
- public int getPetHP()
- {
- return petHP;
- }
-
- public void setPetHP(int petHP)
- {
- this.petHP = petHP;
- }
-
- public int getPetID()
- {
- return petID;
- }
-
- public void setPetID(int petID)
- {
- this.petID = petID;
- }
-
- public int getPetLevel()
- {
- return petLevel;
- }
-
- public void setPetLevel(int petLevel)
- {
- this.petLevel = petLevel;
- }
-
- public int getPetMAtk()
- {
- return petMAtk;
- }
-
- public void setPetMAtk(int petMAtk)
- {
- this.petMAtk = petMAtk;
- }
-
- public int getPetMaxFeed()
- {
- return petMaxFeed;
- }
-
- public void setPetMaxFeed(int petMaxFeed)
- {
- this.petMaxFeed = petMaxFeed;
- }
-
- public int getPetMDef()
- {
- return petMDef;
- }
-
- public void setPetMDef(int petMDef)
- {
- this.petMDef = petMDef;
- }
-
- public int getPetExp()
- {
- return petExp;
- }
-
- public void setPetExp(int petExp)
- {
- this.petExp = petExp;
- }
-
- public int getPetMP()
- {
- return petMP;
- }
-
- public void setPetMP(int petMP)
- {
- this.petMP = petMP;
- }
-
- public int getPetPAtk()
- {
- return petPAtk;
- }
-
- public void setPetPAtk(int petPAtk)
- {
- this.petPAtk = petPAtk;
- }
-
- public int getPetPDef()
- {
- return petPDef;
- }
-
- public void setPetPDef(int petPDef)
- {
- this.petPDef = petPDef;
- }
-
- public int getPetRegenHP()
- {
- return petRegenHP;
- }
-
- public void setPetRegenHP(int petRegenHP)
- {
- this.petRegenHP = petRegenHP;
- }
-
- public int getPetRegenMP()
- {
- return petRegenMP;
- }
-
- public void setPetRegenMP(int petRegenMP)
- {
- this.petRegenMP = petRegenMP;
- }
-
public String toString()
{
- return "PetID: " + getPetID() + "\t" +
- "PetLevel: " + getPetLevel() + "\t" +
- PET_MAX_FEED + ": " + getPetMaxFeed() + "\t" +
- PET_FEED_BATTLE + ": " + getPetFeedBattle() + "\t" +
- PET_FEED_NORMAL + ": " + getPetFeedNormal() + "\t" +
- PET_PATK + ": " + getPetPAtk() + "\t" +
- PET_PDEF + ": " + getPetPDef() + "\t" +
- PET_MATK + ": " + getPetMAtk() + "\t" +
- PET_MDEF + ": " + getPetMDef() + "\t" +
- PET_HP + ": " + getPetHP() + "\t" +
- PET_MP + ": " + getPetMP() + "\t" +
- PET_REGEN_HP + ": " + getPetRegenHP() + "\t" +
- PET_REGEN_MP + ": " + getPetRegenMP() + "\t" +
- PET_EXP + ": " + getPetExp();
+ return "PetID: " + getPetID() + " \t" +
+ "PetLevel: " + getPetLevel() + " \t" +
+ // PET_EXP + ": " + getPetExp() + " \t" +
+ PET_MAX_EXP + ": " + getPetMaxExp() + " \t" +
+ // PET_HP + ": " + getPetHP() + " \t" +
+ PET_MAX_HP + ": " + getPetMaxHP() + " \t" +
+ // PET_MP + ": " + getPetMP() + " \t" +
+ PET_MAX_MP + ": " + getPetMaxMP() + " \t" +
+ PET_PATK + ": " + getPetPAtk() + " \t" +
+ PET_PDEF + ": " + getPetPDef() + " \t" +
+ PET_MATK + ": " + getPetMAtk() + " \t" +
+ PET_MDEF + ": " + getPetMDef() + " \t" +
+ PET_ACCURACY + ": " + getPetAccuracy() + " \t" +
+ PET_EVASION + ": " + getPetEvasion() + " \t" +
+ PET_CRITICAL + ": " + getPetCritical() + " \t" +
+ PET_SPEED + ": " + getPetSpeed() + " \t" +
+ PET_ATK_SPEED + ": " + getPetAtkSpeed() + " \t" +
+ PET_CAST_SPEED + ": " + getPetCastSpeed() + " \t" +
+ // PET_FEED + ": " + getPetFeed() + " \t" +
+ PET_MAX_FEED + ": " + getPetMaxFeed() + " \t" +
+ PET_FEED_BATTLE + ": " + getPetFeedBattle() + " \t" +
+ PET_FEED_NORMAL + ": " + getPetFeedNormal() + " \t" +
+ // PET_LOAD + ": " + getPetLoad() + " \t" +
+ PET_MAX_LOAD + ": " + getPetMaxLoad() + " \t" +
+ PET_REGEN_HP + ": " + getPetRegenHP() + " \t" +
+ PET_REGEN_MP + ": " + getPetRegenMP();
}
}
Index: E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/GameServer.java
===================================================================
--- E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/GameServer.java (revision 1597)
+++ E:/workspace/l2jc4/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/GameServer.java (working copy)
@@ -141,6 +141,7 @@
import net.sf.l2j.gameserver.model.AutoChatHandler;
import net.sf.l2j.gameserver.model.AutoSpawnHandler;
import net.sf.l2j.gameserver.model.L2World;
+import net.sf.l2j.gameserver.model.L2PetDataTable;
import net.sf.l2j.gameserver.script.faenor.FaenorScriptEngine;
import net.sf.l2j.gameserver.taskmanager.TaskManager;
import net.sf.l2j.status.Status;
@@ -407,6 +408,9 @@
GmListTable.getInstance();
FaenorScriptEngine.getInstance();
+
+ // read pet stats from db
+ L2PetDataTable.getInstance().loadPetsData();
Universe.getInstance();