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

Memory of Disaster rework.

Browse Source
This commit is contained in:
MobiusDev
2016-07-13 14:30:05 +00:00
parent c3d15707a3
commit 123830773f
3 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
trunk/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java vendored
View File

@ -396,11 +396,21 @@ public final class MemoryOfDisaster extends AbstractInstance
{ {
switch (event) switch (event)
{ {
case "START_AWAKENING_OPENING_SCENE":
{
playMovie(player, Movie.SC_AWAKENING_OPENING);
break;
}
case "EARTHQUAKE": case "EARTHQUAKE":
{ {
player.sendPacket(new Earthquake(player.getLocation(), 50, 4)); player.sendPacket(new Earthquake(player.getLocation(), 50, 4));
break; break;
} }
case "TELEPORT_PLAYER_TO_START":
{
player.teleToLocation(BATTLE_PORT);
break;
}
case "END_OF_OPENING_SCENE": case "END_OF_OPENING_SCENE":
{ {
player.teleToLocation(BATTLE_PORT); player.teleToLocation(BATTLE_PORT);
@ -559,7 +569,7 @@ public final class MemoryOfDisaster extends AbstractInstance
} }
case "EARTHWORM_TIME": case "EARTHWORM_TIME":
{ {
addSpawn(npc, TEREDOR_TRANSPARENT, 116016, -179503, -1040, 58208, false, 0, false, npc.getInstanceId()); addSpawn(npc, TEREDOR_TRANSPARENT, 116511, -178729, -1176, 43905, false, 0, false, npc.getInstanceId());
break; break;
} }
case "ENTER_EVENT": case "ENTER_EVENT":
@ -573,6 +583,18 @@ public final class MemoryOfDisaster extends AbstractInstance
{ {
npc.setLHandId(0); npc.setLHandId(0);
npc.broadcastInfo(); npc.broadcastInfo();
getTimers().addTimer("END_VIDEO", 20000, null, npc.getInstanceWorld().getFirstPlayer());
break;
}
case "END_VIDEO":
{
playMovie(player, Movie.SC_AWAKENING_OPENING_F);
getTimers().addTimer("END_INSTANCE", 45000, null, player);
break;
}
case "END_INSTANCE":
{
finishInstance(player, 0);
break; break;
} }
} }
@ -586,9 +608,10 @@ public final class MemoryOfDisaster extends AbstractInstance
instance.getPlayers().forEach(p -> instance.getPlayers().forEach(p ->
{ {
p.sendPacket(new OnEventTrigger(FIRE_IN_DWARVEN_VILLAGE, true)); p.sendPacket(new OnEventTrigger(FIRE_IN_DWARVEN_VILLAGE, true));
playMovie(p, Movie.SC_AWAKENING_OPENING);
getTimers().addRepeatingTimer("EARTHQUAKE", 10000, null, p); getTimers().addRepeatingTimer("EARTHQUAKE", 10000, null, p);
getTimers().addTimer("END_OF_OPENING_SCENE", 32000, null, p); getTimers().addTimer("END_OF_OPENING_SCENE", 30000, null, p);
getTimers().addTimer("START_AWAKENING_OPENING_SCENE", 1000, null, p);
getTimers().addTimer("TELEPORT_PLAYER_TO_START", 25000, null, p);
}); });
}); });
} }

30
trunk/dist/game/data/stats/npcs/19100-19199.xml vendored
View File

@ -1861,7 +1861,7 @@
</attribute> </attribute>
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="5465" level="1" /> <!-- Earth Attack --> <skill id="5465" level="1" /> <!-- Earth Attack -->
<skill id="4416" level="12" /> <!-- Bugs --> <skill id="4416" level="12" /> <!-- Bugs -->
@ -2196,7 +2196,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" showName="false" canMove="false" /> <status showName="false" talkable="false" canMove="false" />
<skill_list> <skill_list>
<skill id="4416" level="12" /> <!-- Bugs --> <skill id="4416" level="12" /> <!-- Bugs -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2225,7 +2225,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" showName="false" /> <status attackable="false" showName="false" talkable="false" />
<skill_list> <skill_list>
<skill id="4416" level="12" /> <!-- Bugs --> <skill id="4416" level="12" /> <!-- Bugs -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2689,7 +2689,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2718,7 +2718,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" undying="true" /> <status attackable="false" talkable="false" targetable="false" undying="true" />
<skill_list> <skill_list>
<skill id="4416" level="2" /> <!-- Magic Creatures --> <skill id="4416" level="2" /> <!-- Magic Creatures -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2747,7 +2747,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="true" />
<skill_list> <skill_list>
<skill id="4416" level="21" /> <!-- Siege Weapons --> <skill id="4416" level="21" /> <!-- Siege Weapons -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2777,7 +2777,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="17" /> <!-- Orcs --> <skill id="4416" level="17" /> <!-- Orcs -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2807,7 +2807,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status talkable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2837,7 +2837,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2866,7 +2866,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2895,7 +2895,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2925,7 +2925,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" showName="false" /> <status attackable="false" showName="false" talkable="false" targetable="false" undying="true" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2955,7 +2955,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" showName="false" /> <status attackable="false" showName="false" talkable="false" targetable="false" undying="true" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -2985,7 +2985,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -3015,7 +3015,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" undying="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->

32
trunk/dist/game/data/stats/npcs/19200-19299.xml vendored
View File

@ -18,7 +18,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -48,7 +48,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -78,7 +78,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -108,7 +108,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -138,7 +138,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -168,7 +168,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -198,7 +198,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -228,7 +228,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -258,7 +258,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -288,7 +288,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -318,7 +318,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -348,7 +348,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -378,7 +378,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -408,7 +408,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -438,7 +438,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->
@ -468,7 +468,7 @@
<defence physical="398.415163555849" magical="215.693501667373" /> <defence physical="398.415163555849" magical="215.693501667373" />
<abnormalResist physical="10" magical="10" /> <abnormalResist physical="10" magical="10" />
</stats> </stats>
<status attackable="false" /> <status attackable="false" talkable="false" targetable="false" />
<skill_list> <skill_list>
<skill id="4416" level="18" /> <!-- Dwarves --> <skill id="4416" level="18" /> <!-- Dwarves -->
<skill id="4415" level="3" /> <!-- One-handed Sword --> <skill id="4415" level="3" /> <!-- One-handed Sword -->