Olympiad NPC improvements.

Contributed by quangnguyen.
This commit is contained in:
MobiusDev
2018-02-20 17:37:12 +00:00
parent a1e7a7824e
commit be738375da
6 changed files with 25 additions and 40 deletions

View File

@@ -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;
}

View File

@@ -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

View File

@@ -6,15 +6,14 @@
<tr><td><center></center><br>
<center>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;0">Haste Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;1">Wind Walk Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;2">Empower Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;3">Acumen Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;4">Concentration Lv6</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;5">Might Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;6">Guidance Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;7">Focus Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;8">Death Whisper Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;9">Berserker Spirit Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;1">Acumen Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;2">Wind Walk Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;3">Might Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;4">Shield Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;5">Magic Barrier Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;6">Blessed Body Lv4</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;7">Blessed Soul Lv4</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;8">Berserker Spirit Lv2</Button>
</center>
</td></tr>
<tr><td height=34></td></tr>

View File

@@ -8,15 +8,14 @@
<tr><td><center></center><br>
<center>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;0">Haste Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;1">Wind Walk Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;2">Empower Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;3">Acumen Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;4">Concentration Lv6</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;5">Might Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;6">Guidance Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;7">Focus Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;8">Death Whisper Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;9">Berserker Spirit Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;1">Acumen Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;2">Wind Walk Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;3">Might Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;4">Shield Lv3</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;5">Magic Barrier Lv2</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;6">Blessed Body Lv4</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;7">Blessed Soul Lv4</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;8">Berserker Spirit Lv2</Button>
</center>
</td></tr>
<tr><td height=34></td></tr>

View File

@@ -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
};

View File

@@ -12,10 +12,7 @@
<tr><td align=center>as ingredients will not be applied.</td></tr>
<tr><td height=24></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager calculatePoints" value="I want to calculate my points." width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Reward_Down" fore="L2UI_CT1.OlympiadWnd_DF_Reward"></td></tr>
<tr><td align=center><button action="bypass -h npc_%objectId%_multisell 2095" value="I want to buy Marks of Battle items." width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_BuyEquip_Down" fore="L2UI_CT1.OlympiadWnd_DF_BuyEquip"></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager showEquipmentReward" value="I want to buy equipment." width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_BuyEquip_Down" fore="L2UI_CT1.OlympiadWnd_DF_BuyEquip"></td></tr>
<tr><td align=center><button action="bypass -h npc_%objectId%_multisell 712" value="I want to buy miscellaneous items." width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_BuyEtc_Down" fore="L2UI_CT1.OlympiadWnd_DF_BuyEtc"></td></tr>
<tr><td align=center><button action="bypass -h npc_%objectId%_multisell 2109" value="I want to exchange Olympiad tokens." width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_BuyEtc_Down" fore="L2UI_CT1.OlympiadWnd_DF_BuyEtc"></td></tr>
<tr><td align=center><button action="bypass -h Quest OlyManager index" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
<tr><td height=40></td></tr>
</table>