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

Death Knight class id cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-10-15 21:05:38 +00:00
parent 1e3c3dd1e7
commit 5599581cea
12 changed files with 95 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/CategoryData.xml vendored
View File

@ -585,4 +585,18 @@
<id>34</id> <!-- bladedancer --> <id>34</id> <!-- bladedancer -->
<id>107</id> <!-- spectral_dancer --> <id>107</id> <!-- spectral_dancer -->
</category> </category>
<category name="DEATH_KNIGHT_ALL_CLASS">
<id>196</id> <!-- Death Pilgrim - Human -->
<id>197</id> <!-- Death Blade - Human -->
<id>198</id> <!-- Death Messenger - Human -->
<id>199</id> <!-- Death Knight - Human -->
<id>200</id> <!-- Death Pilgrim - Elf -->
<id>201</id> <!-- Death Blade - Elf -->
<id>202</id> <!-- Death Messenger - Elf -->
<id>203</id> <!-- Death Knight - Elf -->
<id>204</id> <!-- Death Pilgrim - Dark Elf -->
<id>205</id> <!-- Death Blade - Dark Elf -->
<id>206</id> <!-- Death Messenger - Dark Elf -->
<id>207</id> <!-- Death Knight - Dark Elf -->
</category>
</list> </list>

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@ -414,7 +414,7 @@ public class AdminEditChar implements IAdminCommandHandler
player.getAppearance().setFemale(); player.getAppearance().setFemale();
} }
// Death Knight checks. // Death Knight checks.
if ((classidval > 195) && (classidval < 208)) if (player.isDeathKnight())
{ {
player.getAppearance().setMale(); player.getAppearance().setMale();
} }

8
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java vendored
View File

@ -148,8 +148,14 @@ public class Q00255_Tutorial extends Quest
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
// Null check.
if (player == null)
{
return null;
}
// Death Knights. // Death Knights.
if ((player == null) || (player.getClassId().getId() > 195)) if (player.isDeathKnight())
{ {
return null; return null;
} }

18
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/chars/classList.xml vendored
View File

@ -103,17 +103,17 @@
<class classId="134" name="Trickster" parentClassId="130" /> <class classId="134" name="Trickster" parentClassId="130" />
<!-- Death Knight - Human --> <!-- Death Knight - Human -->
<class classId="196" name="Death Pilgrim" /> <class classId="196" name="Death Pilgrim" />
<class classId="205" name="Death Blade" parentClassId="196" /> <class classId="197" name="Death Blade" parentClassId="196" />
<class classId="202" name="Death Messenger" parentClassId="205" /> <class classId="198" name="Death Messenger" parentClassId="197" />
<class classId="199" name="Death Knight" parentClassId="202" /> <class classId="199" name="Death Knight" parentClassId="198" />
<!-- Death Knight - Elf --> <!-- Death Knight - Elf -->
<class classId="200" name="Death Pilgrim" /> <class classId="200" name="Death Pilgrim" />
<class classId="197" name="Death Blade" parentClassId="200" /> <class classId="201" name="Death Blade" parentClassId="200" />
<class classId="206" name="Death Messenger" parentClassId="197" /> <class classId="202" name="Death Messenger" parentClassId="201" />
<class classId="203" name="Death Knight" parentClassId="206" /> <class classId="203" name="Death Knight" parentClassId="202" />
<!-- Death Knight - Dark Elf --> <!-- Death Knight - Dark Elf -->
<class classId="204" name="Death Pilgrim" /> <class classId="204" name="Death Pilgrim" />
<class classId="201" name="Death Blade" parentClassId="204" /> <class classId="205" name="Death Blade" parentClassId="204" />
<class classId="198" name="Death Messenger" parentClassId="201" /> <class classId="206" name="Death Messenger" parentClassId="205" />
<class classId="207" name="Death Knight" parentClassId="198" /> <class classId="207" name="Death Knight" parentClassId="206" />
</list> </list>

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CategoryType.java
View File

