diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 72d4bdf12adae67dc8613b61dadfa0789b8f7160..dbd8b6ee50a2100a12b0b7d91b92dd867fc1d9c0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -31,8 +31,7 @@ public class CharacterBirthday extends Quest
private final static int[] _gk =
{
- 30006,30059,30080,30134,30146,30177,30233,30256,30320,30540,
- 30576,30836,30848,30878,30899,31275,31320,31964,32163
+ 30006, 30059, 30080, 30134, 30146, 30177, 30233, 30256, 30320, 30540, 30576, 30836, 30848, 30878, 30899, 31275, 31320, 31964, 32163
};
public CharacterBirthday(int questId, String name, String descr)
@@ -73,7 +72,9 @@ public class CharacterBirthday extends Quest
_spawns--;
}
else
+ {
htmltext = "32600-nohat.htm";
+ }
}
return htmltext;
}
@@ -81,23 +82,28 @@ public class CharacterBirthday extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- if(_spawns >= 3)
+ if (_spawns >= 3)
+ {
return "busy.htm";
+ }
QuestState st = player.getQuestState(getName());
if (st == null)
+ {
return null;
+ }
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);
+ 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);
_spawns++;
}
else
+ {
return "tooclose.htm";
-
+ }
return null;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index 88043cb0d32a1e6897ca11fcdb005b89fe1de7a3..54b7f4592ae18b359d9d1a3f518f543c7ea4beb6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -14,12 +14,12 @@
*/
package events.FreyaCelebration;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
@@ -32,9 +32,8 @@ import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
/**
- ** @author Gnacik
- **
- ** Retail Event : 'Freya Celebration'
+ * Retail Event : 'Freya Celebration'
+ * @author Gnacik
*/
public class FreyaCelebration extends Quest
{
@@ -43,7 +42,10 @@ public class FreyaCelebration extends Quest
private static final int _freya_gift = 17138;
private static final int _hours = 20;
- private static final int[] _skills = { 9150, 9151, 9152, 9153, 9154, 9155, 9156 };
+ private static final int[] _skills =
+ {
+ 9150, 9151, 9152, 9153, 9154, 9155, 9156
+ };
private static final NpcStringId[] _freya_texts =
{
@@ -54,7 +56,7 @@ public class FreyaCelebration extends Quest
NpcStringId.I_AM_ICE_QUEEN_FREYA_THIS_FEELING_AND_EMOTION_ARE_NOTHING_BUT_A_PART_OF_MELISSAA_MEMORIES
};
- private static final Location[] _spawns =
+ private static final Location[] _spawns =
{
new Location(-119494, 44882, 360, 24576),
new Location(-117239, 46842, 360, 49151),
@@ -92,24 +94,25 @@ public class FreyaCelebration extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
QuestState st = player.getQuestState(getName());
- Quest q = QuestManager.getInstance().getQuest(getName());
- if (st == null || q == null)
+ if (st == null)
+ {
return null;
+ }
if (event.equalsIgnoreCase("give_potion"))
{
- if (st.getQuestItemsCount(57) > 1)
+ if (st.getQuestItemsCount(PcInventory.ADENA_ID) > 1)
{
long _curr_time = System.currentTimeMillis();
- String value = q.loadGlobalQuestVar(player.getAccountName());
+ String value = loadGlobalQuestVar(player.getAccountName());
long _reuse_time = value == "" ? 0 : Long.parseLong(value);
if (_curr_time > _reuse_time)
{
st.setState(State.STARTED);
- st.takeItems(57, 1);
+ st.takeItems(PcInventory.ADENA_ID, 1);
st.giveItems(_freya_potion, 1);
- q.saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_hours * 3600000)));
+ saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_hours * 3600000)));
}
else
{
@@ -126,7 +129,7 @@ public class FreyaCelebration extends Quest
else
{
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_UNIT_OF_THE_ITEM_S1_REQUIRED);
- sm.addItemName(57);
+ sm.addItemName(PcInventory.ADENA_ID);
sm.addNumber(1);
player.sendPacket(sm);
}
@@ -138,7 +141,9 @@ public class FreyaCelebration extends Quest
public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isPet)
{
if ((caster == null) || (npc == null))
+ {
return null;
+ }
if ((npc.getNpcId() == _freya) && Util.contains(targets, npc) && Util.contains(_skills, skill.getId()))
{
@@ -146,9 +151,9 @@ public class FreyaCelebration extends Quest
{
CreatureSay cs = new CreatureSay(npc.getObjectId(), Say2.ALL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERES_NOTHING_STRANGE_ABOUT_IT_ITS_JUST_A_BIT_OF_MY_CAPRICIOUSNESS);
cs.addStringParameter(caster.getName());
-
+
npc.broadcastPacket(cs);
-
+
caster.addItem("FreyaCelebration", _freya_gift, 1, npc, true);
}
else
@@ -165,11 +170,9 @@ public class FreyaCelebration extends Quest
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
- if (st == null)
+ if (player.getQuestState(getName()) == null)
{
- Quest q = QuestManager.getInstance().getQuest(getName());
- st = q.newQuestState(player);
+ newQuestState(player);
}
return "13296.htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 4428e4cfba8c8adb37720f4faac487f2c418c555..90eda514999cd5e03544142b4c6ec4364b6e68d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -15,7 +15,6 @@
package events.GiftOfVitality;
import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -167,11 +166,9 @@ public class GiftOfVitality extends Quest
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
- if (st == null)
+ if (player.getQuestState(getName()) == null)
{
- Quest q = QuestManager.getInstance().getQuest(getName());
- st = q.newQuestState(player);
+ newQuestState(player);
}
return "4306.htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index a5bbefc7bfc11104bd7e065528550f63f6a34c45..aaba505444d41e4321408612f637829d11691796 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -14,7 +14,6 @@
*/
package events.HeavyMedal;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -152,17 +151,12 @@ public class HeavyMedal extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
- QuestState st = player.getQuestState(getName());
-
+ final QuestState st = player.getQuestState(getName());
int level = checkLevel(st);
if (event.equalsIgnoreCase("game"))
{
- if (st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level])
- {
- htmltext = "31229-no.htm";
- }
- htmltext = "31229-game.htm";
+ htmltext = st.getQuestItemsCount(GLITTERING_MEDAL) < MEDALS[level] ? "31229-no.htm" : "31229-game.htm";
}
else if (event.equalsIgnoreCase("heads") || event.equalsIgnoreCase("tails"))
{
@@ -201,11 +195,9 @@ public class HeavyMedal extends Quest
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
- if (st == null)
+ if (player.getQuestState(getName()) == null)
{
- Quest q = QuestManager.getInstance().getQuest(getName());
- st = q.newQuestState(player);
+ newQuestState(player);
}
return npc.getNpcId() + ".htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index bd614f837d0c9957200c4ee2da9c8f56159a479a..e12bc0fa2ddc24a5e35db170b7387ef3f539c2f6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -16,11 +16,11 @@ package events.MasterOfEnchanting;
import java.util.Date;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.SystemMessageId;
@@ -28,7 +28,8 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.Rnd;
/**
- * Event Code for "Master of Enchanting" http://www.lineage2.com/archive/2009/06/master_of_encha.html
+ * Event Code for "Master of Enchanting"<br>
+ * http://www.lineage2.com/archive/2009/06/master_of_encha.html
* @author Gnacik
*/
public class MasterOfEnchanting extends Quest
@@ -37,7 +38,6 @@ public class MasterOfEnchanting extends Quest
private static final int _master_yogi_staff = 13539;
private static final int _master_yogi_scroll = 13540;
- private static final int _adena = 57;
private static final int _staff_price = 1000000;
private static final int _scroll_24_price = 5000000;
private static final int _scroll_24_time = 6;
@@ -107,47 +107,52 @@ public class MasterOfEnchanting extends Quest
addFirstTalkId(_master_yogi);
addTalkId(_master_yogi);
for (Location loc : _spawns)
+ {
addSpawn(_master_yogi, loc, false, 0);
+ }
}
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- String htmltext = "";
+ String htmltext = event;
QuestState st = player.getQuestState(getName());
- Quest q = QuestManager.getInstance().getQuest(getName());
-
- htmltext = event;
if (event.equalsIgnoreCase("buy_staff"))
{
- if (!st.hasQuestItems(_master_yogi_staff) && st.getQuestItemsCount(_adena) > _staff_price)
+ if (!st.hasQuestItems(_master_yogi_staff) && (st.getQuestItemsCount(PcInventory.ADENA_ID) > _staff_price))
{
- st.takeItems(_adena, _staff_price);
+ st.takeItems(PcInventory.ADENA_ID, _staff_price);
st.giveItems(_master_yogi_staff, 1);
htmltext = "32599-staffbuyed.htm";
}
else
+ {
htmltext = "32599-staffcant.htm";
+ }
}
else if (event.equalsIgnoreCase("buy_scroll_24"))
{
long _curr_time = System.currentTimeMillis();
- String value = q.loadGlobalQuestVar(player.getAccountName());
+ String value = loadGlobalQuestVar(player.getAccountName());
long _reuse_time = value == "" ? 0 : Long.parseLong(value);
if (player.getCreateDate().after(_eventStart))
+ {
return "32599-bidth.htm";
+ }
if (_curr_time > _reuse_time)
{
- if (st.getQuestItemsCount(_adena) > _scroll_24_price)
+ if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_24_price)
{
- st.takeItems(_adena, _scroll_24_price);
+ st.takeItems(PcInventory.ADENA_ID, _scroll_24_price);
st.giveItems(_master_yogi_scroll, 24);
- q.saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_scroll_24_time * 3600000)));
+ saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_scroll_24_time * 3600000)));
htmltext = "32599-scroll24.htm";
}
else
+ {
htmltext = "32599-s24-no.htm";
+ }
}
else
{
@@ -173,43 +178,49 @@ public class MasterOfEnchanting extends Quest
{
// Little glitch. There is no SystemMessage with seconds only.
// If time is less than 1 minute player can buy scrolls
- if (st.getQuestItemsCount(_adena) > _scroll_24_price)
+ if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_24_price)
{
- st.takeItems(_adena, _scroll_24_price);
+ st.takeItems(PcInventory.ADENA_ID, _scroll_24_price);
st.giveItems(_master_yogi_scroll, 24);
- q.saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_scroll_24_time * 3600000)));
+ saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (_scroll_24_time * 3600000)));
htmltext = "32599-scroll24.htm";
}
else
+ {
htmltext = "32599-s24-no.htm";
+ }
}
}
}
else if (event.equalsIgnoreCase("buy_scroll_1"))
{
- if (st.getQuestItemsCount(_adena) > _scroll_1_price)
+ if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_1_price)
{
- st.takeItems(_adena, _scroll_1_price);
+ st.takeItems(PcInventory.ADENA_ID, _scroll_1_price);
st.giveItems(_master_yogi_scroll, 1);
htmltext = "32599-scroll-ok.htm";
}
else
+ {
htmltext = "32599-s1-no.htm";
+ }
}
else if (event.equalsIgnoreCase("buy_scroll_10"))
{
- if (st.getQuestItemsCount(_adena) > _scroll_10_price)
+ if (st.getQuestItemsCount(PcInventory.ADENA_ID) > _scroll_10_price)
{
- st.takeItems(_adena, _scroll_10_price);
+ st.takeItems(PcInventory.ADENA_ID, _scroll_10_price);
st.giveItems(_master_yogi_scroll, 10);
htmltext = "32599-scroll-ok.htm";
}
else
+ {
htmltext = "32599-s10-no.htm";
+ }
}
else if (event.equalsIgnoreCase("receive_reward"))
{
- if (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == _master_yogi_staff && st.getEnchantLevel(_master_yogi_staff) > 3)
+ if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == _master_yogi_staff) && (st.getEnchantLevel(_master_yogi_staff) > 3))
{
switch (st.getEnchantLevel(_master_yogi_staff))
{
@@ -280,31 +291,30 @@ public class MasterOfEnchanting extends Quest
st.giveItems(13988, 1); // S80 Grade Weapon Chest (Event)
default:
if (st.getEnchantLevel(_master_yogi_staff) > 23)
+ {
st.giveItems(13988, 1); // S80 Grade Weapon Chest (Event)
+ }
break;
}
st.takeItems(_master_yogi_staff, 1);
htmltext = "32599-rewardok.htm";
}
else
+ {
htmltext = "32599-rewardnostaff.htm";
+ }
}
-
return htmltext;
}
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- String htmltext = "";
- QuestState st = player.getQuestState(getName());
- if (st == null)
+ if (player.getQuestState(getName()) == null)
{
- Quest q = QuestManager.getInstance().getQuest(getName());
- st = q.newQuestState(player);
+ newQuestState(player);
}
- htmltext = npc.getNpcId() + ".htm";
- return htmltext;
+ return npc.getNpcId() + ".htm";
}
public static void main(String[] args)