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

Auto remove, skilltree and AcquireSkillList fixes.

Browse Source 
Contributed by rocknowx.
This commit is contained in:
MobiusDev
2015-11-10 08:52:13 +00:00
parent 4c37092c3a
commit c4988df6a0
39 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -356,6 +356,7 @@ public class AdminEditChar implements IAdminCommandHandler
final L2PcInstance player = target.getActingPlayer();
if ((ClassId.getClassId(classidval) != null) && (player.getClassId().getId() != classidval))
{
final boolean wasAwaken = player.isAwaken();
player.setClassId(classidval);
if (player.isSubClassActive())
@@ -377,7 +378,7 @@ public class AdminEditChar implements IAdminCommandHandler
player.storeMe();
player.sendMessage("A GM changed your class to " + newclass + ".");
player.broadcastUserInfo();
if (player.isAwaken())
if (!wasAwaken && player.isAwaken())
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);
}

1
trunk/dist/game/data/skillTrees/4rthClass/AeoreCardinal.xml vendored
View File

@@ -13,7 +13,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Silver Saint" skillId="8607" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/AeoreEva'sSaint.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Silver Saint" skillId="8607" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/AeoreShillienSaint.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Silver Saint" skillId="8607" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/FeohArchmage.xml vendored
View File

@@ -16,7 +16,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blue Phantom" skillId="8604" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/FeohMysticMuse.xml vendored
View File

@@ -33,7 +33,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blue Phantom" skillId="8604" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/FeohSoulhound.xml vendored
View File

@@ -30,7 +30,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blue Phantom" skillId="8604" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/FeohSoultaker.xml vendored
View File

@@ -26,7 +26,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blue Phantom" skillId="8604" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/FeohStormScreamer.xml vendored
View File

@@ -31,7 +31,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blue Phantom" skillId="8604" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/IssDominator.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Swift Melody" skillId="8606" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/IssDoomcryer.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Swift Melody" skillId="8606" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/IssHierophant.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Swift Melody" skillId="8606" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/IssSpectralDancer.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Swift Melody" skillId="8606" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/IssSwordMuse.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Swift Melody" skillId="8606" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/OthellAdventurer.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blood Tail" skillId="8602" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/OthellGhostHunter.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blood Tail" skillId="8602" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/OthellWindRider.xml vendored
View File

@@ -11,7 +11,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Blood Tail" skillId="8602" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/SigelEva'sTemplar.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Royal Aegis" skillId="8600" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/SigelHellKnight.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Royal Aegis" skillId="8600" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/SigelPhoenixKnight.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Royal Aegis" skillId="8600" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/SigelShillienTemplar.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Royal Aegis" skillId="8600" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/TyrrDoombringer.xml vendored
View File

@@ -13,7 +13,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Battle Scar" skillId="8601" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/TyrrDreadnought.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Battle Scar" skillId="8601" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/TyrrDuelist.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Battle Scar" skillId="8601" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/TyrrGrandKhavatari.xml vendored
View File

@@ -12,7 +12,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Battle Scar" skillId="8601" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/TyrrTitan.xml vendored
View File

@@ -13,7 +13,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Battle Scar" skillId="8601" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/WynnArcanaLord.xml vendored
View File

@@ -17,7 +17,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon White Wing" skillId="8605" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/WynnElementalMaster.xml vendored
View File

@@ -17,7 +17,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon White Wing" skillId="8605" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/WynnSpectralMaster.xml vendored
View File

@@ -17,7 +17,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon White Wing" skillId="8605" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1597" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/YulGhostSentinel.xml vendored
View File

@@ -17,7 +17,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Tempest Arrow" skillId="8603" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/YulMoonlightSentinel.xml vendored
View File

@@ -17,7 +17,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Tempest Arrow" skillId="8603" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/YulSagittarius.xml vendored
View File

@@ -17,7 +17,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Tempest Arrow" skillId="8603" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

