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

SpawnTable should initialize multiple spawns separately.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-08-12 00:16:47 +00:00
parent a7d38cdb8d
commit 8913f24df6
3 changed files with 123 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/SpawnTable.java
View File

@@ -306,51 +306,52 @@ public class SpawnTable implements IXmlReader
continue; continue;
} }
final StatSet spawnInfo = new StatSet(); final Node countNode = attrs.getNamedItem("count");
spawnInfo.set("npcTemplateid", templateId); final int count = countNode == null ? 1 : parseInteger(attrs, "count");
spawnInfo.set("x", x);
spawnInfo.set("y", y);
spawnInfo.set("z", z);
spawnInfo.set("territoryName", territoryName);
spawnInfo.set("spawnName", spawnName);
// trying to read optional parameters for (int i = 0; i < count; i++)
if (attrs.getNamedItem("heading") != null)
{ {
spawnInfo.set("heading", parseInteger(attrs, "heading")); final StatSet spawnInfo = new StatSet();
} spawnInfo.set("npcTemplateid", templateId);
spawnInfo.set("x", x);
if (attrs.getNamedItem("count") != null) spawnInfo.set("y", y);
{ spawnInfo.set("z", z);
spawnInfo.set("count", parseInteger(attrs, "count")); spawnInfo.set("territoryName", territoryName);
} spawnInfo.set("spawnName", spawnName);
if (attrs.getNamedItem("respawnDelay") != null) // trying to read optional parameters
{ if (attrs.getNamedItem("heading") != null)
spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
}
if (attrs.getNamedItem("respawnRandom") != null)
{
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night"))
{ {
spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2); spawnInfo.set("heading", parseInteger(attrs, "heading"));
} }
if (attrs.getNamedItem("respawnDelay") != null)
{
spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
}
if (attrs.getNamedItem("respawnRandom") != null)
{
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night"))
{
spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2);
}
}
spawnInfo.set("fileName", f.getPath());
_spanwCount += addSpawn(spawnInfo, map);
} }
spawnInfo.set("fileName", f.getPath());
_spanwCount += addSpawn(spawnInfo, map);
} }
} }
} }

81
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/SpawnTable.java
View File

@@ -306,51 +306,52 @@ public class SpawnTable implements IXmlReader
continue; continue;
} }
final StatSet spawnInfo = new StatSet(); final Node countNode = attrs.getNamedItem("count");
spawnInfo.set("npcTemplateid", templateId); final int count = countNode == null ? 1 : parseInteger(attrs, "count");
spawnInfo.set("x", x);
spawnInfo.set("y", y);
spawnInfo.set("z", z);
spawnInfo.set("territoryName", territoryName);
spawnInfo.set("spawnName", spawnName);
// trying to read optional parameters for (int i = 0; i < count; i++)
if (attrs.getNamedItem("heading") != null)
{ {
spawnInfo.set("heading", parseInteger(attrs, "heading")); final StatSet spawnInfo = new StatSet();
} spawnInfo.set("npcTemplateid", templateId);
spawnInfo.set("x", x);
if (attrs.getNamedItem("count") != null) spawnInfo.set("y", y);
{ spawnInfo.set("z", z);
spawnInfo.set("count", parseInteger(attrs, "count")); spawnInfo.set("territoryName", territoryName);
} spawnInfo.set("spawnName", spawnName);
if (attrs.getNamedItem("respawnDelay") != null) // trying to read optional parameters
{ if (attrs.getNamedItem("heading") != null)
spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
}
if (attrs.getNamedItem("respawnRandom") != null)
{
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night"))
{ {
spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2); spawnInfo.set("heading", parseInteger(attrs, "heading"));
} }
if (attrs.getNamedItem("respawnDelay") != null)
{
spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
}
if (attrs.getNamedItem("respawnRandom") != null)
{
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night"))
{
spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2);
}
}
spawnInfo.set("fileName", f.getPath());
_spanwCount += addSpawn(spawnInfo, map);
} }
spawnInfo.set("fileName", f.getPath());
_spanwCount += addSpawn(spawnInfo, map);
} }
} }
} }

81
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/SpawnTable.java
View File

@@ -306,51 +306,52 @@ public class SpawnTable implements IXmlReader
continue; continue;
} }
final StatSet spawnInfo = new StatSet(); final Node countNode = attrs.getNamedItem("count");
spawnInfo.set("npcTemplateid", templateId); final int count = countNode == null ? 1 : parseInteger(attrs, "count");
spawnInfo.set("x", x);
spawnInfo.set("y", y);
spawnInfo.set("z", z);
spawnInfo.set("territoryName", territoryName);
spawnInfo.set("spawnName", spawnName);
// trying to read optional parameters for (int i = 0; i < count; i++)
if (attrs.getNamedItem("heading") != null)
{ {
spawnInfo.set("heading", parseInteger(attrs, "heading")); final StatSet spawnInfo = new StatSet();
} spawnInfo.set("npcTemplateid", templateId);
spawnInfo.set("x", x);
if (attrs.getNamedItem("count") != null) spawnInfo.set("y", y);
{ spawnInfo.set("z", z);
spawnInfo.set("count", parseInteger(attrs, "count")); spawnInfo.set("territoryName", territoryName);
} spawnInfo.set("spawnName", spawnName);
if (attrs.getNamedItem("respawnDelay") != null) // trying to read optional parameters
{ if (attrs.getNamedItem("heading") != null)
spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
}
if (attrs.getNamedItem("respawnRandom") != null)
{
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night"))
{ {
spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2); spawnInfo.set("heading", parseInteger(attrs, "heading"));
} }
if (attrs.getNamedItem("respawnDelay") != null)
{
spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
}
if (attrs.getNamedItem("respawnRandom") != null)
{
spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
}
if (attrs.getNamedItem("chaseRange") != null)
{
spawnInfo.set("chaseRange", parseInteger(attrs, "chaseRange"));
}
if (attrs.getNamedItem("periodOfDay") != null)
{
final String period = attrs.getNamedItem("periodOfDay").getNodeValue();
if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night"))
{
spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2);
}
}
spawnInfo.set("fileName", f.getPath());
_spanwCount += addSpawn(spawnInfo, map);
} }
spawnInfo.set("fileName", f.getPath());
_spanwCount += addSpawn(spawnInfo, map);
} }
} }
} }