G-hamsteR

SchemeBuffer

May 29th, 2020
245
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 14.94 KB | None | 0 0
  1. ### Eclipse Workspace Patch 1.0
  2. #P L2J_Mobius_C6_Interlude
  3. diff --git dist/game/data/SchemeBufferSkills.xml dist/game/data/SchemeBufferSkills.xml
  4. index 442ef86..d509ed5 100644
  5. --- dist/game/data/SchemeBufferSkills.xml
  6. +++ dist/game/data/SchemeBufferSkills.xml
  7. @@ -1,69 +1,69 @@
  8.  <?xml version='1.0' encoding='utf-8'?>
  9.  <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/SchemeBufferSkills.xsd">
  10.     <category type="Buffs">
  11. -       <buff id="1035" price="0" desc="Increases resistance to mental attacks." /> <!-- Mental Shield -->
  12. -       <buff id="1036" price="0" desc="Increases M. Def." /> <!-- Magic Barrier -->
  13. -       <buff id="1040" price="0" desc="Increases P. Def." /> <!-- Shield -->
  14. -       <buff id="1045" price="0" desc="Increases maximum HP." /> <!-- Blessed Body -->
  15. -       <buff id="1048" price="0" desc="Increases maximum MP." /> <!-- Blessed Soul -->
  16. -       <buff id="1059" price="0" desc="Increases M. Atk." /> <!-- Empower -->
  17. -       <buff id="1062" price="0" desc="Reduces def. and increase atk. power." /> <!-- Berserker Spirit -->
  18. -       <buff id="1068" price="0" desc="Increases P. Atk." /> <!-- Might -->
  19. -       <buff id="1077" price="0" desc="Increases critical attack rate." /> <!-- Focus -->
  20. -       <buff id="1078" price="0" desc="Increases magic concentration." /> <!-- Concentration -->
  21. -       <buff id="1085" price="0" desc="Increases Casting Spd." /> <!-- Acumen -->
  22. -       <buff id="1086" price="0" desc="Increases Atk. Spd." /> <!-- Haste -->
  23. -       <buff id="1087" price="0" desc="Increases Evasion." /> <!-- Agility -->
  24. -       <buff id="1204" price="0" desc="Increases Speed." /> <!-- Wind Walk -->
  25. -       <buff id="1240" price="0" desc="Increases Accuracy." /> <!-- Guidance -->
  26. -       <buff id="1242" price="0" desc="Increases critical attack." /> <!-- Death Whisper -->
  27. -       <buff id="1243" price="0" desc="Increases shield defense rate." /> <!-- Bless Shield -->
  28. -       <buff id="1259" price="0" desc="Increases resistance to stun attack." /> <!-- Resist Shock -->
  29. -       <buff id="1268" price="0" desc="Restores HP using inflicted damage." /> <!-- Vampiric Rage -->
  30. -       <buff id="1303" price="0" desc="Increases crit. rate of magic attacks." /> <!-- Wild Magic -->
  31. -       <buff id="1304" price="0" desc="Increases shield defense power." /> <!-- Advanced Block -->
  32. -       <buff id="1352" price="0" desc="Increases resistance to atures." /> <!-- Elemental Protection -->
  33. -       <buff id="1353" price="0" desc="Increases resistance to dark attack." /> <!-- Divine Protection -->
  34. -       <buff id="1354" price="0" desc="Increases resistance to de-buff attack." /> <!-- Arcane Protection -->
  35. -       <buff id="1355" price="0" desc="Increases mage abilities." /> <!-- Prophecy of Water -->
  36. -       <buff id="1356" price="0" desc="Increases fighter abilities." /> <!-- Prophecy of Fire -->
  37. -       <buff id="1357" price="0" desc="Increases dagger abilities." /> <!-- Prophecy of Wind -->
  38. -       <buff id="1363" price="0" desc="Increases combat abilities." /> <!-- Chant of Victory -->
  39. -       <buff id="1388" price="0" desc="Increases P. Atk." /> <!-- Greater Might -->
  40. -       <buff id="1389" price="0" desc="Increases P. Def." /> <!-- Greater Shield -->
  41. -       <buff id="1390" price="0" desc="Increases P. Atk." /> <!-- War Chant -->
  42. -       <buff id="1391" price="0" desc="Increases P. Def." /> <!-- Earth Chant -->
  43. -       <buff id="1397" price="0" desc="Decreases MP consumption rate." /> <!-- Clarity -->
  44. -       <buff id="1413" price="0" desc="Increases mage abilities." /> <!-- Magnus' Chant -->
  45. +       <buff id="1035" price="0" level="1" desc="Increases resistance to mental attacks." /> <!-- Mental Shield -->
  46. +       <buff id="1036" price="0" level="1" desc="Increases M. Def." /> <!-- Magic Barrier -->
  47. +       <buff id="1040" price="0" level="1" desc="Increases P. Def." /> <!-- Shield -->
  48. +       <buff id="1045" price="0" level="1" desc="Increases maximum HP." /> <!-- Blessed Body -->
  49. +       <buff id="1048" price="0" level="1" desc="Increases maximum MP." /> <!-- Blessed Soul -->
  50. +       <buff id="1059" price="0" level="1" desc="Increases M. Atk." /> <!-- Empower -->
  51. +       <buff id="1062" price="0" level="1" desc="Reduces def. and increase atk. power." /> <!-- Berserker Spirit -->
  52. +       <buff id="1068" price="0" level="1" desc="Increases P. Atk." /> <!-- Might -->
  53. +       <buff id="1077" price="0" level="1" desc="Increases critical attack rate." /> <!-- Focus -->
  54. +       <buff id="1078" price="0" level="1" desc="Increases magic concentration." /> <!-- Concentration -->
  55. +       <buff id="1085" price="0" level="1" desc="Increases Casting Spd." /> <!-- Acumen -->
  56. +       <buff id="1086" price="0" level="1" desc="Increases Atk. Spd." /> <!-- Haste -->
  57. +       <buff id="1087" price="0" level="1" desc="Increases Evasion." /> <!-- Agility -->
  58. +       <buff id="1204" price="0" level="1" desc="Increases Speed." /> <!-- Wind Walk -->
  59. +       <buff id="1240" price="0" level="1" desc="Increases Accuracy." /> <!-- Guidance -->
  60. +       <buff id="1242" price="0" level="1" desc="Increases critical attack." /> <!-- Death Whisper -->
  61. +       <buff id="1243" price="0" level="1" desc="Increases shield defense rate." /> <!-- Bless Shield -->
  62. +       <buff id="1259" price="0" level="1" desc="Increases resistance to stun attack." /> <!-- Resist Shock -->
  63. +       <buff id="1268" price="0" level="1" desc="Restores HP using inflicted damage." /> <!-- Vampiric Rage -->
  64. +       <buff id="1303" price="0" level="1" desc="Increases crit. rate of magic attacks." /> <!-- Wild Magic -->
  65. +       <buff id="1304" price="0" level="1" desc="Increases shield defense power." /> <!-- Advanced Block -->
  66. +       <buff id="1352" price="0" level="1" desc="Increases resistance to atures." /> <!-- Elemental Protection -->
  67. +       <buff id="1353" price="0" level="1" desc="Increases resistance to dark attack." /> <!-- Divine Protection -->
  68. +       <buff id="1354" price="0" level="1" desc="Increases resistance to de-buff attack." /> <!-- Arcane Protection -->
  69. +       <buff id="1355" price="0" level="1" desc="Increases mage abilities." /> <!-- Prophecy of Water -->
  70. +       <buff id="1356" price="0" level="1" desc="Increases fighter abilities." /> <!-- Prophecy of Fire -->
  71. +       <buff id="1357" price="0" level="1" desc="Increases dagger abilities." /> <!-- Prophecy of Wind -->
  72. +       <buff id="1363" price="0" level="1" desc="Increases combat abilities." /> <!-- Chant of Victory -->
  73. +       <buff id="1388" price="0" level="1" desc="Increases P. Atk." /> <!-- Greater Might -->
  74. +       <buff id="1389" price="0" level="1" desc="Increases P. Def." /> <!-- Greater Shield -->
  75. +       <buff id="1390" price="0" level="1" desc="Increases P. Atk." /> <!-- War Chant -->
  76. +       <buff id="1391" price="0" level="1" desc="Increases P. Def." /> <!-- Earth Chant -->
  77. +       <buff id="1397" price="0" level="1" desc="Decreases MP consumption rate." /> <!-- Clarity -->
  78. +       <buff id="1413" price="0" level="1" desc="Increases mage abilities." /> <!-- Magnus' Chant -->
  79.     </category>
  80.     <category type="Dances">
  81. -       <buff id="271" price="0" desc="Increases P. Atk." /> <!-- Dance of the Warrior -->
  82. -       <buff id="272" price="0" desc="Increases Accuracy." /> <!-- Dance of Inspiration -->
  83. -       <buff id="273" price="0" desc="Increases M. Atk." /> <!-- Dance of the Mystic -->
  84. -       <buff id="274" price="0" desc="Increases critical damage." /> <!-- Dance of Fire -->
  85. -       <buff id="275" price="0" desc="Increases attack speed." /> <!-- Dance of Fury -->
  86. -       <buff id="276" price="0" desc="Increases Casting Spd." /> <!-- Dance of Concentration -->
  87. -       <buff id="277" price="0" desc="Sacred power to physical attack." /> <!-- Dance of Light -->
  88. -       <buff id="307" price="0" desc="Increases water resistance." /> <!-- Dance of Aqua Guard -->
  89. -       <buff id="309" price="0" desc="Increases earth resistance." /> <!-- Dance of Earth Guard -->
  90. -       <buff id="310" price="0" desc="Restores HP by inflicted damage." /> <!-- Dance of the Vampire -->
  91. -       <buff id="311" price="0" desc="Increases resistance to terrain damage." /> <!-- Dance of Protection -->
  92. -       <buff id="365" price="0" desc="Increases rate of magic crit. damage." /> <!-- Siren's Dance -->
  93. +       <buff id="271" price="0" level="1" desc="Increases P. Atk." /> <!-- Dance of the Warrior -->
  94. +       <buff id="272" price="0" level="1" desc="Increases Accuracy." /> <!-- Dance of Inspiration -->
  95. +       <buff id="273" price="0" level="1" desc="Increases M. Atk." /> <!-- Dance of the Mystic -->
  96. +       <buff id="274" price="0" level="1" desc="Increases critical damage." /> <!-- Dance of Fire -->
  97. +       <buff id="275" price="0" level="1" desc="Increases attack speed." /> <!-- Dance of Fury -->
  98. +       <buff id="276" price="0" level="1" desc="Increases Casting Spd." /> <!-- Dance of Concentration -->
  99. +       <buff id="277" price="0" level="1" desc="Sacred power to physical attack." /> <!-- Dance of Light -->
  100. +       <buff id="307" price="0" level="1" desc="Increases water resistance." /> <!-- Dance of Aqua Guard -->
  101. +       <buff id="309" price="0" level="1" desc="Increases earth resistance." /> <!-- Dance of Earth Guard -->
  102. +       <buff id="310" price="0" level="1" desc="Restores HP by inflicted damage." /> <!-- Dance of the Vampire -->
  103. +       <buff id="311" price="0" level="1" desc="Increases resistance to terrain damage." /> <!-- Dance of Protection -->
  104. +       <buff id="365" price="0" level="1" desc="Increases rate of magic crit. damage." /> <!-- Siren's Dance -->
  105.     </category>
  106.     <category type="Songs">
  107. -       <buff id="264" price="0" desc="Increases P. Def." /> <!-- Song of Earth -->
  108. -       <buff id="265" price="0" desc="Increases HP regeneration." /> <!-- Song of Life -->
  109. -       <buff id="266" price="0" desc="Increases Evasion." /> <!-- Song of Water -->
  110. -       <buff id="267" price="0" desc="Increases M. Def." /> <!-- Song of Warding -->
  111. -       <buff id="268" price="0" desc="Increases movement." /> <!-- Song of Wind -->
  112. -       <buff id="269" price="0" desc="Increases critical rate." /> <!-- Song of Hunter -->
  113. -       <buff id="270" price="0" desc="Increases resistance to dark magic." /> <!-- Song of Invocation -->
  114. -       <buff id="304" price="0" desc="Increases maximum HP." /> <!-- Song of Vitality -->
  115. -       <buff id="305" price="0" desc="Reflects damage received." /> <!-- Song of Vengeance -->
  116. -       <buff id="306" price="0" desc="Increases resistance to fire." /> <!-- Song of Flame Guard -->
  117. -       <buff id="308" price="0" desc="Increases resistance to wind." /> <!-- Song of Storm Guard -->
  118. -       <buff id="349" price="0" desc="Decreases re-use time." /> <!-- Song of Renewal -->
  119. -       <buff id="363" price="0" desc="Increases MP regeneration rate." /> <!-- Song of Meditation -->
  120. -       <buff id="364" price="0" desc="Decreases re-use time of physical skills." /> <!-- Song of Champion -->
  121. +       <buff id="264" price="0" level="1" desc="Increases P. Def." /> <!-- Song of Earth -->
  122. +       <buff id="265" price="0" level="1" desc="Increases HP regeneration." /> <!-- Song of Life -->
  123. +       <buff id="266" price="0" level="1" desc="Increases Evasion." /> <!-- Song of Water -->
  124. +       <buff id="267" price="0" level="1" desc="Increases M. Def." /> <!-- Song of Warding -->
  125. +       <buff id="268" price="0" level="1" desc="Increases movement." /> <!-- Song of Wind -->
  126. +       <buff id="269" price="0" level="1" desc="Increases critical rate." /> <!-- Song of Hunter -->
  127. +       <buff id="270" price="0" level="1" desc="Increases resistance to dark magic." /> <!-- Song of Invocation -->
  128. +       <buff id="304" price="0" level="1" desc="Increases maximum HP." /> <!-- Song of Vitality -->
  129. +       <buff id="305" price="0" level="1" desc="Reflects damage received." /> <!-- Song of Vengeance -->
  130. +       <buff id="306" price="0" level="1" desc="Increases resistance to fire." /> <!-- Song of Flame Guard -->
  131. +       <buff id="308" price="0" level="1" desc="Increases resistance to wind." /> <!-- Song of Storm Guard -->
  132. +       <buff id="349" price="0" level="1" desc="Decreases re-use time." /> <!-- Song of Renewal -->
  133. +       <buff id="363" price="0" level="1" desc="Increases MP regeneration rate." /> <!-- Song of Meditation -->
  134. +       <buff id="364" price="0" level="1" desc="Decreases re-use time of physical skills." /> <!-- Song of Champion -->
  135.     </category>
  136.  </list>
  137. \ No newline at end of file
  138. diff --git dist/game/data/xsd/SchemeBufferSkills.xsd dist/game/data/xsd/SchemeBufferSkills.xsd
  139. index 8b8e0e1..4e682bb 100644
  140. --- dist/game/data/xsd/SchemeBufferSkills.xsd
  141. +++ dist/game/data/xsd/SchemeBufferSkills.xsd
  142. @@ -17,6 +17,7 @@
  143.                                         <xs:extension base="xs:string">
  144.                                             <xs:attribute type="xs:short" name="id" use="required"/>
  145.                                             <xs:attribute type="xs:byte" name="price" use="required"/>
  146. +                                           <xs:attribute type="xs:byte" name="level" use="required"/>
  147.                                             <xs:attribute type="xs:string" name="desc" use="required"/>
  148.                                         </xs:extension>
  149.                                     </xs:simpleContent>
  150. diff --git java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java
  151. index 7e5a24c..a84a356 100644
  152. --- java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java
  153. +++ java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java
  154. @@ -115,7 +115,7 @@
  155.                    
  156.                     final NamedNodeMap attrs = c.getAttributes();
  157.                     final int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue());
  158. -                   _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue()));
  159. +                   _availableBuffs.put(skillId, new BuffSkillHolder(skillId, Integer.parseInt(attrs.getNamedItem("price").getNodeValue()), Integer.parseInt(attrs.getNamedItem("level").getNodeValue()), category, attrs.getNamedItem("desc").getNodeValue()));
  160.                 }
  161.             }
  162.         }
  163. diff --git java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
  164. index cc9dcec..a5779f1 100644
  165. --- java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
  166. +++ java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
  167. @@ -116,7 +116,7 @@
  168.             {
  169.                 for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName))
  170.                 {
  171. -                   SkillTable.getInstance().getInfo(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target);
  172. +                   SkillTable.getInstance().getInfo(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).getEffects(this, target);
  173.                 }
  174.             }
  175.         }
  176. diff --git java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java
  177. index ec8fd43..a92512e 100644
  178. --- java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java
  179. +++ java/org/l2jmobius/gameserver/model/holders/BuffSkillHolder.java
  180. @@ -23,13 +23,15 @@
  181.  {
  182.     private final int _id;
  183.     private final int _price;
  184. +   private final int _level;
  185.     private final String _type;
  186.     private final String _description;
  187.    
  188. -   public BuffSkillHolder(int id, int price, String type, String description)
  189. +   public BuffSkillHolder(int id, int price, int level, String type, String description)
  190.     {
  191.         _id = id;
  192.         _price = price;
  193. +       _level = level;
  194.         _type = type;
  195.         _description = description;
  196.     }
  197. @@ -44,6 +46,11 @@
  198.         return _price;
  199.     }
  200.    
  201. +   public int getLevel()
  202. +   {
  203. +       return _level;
  204. +   }
  205. +  
  206.     public String getType()
  207.     {
  208.         return _type;
Add Comment
Please, Sign In to add comment