Olympiad rework.
Contributed by facab.
This commit is contained in:
@@ -7,15 +7,15 @@
|
||||
<tr><td height=10></td></tr>
|
||||
<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">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>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;0">Haste</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;1">Acumen</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;2">Wind Walk</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;3">Might</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;4">Shield</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;5">Magic Barrier</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;6">Blessed Body</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;7">Blessed Soul</Button>
|
||||
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest OlyBuffer giveBuff;8">Berserker Spirit</Button>
|
||||
</center>
|
||||
</td></tr>
|
||||
<tr><td height=34></td></tr>
|
||||
|
||||
@@ -34,15 +34,15 @@ public final class OlyBuffer extends AbstractNpcAI
|
||||
// Skills
|
||||
private static final SkillHolder[] ALLOWED_BUFFS =
|
||||
{
|
||||
new SkillHolder(4357, 2), // Haste Lv2
|
||||
new SkillHolder(4355, 3), // Acumen Lv3
|
||||
new SkillHolder(4342, 2), // Wind Walk Lv2
|
||||
new SkillHolder(4345, 3), // Might 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
|
||||
new SkillHolder(1086, 1), // Haste - Atk. Spd. +15%.
|
||||
new SkillHolder(1085, 1), // Acumen - Casting Spd. +15%
|
||||
new SkillHolder(1204, 1), // Wind Walk - Speed +20.
|
||||
new SkillHolder(1068, 1), // Might - P. Atk. +8%.
|
||||
new SkillHolder(1040, 1), // Shield - P. Def. +8%.
|
||||
new SkillHolder(1036, 1), // Magic Barrier - M. Def. +23%.
|
||||
new SkillHolder(1045, 1), // Blessed Body - Max HP +10%.
|
||||
new SkillHolder(1048, 1), // Blessed Soul - Max MP +10%.
|
||||
new SkillHolder(1062, 1), // Berserker Spirit - P. Def. -5%, M. Def. -10%, P. Evasion -2, P. Atk. +5%, M. Atk. +10%, Atk. Spd. +5%, Casting Spd. +5% and Speed +5.
|
||||
};
|
||||
|
||||
private OlyBuffer()
|
||||
|
||||
@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.Location;
|
||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||
import org.l2jmobius.gameserver.model.actor.Npc;
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
import org.l2jmobius.gameserver.model.olympiad.CompetitionType;
|
||||
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask;
|
||||
@@ -123,7 +124,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
|
||||
}
|
||||
else
|
||||
{
|
||||
OlympiadManager.getInstance().registerNoble(player);
|
||||
OlympiadManager.getInstance().registerNoble(player, CompetitionType.NON_CLASSED);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
|
||||
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameNormal;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameNonClassed;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadGameTask;
|
||||
import org.l2jmobius.gameserver.model.olympiad.OlympiadManager;
|
||||
import org.l2jmobius.gameserver.model.olympiad.Participant;
|
||||
@@ -91,7 +91,7 @@ public class AdminOlympiad implements IAdminCommandHandler
|
||||
final Participant[] players = new Participant[2];
|
||||
players[0] = new Participant(activeChar, 1);
|
||||
players[1] = new Participant(player, 2);
|
||||
task.attachGame(new OlympiadGameNormal(i, players));
|
||||
task.attachGame(new OlympiadGameNonClassed(i, players));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user