Ability to use specific NpcStringId for quest name.
This commit is contained in:
@@ -70,6 +70,7 @@ import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
|
|||||||
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
||||||
|
import com.l2jmobius.gameserver.network.NpcStringId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -95,6 +96,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
private final int _questId;
|
private final int _questId;
|
||||||
private final byte _initialState = State.CREATED;
|
private final byte _initialState = State.CREATED;
|
||||||
private boolean _isCustom = false;
|
private boolean _isCustom = false;
|
||||||
|
private NpcStringId _questNameNpcStringId;
|
||||||
|
|
||||||
private int[] _questItemIds = null;
|
private int[] _questItemIds = null;
|
||||||
|
|
||||||
@@ -180,7 +182,17 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
*/
|
*/
|
||||||
public int getNpcStringId()
|
public int getNpcStringId()
|
||||||
{
|
{
|
||||||
return _questId > 10000 ? _questId - 5000 : _questId;
|
return _questNameNpcStringId != null ? _questNameNpcStringId.getId() / 100 : (_questId > 10000 ? _questId - 5000 : _questId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NpcStringId getQuestNameNpcStringId()
|
||||||
|
{
|
||||||
|
return _questNameNpcStringId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setQuestNameNpcStringId(NpcStringId npcStringId)
|
||||||
|
{
|
||||||
|
_questNameNpcStringId = npcStringId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -71,6 +71,7 @@ import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
|
|||||||
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
||||||
|
import com.l2jmobius.gameserver.network.NpcStringId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -96,6 +97,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
private final int _questId;
|
private final int _questId;
|
||||||
private final byte _initialState = State.CREATED;
|
private final byte _initialState = State.CREATED;
|
||||||
private boolean _isCustom = false;
|
private boolean _isCustom = false;
|
||||||
|
private NpcStringId _questNameNpcStringId;
|
||||||
|
|
||||||
private int[] _questItemIds = null;
|
private int[] _questItemIds = null;
|
||||||
|
|
||||||
@@ -182,7 +184,17 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
*/
|
*/
|
||||||
public int getNpcStringId()
|
public int getNpcStringId()
|
||||||
{
|
{
|
||||||
return _questId > 10000 ? _questId - 5000 : _questId;
|
return _questNameNpcStringId != null ? _questNameNpcStringId.getId() / 100 : (_questId > 10000 ? _questId - 5000 : _questId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NpcStringId getQuestNameNpcStringId()
|
||||||
|
{
|
||||||
|
return _questNameNpcStringId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setQuestNameNpcStringId(NpcStringId npcStringId)
|
||||||
|
{
|
||||||
|
_questNameNpcStringId = npcStringId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -72,6 +72,7 @@ import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
|
|||||||
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
||||||
|
import com.l2jmobius.gameserver.network.NpcStringId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -97,6 +98,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
private final int _questId;
|
private final int _questId;
|
||||||
private final byte _initialState = State.CREATED;
|
private final byte _initialState = State.CREATED;
|
||||||
private boolean _isCustom = false;
|
private boolean _isCustom = false;
|
||||||
|
private NpcStringId _questNameNpcStringId;
|
||||||
|
|
||||||
private int[] _questItemIds = null;
|
private int[] _questItemIds = null;
|
||||||
|
|
||||||
@@ -183,7 +185,17 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
*/
|
*/
|
||||||
public int getNpcStringId()
|
public int getNpcStringId()
|
||||||
{
|
{
|
||||||
return _questId > 10000 ? _questId - 5000 : _questId;
|
return _questNameNpcStringId != null ? _questNameNpcStringId.getId() / 100 : (_questId > 10000 ? _questId - 5000 : _questId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NpcStringId getQuestNameNpcStringId()
|
||||||
|
{
|
||||||
|
return _questNameNpcStringId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setQuestNameNpcStringId(NpcStringId npcStringId)
|
||||||
|
{
|
||||||
|
_questNameNpcStringId = npcStringId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -73,6 +73,7 @@ import com.l2jmobius.gameserver.model.olympiad.Participant;
|
|||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.model.skills.SkillCaster;
|
import com.l2jmobius.gameserver.model.skills.SkillCaster;
|
||||||
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
||||||
|
import com.l2jmobius.gameserver.network.NpcStringId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -98,6 +99,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
private final int _questId;
|
private final int _questId;
|
||||||
private final byte _initialState = State.CREATED;
|
private final byte _initialState = State.CREATED;
|
||||||
private boolean _isCustom = false;
|
private boolean _isCustom = false;
|
||||||
|
private NpcStringId _questNameNpcStringId;
|
||||||
|
|
||||||
private int[] _questItemIds = null;
|
private int[] _questItemIds = null;
|
||||||
|
|
||||||
@@ -183,7 +185,17 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
*/
|
*/
|
||||||
public int getNpcStringId()
|
public int getNpcStringId()
|
||||||
{
|
{
|
||||||
return _questId > 10000 ? _questId - 5000 : _questId;
|
return _questNameNpcStringId != null ? _questNameNpcStringId.getId() / 100 : (_questId > 10000 ? _questId - 5000 : _questId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NpcStringId getQuestNameNpcStringId()
|
||||||
|
{
|
||||||
|
return _questNameNpcStringId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setQuestNameNpcStringId(NpcStringId npcStringId)
|
||||||
|
{
|
||||||
|
_questNameNpcStringId = npcStringId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -71,6 +71,7 @@ import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
|
|||||||
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
||||||
|
import com.l2jmobius.gameserver.network.NpcStringId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -96,6 +97,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
private final int _questId;
|
private final int _questId;
|
||||||
private final byte _initialState = State.CREATED;
|
private final byte _initialState = State.CREATED;
|
||||||
private boolean _isCustom = false;
|
private boolean _isCustom = false;
|
||||||
|
private NpcStringId _questNameNpcStringId;
|
||||||
|
|
||||||
private int[] _questItemIds = null;
|
private int[] _questItemIds = null;
|
||||||
|
|
||||||
@@ -182,7 +184,17 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
*/
|
*/
|
||||||
public int getNpcStringId()
|
public int getNpcStringId()
|
||||||
{
|
{
|
||||||
return _questId > 10000 ? _questId - 5000 : _questId;
|
return _questNameNpcStringId != null ? _questNameNpcStringId.getId() / 100 : (_questId > 10000 ? _questId - 5000 : _questId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NpcStringId getQuestNameNpcStringId()
|
||||||
|
{
|
||||||
|
return _questNameNpcStringId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setQuestNameNpcStringId(NpcStringId npcStringId)
|
||||||
|
{
|
||||||
|
_questNameNpcStringId = npcStringId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -71,6 +71,7 @@ import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
|
|||||||
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
import com.l2jmobius.gameserver.model.olympiad.Participant;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
|
||||||
|
import com.l2jmobius.gameserver.network.NpcStringId;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -96,6 +97,7 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
private final int _questId;
|
private final int _questId;
|
||||||
private final byte _initialState = State.CREATED;
|
private final byte _initialState = State.CREATED;
|
||||||
private boolean _isCustom = false;
|
private boolean _isCustom = false;
|
||||||
|
private NpcStringId _questNameNpcStringId;
|
||||||
|
|
||||||
private int[] _questItemIds = null;
|
private int[] _questItemIds = null;
|
||||||
|
|
||||||
@@ -182,7 +184,17 @@ public class Quest extends AbstractScript implements IIdentifiable
|
|||||||
*/
|
*/
|
||||||
public int getNpcStringId()
|
public int getNpcStringId()
|
||||||
{
|
{
|
||||||
return _questId > 10000 ? _questId - 5000 : _questId;
|
return _questNameNpcStringId != null ? _questNameNpcStringId.getId() / 100 : (_questId > 10000 ? _questId - 5000 : _questId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public NpcStringId getQuestNameNpcStringId()
|
||||||
|
{
|
||||||
|
return _questNameNpcStringId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setQuestNameNpcStringId(NpcStringId npcStringId)
|
||||||
|
{
|
||||||
|
_questNameNpcStringId = npcStringId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user