From 3c4449a121a55e51686be1740fb6161e73b9875c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Thu, 1 Jun 2023 11:24:43 +0300 Subject: [PATCH] Updated supportmagic bypass handler. --- .../dist/game/data/html/default/30598.htm | 6 +- .../dist/game/data/html/default/30599.htm | 2 +- .../dist/game/data/html/default/30600.htm | 4 +- .../dist/game/data/html/default/30601.htm | 4 +- .../dist/game/data/html/default/30602.htm | 2 +- .../dist/game/data/html/default/31076-1.htm | 16 +- .../dist/game/data/html/default/31076.htm | 12 +- .../dist/game/data/html/default/31077-1.htm | 17 +-- .../dist/game/data/html/default/31077.htm | 12 +- .../game/data/html/default/SupportMagic.htm | 15 +- .../html/default/SupportMagicHighLevel.htm | 2 +- .../html/default/SupportMagicLowLevel.htm | 2 +- .../html/default/SupportMagicNoSummon.htm | 3 - .../html/default/SupportMagicServitor.htm | 6 - .../scripts/handlers/bypasshandlers/Link.java | 1 - .../handlers/bypasshandlers/SupportMagic.java | 143 +++++++----------- L2J_Mobius_CT_0_Interlude/readme.txt | 1 + 17 files changed, 98 insertions(+), 150 deletions(-) delete mode 100644 L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicNoSummon.htm delete mode 100644 L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicServitor.htm diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30598.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30598.htm index 378fc65bf3..85b5237d35 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30598.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30598.htm @@ -1,10 +1,10 @@ Newbie Guide:
-If you need advice, please do not hesitate to ask me! I'll try my very best to help you.
+If you are in need of advice, please do not hesitate to ask. I will give you what guidance I can.
Ask for advice.
NPC location information.
Receive blessing of protection.
Ask about the Newbie Travel Token.
Teleport using the Newbie Travel Token.
-Check list of available support magic.
-Ask for help with a newbie item. +Receive help from beneficial magic.
+Ask about the novice characters. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30599.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30599.htm index c6f6ad6dc4..2c6328a6d6 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30599.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30599.htm @@ -6,5 +6,5 @@ Don't hesitate to tell me if you require assistance. I can teach you about a num Ask about the Newbie Travel Token.
Teleport using the Newbie Travel Token.
Receive help from beneficial magic.
-Ask for help with a newbie item. +Ask about the novice characters. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30600.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30600.htm index ca02d77d8b..802b1f7338 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30600.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30600.htm @@ -1,10 +1,10 @@ Newbie Guide:
-If you need advice, do not hesitate to ask me! I will do my very best to help you.
+If you are in need of advice, please do not hesitate to ask. I will give you what guidance I can.
Ask for advice.
NPC Location Information.
Receive blessing of protection.
Ask about the Newbie Travel Token.
Teleport using the Newbie Travel Token.
Receive help from beneficial magic.
-Ask for help with a newbie item. +Ask about the novice characters. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30601.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30601.htm index 4e6cd4bb34..b123a12e2c 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30601.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30601.htm @@ -1,10 +1,10 @@ Newbie Guide:
-Can I help you with anything? Eh? Well, then, what would you like to know?
+Is there anything I can help you with? What do you want to know?
Ask for advice.
NPC Location Information.
Receive blessing of protection.
Ask about the Newbie Travel Token.
Teleport using the Newbie Travel Token.
Receive help from beneficial magic.
-Ask for help with a newbie item. +Ask about the novice characters. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30602.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30602.htm index d9664e1adc..3a190881f4 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30602.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/30602.htm @@ -6,5 +6,5 @@ You wish to grow strong and powerful, Eh? Then listen carefully; I will advice y Ask about the Newbie Travel Token.
Teleport using the Newbie Travel Token.
Receive help from beneficial magic.
-Ask for help with a newbie item. +Ask about the novice characters. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076-1.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076-1.htm index 96e3df1b47..3d59cc9bbb 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076-1.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076-1.htm @@ -1,11 +1,9 @@ Newbie Guide:
-A class transfer permits a character who has reached a certain level of experience and ability to acquire a new, higher-level occupation.
-In order to complete the class transfer, you must undertake a Class Change Quest. Only characters who are at least level 19 may perform this quest; the class transfer takes effect once the quest is completed and the character reaches level 20. Choose your new occupation wisely, because you cannot undue it once the class transfer is completed.
-To hear detailed information about where you can receive a Class Transfer Quest, which occupations you can choose, and more, you should speak to the appropriate Grand Master.
-Fighters and Elven Fighters should visit Grand Master Ramos of the Fighters Guild.
-Mages and Elven Mages should visit High Priestess Levian of the Temple.
-Dark Fighters and Dark Mages should visit Grand Master Xenos of the Dark Elf Guild.
-Orc Fighters and Orc Mages should visit High Prefect Osborn.
-Dwarf Fighters should visit Warehouse Chief Moke or Head Blacksmith Tapoy.
-Kamael Soldiers should visit Grand Master Yeniche of the Kamael Guild. +Once you achieve a certain level of ability and experience you may advance to a higher class through the class transfer system.
+To accomplish a class transfer you must fulfill a class transfer quest. These quests can be undertaken by characters of level 19 and above. After fulfilling the quest and achieving level 20 or higher, class transfer can be completed. At the time of class transfer you will choose one of many available professions. Once made, your decision is irreversible. Make your choice carefully.
+I know all of the teachers in this area for any profession you might choose.
+Human and Elven Fighters are trained by Grand Master Ramos of the Fighters Guild.
+Human and Elven Mystics learn from High Priestess Levian at the temple. Dark Fighters and Dark Mystics go to Grand Master Xenos of the Dark Elf Guild.
+Orc Fighters and Mystics are taught by High Prefect Osborn.
+Dwarven Fighters train with Warehouse Chief Moke at his warehouse or Head Blacksmith Tapoy at his blacksmith shop. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076.htm index b288846342..49e6053785 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31076.htm @@ -1,9 +1,7 @@ Newbie Guide:
-May Einhasad's light protect you! It is my responsibility to advise new adventurers.
-The power of evil is growing day by day, we hear tales of unending wars, and -- most ominous of all -- even the power of Dawn and Dusk struggle for supremacy... You will need all your strength and skill to survive in such a dangerous world. Please pay heed to my advice...
-Ask for advice about class transfers.
-See the list of available supplemental magic.
-See the list of the supplemental magic for servitors.
-Receive Blessing of Protection.
-Receive support with a Newbie item. +May the divine blessing of light be upon you... I advise young adventurers like yourself.
+The evil of the creatures in this world knows no bounds! Unprecedented violence and hatred have led to endless wars; ominous struggles in which dawn and dusk mingle in the sky... Power and wisdom are essential if you are to survive in such a dangerous world. You must heed my words carefully...
+"Tell me about class transfers."
+"Give me some support magic."
+"Tell me about novice characters." \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077-1.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077-1.htm index 227254c681..084ffa0a0b 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077-1.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077-1.htm @@ -1,11 +1,10 @@ Newbie Guide:
-A class transfer permits a character who has reached a certain level of experience and ability to acquire a new, higher-level occupation.
-In order to complete the class transfer, you must undertake a Class Change Quest. Only characters who are at least level 19 may perform this quest; the class transfer takes effect once the quest is completed and the character reaches level 20. Choose your new occupation wisely, because you cannot undue it once the class transfer is completed.
-To hear detailed information about where you can receive a Class Transfer Quest, which occupations you can choose, and more, you should speak to the appropriate Grand Master.
-Fighters and Elven Fighters should visit Grand Master Rains of the Fighters Guild.
-Mages and Elven Mages should visit High Priest Raymond of the Temple.
-Dark Fighters and Dark Mages should visit Grand Master Tobias of the Dark Elf Guild.
-Orc Fighters and Orc Mages should visit High Prefect Drikus.
-Dwarf Fighters should visit Warehouse Chief Rikadio or Head Blacksmith Mendio.
-Kamael Soldiers should visit Grand Master Gershwin of the Kamael Guild. +Once you achieve a certain level of ability and experience you may advance to a higher class through the class transfer system.
+To accomplish a class transfer you must fulfill a class transfer quest. These quests can be undertaken by characters of level 19 and above. After fulfilling the quest and achieving level 20 or higher, class transfer can be completed. At the time of class transfer you will choose one of many available professions. Once made, your decision is irreversible. Make your choice carefully.
+I know all of the teachers in this area for any profession you might choose.
+Human and Elven Fighters train with Grand Master Rains of the Fighters Guild.
+Human and Elven Mystics are taught by High Priest Raymond at the temple.
+Dark Fighters and Dark Mystics go to Grand Master Tobias of the Dark Elf Guild.
+Orc Fighters and Mystics are taught by High Prefect Drikus.
+Dwarven Fighters are trained by Warehouse Chief Rikadio at his warehouse or Head Blacksmith Mendio at his blacksmith shop. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077.htm index b1afd22e3a..53dc0b949c 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/31077.htm @@ -1,9 +1,7 @@ Newbie Guide:
-May blessing of light be upon you! It is my responsibility to help beginning adventurers adjust.
-This world is getting dangerous! Violent spirits, unending wars, even this unnatural struggle between Dawn and Dusk! You will need both strength and wisdom to survive. Please remember my advice...
-Ask for advice about class transfers.
-See the list of available supplemental magic.
-See the list of supplemental magic for servitors.
-Receive Blessing of Protection.
-Receive support with a Newbie item. +May the blessing of light be upon you! I enjoy helping young adventurers like yourself.
+The evil of the creatures in this world knows no bounds! Unprecedented violence and hatred have led to endless wars; ominous struggles in which dawn and dusk mingle in the sky... Power and wisdom are essential if you are to survive in such a dangerous world. You must heed my words carefully...
+"Tell me about class transfers."
+"Give me some support magic."
+"Tell me about novice characters." \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagic.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagic.htm index 7766ea41cb..e5631918d3 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagic.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagic.htm @@ -1,12 +1,11 @@ You are eligible to receive the following supplemental magic:
-Levels 6-75: Wind Walk -Levels 6-75: Shield -Levels 6-75: Magic Barrier -Levels 6-75: Bless the Body (Fighter), Bless the Soul (Wizard) -Levels 6-75: Vampiric Rage (Fighter), Acumen (Wizard) -Levels 6-75: Regeneration (Fighter), Concentration (Wizard) -Levels 6-75: Haste (effect increases after level 40), Empower (Wizard) -Levels 16-34: Life Cubic
+Levels 8-39: Wind Walk +Levels 11-39: Shield +Levels 16-36: Life Cubic +Levels 12-38: Bless the Body (Fighter), Bless the Soul (Wizard) +Levels 13-38: Vampiric Rage (Fighter), Acumen (Wizard) +Levels 14-38: Regeneration (Fighter), Concentration (Wizard) +Levels 15-37: Haste (Fighter), Empower (Wizard) Receive supplemental magic. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicHighLevel.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicHighLevel.htm index 95761e33ef..2e446ad706 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicHighLevel.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicHighLevel.htm @@ -1,3 +1,3 @@ -Support magic is only available for characters who are level 75 or below. +Support magic is only available for characters who are level 39 or below. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicLowLevel.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicLowLevel.htm index 402e91fdf1..3b50e7bfcd 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicLowLevel.htm +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicLowLevel.htm @@ -1,3 +1,3 @@ Newbie Guide:
-You do not yet require Support Magic. Come see me again when you reach level 6. +You do not yet require Support Magic. Come see me again when you reach level 8. \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicNoSummon.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicNoSummon.htm deleted file mode 100644 index 35d5b803f4..0000000000 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicNoSummon.htm +++ /dev/null @@ -1,3 +0,0 @@ - -Only servitors can receive this Support Magic. If you do not have a servitor, you cannot access these spells. - \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicServitor.htm b/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicServitor.htm deleted file mode 100644 index 47d0ef06fa..0000000000 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/html/default/SupportMagicServitor.htm +++ /dev/null @@ -1,6 +0,0 @@ - -Your servitor is eligible to receive the supplemental magic listed below. These spells do not benefit pets.
-Eligibility is determined by the master's level.
-Levels 6-75: Wind Walk, Shield, Magic Barrier, Bless the Body, Bless the Soul, Vampiric Rage, Acumen, Regeneration, Concentration, Haste (increased effect after level 40), Empower
-Receive supplemental magic for servitor. - \ No newline at end of file diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java index a5e7c9a926..863ceb4507 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -51,7 +51,6 @@ public class Link implements IBypassHandler VALID_LINKS.add("common/welcomeback003.htm"); VALID_LINKS.add("default/BlessingOfProtection.htm"); VALID_LINKS.add("default/SupportMagic.htm"); - VALID_LINKS.add("default/SupportMagicServitor.htm"); VALID_LINKS.add("fisherman/fishing_championship.htm"); VALID_LINKS.add("fortress/foreman.htm"); VALID_LINKS.add("olympiad/hero_main2.htm"); diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java index e849fde504..c5a2e5305c 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java @@ -16,64 +16,23 @@ */ package handlers.bypasshandlers; +import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.SkillHolder; public class SupportMagic implements IBypassHandler { private static final String[] COMMANDS = { - "supportmagicservitor", "supportmagic" }; - // Buffs - private static final SkillHolder HASTE_1 = new SkillHolder(4327, 1); - private static final SkillHolder HASTE_2 = new SkillHolder(5632, 1); - private static final SkillHolder CUBIC = new SkillHolder(4338, 1); - private static final SkillHolder[] FIGHTER_BUFFS = - { - new SkillHolder(4322, 1), // Wind Walk - new SkillHolder(4323, 1), // Shield - new SkillHolder(5637, 1), // Magic Barrier - new SkillHolder(4324, 1), // Bless the Body - new SkillHolder(4325, 1), // Vampiric Rage - new SkillHolder(4326, 1), // Regeneration - }; - private static final SkillHolder[] MAGE_BUFFS = - { - new SkillHolder(4322, 1), // Wind Walk - new SkillHolder(4323, 1), // Shield - new SkillHolder(5637, 1), // Magic Barrier - new SkillHolder(4328, 1), // Bless the Soul - new SkillHolder(4329, 1), // Acumen - new SkillHolder(4330, 1), // Concentration - new SkillHolder(4331, 1), // Empower - }; - private static final SkillHolder[] SUMMON_BUFFS = - { - new SkillHolder(4322, 1), // Wind Walk - new SkillHolder(4323, 1), // Shield - new SkillHolder(5637, 1), // Magic Barrier - new SkillHolder(4324, 1), // Bless the Body - new SkillHolder(4325, 1), // Vampiric Rage - new SkillHolder(4326, 1), // Regeneration - new SkillHolder(4328, 1), // Bless the Soul - new SkillHolder(4329, 1), // Acumen - new SkillHolder(4330, 1), // Concentration - new SkillHolder(4331, 1), // Empower - }; - // Levels - private static final int LOWEST_LEVEL = 6; - private static final int HIGHEST_LEVEL = 75; - private static final int CUBIC_LOWEST = 16; - private static final int CUBIC_HIGHEST = 34; - private static final int HASTE_LEVEL_2 = 40; + private static final int LOWEST_LEVEL = 8; + private static final int HIGHEST_LEVEL = 39; @Override public boolean useBypass(String command, Player player, Creature target) @@ -85,24 +44,16 @@ public class SupportMagic implements IBypassHandler if (command.equalsIgnoreCase(COMMANDS[0])) { - makeSupportMagic(player, (Npc) target, true); - } - else if (command.equalsIgnoreCase(COMMANDS[1])) - { - makeSupportMagic(player, (Npc) target, false); + makeSupportMagic(player, (Npc) target); } + return true; } - private void makeSupportMagic(Player player, Npc npc, boolean isSummon) + private void makeSupportMagic(Player player, Npc npc) { final int level = player.getLevel(); - if (isSummon && !player.hasServitor()) - { - npc.showChatWindow(player, "data/html/default/SupportMagicNoSummon.htm"); - return; - } - else if (level > HIGHEST_LEVEL) + if (level > HIGHEST_LEVEL) { npc.showChatWindow(player, "data/html/default/SupportMagicHighLevel.htm"); return; @@ -118,53 +69,67 @@ public class SupportMagic implements IBypassHandler return; } - if (isSummon) + npc.setTarget(player); + if (player.isInCategory(CategoryType.BEGINNER_MAGE)) { - npc.setTarget(player.getSummon()); - for (SkillHolder skill : SUMMON_BUFFS) + if ((player.getLevel() >= 8) && (player.getLevel() <= 39)) { - npc.doCast(skill.getSkill()); + npc.doCast(SkillData.getInstance().getSkill(4322, 1)); // WindWalk } - - if (level >= HASTE_LEVEL_2) + if ((player.getLevel() >= 11) && (player.getLevel() <= 39)) { - npc.doCast(HASTE_2.getSkill()); + npc.doCast(SkillData.getInstance().getSkill(4323, 1)); // Shield } - else + if ((player.getLevel() >= 16) && (player.getLevel() <= 36)) { - npc.doCast(HASTE_1.getSkill()); + player.doSimultaneousCast(SkillData.getInstance().getSkill(4338, 1)); // Life Cubic + } + if ((player.getLevel() >= 12) && (player.getLevel() <= 38)) + { + npc.doCast(SkillData.getInstance().getSkill(4328, 1)); // Bless the Soul + } + if ((player.getLevel() >= 13) && (player.getLevel() <= 38)) + { + npc.doCast(SkillData.getInstance().getSkill(4329, 1)); // Acumen + } + if ((player.getLevel() >= 14) && (player.getLevel() <= 38)) + { + npc.doCast(SkillData.getInstance().getSkill(4330, 1)); // Concentration + } + if ((player.getLevel() >= 15) && (player.getLevel() <= 37)) + { + npc.doCast(SkillData.getInstance().getSkill(4331, 1)); // Empower } } else { - npc.setTarget(player); - if (player.isInCategory(CategoryType.BEGINNER_MAGE)) + if ((player.getLevel() >= 8) && (player.getLevel() <= 39)) { - for (SkillHolder skill : MAGE_BUFFS) - { - npc.doCast(skill.getSkill()); - } + npc.doCast(SkillData.getInstance().getSkill(4322, 1)); // WindWalk } - else + if ((player.getLevel() >= 11) && (player.getLevel() <= 39)) { - for (SkillHolder skill : FIGHTER_BUFFS) - { - npc.doCast(skill.getSkill()); - } - - if (level >= HASTE_LEVEL_2) - { - npc.doCast(HASTE_2.getSkill()); - } - else - { - npc.doCast(HASTE_1.getSkill()); - } + npc.doCast(SkillData.getInstance().getSkill(4323, 1)); // Shield } - - if ((level >= CUBIC_LOWEST) && (level <= CUBIC_HIGHEST)) + if ((player.getLevel() >= 16) && (player.getLevel() <= 36)) { - player.doSimultaneousCast(CUBIC.getSkill()); + player.doSimultaneousCast(SkillData.getInstance().getSkill(4338, 1)); // Life Cubic + } + if ((player.getLevel() >= 12) && (player.getLevel() <= 38)) + { + npc.doCast(SkillData.getInstance().getSkill(4324, 1)); // Bless the Body + } + if ((player.getLevel() >= 13) && (player.getLevel() <= 38)) + { + npc.doCast(SkillData.getInstance().getSkill(4325, 1)); // Vampiric Rage + } + if ((player.getLevel() >= 14) && (player.getLevel() <= 38)) + { + npc.doCast(SkillData.getInstance().getSkill(4326, 1)); // Regeneration + } + if ((player.getLevel() >= 15) && (player.getLevel() <= 37)) + { + npc.doCast(SkillData.getInstance().getSkill(4327, 1)); // Haste } } } @@ -174,4 +139,4 @@ public class SupportMagic implements IBypassHandler { return COMMANDS; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_CT_0_Interlude/readme.txt b/L2J_Mobius_CT_0_Interlude/readme.txt index 20281919c4..fd126a9d39 100644 --- a/L2J_Mobius_CT_0_Interlude/readme.txt +++ b/L2J_Mobius_CT_0_Interlude/readme.txt @@ -105,6 +105,7 @@ What is done -Fixed skill enchanting. -Adjusted MagicSkillUse packet. -Fixed item enchanting. +-Updated supportmagic bypass handler. TODO: Important (project unusable due to the following) -Adjust all skills according to Interlude description.