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

Sync with L2jServer HighFive Feb 10th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-10 22:49:31 +00:00
parent 4dc2666fa4
commit 431b4cacdf
98 changed files with 636 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java vendored
View File

@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.L2Object;
@@ -346,8 +345,8 @@ public class EnergySeeds extends AbstractNpcAI
private L2MonsterInstance spawnSupriseMob(L2Npc energy, int npcId)
{
L2NpcTemplate supriseMobTemplate = NpcData.getInstance().getTemplate(npcId);
L2MonsterInstance monster = new L2MonsterInstance(IdFactory.getInstance().getNextId(), supriseMobTemplate);
L2NpcTemplate surpriseMobTemplate = NpcData.getInstance().getTemplate(npcId);
L2MonsterInstance monster = new L2MonsterInstance(surpriseMobTemplate);
monster.setCurrentHpMp(monster.getMaxHp(), monster.getMaxMp());
monster.setHeading(energy.getHeading());
monster.setInstanceId(energy.getInstanceId());

5
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java vendored
View File

@@ -23,7 +23,6 @@ import java.util.StringTokenizer;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -187,8 +186,8 @@ public class AdminFightCalculator implements IAdminCommandHandler
mid1 = Integer.parseInt(st.nextToken());
mid2 = Integer.parseInt(st.nextToken());
npc1 = new L2MonsterInstance(IdFactory.getInstance().getNextId(), NpcData.getInstance().getTemplate(mid1));
npc2 = new L2MonsterInstance(IdFactory.getInstance().getNextId(), NpcData.getInstance().getTemplate(mid2));
npc1 = new L2MonsterInstance(NpcData.getInstance().getTemplate(mid1));
npc2 = new L2MonsterInstance(NpcData.getInstance().getTemplate(mid2));
}
int miss1 = 0;

3
trunk/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java vendored
View File

@@ -19,7 +19,6 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.FortManager;
@@ -64,7 +63,7 @@ public final class HeadquarterCreate extends AbstractEffect
return;
}
final L2SiegeFlagInstance flag = new L2SiegeFlagInstance(player, IdFactory.getInstance().getNextId(), NpcData.getInstance().getTemplate(HQ_NPC_ID), _isAdvanced, false);
final L2SiegeFlagInstance flag = new L2SiegeFlagInstance(player, NpcData.getInstance().getTemplate(HQ_NPC_ID), _isAdvanced, false);
flag.setTitle(player.getClan().getName());
flag.setCurrentHpMp(flag.getMaxHp(), flag.getMaxMp());
flag.setHeading(player.getHeading());

