From bfb0b42e9d7da28adaaae11233ce2285ed662b3e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 31 Mar 2020 08:57:25 +0000 Subject: [PATCH] Check player base template for Hardin. --- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- .../data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index b5d0cc0801..6c07ab45e1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -71,15 +71,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace())) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index 0bd059c71f..67d3f1257b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -69,15 +69,18 @@ public class Hardin extends AbstractNpcAI if (event.equals("list")) { final StringBuilder classes = new StringBuilder(); + final ClassId playerBaseTemplate = player.getBaseTemplate().getClassId(); for (ClassId c : ClassId.values()) { if ((((c.level() != 4) && (c.getRace() != Race.ERTHEIA)) // || (Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA) && (c.level() != 3))) // || (!Config.HARDIN_ENABLE_ERTHEIAS && (c.getRace() == Race.ERTHEIA)) // - || (c == player.getClassId())) + || (c == player.getClassId()) // + || (c == playerBaseTemplate)) { continue; } + if (!player.isDualClassActive() || (player.isDualClassActive() && Config.HARDIN_ENABLE_DUALCLASS_CHECKS)) { if (!Config.HARDIN_ENABLE_ALL_RACES && (c.getRace() != player.getClassId().getRace()))