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

Sync with L2jServer HighFive Apr 1st 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-04-02 04:12:06 +00:00
parent 8300183361
commit 1abccfcae0
26 changed files with 283 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/dist/game/data/html/default/32537-1.htm vendored
View File

@@ -1,6 +1,6 @@
<html><body>Mouth of Ekimus:<br>
The echoes of the screams of the dying spread to the other side of the gap.<br>
The name Hall of Suffering seems to suit this place where new souls are made.<br>
(The Hall of Erosion is an instant zone exclusively for party use.)<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest SeedOfInfinity">Enter the Hall of Erosion.</Button>
(The Hall of Suffering is an instant zone exclusively for party use.)<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest HallOfSuffering">Enter the Hall of Erosion.</Button>
</body></html>

89
trunk/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java vendored
View File

@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.quest.Quest;
@@ -115,8 +114,10 @@ public final class Q00662_AGameOfCards extends Quest
{
if (player.getLevel() >= MIN_LEVEL)
{
st.setState(State.STARTED);
st.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT);
if (st.isCreated())
{
st.startQuest();
}
htmltext = event;
}
break;
@@ -239,9 +240,8 @@ public final class Q00662_AGameOfCards extends Quest
{
i5 = i5 - 14;
}
st.setCond((i4 * 1000000) + (i3 * 10000) + (i2 * 100) + i1);
st.set("ex", i5);
st.set("v1", (i4 * 1000000) + (i3 * 10000) + (i2 * 100) + i1);
st.set("ExMemoState", i5);
st.takeItems(RED_GEM, REQUIRED_CHIP_COUNT);
htmltext = event;
}
@@ -253,8 +253,8 @@ public final class Q00662_AGameOfCards extends Quest
case "turncard4":
case "turncard5":
{
final int cond = st.getCond();
int i1 = st.getInt("ex");
final int cond = st.getInt("v1");
int i1 = st.getInt("ExMemoState");
int i5 = i1 % 100;
int i9 = i1 / 100;
i1 = cond % 100;
@@ -271,7 +271,7 @@ public final class Q00662_AGameOfCards extends Quest
}
if ((i9 % 32) < 31)
{
st.set("ex", (i9 * 100) + i5);
st.set("ExMemoState", (i9 * 100) + i5);
}
break;
}
@@ -283,7 +283,7 @@ public final class Q00662_AGameOfCards extends Quest
}
if ((i9 % 32) < 31)
{
st.set("ex", (i9 * 100) + i5);
st.set("ExMemoState", (i9 * 100) + i5);
}
break;
}
@@ -295,7 +295,7 @@ public final class Q00662_AGameOfCards extends Quest
}
if ((i9 % 32) < 31)
{
st.set("ex", (i9 * 100) + i5);
st.set("ExMemoState", (i9 * 100) + i5);
}
break;
}
@@ -307,7 +307,7 @@ public final class Q00662_AGameOfCards extends Quest
}
if ((i9 % 32) < 31)
{
st.set("ex", (i9 * 100) + i5);
st.set("ExMemoState", (i9 * 100) + i5);
}
break;
}
@@ -319,7 +319,7 @@ public final class Q00662_AGameOfCards extends Quest
}
if ((i9 % 32) < 31)
{
st.set("ex", (i9 * 100) + i5);
st.set("ExMemoState", (i9 * 100) + i5);
}
break;
}
@@ -491,55 +491,55 @@ public final class Q00662_AGameOfCards extends Quest
if (i6 == 40)
{
st.giveItems(ZIGGOS_GEMSTONE, 43);
st.giveItems(959, 3);
st.giveItems(729, 1);
st.set("ex", 0);
st.setCond(0);
rewardItems(player, ZIGGOS_GEMSTONE, 43);
rewardItems(player, 959, 3);
rewardItems(player, 729, 1);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-13.html");
}
else if (i6 == 30)
{
st.giveItems(959, 2);
st.giveItems(951, 2);
st.set("ex", 0);
st.setCond(0);
rewardItems(player, 959, 2);
rewardItems(player, 951, 2);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-14.html");
}
else if ((i6 == 21) || (i6 == 12))
{
st.giveItems(729, 1);
st.giveItems(947, 2);
st.giveItems(955, 1);
st.set("ex", 0);
st.setCond(0);
rewardItems(player, 729, 1);
rewardItems(player, 947, 2);
rewardItems(player, 955, 1);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-15.html");
}
else if (i6 == 20)
{
st.giveItems(951, 2);
st.set("ex", 0);
st.setCond(0);
rewardItems(player, 951, 2);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-16.html");
}
else if (i6 == 11)
{
st.giveItems(951, 1);
st.set("ex", 0);
st.setCond(0);
rewardItems(player, 951, 1);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-17.html");
}
else if (i6 == 10)
{
st.giveItems(956, 2);
st.set("ex", 0);
st.setCond(0);
rewardItems(player, 956, 2);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-18.html");
}
else if (i6 == 0)
{
st.set("ex", 0);
st.setCond(0);
st.set("ExMemoState", 0);
st.set("v1", 0);
htmltext = getHtm(player.getHtmlPrefix(), "30845-19.html");
}
}
@@ -627,14 +627,14 @@ public final class Q00662_AGameOfCards extends Quest
}
case State.STARTED:
{
if (st.isCond(0))
if (st.isCond(1))
{
htmltext = "30845-04.html";
htmltext = st.getQuestItemsCount(RED_GEM) < REQUIRED_CHIP_COUNT ? "30845-04.html" : "30845-05.html";
}
else if (st.getInt("ex") != 0)
else if (st.getInt("ExMemoState") != 0)
{
int i0 = st.getCond();
int i1 = st.getInt("ex");
int i0 = st.getInt("v1");
int i1 = st.getInt("ExMemoState");
int i5 = i1 % 100;
int i9 = i1 / 100;
i1 = i0 % 100;
@@ -733,8 +733,7 @@ public final class Q00662_AGameOfCards extends Quest
final QuestState st = getQuestState(player, false);
if (st != null)
{
st.giveItems(RED_GEM, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
giveItemRandomly(st.getPlayer(), npc, RED_GEM, 1, 0, MONSTERS.get(npc.getId()), true);
}
}
}

16
trunk/dist/game/data/stats/npcs/18800-18899.xml vendored
View File

@@ -3354,6 +3354,8 @@
<item id="9574" min="1" max="1" chance="0.5292" /> <!-- Mid-Grade Life Stone - Level 80 -->
<item id="9575" min="1" max="1" chance="0.0529" /> <!-- High-Grade Life Stone - Level 80 -->
<item id="960" min="1" max="1" chance="0.1218" /> <!-- Scroll: Enchant Armor (S-Grade) -->
<item id="6622" min="1" max="1" chance="0.5000" /> <!--Giant's Codex-->
<item id="10550" min="1" max="1" chance="0.1000" /> <!--Forgotten Scroll - Protection of Elemental-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -3565,6 +3567,8 @@
<item id="10484" min="1" max="1" chance="0.5144" /> <!-- Mid-Grade Life Stone - Level 82 -->
<item id="10485" min="1" max="1" chance="0.0514" /> <!-- High-Grade Life Stone - Level 82 -->
<item id="15779" min="1" max="1" chance="0.1173" /> <!-- Recipe - Sealed Moirai Leather Breastplate (60%) -->
<item id="6622" min="1" max="1" chance="0.5000" /> <!--Giant's Codex-->
<item id="10549" min="1" max="1" chance="1.0000" /> <!--Forgotten Scroll - Protection of Rune-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -4091,6 +4095,8 @@
<item id="9574" min="1" max="1" chance="0.5292" /> <!-- Mid-Grade Life Stone - Level 80 -->
<item id="9575" min="1" max="1" chance="0.0529" /> <!-- High-Grade Life Stone - Level 80 -->
<item id="960" min="1" max="1" chance="0.1218" /> <!-- Scroll: Enchant Armor (S-Grade) -->
<item id="6622" min="1" max="1" chance="0.5000" /> <!--Giant's Codex-->
<item id="10550" min="1" max="1" chance="0.1000" /> <!--Forgotten Scroll - Protection of Elemental-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -4303,6 +4309,8 @@
<item id="10484" min="1" max="1" chance="0.5146" /> <!-- Mid-Grade Life Stone - Level 82 -->
<item id="10485" min="1" max="1" chance="0.0515" /> <!-- High-Grade Life Stone - Level 82 -->
<item id="15778" min="1" max="1" chance="0.0879" /> <!-- Recipe - Sealed Moirai Breastplate (60%) -->
<item id="6622" min="1" max="1" chance="0.5000" /> <!--Giant's Codex-->
<item id="10549" min="1" max="1" chance="1.0000" /> <!--Forgotten Scroll - Protection of Rune-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -4835,6 +4843,8 @@
<item id="15787" min="1" max="1" chance="0.3548" /> <!-- Recipe - Sealed Moirai Boots (60%) -->
<item id="15788" min="1" max="1" chance="0.3548" /> <!-- Recipe - Sealed Moirai Leather Boots (60%) -->
<item id="15789" min="1" max="1" chance="0.3549" /> <!-- Recipe - Sealed Moirai Shoes (60%) -->
<item id="6622" min="1" max="1" chance="0.1000" /> <!--Giant's Codex-->
<item id="10552" min="1" max="1" chance="0.0500" /> <!--Forgotten Scroll - Fighter's Will-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -5047,6 +5057,8 @@
<item id="10484" min="1" max="1" chance="0.5144" /> <!-- Mid-Grade Life Stone - Level 82 -->
<item id="10485" min="1" max="1" chance="0.0514" /> <!-- High-Grade Life Stone - Level 82 -->
<item id="15780" min="1" max="1" chance="0.1173" /> <!-- Recipe - Sealed Moirai Tunic (60%) -->
<item id="6622" min="1" max="1" chance="0.0500" /> <!--Giant's Codex-->
<item id="10552" min="1" max="1" chance="1.1160" /> <!--Forgotten Scroll - Fighter's Will-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -5566,6 +5578,8 @@
<item id="15787" min="1" max="1" chance="0.3548" /> <!-- Recipe - Sealed Moirai Boots (60%) -->
<item id="15788" min="1" max="1" chance="0.3548" /> <!-- Recipe - Sealed Moirai Leather Boots (60%) -->
<item id="15789" min="1" max="1" chance="0.3549" /> <!-- Recipe - Sealed Moirai Shoes (60%) -->
<item id="6622" min="1" max="1" chance="0.1000" /> <!--Giant's Codex-->
<item id="10552" min="1" max="1" chance="0.5000" /> <!--Forgotten Scroll - Fighter's Will-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->
@@ -5777,6 +5791,8 @@
<item id="10484" min="1" max="1" chance="0.5149" /> <!-- Mid-Grade Life Stone - Level 82 -->
<item id="10485" min="1" max="1" chance="0.0515" /> <!-- High-Grade Life Stone - Level 82 -->
<item id="10374" min="1" max="1" chance="0.0191" /> <!-- Recipe - Icarus Disperser (60%) -->
<item id="6622" min="1" max="1" chance="0.0500" /> <!--Giant's Codex-->
<item id="10552" min="1" max="1" chance="1.1410" /> <!--Forgotten Scroll - Fighter's Will-->
</group>
<group chance="42.0">
<item id="8600" min="1" max="1" chance="55" /> <!-- Herb of Life -->

1
trunk/dist/game/data/stats/skills/00900-00999.xml vendored
View File

@@ -2384,6 +2384,7 @@
<set name="icon" val="icon.skill0997" />
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="overHit" val="true" />
<set name="power" val="#power" />

4
trunk/dist/game/data/stats/skills/22200-22299.xml vendored
View File

@@ -630,7 +630,7 @@
</skill>
<skill id="22272" levels="1" name="Beginner Adventurer's Treasure Sack">
<!-- High Five Skill -->
<table name="#extractableItems">312,1,4.76;167,1,4.76;220,1,4.76;178,1,4.76;221,1,4.76;123,1,4.76;156,1,4.76;291,1,4.76;166,1,4.76;274,1,4.76;21731,1,4.76;318,1,4.76;21738,1,4.76;21732,1,4.76;294,1,4.76;88,1,4.76;90,1,4.76;21735,1,4.76;172,1,4.76;279,1,4.76;169,1,4.8</table>
<table name="#extractableItems">71,1,3.76;72,1,3.76;73,1,3.76;74,1,3.76;75,1,3.76;76,1,3.76;77,1,3.76;84,1,3.76;88,1,4.76;89,1,3.76;90,1,4.76;93,1,4.76;94,1,3.76;95,1,3.76;96,1,3.76;123,1,4.76;129,1,4.76;131,1,3.76;132,1,3.76;133,1,3.76;134,1,3.76;135,1,3.76;145,1,3.76;156,1,4.76;158,1,4.76;160,1,3.76;161,1,3.76;162,1,3.76;166,1,4.76;167,1,4.76;169,1,4.76;172,1,4.76;173,1,3.76;174,1,3.76;178,1,4.76;191,1,3.76;192,1,3.76;193,1,3.76;194,1,3.76;195,1,3.76;196,1,3.76;197,1,3.76;198,1,3.76;199,1,3.76;200,1,3.76;201,1,3.76;202,1,3.76;203,1,3.76;204,1,3.76;205,1,3.76;206,1,3.76;220,1,4.76;221,1,4.76;224,1,4.76;226,1,3.76;227,1,3.76;228,1,3.76;230,1,3.76;231,1,3.76;232,1,3.76;233,1,3.76;242,1,3.76;258,1,4.76;261,1,4.76;263,1,3.76;265,1,3.76;266,1,3.76;274,1,4.76;279,1,4.76;281,1,3.76;282,1,3.76;283,1,3.76;285,1,3.76;286,1,3.76;291,1,4.76;294,1,4.76;298,1,3.76;299,1,3.76;301,1,3.76;302,1,3.76;303,1,3.76;312,1,4.76;318,1,4.76;324,1,3.76;325,1,3.76;326,1,3.76;327,1,3.76;328,1,3.76;329,1,3.76;330,1,3.76;331,1,3.76;332,1,3.76;333,1,3.76;334,1,3.76;2502,1,3.76;2503,1,3.76;4233,1,3.76;5286,1,3.76;7882,1,3.76;7887,1,3.76;7888,1,3.76;7891,1,3.76;7897,1,3.76;7898,1,3.76;9228,1,3.76;9232,1,3.76;9236,1,3.76;9240,1,3.76;9244,1,3.76;9248,1,3.76;9252,1,3.76;9256,1,3.76;9260,1,3.76;9264,1,3.76;9268,1,3.76;9272,1,3.76;9276,1,3.76;9280,1,3.76;9284,1,3.76;9288,1,3.76;9292,1,3.76;9296,1,3.76;9300,1,3.76</table>
<set name="blockedInOlympiad" val="true" />
<set name="capsuled_items_skill" val="#extractableItems" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
@@ -649,7 +649,7 @@
</skill>
<skill id="22273" levels="1" name="Experienced Adventurer's Treasure Sack">
<!-- High Five Skill -->
<table name="#extractableItems">160,1,4.16;298,1,4.16;72,1,4.16;193,1,4.16;192,1,4.16;281,1,4.16;7887,1,4.16;226,1,4.16;191,1,4.16;71,1,4.16;263,1,4.16;78,1,2.5;300,1,2.5;284,1,2.5;142,1,2.5;267,1,2.5;229,1,2.5;148,1,2.5;243,1,2.5;7892,1,2.5;91,1,1.36;80,1,1.36;235,1,1.36;269,1,1.36;288,1,1.36;7884,1,1.36;2504,1,1.36;150,1,1.36;7889,1,1.36;6364,1,0.45;6365,1,0.45;6366,1,0.45;6367,1,0.45;6368,1,0.45;6369,1,0.45;6370,1,0.45;6371,1,0.45;6372,1,0.45;7575,1,0.45</table>
<table name="#extractableItems">78,1,4.16;79,1,4.16;80,1,2.5;81,1,2.5;82,1,0.45;85,1,2.5;91,1,4.16;92,1,4.16;97,1,4.16;98,1,2.5;142,1,4.16;146,1,4.16;147,1,2.5;148,1,4.16;149,1,2.5;150,1,2.5;151,1,2.5;164,1,2.5;171,1,4.16;175,1,4.16;207,1,4.16;208,1,4.16;209,1,4.16;210,1,4.16;211,1,4.16;212,1,2.5;213,1,2.5;229,1,4.16;234,1,4.16;235,1,2.5;236,1,2.5;243,1,4.16;264,1,4.16;267,1,4.16;268,1,4.16;269,1,2.5;270,1,2.5;284,1,4.16;287,1,4.16;288,1,2.5;289,1,2.5;300,1,4.16;304,1,2.5;305,1,2.5;335,1,4.16;336,1,4.16;337,1,4.16;338,1,4.16;339,1,4.16;340,1,4.16;341,1,2.5;342,1,2.5;343,1,2.5;344,1,2.5;345,1,2.5;346,1,0.45;2500,1,2.5;2504,1,2.5;6364,1,0.45;6365,1,0.45;6366,1,0.45;6367,1,0.45;6368,1,0.45;6369,1,0.45;6370,1,0.45;6371,1,0.45;6372,1,0.45;6579,1,0.45;7575,1,0.45;7883,1,4.16;7884,1,2.5;7889,1,4.16;7892,1,4.16;7893,1,4.16;7894,1,2.5;7895,1,2.5;7899,1,2.5;7900,1,4.16;7901,1,4.16;7902,1,2.5;8678,1,2.5;8682,1,2.5;8683,1,2.5;8684,1,2.5;8685,1,2.5;8686,1,2.5;8688,1,2.5;9304,1,4.16;9308,1,4.16;9312,1,4.16;9316,1,4.16;9320,1,4.16;9324,1,4.16;9328,1,2.5;9332,1,2.5;9336,1,2.5;9340,1,2.5;9344,1,2.5;9348,1,2.5;9352,1,2.5;9356,1,2.5;9360,1,2.5;9364,1,0.45;9368,1,0.45;9372,1,0.45</table>
<set name="blockedInOlympiad" val="true" />
<set name="capsuled_items_skill" val="#extractableItems" />
<set name="isMagic" val="2" /> <!-- Static Skill -->