From 98c6cd74562bc18d710903314af4a561db21950f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 29 Nov 2018 01:05:02 +0000 Subject: [PATCH] Fixed talking to monument of heroes. --- .../MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html | 3 ++- .../ai/others/MonumentOfHeroes/MonumentOfHeroes.java | 7 ++++++- .../MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html | 3 ++- .../ai/others/MonumentOfHeroes/MonumentOfHeroes.java | 7 ++++++- .../MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html | 3 ++- .../ai/others/MonumentOfHeroes/MonumentOfHeroes.java | 7 ++++++- .../MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html | 3 ++- .../ai/others/MonumentOfHeroes/MonumentOfHeroes.java | 7 ++++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html index 024d65d849..b442797616 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html @@ -6,7 +6,8 @@ - + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 6a62853fb2..bca5df5eaf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes; import java.util.List; +import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Hero; @@ -225,7 +226,11 @@ public final class MonumentOfHeroes extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return player.isNoble() ? "MonumentOfHeroes-noblesse.html" : "MonumentOfHeroes-noNoblesse.html"; + if ((!player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP)) || (player.getLevel() < 55)) + { + return "MonumentOfHeroes-noNoblesse.html"; + } + return "MonumentOfHeroes-noblesse.html"; } private int getOlympiadRank(L2PcInstance player) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html index 024d65d849..b442797616 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html @@ -6,7 +6,8 @@
You are not a noblesse.
(You have to reach Lv. 55 and complete
the 2nd Class Transfer to compete.)
You can check to see who the era's heroes are.
- + + diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 6a62853fb2..bca5df5eaf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes; import java.util.List; +import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Hero; @@ -225,7 +226,11 @@ public final class MonumentOfHeroes extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return player.isNoble() ? "MonumentOfHeroes-noblesse.html" : "MonumentOfHeroes-noNoblesse.html"; + if ((!player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP)) || (player.getLevel() < 55)) + { + return "MonumentOfHeroes-noNoblesse.html"; + } + return "MonumentOfHeroes-noblesse.html"; } private int getOlympiadRank(L2PcInstance player) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html index 024d65d849..b442797616 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html @@ -6,7 +6,8 @@
You are not a noblesse.
(You have to reach Lv. 55 and complete
the 2nd Class Transfer to compete.)
You can check to see who the era's heroes are.
- + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 6a62853fb2..bca5df5eaf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes; import java.util.List; +import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Hero; @@ -225,7 +226,11 @@ public final class MonumentOfHeroes extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return player.isNoble() ? "MonumentOfHeroes-noblesse.html" : "MonumentOfHeroes-noNoblesse.html"; + if ((!player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP)) || (player.getLevel() < 55)) + { + return "MonumentOfHeroes-noNoblesse.html"; + } + return "MonumentOfHeroes-noblesse.html"; } private int getOlympiadRank(L2PcInstance player) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html index 024d65d849..b442797616 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-noNoblesse.html @@ -6,7 +6,8 @@
You are not a noblesse.
(You have to reach Lv. 55 and complete
the 2nd Class Transfer to compete.)
You can check to see who the era's heroes are.
- + + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 6a62853fb2..bca5df5eaf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes; import java.util.List; +import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Hero; @@ -225,7 +226,11 @@ public final class MonumentOfHeroes extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return player.isNoble() ? "MonumentOfHeroes-noblesse.html" : "MonumentOfHeroes-noNoblesse.html"; + if ((!player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP)) || (player.getLevel() < 55)) + { + return "MonumentOfHeroes-noNoblesse.html"; + } + return "MonumentOfHeroes-noblesse.html"; } private int getOlympiadRank(L2PcInstance player)
You are not a noblesse.
(You have to reach Lv. 55 and complete
the 2nd Class Transfer to compete.)
You can check to see who the era's heroes are.