@ -54,7 +54,8 @@ public enum CategoryType
SUB_GROUP_ORC, SUB_GROUP_ORC,
SUB_GROUP_WARE, SUB_GROUP_WARE,
SUB_GROUP_BLACK, SUB_GROUP_BLACK,
SUB_GROUP_DE; SUB_GROUP_DE,
DEATH_KNIGHT_ALL_CLASS;
/** /**
* Finds category by it's name * Finds category by it's name

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -6694,7 +6694,7 @@ public class PlayerInstance extends Playable
{ {
player._activeClass = activeClassId; player._activeClass = activeClassId;
} }
if ((activeClassId > 195) && (activeClassId < 208)) if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, activeClassId))
{ {
player._isDeathKnight = true; player._isDeathKnight = true;
} }
@ -14233,7 +14233,7 @@ public class PlayerInstance extends Playable
addStatusUpdateValue(StatusUpdateType.LEVEL); addStatusUpdateValue(StatusUpdateType.LEVEL);
addStatusUpdateValue(StatusUpdateType.MAX_CP); addStatusUpdateValue(StatusUpdateType.MAX_CP);
addStatusUpdateValue(StatusUpdateType.CUR_CP); addStatusUpdateValue(StatusUpdateType.CUR_CP);
if (isPlayer() && (getActingPlayer().getClassId().getId() > 195)) if (isDeathKnight())
{ {
addStatusUpdateValue(StatusUpdateType.CUR_DP); addStatusUpdateValue(StatusUpdateType.CUR_DP);
} }

44
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/CategoryData.xml vendored
View File

@ -66,16 +66,16 @@
<id>194</id> <!-- Soul Breaker --> <id>194</id> <!-- Soul Breaker -->
<id>195</id> <!-- Soul Hound --> <id>195</id> <!-- Soul Hound -->
<id>196</id> <!-- Death Pilgrim - Human --> <id>196</id> <!-- Death Pilgrim - Human -->
<id>205</id> <!-- Death Blade - Human --> <id>197</id> <!-- Death Blade - Human -->
<id>202</id> <!-- Death Messenger - Human --> <id>198</id> <!-- Death Messenger - Human -->
<id>199</id> <!-- Death Knight - Human --> <id>199</id> <!-- Death Knight - Human -->
<id>200</id> <!-- Death Pilgrim - Elf --> <id>200</id> <!-- Death Pilgrim - Elf -->
<id>197</id> <!-- Death Blade - Elf --> <id>201</id> <!-- Death Blade - Elf -->
<id>206</id> <!-- Death Messenger - Elf --> <id>202</id> <!-- Death Messenger - Elf -->
<id>203</id> <!-- Death Knight - Elf --> <id>203</id> <!-- Death Knight - Elf -->
<id>204</id> <!-- Death Pilgrim - Dark Elf --> <id>204</id> <!-- Death Pilgrim - Dark Elf -->
<id>201</id> <!-- Death Blade - Dark Elf --> <id>205</id> <!-- Death Blade - Dark Elf -->
<id>198</id> <!-- Death Messenger - Dark Elf --> <id>206</id> <!-- Death Messenger - Dark Elf -->
<id>207</id> <!-- Death Knight - Dark Elf --> <id>207</id> <!-- Death Knight - Dark Elf -->
<id>208</id> <!-- Sylph Gunner --> <id>208</id> <!-- Sylph Gunner -->
<id>209</id> <!-- Sharpshooter --> <id>209</id> <!-- Sharpshooter -->
@ -206,16 +206,16 @@
<id>194</id> <!-- Soul Breaker --> <id>194</id> <!-- Soul Breaker -->
<id>195</id> <!-- Soul Hound --> <id>195</id> <!-- Soul Hound -->
<id>196</id> <!-- Death Pilgrim - Human --> <id>196</id> <!-- Death Pilgrim - Human -->
<id>205</id> <!-- Death Blade - Human --> <id>197</id> <!-- Death Blade - Human -->
<id>202</id> <!-- Death Messenger - Human --> <id>198</id> <!-- Death Messenger - Human -->
<id>199</id> <!-- Death Knight - Human --> <id>199</id> <!-- Death Knight - Human -->
<id>200</id> <!-- Death Pilgrim - Elf --> <id>200</id> <!-- Death Pilgrim - Elf -->
<id>197</id> <!-- Death Blade - Elf --> <id>201</id> <!-- Death Blade - Elf -->
<id>206</id> <!-- Death Messenger - Elf --> <id>202</id> <!-- Death Messenger - Elf -->
<id>203</id> <!-- Death Knight - Elf --> <id>203</id> <!-- Death Knight - Elf -->
<id>204</id> <!-- Death Pilgrim - Dark Elf --> <id>204</id> <!-- Death Pilgrim - Dark Elf -->
<id>201</id> <!-- Death Blade - Dark Elf --> <id>205</id> <!-- Death Blade - Dark Elf -->
<id>198</id> <!-- Death Messenger - Dark Elf --> <id>206</id> <!-- Death Messenger - Dark Elf -->
<id>207</id> <!-- Death Knight - Dark Elf --> <id>207</id> <!-- Death Knight - Dark Elf -->
<id>208</id> <!-- Sylph Gunner --> <id>208</id> <!-- Sylph Gunner -->
<id>209</id> <!-- Sharpshooter --> <id>209</id> <!-- Sharpshooter -->
@ -597,4 +597,24 @@
<id>34</id> <!-- bladedancer --> <id>34</id> <!-- bladedancer -->
<id>107</id> <!-- spectral_dancer --> <id>107</id> <!-- spectral_dancer -->
</category> </category>
<category name="DEATH_KNIGHT_ALL_CLASS">
<id>196</id> <!-- Death Pilgrim - Human -->
<id>197</id> <!-- Death Blade - Human -->
<id>198</id> <!-- Death Messenger - Human -->
<id>199</id> <!-- Death Knight - Human -->
<id>200</id> <!-- Death Pilgrim - Elf -->
<id>201</id> <!-- Death Blade - Elf -->
<id>202</id> <!-- Death Messenger - Elf -->
<id>203</id> <!-- Death Knight - Elf -->
<id>204</id> <!-- Death Pilgrim - Dark Elf -->
<id>205</id> <!-- Death Blade - Dark Elf -->
<id>206</id> <!-- Death Messenger - Dark Elf -->
<id>207</id> <!-- Death Knight - Dark Elf -->
</category>
<category name="SYLPH_ALL_CLASS">
<id>208</id> <!-- Sylph Gunner -->
<id>209</id> <!-- Sharpshooter -->
<id>210</id> <!-- Wind Sniper -->
<id>211</id> <!-- Storm Blaster -->
</category>
</list> </list>

2
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@ -410,7 +410,7 @@ public class AdminEditChar implements IAdminCommandHandler
} }
} }
// Death Knight checks. // Death Knight checks.
if ((classidval > 195) && (classidval < 208)) if (player.isDeathKnight())
{ {
player.getAppearance().setMale(); player.getAppearance().setMale();
} }

14
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java vendored
View File

@ -148,8 +148,20 @@ public class Q00255_Tutorial extends Quest
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
// Null check.
if (player == null)
{
return null;
}
// Death Knights. // Death Knights.
if ((player == null) || (player.getClassId().getId() > 195)) if (player.isDeathKnight())
{
return null;
}
// Sylph.
if (player.getRace() == Race.SYLPH)
{ {
return null; return null;
} }

18
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/chars/classList.xml vendored
View File

@ -103,19 +103,19 @@
<class classId="134" name="Trickster" parentClassId="130" /> <class classId="134" name="Trickster" parentClassId="130" />
<!-- Death Knight - Human --> <!-- Death Knight - Human -->
<class classId="196" name="Death Pilgrim" /> <class classId="196" name="Death Pilgrim" />
<class classId="205" name="Death Blade" parentClassId="196" /> <class classId="197" name="Death Blade" parentClassId="196" />
<class classId="202" name="Death Messenger" parentClassId="205" /> <class classId="198" name="Death Messenger" parentClassId="197" />
<class classId="199" name="Death Knight" parentClassId="202" /> <class classId="199" name="Death Knight" parentClassId="198" />
<!-- Death Knight - Elf --> <!-- Death Knight - Elf -->
<class classId="200" name="Death Pilgrim" /> <class classId="200" name="Death Pilgrim" />
<class classId="197" name="Death Blade" parentClassId="200" /> <class classId="201" name="Death Blade" parentClassId="200" />
<class classId="206" name="Death Messenger" parentClassId="197" /> <class classId="202" name="Death Messenger" parentClassId="201" />
<class classId="203" name="Death Knight" parentClassId="206" /> <class classId="203" name="Death Knight" parentClassId="202" />
<!-- Death Knight - Dark Elf --> <!-- Death Knight - Dark Elf -->
<class classId="204" name="Death Pilgrim" /> <class classId="204" name="Death Pilgrim" />
<class classId="201" name="Death Blade" parentClassId="204" /> <class classId="205" name="Death Blade" parentClassId="204" />
<class classId="198" name="Death Messenger" parentClassId="201" /> <class classId="206" name="Death Messenger" parentClassId="205" />
<class classId="207" name="Death Knight" parentClassId="198" /> <class classId="207" name="Death Knight" parentClassId="206" />
<!-- Sylph --> <!-- Sylph -->
<class classId="208" name="Sylph Gunner" /> <class classId="208" name="Sylph Gunner" />
<class classId="209" name="Sharpshooter" parentClassId="208" /> <class classId="209" name="Sharpshooter" parentClassId="208" />

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CategoryType.java
View File

@ -54,7 +54,9 @@ public enum CategoryType
SUB_GROUP_ORC, SUB_GROUP_ORC,
SUB_GROUP_WARE, SUB_GROUP_WARE,
SUB_GROUP_BLACK, SUB_GROUP_BLACK,
SUB_GROUP_DE; SUB_GROUP_DE,
DEATH_KNIGHT_ALL_CLASS,
SYLPH_ALL_CLASS;
/** /**
* Finds category by it's name * Finds category by it's name

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -6739,7 +6739,7 @@ public class PlayerInstance extends Playable
{ {
player._activeClass = activeClassId; player._activeClass = activeClassId;
} }
if ((activeClassId > 195) && (activeClassId < 208)) if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, activeClassId))
{ {
player._isDeathKnight = true; player._isDeathKnight = true;
} }
@ -14310,7 +14310,7 @@ public class PlayerInstance extends Playable
addStatusUpdateValue(StatusUpdateType.LEVEL); addStatusUpdateValue(StatusUpdateType.LEVEL);
addStatusUpdateValue(StatusUpdateType.MAX_CP); addStatusUpdateValue(StatusUpdateType.MAX_CP);
addStatusUpdateValue(StatusUpdateType.CUR_CP); addStatusUpdateValue(StatusUpdateType.CUR_CP);
if (isPlayer() && (getActingPlayer().getClassId().getId() > 195)) if (isDeathKnight())
{ {
addStatusUpdateValue(StatusUpdateType.CUR_DP); addStatusUpdateValue(StatusUpdateType.CUR_DP);
} }