Respawn rework and various changes.

This commit is contained in:
MobiusDev
2018-03-31 16:36:49 +00:00
parent 41e19cc19e
commit 10b722829a
282 changed files with 866 additions and 1807 deletions

View File

@@ -37,7 +37,7 @@ import ai.AbstractNpcAI;
*/
public final class SelMahumSquad extends AbstractNpcAI
{
// NPC's
// NPCs
private static final int CHEF = 18908;
private static final int FIRE = 18927;
private static final int STOVE = 18933;

View File

@@ -32,7 +32,7 @@ import ai.AbstractNpcAI;
*/
public final class ClassTransferTalk extends AbstractNpcAI
{
// NPC's
// NPCs
// Talking Island Village (Administrative office)
private static final int FRANCO = 32153;
private static final int RIVIAN = 32147;

View File

@@ -85,7 +85,7 @@ public final class Elpies extends Event
return false;
}
// Check Custom Table - we use custom NPC's
// Check Custom Table - we use custom NPCs
if (!Config.CUSTOM_NPC_DATA)
{
_log.info(getName() + ": Event can't be started because custom NPC table is disabled!");

View File

@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.util.Broadcast;
*/
public final class Race extends Event
{
// Event NPC's list
// Event NPCs list
private List<L2Npc> _npclist;
// Npc
private L2Npc _npc;
@@ -56,7 +56,7 @@ public final class Race extends Event
private static final int _time_register = 5;
// 5 min for race
private static final int _time_race = 10;
// NPC's
// NPCs
private static final int _start_npc = 900103;
private static final int _stop_npc = 900104;
// Skills (Frog by default)
@@ -118,7 +118,7 @@ public final class Race extends Event
{
return false;
}
// Check Custom Table - we use custom NPC's
// Check Custom Table - we use custom NPCs
if (!Config.CUSTOM_NPC_DATA)
{
_log.info(getName() + ": Event can't be started, because custom npc table is disabled!");

View File

@@ -128,8 +128,6 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.setInvisible(true);
activeChar.broadcastUserInfo();
activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
activeChar.decayMe();
activeChar.spawnMe();
activeChar.sendMessage("You are now invisible.");
}
else
@@ -149,8 +147,6 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.setInvisible(true);
activeChar.broadcastUserInfo();
activeChar.sendPacket(new ExUserInfoAbnormalVisualEffect(activeChar));
activeChar.decayMe();
activeChar.spawnMe();
activeChar.sendMessage("You are now invisible.");
}
else if (command.startsWith("admin_vis"))
@@ -401,8 +397,6 @@ public class AdminEffects implements IAdminCommandHandler
else if (command.startsWith("admin_unpolyself"))
{
activeChar.getPoly().setPolyInfo(null, "1");
activeChar.decayMe();
activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
activeChar.broadcastUserInfo();
}
else if (command.equals("admin_clearteams"))

View File

@@ -167,8 +167,7 @@ public class AdminPolymorph implements IAdminCommandHandler
Char.sendPacket(sg);
}
// end of animation
obj.decayMe();
obj.spawnMe(obj.getX(), obj.getY(), obj.getZ());
obj.broadcastInfo();
activeChar.sendMessage("Polymorph succeed");
}
else
@@ -187,8 +186,7 @@ public class AdminPolymorph implements IAdminCommandHandler
if (target != null)
{
target.getPoly().setPolyInfo(null, "1");
target.decayMe();
target.spawnMe(target.getX(), target.getY(), target.getZ());
target.broadcastInfo();
activeChar.sendMessage("Unpolymorph succeed");
}
else

View File

@@ -504,7 +504,7 @@ public class AdminSpawn implements IAdminCommandHandler
final List<L2NpcTemplate> mobs = NpcData.getInstance().getAllMonstersOfLevel(level);
final int mobsCount = mobs.size();
final StringBuilder tb = new StringBuilder(500 + (mobsCount * 80));
tb.append("<html><title>Spawn Monster:</title><body><p> Level : " + level + "<br>Total Npc's : " + mobsCount + "<br>");
tb.append("<html><title>Spawn Monster:</title><body><p> Level : " + level + "<br>Total NPCs : " + mobsCount + "<br>");
// Loop
int i = from;

View File

