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

Renamed idTemplate to displayId.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-06-15 22:34:40 +00:00
parent 7d8e78bb6d
commit 7de9daa055
45 changed files with 6346 additions and 6349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java
View File

@@ -274,7 +274,7 @@ public class NpcTable
final StatSet npcDat = new StatSet();
final int id = npcData.getInt("id");
npcDat.set("npcId", id);
npcDat.set("idTemplate", npcData.getInt("idTemplate"));
npcDat.set("displayId", npcData.getInt("displayId"));
// Level: for special bosses could be different
int level = 0;
@@ -485,12 +485,12 @@ public class NpcTable
npcDat.set("baseRunSpd", npcData.getInt("runspd"));
// constants, until we have stats in DB
npcDat.safeSet("baseSTR", npcData.getInt("str"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseCON", npcData.getInt("con"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseDEX", npcData.getInt("dex"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseINT", npcData.getInt("int"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseWIT", npcData.getInt("wit"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseMEN", npcData.getInt("men"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseSTR", npcData.getInt("str"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("displayId"));
npcDat.safeSet("baseCON", npcData.getInt("con"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("displayId"));
npcDat.safeSet("baseDEX", npcData.getInt("dex"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("displayId"));
npcDat.safeSet("baseINT", npcData.getInt("int"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("displayId"));
npcDat.safeSet("baseWIT", npcData.getInt("wit"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("displayId"));
npcDat.safeSet("baseMEN", npcData.getInt("men"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("displayId"));
npcDat.set("baseCpMax", 0);
npcDat.set("factionId", npcData.getString("faction_id"));
npcDat.set("factionRange", npcData.getInt("faction_range"));

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
View File

@@ -824,7 +824,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{
adminReply.setHtml(content);
adminReply.replace("%npcId%", String.valueOf(npc.getNpcId()));
adminReply.replace("%templateId%", String.valueOf(npc.getIdTemplate()));
adminReply.replace("%templateId%", String.valueOf(npc.getDisplayId()));
adminReply.replace("%name%", npc.getName());
adminReply.replace("%serverSideName%", npc.isServerSideName() ? "1" : "0");
adminReply.replace("%title%", npc.getTitle());
@@ -897,7 +897,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{
case "templateId":
{
newNpcData.set("idTemplate", Integer.parseInt(value));
newNpcData.set("displayId", Integer.parseInt(value));
break;
}
case "name":

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PetStatus.java
View File

@@ -53,7 +53,7 @@ public class PetStatus extends SummonStatus
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_CAUSED_BY_S1);
if (attacker instanceof NpcInstance)
{
sm.addNpcName(((NpcInstance) attacker).getTemplate().getIdTemplate());
sm.addNpcName(((NpcInstance) attacker).getTemplate().getDisplayId());
}
else
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
View File

@@ -154,11 +154,11 @@ public class PlayerStatus extends PlayableStatus
final SystemMessage smsg = new SystemMessage(SystemMessageId.S1_HIT_YOU_FOR_S2_DAMAGE);
if (attacker instanceof NpcInstance)
{
smsg.addNpcName(((NpcInstance) attacker).getTemplate().getIdTemplate());
smsg.addNpcName(((NpcInstance) attacker).getTemplate().getDisplayId());
}
else if (attacker instanceof Summon)
{
smsg.addNpcName(((Summon) attacker).getTemplate().getIdTemplate());
smsg.addNpcName(((Summon) attacker).getTemplate().getDisplayId());
}
else
{

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.skills.Stat;
/**
* This cl contains all generic data of a Spawn object.<br>
* This class contains all generic data of a Spawn object.<br>
* <br>
* <b><u>Data</u>:</b><br>
* <li>npcId, type, name, sex</li>
@@ -56,7 +56,7 @@ public class NpcTemplate extends CreatureTemplate
protected static final Logger LOGGER = Logger.getLogger(NpcTemplate.class.getName());
private final int _npcId;
private final int _idTemplate;
private final int _displayId;
private final String _type;
private final String _name;
private final boolean _serverSideName;
@@ -136,7 +136,7 @@ public class NpcTemplate extends CreatureTemplate
{
super(set);
_npcId = set.getInt("npcId");
_idTemplate = set.getInt("idTemplate");
_displayId = set.getInt("displayId");
_type = set.getString("type");
_name = set.getString("name");
_serverSideName = set.getBoolean("serverSideName");
@@ -506,9 +506,9 @@ public class NpcTemplate extends CreatureTemplate
return _npcId;
}
public int getIdTemplate()
public int getDisplayId()
{
return _idTemplate;
return _displayId;
}
public boolean isServerSideName()

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
View File

@@ -52,7 +52,7 @@ public class MonRaceInfo extends GameServerPacket
for (int i = 0; i < 8; i++)
{
writeD(_monsters[i].getObjectId()); // npcObjectID
writeD(_monsters[i].getTemplate().getIdTemplate() + 1000000); // npcID
writeD(_monsters[i].getTemplate().getDisplayId() + 1000000); // npcID
writeD(14107); // origin X
writeD(181875 + (58 * (7 - i))); // origin Y
writeD(-3566); // origin Z

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
View File

@@ -34,7 +34,7 @@ public class NpcInfo extends GameServerPacket
private int _y;
private int _z;
private int _heading;
private int _idTemplate;
private int _displayId;
private boolean _isAttackable;
private boolean _isSummoned;
private int _mAtkSpd;
@@ -71,7 +71,7 @@ public class NpcInfo extends GameServerPacket
return;
}
_creature = cha;
_idTemplate = cha.getTemplate().getIdTemplate();
_displayId = cha.getTemplate().getDisplayId();
_isAttackable = cha.isAutoAttackable(attacker);
_rhand = cha.getRightHandItem();
_lhand = cha.getLeftHandItem();
@@ -145,7 +145,7 @@ public class NpcInfo extends GameServerPacket
public NpcInfo(Summon cha, Creature attacker)
{
_creature = cha;
_idTemplate = cha.getTemplate().getIdTemplate();
_displayId = cha.getTemplate().getDisplayId();
_isAttackable = cha.isAutoAttackable(attacker); // (cha.getKarma() > 0);
_rhand = 0;
_lhand = 0;
@@ -189,7 +189,7 @@ public class NpcInfo extends GameServerPacket
writeC(0x16);
writeD(_creature.getObjectId());
writeD(_idTemplate + 1000000); // npctype id
writeD(_displayId + 1000000); // npctype id
writeD(_isAttackable ? 1 : 0);
writeD(_x);
writeD(_y);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java
View File

@@ -86,7 +86,7 @@ public class PetInfo extends GameServerPacket
writeC(0xb1);
writeD(_summon.getSummonType());
writeD(_summon.getObjectId());
writeD(_summon.getTemplate().getIdTemplate() + 1000000);
writeD(_summon.getTemplate().getDisplayId() + 1000000);
writeD(0); // 1=attackable
writeD(_x);