From be738375dadb7cd06b66b4aa35176fde5aadc2b6 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 20 Feb 2018 17:37:12 +0000 Subject: [PATCH] Olympiad NPC improvements. Contributed by quangnguyen. --- .../ClanHallAuctioneer/ClanHallAuctioneer.java | 2 +- .../others/ClanHallManager/ClanHallManager.java | 15 +++------------ .../others/OlyBuffer/OlyBuffer-afterBuff.html | 17 ++++++++--------- .../ai/others/OlyBuffer/OlyBuffer-index.html | 17 ++++++++--------- .../scripts/ai/others/OlyBuffer/OlyBuffer.java | 11 +++++------ .../others/OlyManager/OlyManager-rewards.html | 3 --- 6 files changed, 25 insertions(+), 40 deletions(-) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 99c35e0872..f85bf56410 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -78,7 +78,7 @@ public final class ClanHallAuctioneer extends AbstractNpcAI case "map": { htmltext = getHtm(player.getHtmlPrefix(), "ClanHallAuctioneer-map.html"); - htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio").toUpperCase()); + htmltext = htmltext.replace("%MAP%", npc.getParameters().getString("fnAgitMap", "gludio")); htmltext = htmltext.replace("%TOWN_NAME%", npc.getCastle().getName()); break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 6770e8426e..77adc4fe5b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -48,6 +48,9 @@ import ai.AbstractNpcAI; public final class ClanHallManager extends AbstractNpcAI { // NPCs + // 35461, 35463, 35465, 35467, // Goddard + // 35566, 35568, 35570, 35572, 35574, 35576, 35578, // Rune + // 35580, 35582, 35584, 35586, // Schuttgart // @formatter:off private static final int[] CLANHALL_MANAGERS = { @@ -56,9 +59,6 @@ public final class ClanHallManager extends AbstractNpcAI 35403, 35405, 35407, // Dion 35439, 35441, 35443, 35445, 35447, 35449, // Aden 35451, 35453, 35455, 35457, 35459, // Giran - 35461, 35463, 35465, 35467, // Goddard - 35566, 35568, 35570, 35572, 35574, 35576, 35578, // Rune - 35580, 35582, 35584, 35586, // Schuttgart 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village @@ -72,24 +72,15 @@ public final class ClanHallManager extends AbstractNpcAI 4344, // Shield 4346, // Mental Shield 4345, // Might - 15374, // Horn Melody - 15375, // Drum Melody 4347, // Blessed Body 4349, // Magic Barrier 4350, // Resist Shock 4348, // Blessed Soul - 15376, // Pipe Organ Melody - 15377, // Guitar Melody 4351, // Concentration 4352, // Berserker Spirit 4353, // Blessed Shield 4358, // Guidance 4354, // Vampiric Rage - 15378, // Harp Melody - 15379, // Lute Melody - 15380, // Knight's Harmony - 15381, // Warrior's Harmony - 15382, // Wizard's Harmony 4355, // Acumen 4356, // Empower 4357, // Haste diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-afterBuff.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-afterBuff.html index 6dadbb7915..a7f3b24d6e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-afterBuff.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-afterBuff.html @@ -6,15 +6,14 @@

- - - - - - - - - + + + + + + + +
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-index.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-index.html index 780e11c39f..33217e6478 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-index.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer-index.html @@ -8,15 +8,14 @@

- - - - - - - - - + + + + + + + +
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java index 4d353489a0..e39b84e846 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java @@ -34,14 +34,13 @@ public final class OlyBuffer extends AbstractNpcAI private static final SkillHolder[] ALLOWED_BUFFS = { new SkillHolder(4357, 2), // Haste Lv2 - new SkillHolder(4342, 2), // Wind Walk Lv2 - new SkillHolder(4356, 3), // Empower Lv3 new SkillHolder(4355, 3), // Acumen Lv3 - new SkillHolder(4351, 6), // Concentration Lv6 + new SkillHolder(4342, 2), // Wind Walk Lv2 new SkillHolder(4345, 3), // Might Lv3 - new SkillHolder(4358, 3), // Guidance Lv3 - new SkillHolder(4359, 3), // Focus Lv3 - new SkillHolder(4360, 3), // Death Whisper Lv3 + new SkillHolder(4344, 3), // Shield Lv3 + new SkillHolder(4349, 2), // Magic Barrier lv.2 + new SkillHolder(4347, 4), // Blessed Body lv.4 + new SkillHolder(4348, 4), // Blessed Soul lv.4 new SkillHolder(4352, 2), // Berserker Spirit Lv2 }; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-rewards.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-rewards.html index 6248342fda..634f3ef5cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-rewards.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager-rewards.html @@ -12,10 +12,7 @@ as ingredients will not be applied.