From d165bb0398f59d78fc1bff349c0bf2b95dc55348 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 1 Aug 2017 00:07:17 +0000
Subject: [PATCH] Olympiad reward improvements.
---
.../MonumentOfHeroes-weaponList.html | 24 ++++------
.../MonumentOfHeroes/MonumentOfHeroes.java | 48 ++++++++-----------
.../ai/others/OlyManager/OlyManager.java | 43 +----------------
3 files changed, 32 insertions(+), 83 deletions(-)
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-weaponList.html b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-weaponList.html
index 7c47b7eeaf..684ecd535c 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-weaponList.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes-weaponList.html
@@ -4,20 +4,16 @@
| Select a weapon that suits you. |
|
-Infinity Shaper (dagger)
-Infinity Cutter (1-H Sword)
-Infinity Slasher (2-H Sword)
-Infinity Avenger (1-H Blunt Weapon)
-Infinity Fighter (Fist)
-Infinity Stormer (Polearm)
-Infinity Thrower (bow)
-Infinity Shooter (crossbow)
-Infinity Buster (magic sword)
-Infinity Caster (magic blunt weapon)
-Infinity Retributer (two-handed magic blunt weapon)
-Infinity Dual Sword (Dual Swords)
-Infinity Dual Dagger (Dual Daggers)
-Infinity Dual Blunt Weapon (Dual Blunt Weapon)
+Infinity Blade
+Infinity Cleaver
+Infinity Axe
+Infinity Rod
+Infinity Scepter
+Infinity Stinger
+Infinity Fang
+Infinity Bow
+Infinity Wing
+Infinity Spear
|
|
|
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index 37aa1851df..e6bafa642a 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -51,20 +51,16 @@ public final class MonumentOfHeroes extends AbstractNpcAI
private static final int WINGS_OF_DESTINY_CIRCLET = 6842;
private static final int[] WEAPONS =
{
- 30392, // Infinity Shaper (dagger)
- 30393, // Infinity Cutter (1-H Sword)
- 30394, // Infinity Slasher (2-H Sword)
- 30395, // Infinity Avenger (1-H Blunt Weapon)
- 30396, // Infinity Fighter (Fist)
- 30397, // Infinity Stormer (Polearm)
- 30398, // Infinity Thrower (bow)
- 30399, // Infinity Shooter (crossbow)
- 30400, // Infinity Buster (magic sword)
- 30401, // Infinity Caster (magic blunt weapon)
- 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)
+ 6611, // Infinity Blade
+ 6612, // Infinity Cleaver
+ 6613, // Infinity Axe
+ 6614, // Infinity Rod
+ 6616, // Infinity Scepter
+ 6617, // Infinity Stinger
+ 6618, // Infinity Fang
+ 6619, // Infinity Bow
+ 6620, // Infinity Wing
+ 6621, // Infinity Spear
};
private MonumentOfHeroes()
@@ -228,20 +224,16 @@ public final class MonumentOfHeroes extends AbstractNpcAI
}
break;
}
- case "give_30392": // Infinity Shaper (dagger)
- case "give_30393": // Infinity Cutter (1-H Sword)
- case "give_30394": // Infinity Slasher (2-H Sword)
- case "give_30395": // Infinity Avenger (1-H Blunt Weapon)
- case "give_30396": // Infinity Fighter (Fist)
- case "give_30397": // Infinity Stormer (Polearm)
- case "give_30398": // Infinity Thrower (bow)
- case "give_30399": // Infinity Shooter (crossbow)
- case "give_30400": // Infinity Buster (magic sword)
- case "give_30401": // Infinity Caster (magic blunt weapon)
- 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)
+ case "give_6611": // Infinity Blade
+ case "give_6612": // Infinity Cleaver
+ case "give_6613": // Infinity Axe
+ case "give_6614": // Infinity Rod
+ case "give_6616": // Infinity Scepter
+ case "give_6617": // Infinity Stinger
+ case "give_6618": // Infinity Fang
+ case "give_6619": // Infinity Bow
+ case "give_6620": // Infinity Wing
+ case "give_6621": // Infinity Spear
{
final int weaponId = Integer.parseInt(event.replace("give_", ""));
giveItems(player, weaponId, 1);
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 5de61263fd..6c1d0c7c68 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -19,9 +19,7 @@ package ai.others.OlyManager;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.temporal.WeekFields;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.logging.Level;
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.L2Npc;
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.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -56,18 +53,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
// NPC
private static final int MANAGER = 31688;
// Misc
- private static final Map EQUIPMENT_MULTISELL = new HashMap<>();
-
- {
- 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 int EQUIPMENT_MULTISELL = 3168801;
private static final String[] BYPASSES =
{
@@ -213,32 +199,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "showEquipmentReward":
{
- int multisellId = -1;
-
- 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);
- }
+ MultisellData.getInstance().separateAndSend(EQUIPMENT_MULTISELL, player, npc, false);
break;
}
case "rank_2": // Gladiator