lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Olympiad reward improvements.

Browse Source
This commit is contained in:
MobiusDev
2017-08-01 00:07:17 +00:00
parent 9843755dd7
commit d165bb0398
3 changed files with 32 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-weaponList.html vendored
View File

@@ -4,20 +4,16 @@
<tr><td align=center>Select a weapon that suits you.</td></tr> <tr><td align=center>Select a weapon that suits you.</td></tr>
<tr><td height=30></td></tr> <tr><td height=30></td></tr>
<tr><td align=center> <tr><td align=center>
<a action="bypass -h Quest MonumentOfHeroes give_30392" msg="1484">Infinity Shaper (dagger)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6611" msg="1484">Infinity Blade</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30393" msg="1484">Infinity Cutter (1-H Sword)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6612" msg="1484">Infinity Cleaver</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30394" msg="1484">Infinity Slasher (2-H Sword)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6613" msg="1484">Infinity Axe</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30395" msg="1484">Infinity Avenger (1-H Blunt Weapon)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6614" msg="1484">Infinity Rod</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30396" msg="1484">Infinity Fighter (Fist)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6616" msg="1484">Infinity Scepter</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30397" msg="1484">Infinity Stormer (Polearm)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6617" msg="1484">Infinity Stinger</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30398" msg="1484">Infinity Thrower (bow)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6618" msg="1484">Infinity Fang</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30399" msg="1484">Infinity Shooter (crossbow)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6619" msg="1484">Infinity Bow</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30400" msg="1484">Infinity Buster (magic sword)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6620" msg="1484">Infinity Wing</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30401" msg="1484">Infinity Caster (magic blunt weapon)</a><br> <a action="bypass -h Quest MonumentOfHeroes give_6621" msg="1484">Infinity Spear</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30402" msg="1484">Infinity Retributer (two-handed magic blunt weapon)</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30403" msg="1484">Infinity Dual Sword (Dual Swords)</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30404" msg="1484">Infinity Dual Dagger (Dual Daggers)</a><br>
<a action="bypass -h Quest MonumentOfHeroes give_30405" msg="1484">Infinity Dual Blunt Weapon (Dual Blunt Weapon)</a><br>
</td></tr> </td></tr>
<tr><td height=34></td></tr> <tr><td height=34></td></tr>
<tr><td align=center><button action="bypass -h Quest MonumentOfHeroes index" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr> <tr><td align=center><button action="bypass -h Quest MonumentOfHeroes index" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

48
L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java vendored
View File

