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

Dropped L2QuestGuardInstance.

Browse Source
This commit is contained in:
MobiusDev
2017-09-09 02:38:17 +00:00
parent e971fbf3b8
commit 1b17669d5b
49 changed files with 79 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java vendored
View File

@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.model.events.ListenerRegisterType;
import com.l2jmobius.gameserver.model.events.annotations.Id;
@@ -149,7 +149,7 @@ public final class Wastelands extends AbstractNpcAI
if (guard.getId() == SCHUAZEN)
{
//@formatter:off
final L2QuestGuardInstance decoGuard = (L2QuestGuardInstance) L2World.getInstance().getVisibleObjects(guard, L2Npc.class, 500)
final FriendlyNpcInstance decoGuard = (FriendlyNpcInstance) L2World.getInstance().getVisibleObjects(guard, L2Npc.class, 500)
.stream()
.filter(obj -> (obj.getId() == DECO_GUARD2))
.findFirst()
@@ -202,7 +202,7 @@ public final class Wastelands extends AbstractNpcAI
{
final int guardId = npc.getId() == REGENERATED_KANILOV ? JOEL : SCHUAZEN;
//@formatter:off
final L2QuestGuardInstance guard = (L2QuestGuardInstance) L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 500)
final FriendlyNpcInstance guard = (FriendlyNpcInstance) L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 500)
.stream()
.filter(obj -> (obj.getId() == guardId))
.findFirst()

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -30,10 +30,10 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2GrandBossInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.instancezone.Instance;
@@ -430,14 +430,14 @@ public final class IceQueensCastleBattle extends AbstractInstance
freya.disableCoreAI(false);
manageScreenMsg(world, NpcStringId.BEGIN_STAGE_4);
final L2QuestGuardInstance jinia = (L2QuestGuardInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getId());
final FriendlyNpcInstance jinia = (FriendlyNpcInstance) addSpawn(SUPP_JINIA, SUPP_JINIA_SPAWN, false, 0, true, world.getId());
jinia.setIsRunning(true);
jinia.setIsInvul(true);
jinia.setCanReturnToSpawnPoint(false);
jinia.reduceCurrentHp(1, freya, null); // TODO: Find better way for attack
freya.reduceCurrentHp(1, jinia, null);
final L2QuestGuardInstance kegor = (L2QuestGuardInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getId());
final FriendlyNpcInstance kegor = (FriendlyNpcInstance) addSpawn(SUPP_KEGOR, SUPP_KEGOR_SPAWN, false, 0, true, world.getId());
kegor.setIsRunning(true);
kegor.setIsInvul(true);
kegor.setCanReturnToSpawnPoint(false);

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java vendored
View File

@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
import com.l2jmobius.gameserver.model.events.EventType;
import com.l2jmobius.gameserver.model.events.ListenerRegisterType;
import com.l2jmobius.gameserver.model.events.annotations.Id;
@@ -153,7 +153,7 @@ public final class MuseumDungeon extends AbstractInstance
if (npc.isScriptValue(0) && (skill == SPOIL.getSkill()) && (caster.getTarget() == npc) && (npc.calculateDistance(caster, false, false) < 200))
{
final L2Npc toyron = npc.getInstanceWorld().getNpc(TOYRON);
((L2QuestGuardInstance) toyron).addDamageHate(npc, 0, 9999); // TODO: Find better way for attack
((FriendlyNpcInstance) toyron).addDamageHate(npc, 0, 9999); // TODO: Find better way for attack
npc.reduceCurrentHp(1, toyron, null);
npc.setScriptValue(1);
}
@@ -277,7 +277,7 @@ public final class MuseumDungeon extends AbstractInstance
}
final L2Npc toyron = instance.getNpc(TOYRON);
((L2QuestGuardInstance) toyron).addDamageHate(target, 0, 9999); // TODO: Find better way for attack
((FriendlyNpcInstance) toyron).addDamageHate(target, 0, 9999); // TODO: Find better way for attack
target.reduceCurrentHp(1, toyron, null);
((L2Npc) target).setScriptValue(1);
return new DamageReturn(false, true, false, target.getMaxHp() * DAMAGE_BY_SKILL);

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java vendored
View File

@@ -19,8 +19,8 @@ package quests.Q10791_TheManOfMystery;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2QuestGuardInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
@@ -187,7 +187,7 @@ public class Q10791_TheManOfMystery extends Quest
if (kills >= 5)
{
final L2Npc monster = addSpawn(NEEDLE_STAKATO_CAPTAIN, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), true, 600000, false);
final L2QuestGuardInstance kain = (L2QuestGuardInstance) addSpawn(KAIN_VAN_HALTER, killer.getX() + getRandom(-100, 100), killer.getY() + getRandom(-100, 100), killer.getZ(), 0, true, 300000, false);
final FriendlyNpcInstance kain = (FriendlyNpcInstance) addSpawn(KAIN_VAN_HALTER, killer.getX() + getRandom(-100, 100), killer.getY() + getRandom(-100, 100), killer.getZ(), 0, true, 300000, false);
kain.setRunning();
kain.setIsInvul(true);
kain.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack

10
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/18800-18899.xml vendored
View File