3
trunk/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.ExperienceData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
@@ -77,7 +76,7 @@ public final class Summon extends AbstractEffect
final L2PcInstance player = info.getEffected().getActingPlayer();
final L2NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final L2ServitorInstance summon = new L2ServitorInstance(IdFactory.getInstance().getNextId(), template, player);
final L2ServitorInstance summon = new L2ServitorInstance(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
summon.setName(template.getName());

5
trunk/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java vendored
View File

@@ -19,7 +19,6 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.StatsSet;
@@ -101,7 +100,7 @@ public final class SummonNpc extends AbstractEffect
{
case "L2Decoy":
{
final L2DecoyInstance decoy = new L2DecoyInstance(IdFactory.getInstance().getNextId(), npcTemplate, player, _despawnDelay);
final L2DecoyInstance decoy = new L2DecoyInstance(npcTemplate, player, _despawnDelay);
decoy.setCurrentHp(decoy.getMaxHp());
decoy.setCurrentMp(decoy.getMaxMp());
decoy.setHeading(player.getHeading());
@@ -113,7 +112,7 @@ public final class SummonNpc extends AbstractEffect
}
case "L2EffectPoint": // TODO: Implement proper signet skills.
{
final L2EffectPointInstance effectPoint = new L2EffectPointInstance(IdFactory.getInstance().getNextId(), npcTemplate, player);
final L2EffectPointInstance effectPoint = new L2EffectPointInstance(npcTemplate, player);
effectPoint.setCurrentHp(effectPoint.getMaxHp());
effectPoint.setCurrentMp(effectPoint.getMaxMp());
int x = player.getX();

3
trunk/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java vendored
View File

@@ -19,7 +19,6 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
@@ -84,7 +83,7 @@ public final class SummonTrap extends AbstractEffect
return;
}
final L2TrapInstance trap = new L2TrapInstance(IdFactory.getInstance().getNextId(), npcTemplate, player, _despawnTime);
final L2TrapInstance trap = new L2TrapInstance(npcTemplate, player, _despawnTime);
trap.setCurrentHp(trap.getMaxHp());
trap.setCurrentMp(trap.getMaxMp());
trap.setIsInvul(true);

2
trunk/dist/game/data/stats/npcs/13100-13200.xml vendored
View File

@@ -1855,7 +1855,7 @@
<height normal="27.5" />
</collision>
</npc>
<npc id="13148" level="55" type="L2FlyMonster" name="Lindvior">
<npc id="13148" level="55" type="L2Monster" name="Lindvior">
<!-- Confirmed CT2.5 -->
<race>DRAGON</race>
<sex>FEMALE</sex>

18
trunk/dist/game/data/stats/npcs/18600-18700.xml vendored
View File

@@ -4539,7 +4539,7 @@
<height normal="10" />
</collision>
</npc>
<npc id="18684" level="1" type="L2FlyNpc" name="Red Star Stone">
<npc id="18684" level="1" type="L2Npc" name="Red Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4581,7 +4581,7 @@
<height normal="61" />
</collision>
</npc>
<npc id="18685" level="1" type="L2FlyNpc" name="Red Star Stone">
<npc id="18685" level="1" type="L2Npc" name="Red Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4623,7 +4623,7 @@
<height normal="43.5" />
</collision>
</npc>
<npc id="18686" level="1" type="L2FlyNpc" name="Red Star Stone">
<npc id="18686" level="1" type="L2Npc" name="Red Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4665,7 +4665,7 @@
<height normal="30.5" />
</collision>
</npc>
<npc id="18687" level="1" type="L2FlyNpc" name="Blue Star Stone">
<npc id="18687" level="1" type="L2Npc" name="Blue Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4707,7 +4707,7 @@
<height normal="61" />
</collision>
</npc>
<npc id="18688" level="1" type="L2FlyNpc" name="Blue Star Stone">
<npc id="18688" level="1" type="L2Npc" name="Blue Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4749,7 +4749,7 @@
<height normal="43.5" />
</collision>
</npc>
<npc id="18689" level="1" type="L2FlyNpc" name="Blue Star Stone">
<npc id="18689" level="1" type="L2Npc" name="Blue Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4791,7 +4791,7 @@
<height normal="30.5" />
</collision>
</npc>
<npc id="18690" level="1" type="L2FlyNpc" name="Green Star Stone">
<npc id="18690" level="1" type="L2Npc" name="Green Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4833,7 +4833,7 @@
<height normal="61" />
</collision>
</npc>
<npc id="18691" level="1" type="L2FlyNpc" name="Green Star Stone">
<npc id="18691" level="1" type="L2Npc" name="Green Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>
@@ -4875,7 +4875,7 @@
<height normal="43.5" />
</collision>
</npc>
<npc id="18692" level="1" type="L2FlyNpc" name="Green Star Stone">
<npc id="18692" level="1" type="L2Npc" name="Green Star Stone">
<!-- Confirmed CT2.5 -->
<race>CONSTRUCT</race>
<sex>FEMALE</sex>

28
trunk/dist/game/data/stats/npcs/22600-22700.xml vendored
View File

@@ -50,7 +50,7 @@
<height normal="74" />
</collision>
</npc>
<npc id="22602" level="73" type="L2FlyMonster" name="Mutant Bird">
<npc id="22602" level="73" type="L2Monster" name="Mutant Bird">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="110" />
@@ -131,7 +131,7 @@
<height normal="85" />
</collision>
</npc>
<npc id="22603" level="74" type="L2FlyMonster" name="Mutant Bird">
<npc id="22603" level="74" type="L2Monster" name="Mutant Bird">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="110" />
@@ -216,7 +216,7 @@
<height normal="85" />
</collision>
</npc>
<npc id="22604" level="74" type="L2FlyMonster" name="Dra Hawk">
<npc id="22604" level="74" type="L2Monster" name="Dra Hawk">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="90" />
@@ -296,7 +296,7 @@
<height normal="35" />
</collision>
</npc>
<npc id="22605" level="75" type="L2FlyMonster" name="Dra Hawk">
<npc id="22605" level="75" type="L2Monster" name="Dra Hawk">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="90" />
@@ -376,7 +376,7 @@
<height normal="35" />
</collision>
</npc>
<npc id="22606" level="76" type="L2FlyMonster" name="Floating Skull">
<npc id="22606" level="76" type="L2Monster" name="Floating Skull">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="100" />
@@ -459,7 +459,7 @@
<height normal="39" />
</collision>
</npc>
<npc id="22607" level="77" type="L2FlyMonster" name="Floating Skull">
<npc id="22607" level="77" type="L2Monster" name="Floating Skull">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="100" />
@@ -530,7 +530,7 @@
<height normal="39" />
</collision>
</npc>
<npc id="22608" level="75" type="L2FlyMonster" name="Floating Zombie">
<npc id="22608" level="75" type="L2Monster" name="Floating Zombie">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="110" />
@@ -602,7 +602,7 @@
<height normal="50" />
</collision>
</npc>
<npc id="22609" level="76" type="L2FlyMonster" name="Floating Zombie">
<npc id="22609" level="76" type="L2Monster" name="Floating Zombie">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="110" />
@@ -674,7 +674,7 @@
<height normal="50" />
</collision>
</npc>
<npc id="22610" level="75" type="L2FlyMonster" name="Mutated Drake Wing">
<npc id="22610" level="75" type="L2Monster" name="Mutated Drake Wing">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="120" />
@@ -753,7 +753,7 @@
<height normal="63" />
</collision>
</npc>
<npc id="22611" level="76" type="L2FlyMonster" name="Mutated Drake Wing">
<npc id="22611" level="76" type="L2Monster" name="Mutated Drake Wing">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="120" />
@@ -832,7 +832,7 @@
<height normal="63" />
</collision>
</npc>
<npc id="22612" level="76" type="L2FlyMonster" name="Drak">
<npc id="22612" level="76" type="L2Monster" name="Drak">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="80" />
@@ -914,7 +914,7 @@
<height normal="40" />
</collision>
</npc>
<npc id="22613" level="77" type="L2FlyMonster" name="Drak">
<npc id="22613" level="77" type="L2Monster" name="Drak">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="80" />
@@ -994,7 +994,7 @@
<height normal="40" />
</collision>
</npc>
<npc id="22614" level="74" type="L2FlyMonster" name="Vulture Rider">
<npc id="22614" level="74" type="L2Monster" name="Vulture Rider">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="105" />
@@ -1083,7 +1083,7 @@
<height normal="90" />
</collision>
</npc>
<npc id="22615" level="75" type="L2FlyMonster" name="Vulture Rider">
<npc id="22615" level="75" type="L2Monster" name="Vulture Rider">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="105" />

14
trunk/dist/game/data/stats/npcs/25600-25700.xml vendored
View File

@@ -1465,7 +1465,7 @@
<height normal="40" grown="48" />
</collision>
</npc>
<npc id="25623" level="80" type="L2FlyRaidBoss" name="Valdstone" title="Master Rider">
<npc id="25623" level="80" type="L2RaidBoss" name="Valdstone" title="Master Rider">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="Skill01_AttackSplash" value="1" />
@@ -1543,7 +1543,7 @@
<height normal="90" />
</collision>
</npc>
<npc id="25624" level="80" type="L2FlyRaidBoss" name="Rok" title="King of Birds">
<npc id="25624" level="80" type="L2RaidBoss" name="Rok" title="King of Birds">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="Skill01_AttackSplash" value="1" />
@@ -1608,7 +1608,7 @@
<height normal="130.5" />
</collision>
</npc>
<npc id="25625" level="80" type="L2FlyRaidBoss" name="Enira" title="Banshee Queen">
<npc id="25625" level="80" type="L2RaidBoss" name="Enira" title="Banshee Queen">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="Skill01_Target" value="3" />
@@ -1691,7 +1691,7 @@
<height normal="33.5" />
</collision>
</npc>
<npc id="25626" level="80" type="L2FlyRaidBoss" name="Dius" title="Deadman of Destruction">
<npc id="25626" level="80" type="L2RaidBoss" name="Dius" title="Deadman of Destruction">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="Skill01_AttackSplash" value="1" />
@@ -1860,7 +1860,7 @@
<height normal="35" />
</collision>
</npc>
<npc id="25629" level="78" type="L2FlyMonster" name="Floating Skull" title="Enira's Evil Spirit">
<npc id="25629" level="78" type="L2Monster" name="Floating Skull" title="Enira's Evil Spirit">
<!-- Confirmed CT2.5 -->
<parameters>
<skill name="Skill01_ID" id="5803" level="1" /> <!-- Green Chili -->
@@ -1909,7 +1909,7 @@
<height normal="39" />
</collision>
</npc>
<npc id="25630" level="77" type="L2FlyMonster" name="Floating Zombie" title="Enira's Evil Spirit">
<npc id="25630" level="77" type="L2Monster" name="Floating Zombie" title="Enira's Evil Spirit">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="Skill02_Target" value="3" />
@@ -2058,7 +2058,7 @@
<height normal="40" />
</collision>
</npc>
<npc id="25633" level="76" type="L2FlyMonster" name="Elite Rider" title="Valdstone's Elites">
<npc id="25633" level="76" type="L2Monster" name="Elite Rider" title="Valdstone's Elites">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="Skill03_Target" value="4" />