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

19
trunk/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java vendored
View File

@@ -58,17 +58,17 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
final QuestState st = getQuestState(player, false);
if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
{
final long currentCount = st.getQuestItemsCount(ZAKENS_SOUL_FRAGMENT);
final long currentCount = getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT);
final long count = getRandom(1, 3);
if (count >= (FRAGMENT_COUNT - currentCount))
{
st.giveItems(ZAKENS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
giveItems(player, ZAKENS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
st.setCond(2, true);
}
else
{
st.giveItems(ZAKENS_SOUL_FRAGMENT, count);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, ZAKENS_SOUL_FRAGMENT, count);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
}
@@ -96,11 +96,6 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
}
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
@@ -120,10 +115,10 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
}
case 2:
{
if (st.getQuestItemsCount(ZAKENS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
if (getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
{
st.giveItems(SOUL_CLOAK_OF_ZAKEN, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, SOUL_CLOAK_OF_ZAKEN, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.exitQuest(false, true);
htmltext = "32612-06.html";
}

14
trunk/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java vendored
View File

@@ -58,17 +58,17 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
final QuestState st = getQuestState(player, false);
if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
{
final long currentCount = st.getQuestItemsCount(FREYAS_SOUL_FRAGMENT);
final long currentCount = getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT);
final long count = getRandom(1, 3);
if (count >= (FRAGMENT_COUNT - currentCount))
{
st.giveItems(FREYAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
giveItems(player, FREYAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
st.setCond(2, true);
}
else
{
st.giveItems(FREYAS_SOUL_FRAGMENT, count);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, FREYAS_SOUL_FRAGMENT, count);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
}
@@ -120,10 +120,10 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
}
case 2:
{
if (st.getQuestItemsCount(FREYAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
if (getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
{
st.giveItems(SOUL_CLOAK_OF_FREYA, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, SOUL_CLOAK_OF_FREYA, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.exitQuest(false, true);
htmltext = "32612-06.html";
}

19
trunk/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java vendored
View File

@@ -59,17 +59,17 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
final QuestState st = getQuestState(player, false);
if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
{
final long currentCount = st.getQuestItemsCount(FRINTEZZAS_SOUL_FRAGMENT);
final long currentCount = getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT);
final long count = getRandom(1, 3);
if (count >= (FRAGMENT_COUNT - currentCount))
{
st.giveItems(FRINTEZZAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
giveItems(player, FRINTEZZAS_SOUL_FRAGMENT, FRAGMENT_COUNT - currentCount);
st.setCond(2, true);
}
else
{
st.giveItems(FRINTEZZAS_SOUL_FRAGMENT, count);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, FRINTEZZAS_SOUL_FRAGMENT, count);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
}
@@ -97,11 +97,6 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
}
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
@@ -121,10 +116,10 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
}
case 2:
{
if (st.getQuestItemsCount(FRINTEZZAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
if (getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT)
{
st.giveItems(SOUL_CLOAK_OF_FRINTEZZA, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, SOUL_CLOAK_OF_FRINTEZZA, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.exitQuest(false, true);
htmltext = "32612-06.html";
}

20
trunk/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java vendored
View File

@@ -59,9 +59,9 @@ public final class Q10504_JewelOfAntharas extends Quest
final QuestState st = getQuestState(player, false);
if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
{
st.takeItems(CLEAR_CRYSTAL, -1);
st.giveItems(FILLED_CRYSTAL_ANTHARAS_ENERGY, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
takeItems(player, CLEAR_CRYSTAL, -1);
giveItems(player, FILLED_CRYSTAL_ANTHARAS_ENERGY, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.setCond(2, true);
}
}
@@ -76,7 +76,7 @@ public final class Q10504_JewelOfAntharas extends Quest
}
String htmltext = null;
if ((player.getLevel() >= MIN_LEVEL) && st.hasQuestItems(PORTAL_STONE))
if ((player.getLevel() >= MIN_LEVEL) && hasQuestItems(player, PORTAL_STONE))
{
switch (event)
{
@@ -89,7 +89,7 @@ public final class Q10504_JewelOfAntharas extends Quest
case "30755-07.html":
{
st.startQuest();
st.giveItems(CLEAR_CRYSTAL, 1);
giveItems(player, CLEAR_CRYSTAL, 1);
htmltext = event;
break;
}
@@ -118,7 +118,7 @@ public final class Q10504_JewelOfAntharas extends Quest
{
htmltext = "30755-02.html";
}
else if (!st.hasQuestItems(PORTAL_STONE))
else if (!hasQuestItems(player, PORTAL_STONE))
{
htmltext = "30755-04.html";
}
@@ -134,21 +134,21 @@ public final class Q10504_JewelOfAntharas extends Quest
{
case 1:
{
if (st.hasQuestItems(CLEAR_CRYSTAL))
if (hasQuestItems(player, CLEAR_CRYSTAL))
{
htmltext = "30755-08.html";
}
else
{
st.giveItems(CLEAR_CRYSTAL, 1);
giveItems(player, CLEAR_CRYSTAL, 1);
htmltext = "30755-09.html";
}
break;
}
case 2:
{
st.giveItems(JEWEL_OF_ANTHARAS, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, JEWEL_OF_ANTHARAS, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.exitQuest(false, true);
htmltext = "30755-10.html";
break;

27
trunk/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java vendored
View File

@@ -59,9 +59,9 @@ public class Q10505_JewelOfValakas extends Quest
final QuestState st = getQuestState(player, false);
if ((st != null) && st.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
{
st.takeItems(EMPTY_CRYSTAL, -1);
st.giveItems(FILLED_CRYSTAL_VALAKAS_ENERGY, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
takeItems(player, EMPTY_CRYSTAL, -1);
giveItems(player, FILLED_CRYSTAL_VALAKAS_ENERGY, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.setCond(2, true);
}
}
@@ -76,7 +76,7 @@ public class Q10505_JewelOfValakas extends Quest
}
String htmltext = null;
if ((player.getLevel() >= MIN_LEVEL) && st.hasQuestItems(VACUALITE_FLOATING_STONE))
if ((player.getLevel() >= MIN_LEVEL) && hasQuestItems(player, VACUALITE_FLOATING_STONE))
{
switch (event)
{
@@ -89,7 +89,7 @@ public class Q10505_JewelOfValakas extends Quest
case "31540-07.html":
{
st.startQuest();
st.giveItems(EMPTY_CRYSTAL, 1);
giveItems(player, EMPTY_CRYSTAL, 1);
htmltext = event;
break;
}
@@ -108,12 +108,7 @@ public class Q10505_JewelOfValakas extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
if (st == null)
{
return getNoQuestMsg(player);
}
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
@@ -123,7 +118,7 @@ public class Q10505_JewelOfValakas extends Quest
{
htmltext = "31540-02.html";
}
else if (!st.hasQuestItems(VACUALITE_FLOATING_STONE))
else if (!hasQuestItems(player, VACUALITE_FLOATING_STONE))
{
htmltext = "31540-04.html";
}
@@ -139,21 +134,21 @@ public class Q10505_JewelOfValakas extends Quest
{
case 1:
{
if (st.hasQuestItems(EMPTY_CRYSTAL))
if (hasQuestItems(player, EMPTY_CRYSTAL))
{
htmltext = "31540-08.html";
}
else
{
st.giveItems(EMPTY_CRYSTAL, 1);
giveItems(player, EMPTY_CRYSTAL, 1);
htmltext = "31540-09.html";
}
break;
}
case 2:
{
st.giveItems(JEWEL_OF_VALAKAS, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItems(player, JEWEL_OF_VALAKAS, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
st.exitQuest(false, true);
htmltext = "31540-10.html";
break;