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

Sync with L2JServer Jan 12th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-13 09:50:20 +00:00
parent a868d961a3
commit 0a44ad683c
1158 changed files with 59729 additions and 58627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/dist/game/data/scripts/instances/IceQueensCastleHardBattle/IceQueensCastleHardBattle.java vendored
View File

@@ -173,7 +173,6 @@ public final class IceQueensCastleHardBattle extends AbstractNpcAI
addTalkId(SIRRA, JINIA, SUPP_KEGOR);
addAttackId(FREYA_THRONE, FREYA_STAND, GLAKIAS, GLACIER, BREATH, KNIGHT);
addKillId(GLAKIAS, FREYA_STAND, KNIGHT, GLACIER, BREATH);
addSpawnId(GLAKIAS, FREYA_STAND, KNIGHT, GLACIER, BREATH);
addSpellFinishedId(GLACIER, BREATH);
}
@@ -677,13 +676,6 @@ public final class IceQueensCastleHardBattle extends AbstractNpcAI
return super.onAdvEvent(event, npc, player);
}
@Override
public String onSpawn(L2Npc npc)
{
((L2Attackable) npc).setOnKillDelay(0);
return super.onSpawn(npc);
}
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{

8
trunk/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java vendored
View File

@@ -173,7 +173,6 @@ public final class IceQueensCastleNormalBattle extends AbstractNpcAI
addTalkId(SIRRA, JINIA, SUPP_KEGOR);
addAttackId(FREYA_THRONE, FREYA_STAND, GLAKIAS, GLACIER, BREATH, KNIGHT);
addKillId(GLAKIAS, FREYA_STAND, KNIGHT, GLACIER, BREATH);
addSpawnId(GLAKIAS, FREYA_STAND, KNIGHT, GLACIER, BREATH);
addSpellFinishedId(GLACIER, BREATH);
}
@@ -677,13 +676,6 @@ public final class IceQueensCastleNormalBattle extends AbstractNpcAI
return super.onAdvEvent(event, npc, player);
}
@Override
public String onSpawn(L2Npc npc)
{
((L2Attackable) npc).setOnKillDelay(0);
return super.onSpawn(npc);
}
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{

10
trunk/dist/game/data/scripts/instances/Kamaloka/31340.htm vendored
View File

@@ -1,7 +1,7 @@
<html><body>Captain Mathias:<br>
What? You want to enter Kamaloka?<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 15">Enter Kamaloka, Hall of the Abyss (level 73).</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 16">Enter Kamaloka, Labyrinth of the Abyss (level 78).</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 17">Enter Kamaloka, Labyrinth of the Abyss (level 81).</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 18">Enter Kamaloka, Labyrinth of the Abyss (level 83).</Button>
Are you trying to enter Kamaloka?<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 15">"I want to enter Kamaloka (Hall of the Abyss) (Lv. 73)."</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 16">"I want to enter Kamaloka (Labyrinth of the Abyss) (Lv. 78)."</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 17">"I want to enter Near Kamaloka (Labyrinth of the Abyss) (Lv. 81)."</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Kamaloka 18">"I want to enter Kamaloka (Labyrinth of the Abyss) (Lv. 83)."</Button>
</body></html>

5
trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -34,7 +34,6 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Instance;
import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
@@ -1518,9 +1517,7 @@ public final class Kamaloka extends Quest
}
// boss
npc = addSpawn(BOSS[index][0], BOSS[index][1], BOSS[index][2], BOSS[index][3], 0, false, 0, false, world.getInstanceId());
((L2MonsterInstance) npc).setOnKillDelay(100);
world.boss = npc;
world.boss = addSpawn(BOSS[index][0], BOSS[index][1], BOSS[index][2], BOSS[index][3], 0, false, 0, false, world.getInstanceId());
}
/**