From c98a0c4e7f8b77676416fd46bfe3e9f4ecce4651 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 2 Aug 2020 06:52:15 +0000 Subject: [PATCH] Set buff skill level for Scheme Buffer. Contributed by G-hamsteR. --- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 1 + .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 1 + .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- .../dist/game/data/SchemeBufferSkills.xml | 120 +++++++++--------- .../dist/game/data/xsd/SchemeBufferSkills.xsd | 9 +- .../datatables/SchemeBufferTable.java | 2 +- .../actor/instance/SchemeBufferInstance.java | 2 +- .../model/holders/BuffSkillHolder.java | 9 +- 55 files changed, 817 insertions(+), 729 deletions(-) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/SchemeBufferSkills.xsd index 7af38419d6..323e5b9acc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -16,6 +16,7 @@ + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 2be14671bf..efe3589ffa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 20f07fd7f1..55e80d8e52 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -116,7 +116,7 @@ public class SchemeBufferInstance extends FolkInstance { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - SkillTable.getInstance().getSkill(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target); + SkillTable.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).getEffects(this, target); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_C6_Interlude/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd index 7af38419d6..323e5b9acc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -16,6 +16,7 @@ + diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 2be14671bf..efe3589ffa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 20f07fd7f1..55e80d8e52 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -116,7 +116,7 @@ public class SchemeBufferInstance extends FolkInstance { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - SkillTable.getInstance().getSkill(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target); + SkillTable.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).getEffects(this, target); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 2be14671bf..efe3589ffa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index c3913dc244..44f5e97025 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -119,7 +119,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)).applyEffects(this, target); + SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).applyEffects(this, target); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index 2be14671bf..efe3589ffa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index c3913dc244..44f5e97025 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -119,7 +119,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)).applyEffects(this, target); + SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).applyEffects(this, target); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/SchemeBufferSkills.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/SchemeBufferSkills.xml index dc54a77ef5..89df79bad3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/SchemeBufferSkills.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/SchemeBufferSkills.xml @@ -1,69 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd index 91ae871150..323e5b9acc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/SchemeBufferSkills.xsd @@ -15,15 +15,16 @@ - - - + + + + - + diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..10f4cc0048 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -115,7 +115,7 @@ public class SchemeBufferTable final NamedNodeMap attrs = c.getAttributes(); final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue()); - _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); + _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue())); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 66cbf98d78..704519d9b5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -107,7 +107,7 @@ public class SchemeBufferInstance extends Npc { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - final Skill skill = SkillData.getInstance().getSkill(skillId, SkillData.getInstance().getMaxLevel(skillId)); + final Skill skill = SkillData.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()); if (buffSummons) { if (player.getPet() != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java index 54160c62ac..29b0eb25c5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java @@ -22,13 +22,15 @@ package org.l2jmobius.gameserver.model.holders; public class BuffSkillHolder { private final int _id; + private final int _level; private final int _price; private final String _type; private final String _description; - public BuffSkillHolder(int id, int price, String type, String description) + public BuffSkillHolder(int id, int level, int price, String type, String description) { _id = id; + _level = level; _price = price; _type = type; _description = description; @@ -39,6 +41,11 @@ public class BuffSkillHolder return _id; } + public int getLevel() + { + return _level; + } + public int getPrice() { return _price;