1
trunk/dist/game/data/skillTrees/4rthClass/YulTrickster.xml vendored
View File

@@ -16,7 +16,6 @@
<skill skillName="Crystallize" skillId="248" skillLvl="4" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="5" getLevel="85" autoGet="true" />
<skill skillName="Crystallize" skillId="248" skillLvl="6" getLevel="85" autoGet="true" />
<skill skillName="Weight Limit" skillId="150" skillLvl="3" getLevel="85" autoGet="true" />
<skill skillName="Summon Tempest Arrow" skillId="8603" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Inventory Increase" skillId="1571" skillLvl="1" getLevel="85" autoGet="true" />
<skill skillName="Weight Increase" skillId="1572" skillLvl="1" getLevel="85" autoGet="true" />

3
trunk/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml vendored
View File

@@ -3,6 +3,9 @@
<skillTree type="classSkillTree" classId="188" parentClassId="186">
<skill skillName="Lucky" skillId="194" skillLvl="1" getLevel="1" autoGet="true" />
<skill skillName="Common Craft" skillId="1322" skillLvl="1" getLevel="1" autoGet="true" />
<skill skillName="Divine Wind" skillId="30400" skillLvl="2" getLevel="1" autoGet="true" /> <!-- Race skill -->
<skill skillName="Efficacy" skillId="30402" skillLvl="2" getLevel="1" autoGet="true" /> <!-- Race skill -->
<skill skillName="Tenacity" skillId="30401" skillLvl="2" getLevel="1" autoGet="true" /> <!-- Race skill -->
<skill skillName="Eminent Attack Movement" skillId="30522" skillLvl="1" getLevel="40" levelUpSp="42" />
<skill skillName="Heavy Punch" skillId="30526" skillLvl="1" getLevel="76" levelUpSp="3000" />
<skill skillName="Expertise R" skillId="239" skillLvl="8" getLevel="85" autoGet="true" />

3
trunk/dist/game/data/skillTrees/ErtheiaClass/Sayha'sSeer.xml vendored
View File

@@ -3,6 +3,9 @@
<skillTree type="classSkillTree" classId="189" parentClassId="187">
<skill skillName="Lucky" skillId="194" skillLvl="1" getLevel="1" autoGet="true" />
<skill skillName="Common Craft" skillId="1322" skillLvl="1" getLevel="1" autoGet="true" />
<skill skillName="Divine Wind" skillId="30400" skillLvl="2" getLevel="1" autoGet="true" /> <!-- Race skill -->
<skill skillName="Efficacy" skillId="30402" skillLvl="2" getLevel="1" autoGet="true" /> <!-- Race skill -->
<skill skillName="Tenacity" skillId="30401" skillLvl="2" getLevel="1" autoGet="true" /> <!-- Race skill -->
<skill skillName="Expertise R" skillId="239" skillLvl="8" getLevel="85" autoGet="true" />
<skill skillName="Create Common Item" skillId="1320" skillLvl="10" getLevel="85" autoGet="true" />
<skill skillName="Sayha's Seer Aura" skillId="30605" skillLvl="1" getLevel="85" autoGet="true" />

5
trunk/dist/game/data/skillTrees/raceSkillTree.xml vendored
View File

@@ -26,9 +26,4 @@
<skill skillName="Body Reinforcement" skillId="1926" skillLvl="1" getLevel="1" autoGet="true" />
<skill skillName="Flying Body Reinforcement" skillId="1954" skillLvl="1" getLevel="1" autoGet="true" />
</skillTree>
<skillTree type="raceSkillTree" race="ERTHEIA">
<skill skillName="Divine Wind" skillId="30400" skillLvl="2" getLevel="1" autoGet="true" />
<skill skillName="Tenacity" skillId="30401" skillLvl="2" getLevel="1" autoGet="true" />
<skill skillName="Efficacy" skillId="30402" skillLvl="2" getLevel="1" autoGet="true" />
</skillTree>
</list>

68
trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java
View File

