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

Sync with L2JServer Jan 26th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-27 01:59:37 +00:00
parent 5d7ab65416
commit bfe682bbe3
63 changed files with 1049 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java vendored
View File

@ -21,8 +21,6 @@ package events.CharacterBirthday;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
/**
@ -71,8 +69,6 @@ public final class CharacterBirthday extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
QuestState st = getQuestState(player, false);
if (event.equalsIgnoreCase("despawn_npc"))
{
npc.doDie(player);
@ -83,10 +79,10 @@ public final class CharacterBirthday extends Quest
else if (event.equalsIgnoreCase("change"))
{
// Change Hat
if (st.hasQuestItems(10250))
if (hasQuestItems(player, 10250))
{
st.takeItems(10250, 1); // Adventurer Hat (Event)
st.giveItems(21594, 1); // Birthday Hat
takeItems(player, 10250, 1); // Adventurer Hat (Event)
giveItems(player, 21594, 1); // Birthday Hat
htmltext = null; // FIXME: Probably has html
// Despawn npc
npc.doDie(player);
@ -108,13 +104,10 @@ public final class CharacterBirthday extends Quest
return "busy.htm";
}
QuestState st = getQuestState(player, true);
if (!Util.checkIfInRange(10, npc, player, true))
{
L2Npc spawned = st.addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true);
st.setState(State.STARTED);
st.startQuestTimer("despawn_npc", 180000, spawned);
L2Npc spawned = addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true);
startQuestTimer("despawn_npc", 180000, spawned, player);
SPAWNS++;
}
else

16
trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@ -23,8 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.SystemMessageId;
@ -79,15 +77,9 @@ public final class FreyaCelebration extends LongTimeEvent
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, false);
if (st == null)
{
return null;
}
if (event.equalsIgnoreCase("give_potion"))
{
if (st.getQuestItemsCount(Inventory.ADENA_ID) > 1)
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{
long _curr_time = System.currentTimeMillis();
String value = loadGlobalQuestVar(player.getAccountName());
@ -95,9 +87,8 @@ public final class FreyaCelebration extends LongTimeEvent
if (_curr_time > _reuse_time)
{
st.setState(State.STARTED);
st.takeItems(Inventory.ADENA_ID, 1);
st.giveItems(FREYA_POTION, 1);
takeItems(player, Inventory.ADENA_ID, 1);
giveItems(player, FREYA_POTION, 1);
saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (HOURS * 3600000)));
}
else
@ -156,7 +147,6 @@ public final class FreyaCelebration extends LongTimeEvent
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
getQuestState(player, true);
return "13296.htm";
}

31
trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java vendored
View File

@ -22,8 +22,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@ -76,6 +74,11 @@ public final class GiftOfVitality extends LongTimeEvent
new SkillHolder(5636, 1), // Empower
};
// Misc
private static final int HOURS = 5; // Reuse between buffs
private static final int MIN_LEVEL = 75;
private static final String REUSE = GiftOfVitality.class.getSimpleName() + "_reuse";
private GiftOfVitality()
{
super(GiftOfVitality.class.getSimpleName(), "events");
@ -84,29 +87,18 @@ public final class GiftOfVitality extends LongTimeEvent
addTalkId(STEVE_SHYAGEL);
}
// Misc
private static final int HOURS = 5; // Reuse between buffs
private static final int MIN_LEVEL = 75;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
QuestState st = getQuestState(player, false);
switch (event)
{
case "vitality":
{
long _reuse = 0;
String _streuse = st.get("reuse");
if (_streuse != null)
final long reuse = player.getVariables().getLong(REUSE, 0);
if (reuse > System.currentTimeMillis())
{
_reuse = Long.parseLong(_streuse);
}
if (_reuse > System.currentTimeMillis())
{
long remainingTime = (_reuse - System.currentTimeMillis()) / 1000;
long remainingTime = (reuse - System.currentTimeMillis()) / 1000;
int hours = (int) (remainingTime / 3600);
int minutes = (int) ((remainingTime % 3600) / 60);
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
@ -120,8 +112,7 @@ public final class GiftOfVitality extends LongTimeEvent
{
player.doCast(GIFT_OF_VITALITY.getSkill());
player.doSimultaneousCast(JOY_OF_VITALITY.getSkill());
st.setState(State.STARTED);
st.set("reuse", String.valueOf(System.currentTimeMillis() + (HOURS * 3600000)));
player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000));
htmltext = "4306-okvitality.htm";
}
break;
@ -175,10 +166,6 @@ public final class GiftOfVitality extends LongTimeEvent
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
if (player.getQuestState(getName()) == null)
{
newQuestState(player);
}
return "4306.htm";
}

31
trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java vendored
View File

@ -22,7 +22,6 @@ import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.quest.QuestState;
/**
* Heavy Medals event AI.
@ -65,28 +64,22 @@ public final class HeavyMedal extends LongTimeEvent
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, false);
if (st == null)
{
return getNoQuestMsg(player);
}
String htmltext = event;
int level = checkLevel(st);
int level = checkLevel(player);
if (event.equalsIgnoreCase("game"))
{
htmltext = st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level] ? "31229-no.htm" : "31229-game.htm";
htmltext = getQuestItemsCount(player, GLITTERING_MEDAL) < MEDALS[level] ? "31229-no.htm" : "31229-game.htm";
}
else if (event.equalsIgnoreCase("heads") || event.equalsIgnoreCase("tails"))
{
if (st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level])
if (getQuestItemsCount(player, GLITTERING_MEDAL) < MEDALS[level])
{
htmltext = "31229-" + event.toLowerCase() + "-10.htm";
}
else
{
st.takeItems(GLITTERING_MEDAL, MEDALS[level]);
takeItems(player, GLITTERING_MEDAL, MEDALS[level]);
if (getRandom(100) > WIN_CHANCE)
{
@ -96,10 +89,10 @@ public final class HeavyMedal extends LongTimeEvent
{
if (level > 0)
{
st.takeItems(BADGES[level - 1], -1);
takeItems(player, BADGES[level - 1], -1);
}
st.giveItems(BADGES[level], 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, BADGES[level], 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
level++;
}
htmltext = "31229-" + event.toLowerCase() + "-" + String.valueOf(level) + ".htm";
@ -122,22 +115,22 @@ public final class HeavyMedal extends LongTimeEvent
return npc.getId() + ".htm";
}
public int checkLevel(QuestState st)
public int checkLevel(L2PcInstance player)
{
int _lev = 0;
if (st.hasQuestItems(6402))
if (hasQuestItems(player, 6402))
{
_lev = 4;
}
else if (st.hasQuestItems(6401))
else if (hasQuestItems(player, 6401))
{
_lev = 3;
}
else if (st.hasQuestItems(6400))
else if (hasQuestItems(player, 6400))
{
_lev = 2;
}
else if (st.hasQuestItems(6399))
else if (hasQuestItems(player, 6399))
{
_lev = 1;
}

41
trunk/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java vendored
View File

@ -23,8 +23,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@ -38,11 +36,12 @@ public final class LoveYourGatekeeper extends LongTimeEvent
private static final int GATEKEEPER = 32477;
// Item
private static final int GATEKEEPER_TRANSFORMATION_STICK = 12814;
// Skills
private static SkillHolder TELEPORTER_TRANSFORM = new SkillHolder(5655, 1);
// Misc
private static final int HOURS = 24;
private static final int PRICE = 10000;
// Skills
private static SkillHolder TELEPORTER_TRANSFORM = new SkillHolder(5655, 1);
private static final String REUSE = LoveYourGatekeeper.class.getSimpleName() + "_reuse";
private LoveYourGatekeeper()
{
@ -55,27 +54,16 @@ public final class LoveYourGatekeeper extends LongTimeEvent
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, false);
if (st == null)
{
return getNoQuestMsg(player);
}
switch (event)
{
case "transform_stick":
{
if (player.getAdena() >= PRICE)
{
long _reuse = 0;
String _streuse = st.get("reuse");
if (_streuse != null)
final long reuse = player.getVariables().getLong(REUSE, 0);
if (reuse > System.currentTimeMillis())
{
_reuse = Long.parseLong(_streuse);
}
if (_reuse > System.currentTimeMillis())
{
final long remainingTime = (_reuse - System.currentTimeMillis()) / 1000;
final long remainingTime = (reuse - System.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
@ -86,12 +74,10 @@ public final class LoveYourGatekeeper extends LongTimeEvent
}
else
{
st.takeItems(Inventory.ADENA_ID, PRICE);
st.giveItems(GATEKEEPER_TRANSFORMATION_STICK, 1);
st.setState(State.STARTED);
st.set("reuse", String.valueOf(System.currentTimeMillis() + (HOURS * 3600000)));
takeItems(player, Inventory.ADENA_ID, PRICE);
giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1);
player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000));
}
}
else
{
@ -101,11 +87,10 @@ public final class LoveYourGatekeeper extends LongTimeEvent
}
case "transform":
{
if (player.isTransformed())
if (!player.isTransformed())
{
return null;
player.doCast(TELEPORTER_TRANSFORM.getSkill());
}
player.doCast(TELEPORTER_TRANSFORM.getSkill());
return null;
}
}
@ -115,10 +100,6 @@ public final class LoveYourGatekeeper extends LongTimeEvent
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
if (player.getQuestState(getName()) == null)
{
newQuestState(player);
}
return "32477.htm";
}

114
trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java vendored
View File

@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@ -66,7 +65,7 @@ public final class MasterOfEnchanting extends LongTimeEvent
};
@SuppressWarnings("deprecation")
private static final Date _eventStart = new Date(2011, 7, 1);
private static final Date EVENT_START = new Date(2011, 7, 1);
private MasterOfEnchanting()
{
@ -80,13 +79,12 @@ public final class MasterOfEnchanting extends LongTimeEvent
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
QuestState st = getQuestState(player, false);
if (event.equalsIgnoreCase("buy_staff"))
{
if (!st.hasQuestItems(MASTER_YOGI_STAFF) && (st.getQuestItemsCount(Inventory.ADENA_ID) > STAFF_PRICE))
if (!hasQuestItems(player, MASTER_YOGI_STAFF) && (getQuestItemsCount(player, Inventory.ADENA_ID) > STAFF_PRICE))
{
st.takeItems(Inventory.ADENA_ID, STAFF_PRICE);
st.giveItems(MASTER_YOGI_STAFF, 1);
takeItems(player, Inventory.ADENA_ID, STAFF_PRICE);
giveItems(player, MASTER_YOGI_STAFF, 1);
htmltext = "32599-staffbuyed.htm";
}
else
@ -96,20 +94,20 @@ public final class MasterOfEnchanting extends LongTimeEvent
}
else if (event.equalsIgnoreCase("buy_scroll_24"))
{
long _curr_time = System.currentTimeMillis();
long curTime = System.currentTimeMillis();
String value = loadGlobalQuestVar(player.getAccountName());
long _reuse_time = value == "" ? 0 : Long.parseLong(value);
if (player.getCreateDate().after(_eventStart))
long reuse = value == "" ? 0 : Long.parseLong(value);
if (player.getCreateDate().after(EVENT_START))
{
return "32599-bidth.htm";
}
if (_curr_time > _reuse_time)
if (curTime > reuse)
{
if (st.getQuestItemsCount(Inventory.ADENA_ID) > SCROLL_24_PRICE)
if (getQuestItemsCount(player, Inventory.ADENA_ID) > SCROLL_24_PRICE)
{
st.takeItems(Inventory.ADENA_ID, SCROLL_24_PRICE);
st.giveItems(MASTER_YOGI_SCROLL, 24);
takeItems(player, Inventory.ADENA_ID, SCROLL_24_PRICE);
giveItems(player, MASTER_YOGI_SCROLL, 24);
saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
htmltext = "32599-scroll24.htm";
}
@ -120,9 +118,9 @@ public final class MasterOfEnchanting extends LongTimeEvent
}
else
{
long _remaining_time = (_reuse_time - _curr_time) / 1000;
int hours = (int) _remaining_time / 3600;
int minutes = ((int) _remaining_time % 3600) / 60;
long remainingTime = (reuse - curTime) / 1000;
int hours = (int) remainingTime / 3600;
int minutes = ((int) remainingTime % 3600) / 60;
if (hours > 0)
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S1_HOUR_S_AND_S2_MINUTE_S_REMAINING_UNTIL_THE_ITEM_CAN_BE_PURCHASED_AGAIN);
@ -142,10 +140,10 @@ public final class MasterOfEnchanting extends LongTimeEvent
{
// Little glitch. There is no SystemMessage with seconds only.
// If time is less than 1 minute player can buy scrolls
if (st.getQuestItemsCount(Inventory.ADENA_ID) > SCROLL_24_PRICE)
if (getQuestItemsCount(player, Inventory.ADENA_ID) > SCROLL_24_PRICE)
{
st.takeItems(Inventory.ADENA_ID, SCROLL_24_PRICE);
st.giveItems(MASTER_YOGI_SCROLL, 24);
takeItems(player, Inventory.ADENA_ID, SCROLL_24_PRICE);
giveItems(player, MASTER_YOGI_SCROLL, 24);
saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
htmltext = "32599-scroll24.htm";
}
@ -158,10 +156,10 @@ public final class MasterOfEnchanting extends LongTimeEvent
}
else if (event.equalsIgnoreCase("buy_scroll_1"))
{
if (st.getQuestItemsCount(Inventory.ADENA_ID) > SCROLL_1_PRICE)
if (getQuestItemsCount(player, Inventory.ADENA_ID) > SCROLL_1_PRICE)
{
st.takeItems(Inventory.ADENA_ID, SCROLL_1_PRICE);
st.giveItems(MASTER_YOGI_SCROLL, 1);
takeItems(player, Inventory.ADENA_ID, SCROLL_1_PRICE);
giveItems(player, MASTER_YOGI_SCROLL, 1);
htmltext = "32599-scroll-ok.htm";
}
else
@ -171,10 +169,10 @@ public final class MasterOfEnchanting extends LongTimeEvent
}
else if (event.equalsIgnoreCase("buy_scroll_10"))
{
if (st.getQuestItemsCount(Inventory.ADENA_ID) > SCROLL_10_PRICE)
if (getQuestItemsCount(player, Inventory.ADENA_ID) > SCROLL_10_PRICE)
{
st.takeItems(Inventory.ADENA_ID, SCROLL_10_PRICE);
st.giveItems(MASTER_YOGI_SCROLL, 10);
takeItems(player, Inventory.ADENA_ID, SCROLL_10_PRICE);
giveItems(player, MASTER_YOGI_SCROLL, 10);
htmltext = "32599-scroll-ok.htm";
}
else
@ -184,83 +182,83 @@ public final class MasterOfEnchanting extends LongTimeEvent
}
else if (event.equalsIgnoreCase("receive_reward"))
{
if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == MASTER_YOGI_STAFF) && (st.getEnchantLevel(MASTER_YOGI_STAFF) > 3))
if ((getItemEquipped(player, Inventory.PAPERDOLL_RHAND) == MASTER_YOGI_STAFF) && (getEnchantLevel(player, MASTER_YOGI_STAFF) > 3))
{
switch (st.getEnchantLevel(MASTER_YOGI_STAFF))
switch (getEnchantLevel(player, MASTER_YOGI_STAFF))
{
case 4:
st.giveItems(6406, 1); // Firework
giveItems(player, 6406, 1); // Firework
break;
case 5:
st.giveItems(6406, 2); // Firework
st.giveItems(6407, 1); // Large Firework
giveItems(player, 6406, 2); // Firework
giveItems(player, 6407, 1); // Large Firework
break;
case 6:
st.giveItems(6406, 3); // Firework
st.giveItems(6407, 2); // Large Firework
giveItems(player, 6406, 3); // Firework
giveItems(player, 6407, 2); // Large Firework
break;
case 7:
st.giveItems(HAT_SHADOW_REWARD[getRandom(3)], 1);
giveItems(player, HAT_SHADOW_REWARD[getRandom(3)], 1);
break;
case 8:
st.giveItems(955, 1); // Scroll: Enchant Weapon (D)
giveItems(player, 955, 1); // Scroll: Enchant Weapon (D)
break;
case 9:
st.giveItems(955, 1); // Scroll: Enchant Weapon (D)
st.giveItems(956, 1); // Scroll: Enchant Armor (D)
giveItems(player, 955, 1); // Scroll: Enchant Weapon (D)
giveItems(player, 956, 1); // Scroll: Enchant Armor (D)
break;
case 10:
st.giveItems(951, 1); // Scroll: Enchant Weapon (C)
giveItems(player, 951, 1); // Scroll: Enchant Weapon (C)
break;
case 11:
st.giveItems(951, 1); // Scroll: Enchant Weapon (C)
st.giveItems(952, 1); // Scroll: Enchant Armor (C)
giveItems(player, 951, 1); // Scroll: Enchant Weapon (C)
giveItems(player, 952, 1); // Scroll: Enchant Armor (C)
break;
case 12:
st.giveItems(948, 1); // Scroll: Enchant Armor (B)
giveItems(player, 948, 1); // Scroll: Enchant Armor (B)
break;
case 13:
st.giveItems(729, 1); // Scroll: Enchant Weapon (A)
giveItems(player, 729, 1); // Scroll: Enchant Weapon (A)
break;
case 14:
st.giveItems(HAT_EVENT_REWARD[getRandom(3)], 1);
giveItems(player, HAT_EVENT_REWARD[getRandom(3)], 1);
break;
case 15:
st.giveItems(13992, 1); // Grade S Accessory Chest (Event)
giveItems(player, 13992, 1); // Grade S Accessory Chest (Event)
break;
case 16:
st.giveItems(8762, 1); // Top-Grade Life Stone: level 76
giveItems(player, 8762, 1); // Top-Grade Life Stone: level 76
break;
case 17:
st.giveItems(959, 1); // Scroll: Enchant Weapon (S)
giveItems(player, 959, 1); // Scroll: Enchant Weapon (S)
break;
case 18:
st.giveItems(13991, 1); // Grade S Armor Chest (Event)
giveItems(player, 13991, 1); // Grade S Armor Chest (Event)
break;
case 19:
st.giveItems(13990, 1); // Grade S Weapon Chest (Event)
giveItems(player, 13990, 1); // Grade S Weapon Chest (Event)
break;
case 20:
st.giveItems(CRYSTAL_REWARD[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
giveItems(player, CRYSTAL_REWARD[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
break;
case 21:
st.giveItems(8762, 1); // Top-Grade Life Stone: level 76
st.giveItems(8752, 1); // High-Grade Life Stone: level 76
st.giveItems(CRYSTAL_REWARD[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
giveItems(player, 8762, 1); // Top-Grade Life Stone: level 76
giveItems(player, 8752, 1); // High-Grade Life Stone: level 76
giveItems(player, CRYSTAL_REWARD[getRandom(3)], 1); // Red/Blue/Green Soul Crystal - Stage 14
break;
case 22:
st.giveItems(13989, 1); // S80 Grade Armor Chest (Event)
giveItems(player, 13989, 1); // S80 Grade Armor Chest (Event)
break;
case 23:
st.giveItems(13988, 1); // S80 Grade Weapon Chest (Event)
giveItems(player, 13988, 1); // S80 Grade Weapon Chest (Event)
default:
if (st.getEnchantLevel(MASTER_YOGI_STAFF) > 23)
if (getEnchantLevel(player, MASTER_YOGI_STAFF) > 23)
{
st.giveItems(13988, 1); // S80 Grade Weapon Chest (Event)
giveItems(player, 13988, 1); // S80 Grade Weapon Chest (Event)
}
break;
}
st.takeItems(MASTER_YOGI_STAFF, 1);
takeItems(player, MASTER_YOGI_STAFF, 1);
htmltext = "32599-rewardok.htm";
}
else
@ -274,10 +272,6 @@ public final class MasterOfEnchanting extends LongTimeEvent
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
if (player.getQuestState(getName()) == null)
{
newQuestState(player);
}
return npc.getId() + ".htm";
}

21
trunk/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java vendored
View File

@ -22,8 +22,6 @@ import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.event.LongTimeEvent;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
* The Valentine Event event AI.
@ -35,6 +33,8 @@ public final class TheValentineEvent extends LongTimeEvent
private static final int NPC = 4301;
// Item
private static final int RECIPE = 20191;
// Misc
private static final String COMPLETED = TheValentineEvent.class.getSimpleName() + "_completed";
private TheValentineEvent()
{
@ -47,24 +47,17 @@ public final class TheValentineEvent extends LongTimeEvent
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, false);
if (st == null)
{
return getNoQuestMsg(player);
}
String htmltext = event;
if (event.equalsIgnoreCase("4301-3.htm"))
{
if (st.isCompleted())
if (player.getVariables().getBoolean(COMPLETED, false))
{
htmltext = "4301-4.htm";
}
else
{
st.giveItems(RECIPE, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.setState(State.COMPLETED);
giveItems(player, RECIPE, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
return htmltext;
@ -73,10 +66,6 @@ public final class TheValentineEvent extends LongTimeEvent
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
if (player.getQuestState(getName()) == null)
{
newQuestState(player);
}
return npc.getId() + ".htm";
}