@@ -350,7 +350,7 @@ public final class Kamaloka extends AbstractInstance
*/
private static final int TELEPORTER = 32496;
/** Kamaloka captains (start npc's) npcIds. */
/** Kamaloka captains (start NPCs) npcIds. */
private static final int[] CAPTAINS =
{
30332,

View File

@@ -47,7 +47,7 @@ import quests.Q10331_StartOfFate.Q10331_StartOfFate;
*/
public final class LabyrinthOfBelis extends AbstractInstance
{
// NPC's
// NPCs
private static final int SEBION = 32972;
private static final int INFILTRATION_OFFICER = 19155;
private static final int BELIS_VERITIFICATION_SYSTEM = 33215;

View File

@@ -30,7 +30,7 @@ import quests.Q00184_ArtOfPersuasion.Q00184_ArtOfPersuasion;
*/
public final class Q00185_NikolasCooperation extends Quest
{
// NPC's
// NPCs
private static final int MAESTRO_NIKOLA = 30621;
private static final int RESEARCHER_LORAIN = 30673;
private static final int DESTROYED_DEVICE = 32366;

View File

@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.quest.State;
*/
public class Q00776_SlayDarkLordEkimus extends Quest
{
// NPC's
// NPCs
private static final int TEPIOS = 32603;
// Boss
private static final int EKIMUS = 29150;

View File

@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.quest.State;
*/
public class Q00777_SlayDarkLordTiat extends Quest
{
// NPC's
// NPCs
private static final int ALLENOS = 32526;
// Boss
private static final int TIAT = 29163;

View File

@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.quest.State;
*/
public final class Q10353_CertificationOfValue extends Quest
{
// Npc's
// NPCs
public static final int RIEYI = 33155;
public static final int KYUORI = 33358;
private static final int DUMMY_MONSTER = 33349;

View File

@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.util.Util;
*/
public final class Q10378_WeedingWork extends Quest
{
// NPC's
// NPCs
private static final int DADFPHYNA = 33697;
// Monster's
private static final int MANDRAGORA_OF_JOY_AND_SORROW = 23210;

View File

@@ -36,7 +36,7 @@ import quests.Q10379_AnUninvitedGuest.Q10379_AnUninvitedGuest;
*/
public final class Q10380_TheExecutionersExecution extends Quest
{
// NPC's
// NPCs
private static final int ENDRIGO = 30632;
private static final int GUILLOTINE_OF_DEATH = 25892;
private static final int NAGDU_THE_DEFORMED = 23201;

View File

@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
*/
public final class Q10452_IsItEdible extends Quest
{
// Npc's
// NPCs
private static final int SALLY = 32743;
// Monster's
private static final int FANTASY_MUSHROM = 18864;

View File

@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml;
*/
public final class Q10732_AForeignLand extends Quest
{
// NPC's
// NPCs
private static final int NAVARI = 33931;
private static final int GERETH = 33932;
// Misc

View File

@@ -30,7 +30,7 @@ import quests.Q10732_AForeignLand.Q10732_AForeignLand;
*/
public final class Q10733_TheTestForSurvival extends Quest
{
// NPC's
// NPCs
private static final int GERETH = 33932;
private static final int DIA = 34005;
private static final int KATALIN = 33943;

View File

@@ -35,7 +35,7 @@ import quests.Q10733_TheTestForSurvival.Q10733_TheTestForSurvival;
*/
public final class Q10734_DoOrDie extends Quest
{
// NPC's
// NPCs
private static final int KATALIN = 33943;
private static final int AYANTHE = 33942;
private static final int ADVENTURER_S_GUIDE_APPRENTICE = 33950;

View File

@@ -35,7 +35,7 @@ import quests.Q10736_ASpecialPower.Q10736_ASpecialPower;
*/
public final class Q10737_GrakonsWarehouse extends Quest
{
// NPC's
// NPCs
private static final int KATALIN = 33943;
private static final int AYANTHE = 33942;
private static final int GRAKON = 33947;

View File

@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.quest.State;
*/
public final class Q10741_ADraughtForTheCold extends Quest
{
// NPC's
// NPCs
private static final int SIVANTHE = 33951;
private static final int LEIRA = 33952;
// Items

View File

@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
*/
public final class Q10745_TheSecretIngredients extends Quest
{
// Npc's
// NPCs
private static final int DOLKIN = 33954;
private static final int KARLA = 33933;
private static final int DOLKIN_INSTANCE = 34002;