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

Renamed PetSkillData templateId value to npcId.

Browse Source
This commit is contained in:
MobiusDev
2017-10-15 11:51:11 +00:00
parent e17068f812
commit 3f9a652812
15 changed files with 10567 additions and 10567 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

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

@@ -6,7 +6,7 @@
<xs:complexType> <xs:complexType>
<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="npcId"/>
<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>

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

@@ -65,9 +65,9 @@ public class PetSkillData implements IGameXmlReader
{ {
final NamedNodeMap attrs = d.getAttributes(); final NamedNodeMap attrs = d.getAttributes();
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "npcId");
final int id = parseInteger(attrs, "skillId"); final int skillId = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int skillLvl = parseInteger(attrs, "skillLvl");
Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId); Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -76,13 +76,13 @@ public class PetSkillData implements IGameXmlReader
_skillTrees.put(npcId, skillTree); _skillTrees.put(npcId, skillTree);
} }
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(skillId, skillLvl == 0 ? 1 : skillLvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new SkillHolder(id, lvl)); skillTree.put(SkillData.getSkillHashCode(skillId, skillLvl + 1), new SkillHolder(skillId, skillLvl));
} }
else else
{ {
LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + id + ", level " + lvl + " for NPC " + npcId + "."); LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + skillId + ", level " + skillLvl + " for NPC " + npcId + ".");
} }
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@@ -6,7 +6,7 @@
<xs:complexType> <xs:complexType>
<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="npcId"/>
<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>

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

@@ -65,9 +65,9 @@ public class PetSkillData implements IGameXmlReader
{ {
final NamedNodeMap attrs = d.getAttributes(); final NamedNodeMap attrs = d.getAttributes();
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "npcId");
final int id = parseInteger(attrs, "skillId"); final int skillId = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int skillLvl = parseInteger(attrs, "skillLvl");
Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId); Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -76,13 +76,13 @@ public class PetSkillData implements IGameXmlReader
_skillTrees.put(npcId, skillTree); _skillTrees.put(npcId, skillTree);
} }
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(skillId, skillLvl == 0 ? 1 : skillLvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new SkillHolder(id, lvl)); skillTree.put(SkillData.getSkillHashCode(skillId, skillLvl + 1), new SkillHolder(skillId, skillLvl));
} }
else else
{ {
LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + id + ", level " + lvl + " for NPC " + npcId + "."); LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + skillId + ", level " + skillLvl + " for NPC " + npcId + ".");
} }
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@@ -6,7 +6,7 @@
<xs:complexType> <xs:complexType>
<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="npcId"/>
<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>

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

@@ -65,9 +65,9 @@ public class PetSkillData implements IGameXmlReader
{ {
final NamedNodeMap attrs = d.getAttributes(); final NamedNodeMap attrs = d.getAttributes();
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "npcId");
final int id = parseInteger(attrs, "skillId"); final int skillId = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int skillLvl = parseInteger(attrs, "skillLvl");
Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId); Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -76,13 +76,13 @@ public class PetSkillData implements IGameXmlReader
_skillTrees.put(npcId, skillTree); _skillTrees.put(npcId, skillTree);
} }
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(skillId, skillLvl == 0 ? 1 : skillLvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new SkillHolder(id, lvl)); skillTree.put(SkillData.getSkillHashCode(skillId, skillLvl + 1), new SkillHolder(skillId, skillLvl));
} }
else else
{ {
LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + id + ", level " + lvl + " for NPC " + npcId + "."); LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + skillId + ", level " + skillLvl + " for NPC " + npcId + ".");
} }
} }
} }

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

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

@@ -6,7 +6,7 @@
<xs:complexType> <xs:complexType>
<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="npcId"/>
<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>

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

@@ -66,9 +66,9 @@ public class PetSkillData implements IXmlReader
{ {
final NamedNodeMap attrs = d.getAttributes(); final NamedNodeMap attrs = d.getAttributes();
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "npcId");
final int id = parseInteger(attrs, "skillId"); final int skillId = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int skillLvl = parseInteger(attrs, "skillLvl");
Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId); Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -77,13 +77,13 @@ public class PetSkillData implements IXmlReader
_skillTrees.put(npcId, skillTree); _skillTrees.put(npcId, skillTree);
} }
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(skillId, skillLvl == 0 ? 1 : skillLvl) != null)
{ {
skillTree.put((long) SkillData.getSkillHashCode(id, lvl + 1), new SkillHolder(id, lvl)); skillTree.put((long) SkillData.getSkillHashCode(skillId, skillLvl + 1), new SkillHolder(skillId, skillLvl));
} }
else else
{ {
LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + id + ", level " + lvl + " for NPC " + npcId + "."); LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + skillId + ", level " + skillLvl + " for NPC " + npcId + ".");
} }
} }
} }

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

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

@@ -6,7 +6,7 @@
<xs:complexType> <xs:complexType>
<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="npcId"/>
<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>

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

@@ -65,9 +65,9 @@ public class PetSkillData implements IGameXmlReader
{ {
final NamedNodeMap attrs = d.getAttributes(); final NamedNodeMap attrs = d.getAttributes();
final int npcId = parseInteger(attrs, "templateId"); final int npcId = parseInteger(attrs, "npcId");
final int id = parseInteger(attrs, "skillId"); final int skillId = parseInteger(attrs, "skillId");
final int lvl = parseInteger(attrs, "skillLvl"); final int skillLvl = parseInteger(attrs, "skillLvl");
Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId); Map<Long, SkillHolder> skillTree = _skillTrees.get(npcId);
if (skillTree == null) if (skillTree == null)
@@ -76,13 +76,13 @@ public class PetSkillData implements IGameXmlReader
_skillTrees.put(npcId, skillTree); _skillTrees.put(npcId, skillTree);
} }
if (SkillData.getInstance().getSkill(id, lvl == 0 ? 1 : lvl) != null) if (SkillData.getInstance().getSkill(skillId, skillLvl == 0 ? 1 : skillLvl) != null)
{ {
skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new SkillHolder(id, lvl)); skillTree.put(SkillData.getSkillHashCode(skillId, skillLvl + 1), new SkillHolder(skillId, skillLvl));
} }
else else
{ {
LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + id + ", level " + lvl + " for NPC " + npcId + "."); LOGGER.info(getClass().getSimpleName() + ": Could not find skill with id " + skillId + ", level " + skillLvl + " for NPC " + npcId + ".");
} }
} }
} }