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

Removed minimum level from pet skill data.

Browse Source
This commit is contained in:
MobiusDev
2017-10-15 00:31:43 +00:00
parent dbbf4c0862
commit 77411e1e89
15 changed files with 10547 additions and 10592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4500
L2J_Mobius_1.0_Ertheia/dist/game/data/PetSkillData.xml vendored
View File

File diff suppressed because it is too large Load Diff

1
L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/PetSkillData.xsd vendored
View File

@@ -7,7 +7,6 @@
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:string"> <xs:extension base="xs:string">
<xs:attribute type="xs:short" name="templateId"/> <xs:attribute type="xs:short" name="templateId"/>
<xs:attribute type="xs:byte" name="minLvl"/>
<xs:attribute type="xs:short" name="skillId"/> <xs:attribute type="xs:short" name="skillId"/>
<xs:attribute type="xs:byte" name="skillLvl"/> <xs:attribute type="xs:byte" name="skillLvl"/>
</xs:extension> </xs:extension>

14
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
View File

@@ -68,7 +68,6 @@ public class PetSkillData implements IGameXmlReader
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "templateId");
final int id = parseInteger(attrs, "skillId"); final int id = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int lvl = parseInteger(attrs, "skillLvl");
final int minLvl = parseInteger(attrs, "minLvl");
Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId); Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -79,7 +78,7 @@ public class PetSkillData implements IGameXmlReader
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, minLvl)); skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl));
} }
else else
{ {
@@ -129,7 +128,7 @@ public class PetSkillData implements IGameXmlReader
} }
break; break;
} }
else if (temp.getMinLevel() <= cha.getLevel()) else if (1 <= cha.getLevel())
{ {
if (temp.getLevel() > lvl) if (temp.getLevel() > lvl)
{ {
@@ -164,13 +163,11 @@ public class PetSkillData implements IGameXmlReader
{ {
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _minLevel;
public L2PetSkillLearn(int id, int lvl, int minLvl) public L2PetSkillLearn(int id, int lvl)
{ {
_id = id; _id = id;
_level = lvl; _level = lvl;
_minLevel = minLvl;
} }
public int getId() public int getId()
@@ -182,11 +179,6 @@ public class PetSkillData implements IGameXmlReader
{ {
return _level; return _level;
} }
public int getMinLevel()
{
return _minLevel;
}
} }
public static PetSkillData getInstance() public static PetSkillData getInstance()

4500
L2J_Mobius_2.5_Underground/dist/game/data/PetSkillData.xml vendored
View File

File diff suppressed because it is too large Load Diff

1
L2J_Mobius_2.5_Underground/dist/game/data/xsd/PetSkillData.xsd vendored
View File

@@ -7,7 +7,6 @@
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:string"> <xs:extension base="xs:string">
<xs:attribute type="xs:short" name="templateId"/> <xs:attribute type="xs:short" name="templateId"/>
<xs:attribute type="xs:byte" name="minLvl"/>
<xs:attribute type="xs:short" name="skillId"/> <xs:attribute type="xs:short" name="skillId"/>
<xs:attribute type="xs:byte" name="skillLvl"/> <xs:attribute type="xs:byte" name="skillLvl"/>
</xs:extension> </xs:extension>

14
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
View File

@@ -68,7 +68,6 @@ public class PetSkillData implements IGameXmlReader
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "templateId");
final int id = parseInteger(attrs, "skillId"); final int id = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int lvl = parseInteger(attrs, "skillLvl");
final int minLvl = parseInteger(attrs, "minLvl");
Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId); Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -79,7 +78,7 @@ public class PetSkillData implements IGameXmlReader
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, minLvl)); skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl));
} }
else else
{ {
@@ -129,7 +128,7 @@ public class PetSkillData implements IGameXmlReader
} }
break; break;
} }
else if (temp.getMinLevel() <= cha.getLevel()) else if (1 <= cha.getLevel())
{ {
if (temp.getLevel() > lvl) if (temp.getLevel() > lvl)
{ {
@@ -164,13 +163,11 @@ public class PetSkillData implements IGameXmlReader
{ {
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _minLevel;
public L2PetSkillLearn(int id, int lvl, int minLvl) public L2PetSkillLearn(int id, int lvl)
{ {
_id = id; _id = id;
_level = lvl; _level = lvl;
_minLevel = minLvl;
} }
public int getId() public int getId()
@@ -182,11 +179,6 @@ public class PetSkillData implements IGameXmlReader
{ {
return _level; return _level;
} }
public int getMinLevel()
{
return _minLevel;
}
} }
public static PetSkillData getInstance() public static PetSkillData getInstance()

4500
L2J_Mobius_3.0_Helios/dist/game/data/PetSkillData.xml vendored
View File

File diff suppressed because it is too large Load Diff

1
L2J_Mobius_3.0_Helios/dist/game/data/xsd/PetSkillData.xsd vendored
View File

@@ -7,7 +7,6 @@
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:string"> <xs:extension base="xs:string">
<xs:attribute type="xs:short" name="templateId"/> <xs:attribute type="xs:short" name="templateId"/>
<xs:attribute type="xs:byte" name="minLvl"/>
<xs:attribute type="xs:short" name="skillId"/> <xs:attribute type="xs:short" name="skillId"/>
<xs:attribute type="xs:byte" name="skillLvl"/> <xs:attribute type="xs:byte" name="skillLvl"/>
</xs:extension> </xs:extension>

14
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
View File

@@ -68,7 +68,6 @@ public class PetSkillData implements IGameXmlReader
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "templateId");
final int id = parseInteger(attrs, "skillId"); final int id = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int lvl = parseInteger(attrs, "skillLvl");
final int minLvl = parseInteger(attrs, "minLvl");
Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId); Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -79,7 +78,7 @@ public class PetSkillData implements IGameXmlReader
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, minLvl)); skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl));
} }
else else
{ {
@@ -129,7 +128,7 @@ public class PetSkillData implements IGameXmlReader
} }
break; break;
} }
else if (temp.getMinLevel() <= cha.getLevel()) else if (1 <= cha.getLevel())
{ {
if (temp.getLevel() > lvl) if (temp.getLevel() > lvl)
{ {
@@ -164,13 +163,11 @@ public class PetSkillData implements IGameXmlReader
{ {
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _minLevel;
public L2PetSkillLearn(int id, int lvl, int minLvl) public L2PetSkillLearn(int id, int lvl)
{ {
_id = id; _id = id;
_level = lvl; _level = lvl;
_minLevel = minLvl;
} }
public int getId() public int getId()
@@ -182,11 +179,6 @@ public class PetSkillData implements IGameXmlReader
{ {
return _level; return _level;
} }
public int getMinLevel()
{
return _minLevel;
}
} }
public static PetSkillData getInstance() public static PetSkillData getInstance()

3782
L2J_Mobius_CT_2.6_HighFive/dist/game/data/PetSkillData.xml vendored
View File

File diff suppressed because it is too large Load Diff

1
L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/PetSkillData.xsd vendored
View File

@@ -7,7 +7,6 @@
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:string"> <xs:extension base="xs:string">
<xs:attribute type="xs:short" name="templateId"/> <xs:attribute type="xs:short" name="templateId"/>
<xs:attribute type="xs:byte" name="minLvl"/>
<xs:attribute type="xs:short" name="skillId"/> <xs:attribute type="xs:short" name="skillId"/>
<xs:attribute type="xs:byte" name="skillLvl"/> <xs:attribute type="xs:byte" name="skillLvl"/>
</xs:extension> </xs:extension>

14
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
View File

@@ -69,7 +69,6 @@ public class PetSkillData implements IXmlReader
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "templateId");
final int id = parseInteger(attrs, "skillId"); final int id = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int lvl = parseInteger(attrs, "skillLvl");
final int minLvl = parseInteger(attrs, "minLvl");
Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId); Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -80,7 +79,7 @@ public class PetSkillData implements IXmlReader
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null)
{ {
skillTree.put((long) SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, minLvl)); skillTree.put((long) SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl));
} }
else else
{ {
@@ -130,7 +129,7 @@ public class PetSkillData implements IXmlReader
} }
break; break;
} }
else if (temp.getMinLevel() <= cha.getLevel()) else if (1 <= cha.getLevel())
{ {
if (temp.getLevel() > lvl) if (temp.getLevel() > lvl)
{ {
@@ -165,13 +164,11 @@ public class PetSkillData implements IXmlReader
{ {
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _minLevel;
public L2PetSkillLearn(int id, int lvl, int minLvl) public L2PetSkillLearn(int id, int lvl)
{ {
_id = id; _id = id;
_level = lvl; _level = lvl;
_minLevel = minLvl;
} }
public int getId() public int getId()
@@ -183,11 +180,6 @@ public class PetSkillData implements IXmlReader
{ {
return _level; return _level;
} }
public int getMinLevel()
{
return _minLevel;
}
} }
public static PetSkillData getInstance() public static PetSkillData getInstance()

3782
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/PetSkillData.xml vendored
View File

File diff suppressed because it is too large Load Diff

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/PetSkillData.xsd vendored
View File

@@ -7,7 +7,6 @@
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:string"> <xs:extension base="xs:string">
<xs:attribute type="xs:short" name="templateId"/> <xs:attribute type="xs:short" name="templateId"/>
<xs:attribute type="xs:byte" name="minLvl"/>
<xs:attribute type="xs:short" name="skillId"/> <xs:attribute type="xs:short" name="skillId"/>
<xs:attribute type="xs:byte" name="skillLvl"/> <xs:attribute type="xs:byte" name="skillLvl"/>
</xs:extension> </xs:extension>

14
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/PetSkillData.java
View File

@@ -68,7 +68,6 @@ public class PetSkillData implements IGameXmlReader
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "templateId");
final int id = parseInteger(attrs, "skillId"); final int id = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int lvl = parseInteger(attrs, "skillLvl");
final int minLvl = parseInteger(attrs, "minLvl");
Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId); Map<Long, L2PetSkillLearn> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -79,7 +78,7 @@ public class PetSkillData implements IGameXmlReader
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, minLvl)); skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl));
} }
else else
{ {
@@ -129,7 +128,7 @@ public class PetSkillData implements IGameXmlReader
} }
break; break;
} }
else if (temp.getMinLevel() <= cha.getLevel()) else if (1 <= cha.getLevel())
{ {
if (temp.getLevel() > lvl) if (temp.getLevel() > lvl)
{ {
@@ -164,13 +163,11 @@ public class PetSkillData implements IGameXmlReader
{ {
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _minLevel;
public L2PetSkillLearn(int id, int lvl, int minLvl) public L2PetSkillLearn(int id, int lvl)
{ {
_id = id; _id = id;
_level = lvl; _level = lvl;
_minLevel = minLvl;
} }
public int getId() public int getId()
@@ -182,11 +179,6 @@ public class PetSkillData implements IGameXmlReader
{ {
return _level; return _level;
} }
public int getMinLevel()
{
return _minLevel;
}
} }
public static PetSkillData getInstance() public static PetSkillData getInstance()