Updated buff skills.

Contributed by Index.
This commit is contained in:
MobiusDevelopment
2022-09-13 21:34:50 +00:00
parent 26d1af8cc1
commit 0c75515d74
11 changed files with 1434 additions and 166 deletions

View File

@@ -20,7 +20,6 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.data.xml.MultisellData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -59,19 +58,8 @@ public class AdventureGuildsman extends AbstractNpcAI
private static final SkillHolder KNIGHT = new SkillHolder(32840, 1); // Fantasia Harmony - Adventurer
private static final SkillHolder WARRIOR = new SkillHolder(32840, 1); // Fantasia Harmony - Adventurer
private static final SkillHolder WIZARD = new SkillHolder(32840, 1); // Fantasia Harmony - Adventurer
private static final SkillHolder[] GROUP_MELODY =
{
new SkillHolder(9273, 1), // Player Commendation - Horn Melody
new SkillHolder(9274, 1), // Player Commendation - Drum Melody
new SkillHolder(9276, 1), // Player Commendation - Pipe Organ Melody
new SkillHolder(9277, 1), // Player Commendation - Guitar Melody
};
private static final SkillHolder[] GROUP_SONATA =
{
new SkillHolder(17291, 1), // Player Commendation - Prevailing Sonata
new SkillHolder(17292, 1), // Player Commendation - Daring Sonata
new SkillHolder(17293, 1), // Player Commendation - Refreshing Sonata
};
private static final SkillHolder MELODY = new SkillHolder(34243, 1); // Musician's Melody (Adventurer)
private static final SkillHolder SONATA = new SkillHolder(34254, 1); // Sonate Performance (Adventurer)
// Misc
//@formatter:off
private static final Map<CategoryType, Integer> R_CLASS_TALISMAN = new EnumMap<>(CategoryType.class);
@@ -420,11 +408,10 @@ public class AdventureGuildsman extends AbstractNpcAI
}
if (event.startsWith("melody"))
{
final int buffOffset = CommonUtil.constrain(Integer.parseInt(event.substring(event.indexOf(' ') + 1)), 0, GROUP_MELODY.length);
if (player.getPcCafePoints() >= 20)
{
npc.setTarget(player);
npc.doCast(GROUP_MELODY[buffOffset].getSkill());
npc.doCast(MELODY.getSkill());
player.setPcCafePoints(player.getPcCafePoints() - 20);
htmltext = "pccafe_buff_1001.htm";
}
@@ -438,14 +425,8 @@ public class AdventureGuildsman extends AbstractNpcAI
private String applyBuffs(Npc npc, Player player, Skill skill)
{
for (SkillHolder holder : GROUP_MELODY)
{
SkillCaster.triggerCast(npc, player, holder.getSkill());
}
for (SkillHolder holder : GROUP_SONATA)
{
SkillCaster.triggerCast(npc, player, holder.getSkill());
}
SkillCaster.triggerCast(npc, player, MELODY.getSkill());
SkillCaster.triggerCast(npc, player, SONATA.getSkill());
SkillCaster.triggerCast(npc, player, skill);
player.setPcCafePoints(player.getPcCafePoints() - 200);
return null;
@@ -453,10 +434,7 @@ public class AdventureGuildsman extends AbstractNpcAI
private String applyBuffsGroup(Npc npc, Player player)
{
for (SkillHolder holder : GROUP_MELODY)
{
SkillCaster.triggerCast(npc, player, holder.getSkill());
}
SkillCaster.triggerCast(npc, player, MELODY.getSkill());
player.setPcCafePoints(player.getPcCafePoints() - 120);
return null;
}

View File

@@ -44,27 +44,17 @@ public class AdventurersGuide extends AbstractNpcAI
private static final SkillHolder FANTASIA = new SkillHolder(32840, 1); // Fantasia Harmony - Adventurer
private static final SkillHolder[] GROUP_BUFFS =
{
new SkillHolder(15642, 1), // Horn Melody (Adventurer)
new SkillHolder(15643, 1), // Drum Melody (Adventurer)
new SkillHolder(15644, 1), // Pipe Organ Melody (Adventurer)
new SkillHolder(15645, 1), // Guitar Melody (Adventurer)
new SkillHolder(15651, 1), // Prevailing Sonata (Adventurer)
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
new SkillHolder(34243, 1), // Musician's Melody (Adventurer)
new SkillHolder(34254, 1), // Sonate Performance (Adventurer)
};
private static final SkillHolder[] DONATE_BUFFS =
{
new SkillHolder(15642, 4), // Horn Melody (Adventurer)
new SkillHolder(15643, 4), // Drum Melody (Adventurer)
new SkillHolder(15644, 4), // Pipe Organ Melody (Adventurer)
new SkillHolder(15645, 4), // Guitar Melody (Adventurer)
new SkillHolder(15651, 1), // Prevailing Sonata (Adventurer)
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
new SkillHolder(34243, 3), // Musician's Melody (Adventurer)
new SkillHolder(34254, 1), // Sonate Performance (Adventurer)
};
// Misc
private static int MAX_LEVEL_BUFFS = 99;
private static int MIN_LEVEL_PROTECTION = 40;
private static final int MAX_LEVEL_BUFFS = 99;
private static final int MIN_LEVEL_PROTECTION = 40;
private AdventurersGuide()
{

View File

@@ -81,13 +81,8 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
// Skills
private static final SkillHolder[] MENTEE_BUFFS_WITHOUT_MENTOR_ONLINE =
{
new SkillHolder(9227, 1), // Horn Melody - Mentor
new SkillHolder(9228, 1), // Drum Melody - Mentor
new SkillHolder(9230, 1), // Pipe Organ Melody - Mentor
new SkillHolder(9231, 1), // Guitar Melody - Mentor
new SkillHolder(17082, 1), // Mentor's Prevailing Sonata
new SkillHolder(17083, 1), // Daring Sonata - Mentor
new SkillHolder(17084, 1), // Refreshing Sonata - Mentor
new SkillHolder(34237, 1), // Musician's Melody
new SkillHolder(34256, 1), // Sonate Performance
new SkillHolder(18593, 1), // Mentor's Harmony
};
protected static final SkillHolder[] MENTOR_BUFFS =

View File

@@ -48,13 +48,8 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
private static final SkillHolder FANTASIA = new SkillHolder(32840, 1); // Fantasia Harmony - Adventurer
private static final SkillHolder[] GROUP_BUFFS =
{
new SkillHolder(15642, 1), // Horn Melody (Adventurer)
new SkillHolder(15643, 1), // Drum Melody (Adventurer)
new SkillHolder(15644, 1), // Pipe Organ Melody (Adventurer)
new SkillHolder(15645, 1), // Guitar Melody (Adventurer)
new SkillHolder(15651, 1), // Prevailing Sonata (Adventurer)
new SkillHolder(15652, 1), // Daring Sonata (Adventurer)
new SkillHolder(15653, 1), // Refreshing Sonata (Adventurer)
new SkillHolder(34254, 1), // Sonate Performance (Adventurer)
new SkillHolder(34243, 1), // Musician's Melody (Adventurer)
};
private RecieveAdventurerBuffs()