@@ -1846,7 +1846,7 @@
<height normal="0.1" />
</collision>
</npc>
<npc id="18846" level="85" type="L2QuestGuard" name="Kegor">
<npc id="18846" level="85" type="FriendlyNpc" name="Kegor">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Buff" id="6286" level="1" />
@@ -1924,7 +1924,7 @@
<height normal="98.5" />
</collision>
</npc>
<npc id="18848" level="85" type="L2QuestGuard" name="Battalion Leader" title="Jinia Guild">
<npc id="18848" level="85" type="FriendlyNpc" name="Battalion Leader" title="Jinia Guild">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Skill01_ID" id="4032" level="10" />
@@ -1963,7 +1963,7 @@
<height normal="23.75" />
</collision>
</npc>
<npc id="18849" level="85" type="L2QuestGuard" name="Legionnaire" title="Jinia Guild">
<npc id="18849" level="85" type="FriendlyNpc" name="Legionnaire" title="Jinia Guild">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Skill01_ID" id="4032" level="10" />
@@ -2002,7 +2002,7 @@
<height normal="30" />
</collision>
</npc>
<npc id="18850" level="85" type="L2QuestGuard" name="Jinia">
<npc id="18850" level="85" type="FriendlyNpc" name="Jinia">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Skill01_ID" id="6641" level="1" />
@@ -2042,7 +2042,7 @@
<height normal="23.5" />
</collision>
</npc>
<npc id="18851" level="85" type="L2QuestGuard" name="Kegor">
<npc id="18851" level="85" type="FriendlyNpc" name="Kegor">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Skill01_ID" id="6643" level="1" />

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/18900-18999.xml vendored
View File

@@ -1178,7 +1178,7 @@
<height normal="13" />
</collision>
</npc>
<npc id="18926" level="85" type="L2QuestGuard" name="Mercenary Archer" title="Jinia Guild">
<npc id="18926" level="85" type="FriendlyNpc" name="Mercenary Archer" title="Jinia Guild">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Skill01_ID" id="4032" level="9" />

6
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/19100-19199.xml vendored
View File

@@ -822,7 +822,7 @@
<height normal="0.1" />
</collision>
</npc>
<npc id="19126" level="30" type="L2QuestGuard" name="Commando" title="">
<npc id="19126" level="30" type="FriendlyNpc" name="Commando" title="">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<race>HUMAN</race>
<sex>MALE</sex>
@@ -848,7 +848,7 @@
<height normal="24" />
</collision>
</npc>
<npc id="19127" level="30" type="L2QuestGuard" name="Commando Captain" title="">
<npc id="19127" level="30" type="FriendlyNpc" name="Commando Captain" title="">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<race>HUMAN</race>
<sex>MALE</sex>
@@ -1843,7 +1843,7 @@
<height normal="22.5" />
</collision>
</npc>
<npc id="19163" level="1" type="L2QuestGuard" name="Wastelands Decoration 1" title="">
<npc id="19163" level="1" type="FriendlyNpc" name="Wastelands Decoration 1" title="">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<race>HUMAN</race>
<sex>MALE</sex>

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/32200-32299.xml vendored
View File

@@ -3829,7 +3829,7 @@
<height normal="58.5" />
</collision>
</npc>
<npc id="32299" level="70" type="L2QuestGuard" name="Quarry Slave">
<npc id="32299" level="70" type="FriendlyNpc" name="Quarry Slave">
<!-- Confirmed CT2.5 -->
<race>HUMANOID</race>
<sex>MALE</sex>

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/32300-32399.xml vendored
View File

@@ -2189,7 +2189,7 @@
<height normal="24" />
</collision>
</npc>
<npc id="32358" level="70" type="L2QuestGuard" name="Native Prisoner">
<npc id="32358" level="70" type="FriendlyNpc" name="Native Prisoner">
<!-- Confirmed CT2.5 -->
<race>HUMAN</race>
<sex>MALE</sex>

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/33000-33099.xml vendored
View File

@@ -135,7 +135,7 @@
<height normal="24" />
</collision>
</npc>
<npc id="33004" level="85" type="L2QuestGuard" name="Toyron" title="Museum Keeper">
<npc id="33004" level="85" type="FriendlyNpc" name="Toyron" title="Museum Keeper">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<parameters>
<param name="MoveAroundSocial" value="200" />

4
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/33500-33599.xml vendored
View File

@@ -550,7 +550,7 @@
<height normal="23" />
</collision>
</npc>
<npc id="33516" level="40" type="L2QuestGuard" name="Joel" title="Guard">
<npc id="33516" level="40" type="FriendlyNpc" name="Joel" title="Guard">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<parameters>
<param name="MoveAroundSocial" value="200" />
@@ -584,7 +584,7 @@
<height normal="25" />
</collision>
</npc>
<npc id="33517" level="40" type="L2QuestGuard" name="Schuazen" title="Guard">
<npc id="33517" level="40" type="FriendlyNpc" name="Schuazen" title="Guard">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<parameters>
<param name="MoveAroundSocial" value="200" />

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/33700-33799.xml vendored
View File

@@ -1044,7 +1044,7 @@
<height normal="17" />
</collision>
</npc>
<npc id="33735" level="75" type="L2QuestGuard" name="Flame Flower" title="">
<npc id="33735" level="75" type="FriendlyNpc" name="Flame Flower" title="">
<!-- AUTO GENERATED NPC TODO: FIX IT -->
<race>CONSTRUCT</race>
<sex>MALE</sex>

2
L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/33900-33999.xml vendored
View File

@@ -2098,7 +2098,7 @@
<height normal="66" />
</collision>
</npc>
<npc id="33993" level="85" type="L2QuestGuard" name="Kain van Halter" title="Mysterious Man">
<npc id="33993" level="85" type="FriendlyNpc" name="Kain van Halter" title="Mysterious Man">
<race>HUMAN</race>
<sex>MALE</sex>
<equipment rhand="2626" /> <!-- rhand: Samurai Long Sword*Samurai Long Sword -->