@@ -51,20 +51,16 @@ public final class MonumentOfHeroes extends AbstractNpcAI
private static final int WINGS_OF_DESTINY_CIRCLET = 6842; private static final int WINGS_OF_DESTINY_CIRCLET = 6842;
private static final int[] WEAPONS = private static final int[] WEAPONS =
{ {
30392, // Infinity Shaper (dagger) 6611, // Infinity Blade
30393, // Infinity Cutter (1-H Sword) 6612, // Infinity Cleaver
30394, // Infinity Slasher (2-H Sword) 6613, // Infinity Axe
30395, // Infinity Avenger (1-H Blunt Weapon) 6614, // Infinity Rod
30396, // Infinity Fighter (Fist) 6616, // Infinity Scepter
30397, // Infinity Stormer (Polearm) 6617, // Infinity Stinger
30398, // Infinity Thrower (bow) 6618, // Infinity Fang
30399, // Infinity Shooter (crossbow) 6619, // Infinity Bow
30400, // Infinity Buster (magic sword) 6620, // Infinity Wing
30401, // Infinity Caster (magic blunt weapon) 6621, // Infinity Spear
30402, // Infinity Retributer (two-handed magic blunt weapon)
30403, // Infinity Dual Sword (Dual Swords)
30404, // Infinity Dual Dagger (Dual Daggers)
30405, // Infinity Dual Blunt Weapon (Dual Blunt Weapon)
}; };
private MonumentOfHeroes() private MonumentOfHeroes()
@@ -228,20 +224,16 @@ public final class MonumentOfHeroes extends AbstractNpcAI
} }
break; break;
} }
case "give_30392": // Infinity Shaper (dagger) case "give_6611": // Infinity Blade
case "give_30393": // Infinity Cutter (1-H Sword) case "give_6612": // Infinity Cleaver
case "give_30394": // Infinity Slasher (2-H Sword) case "give_6613": // Infinity Axe
case "give_30395": // Infinity Avenger (1-H Blunt Weapon) case "give_6614": // Infinity Rod
case "give_30396": // Infinity Fighter (Fist) case "give_6616": // Infinity Scepter
case "give_30397": // Infinity Stormer (Polearm) case "give_6617": // Infinity Stinger
case "give_30398": // Infinity Thrower (bow) case "give_6618": // Infinity Fang
case "give_30399": // Infinity Shooter (crossbow) case "give_6619": // Infinity Bow
case "give_30400": // Infinity Buster (magic sword) case "give_6620": // Infinity Wing
case "give_30401": // Infinity Caster (magic blunt weapon) case "give_6621": // Infinity Spear
case "give_30402": // Infinity Retributer (two-handed magic blunt weapon)
case "give_30403": // Infinity Dual Sword (Dual Swords)
case "give_30404": // Infinity Dual Dagger (Dual Daggers)
case "give_30405": // Infinity Dual Blunt Weapon (Dual Blunt Weapon)
{ {
final int weaponId = Integer.parseInt(event.replace("give_", "")); final int weaponId = Integer.parseInt(event.replace("give_", ""));
giveItems(player, weaponId, 1); giveItems(player, weaponId, 1);

43
L2J_Mobius_Classic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -19,9 +19,7 @@ package ai.others.OlyManager;
import java.time.DayOfWeek; import java.time.DayOfWeek;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.temporal.WeekFields; import java.time.temporal.WeekFields;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -35,7 +33,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero; import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType; import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad; import com.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -56,18 +53,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
// NPC // NPC
private static final int MANAGER = 31688; private static final int MANAGER = 31688;
// Misc // Misc
private static final Map<CategoryType, Integer> EQUIPMENT_MULTISELL = new HashMap<>(); private static final int EQUIPMENT_MULTISELL = 3168801;
{
EQUIPMENT_MULTISELL.put(CategoryType.SIGEL_GROUP, 917);
EQUIPMENT_MULTISELL.put(CategoryType.TYRR_GROUP, 918);
EQUIPMENT_MULTISELL.put(CategoryType.OTHELL_GROUP, 919);
EQUIPMENT_MULTISELL.put(CategoryType.YUL_GROUP, 920);
EQUIPMENT_MULTISELL.put(CategoryType.FEOH_GROUP, 921);
EQUIPMENT_MULTISELL.put(CategoryType.ISS_GROUP, 923);
EQUIPMENT_MULTISELL.put(CategoryType.WYNN_GROUP, 922);
EQUIPMENT_MULTISELL.put(CategoryType.AEORE_GROUP, 924);
}
private static final String[] BYPASSES = private static final String[] BYPASSES =
{ {
@@ -213,32 +199,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
} }
case "showEquipmentReward": case "showEquipmentReward":
{ {
int multisellId = -1; MultisellData.getInstance().separateAndSend(EQUIPMENT_MULTISELL, player, npc, false);
if (player.getClassId() == ClassId.SAYHA_SEER)
{
multisellId = 926;
}
else if (player.getClassId() == ClassId.EVISCERATOR)
{
multisellId = 925;
}
else
{
for (CategoryType type : EQUIPMENT_MULTISELL.keySet())
{
if (player.isInCategory(type))
{
multisellId = EQUIPMENT_MULTISELL.get(type);
break;
}
}
}
if (multisellId > 0)
{
MultisellData.getInstance().separateAndSend(multisellId, player, npc, false);
}
break; break;
} }
case "rank_2": // Gladiator case "rank_2": // Gladiator