@@ -653,6 +653,11 @@ public final class SkillTreesData implements IXmlReader
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
}
public List<L2SkillLearn> getAvailableSkillsList(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkillsList(player, classId, includeByFs, includeAutoGet, player);
}
/**
* Gets the available skills.
* @param player the learning skill player
@@ -715,6 +720,56 @@ public final class SkillTreesData implements IXmlReader
return result;
}
private List<L2SkillLearn> getAvailableSkillsList(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
{
final List<L2SkillLearn> result = new LinkedList<>();
final Map<Integer, L2SkillLearn> skills = getCompleteClassSkillTree(classId);
if (skills.isEmpty())
{
// The Skill Tree for this class is undefined.
LOGGER.warning(getClass().getSimpleName() + ": Skilltree for class " + classId + " is not defined!");
return result;
}
final boolean isAwaken = player.isInCategory(CategoryType.AWAKEN_GROUP);
for (Entry<Integer, L2SkillLearn> entry : skills.entrySet())
{
final L2SkillLearn skill = entry.getValue();
// Skill level doesn't exist.
if (SkillData.getInstance().getMaxLevel(skill.getSkillId()) < skill.getSkillLevel())
{
continue;
}
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId()))
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()))
{
continue;
}
final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
{
if (oldSkill.getLevel() == (skill.getSkillLevel() - 1))
{
result.add(skill);
}
}
else if (skill.getSkillLevel() == 1)
{
result.add(skill);
}
}
return result;
}
public Collection<Skill> getAllAvailableSkills(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
// Get available skills
@@ -1463,11 +1518,20 @@ public final class SkillTreesData implements IXmlReader
for (Skill skill : player.getAllSkills())
{
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
final int Lvl_cur = skill.getLevel();
final int hashCode = SkillData.getSkillHashCode(skill.getId(), maxLvl);
final int hash_cur = SkillData.getSkillHashCode(skill.getId(), Lvl_cur); // must in parent class
final int hash_curx = SkillData.getSkillHashCode(skill.getId(), Lvl_cur + 1); // some skill not update maxlvl in stats
if (!isCurrentClassSkillNoParent(player.getClassId(), hashCode) && !isRemoveSkill(player.getClassId(), skill.getId()))
final int _classlv = player.getClassId().level();
ClassId _classId = player.getClassId();
for (int i = 0; i < _classlv; i++)
{
player.removeSkill(skill, true, true);
_classId = _classId.getParent();
if (isCurrentClassSkillNoParent(_classId, hash_cur) && (!isCurrentClassSkillNoParent(player.getClassId(), hashCode) && !isCurrentClassSkillNoParent(player.getClassId(), hash_curx)) && !isRemoveSkill(player.getClassId(), skill.getId()))
{
player.removeSkill(skill, true, true);
}
}
}
}

2
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2657,7 +2657,7 @@ public final class L2PcInstance extends L2Playable
// Remove skills if required.
for (Skill sk : getSkills().values())
{
final L2SkillLearn s = SkillTreesData.getInstance().getSkillLearn(sk.getId(), sk.getLevel(), this);
final L2SkillLearn s = SkillTreesData.getInstance().getSkillLearn(sk.getId(), 1, this);
if ((s != null) && !s.getRemoveSkills().isEmpty())
{
s.getRemoveSkills().forEach(skillId ->

3
trunk/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java
View File

@@ -40,8 +40,7 @@ public class AcquireSkillList extends L2GameServerPacket
public AcquireSkillList(L2PcInstance activeChar)
{
_activeChar = activeChar;
_learnable = SkillTreesData.getInstance().getAvailableSkills(activeChar, activeChar.getClassId(), false, false);
_learnable.addAll(SkillTreesData.getInstance().getNextAvailableSkills(activeChar, activeChar.getClassId(), false, false));
_learnable = SkillTreesData.getInstance().getAvailableSkillsList(activeChar, activeChar.getClassId(), false, false);
}
@Override