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

Dropped SQL spawnlist.

Browse Source
This commit is contained in:
MobiusDev
2018-04-06 01:12:11 +00:00
parent aa520ca56a
commit 3b22c6321f
24 changed files with 38456 additions and 43173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/custom_spawnlist.sql vendored
View File

@@ -1,15 +0,0 @@
CREATE TABLE IF NOT EXISTS `custom_spawnlist` (
`location` varchar(40) NOT NULL DEFAULT '',
`count` tinyint(1) unsigned NOT NULL DEFAULT '0',
`npc_templateid` mediumint(7) unsigned NOT NULL DEFAULT '0',
`locx` mediumint(6) NOT NULL DEFAULT '0',
`locy` mediumint(6) NOT NULL DEFAULT '0',
`locz` mediumint(6) NOT NULL DEFAULT '0',
`randomx` mediumint(6) NOT NULL DEFAULT '0',
`randomy` mediumint(6) NOT NULL DEFAULT '0',
`heading` mediumint(6) NOT NULL DEFAULT '0',
`respawn_delay` mediumint(5) NOT NULL DEFAULT '0',
`respawn_random` mediumint(5) NOT NULL DEFAULT '0',
`loc_id` int(9) NOT NULL DEFAULT '0',
`periodOfDay` tinyint(1) unsigned NOT NULL DEFAULT '0'
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

42956
L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/spawnlist.sql vendored
View File

File diff suppressed because it is too large Load Diff

7
L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini vendored
View File

@@ -754,13 +754,6 @@ SafeEnchantCostMultipiler = 5
# Custom Components
# ---------------------------------------------------------------------------
# Default: False
CustomSpawnlistTable = True
# Option to save GM spawn only in the custom table.
# Default: False
SaveGmSpawnOnCustom = True
# Default: False
CustomNpcData = True

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/npcinfo.htm vendored
View File

@@ -22,7 +22,8 @@
<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Race</font></td><td align=right width=170>%race%</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Territory:</font></td><td align=right width=170>%territory%</td></tr></table></td></tr>
<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Spawn type:</font></td><td align=right width=170>%spawntype%</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Spawn loc:</font></td><td align=right width=170>%spawn%</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Spawn file:</font></td><td align=right width=170>%spawnfile%</td></tr></table></td></tr>
<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Spawn loc:</font></td><td align=right width=170>%spawn%</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Location:</font></td><td align=right width=170>%loc%</td></tr></table></td></tr>
<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color="LEVEL">Heading:</font></td><td align=right width=170>%heading%</td></tr></table></td></tr>
<tr><td><table width=270 border=0><tr><td width=100><font color="LEVEL">Collision Radius:</font></td><td align=right width=170>%collision_radius%</td></tr></table></td></tr>

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java vendored
View File

@@ -279,7 +279,7 @@ public final class NpcLocationInfo extends Quest
if (Util.contains(NPCRADAR, npcId))
{
int x = 0, y = 0, z = 0;
final L2Spawn spawn = SpawnTable.getInstance().findAny(npcId);
final L2Spawn spawn = SpawnTable.getInstance().getAnySpawn(npcId);
if (spawn != null)
{
x = spawn.getX();

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java vendored
View File

@@ -79,7 +79,7 @@ public final class RaidbossInfo extends Quest
if (RAIDS.contains(bossId))
{
final L2Spawn spawn = SpawnTable.getInstance().findAny(bossId);
final L2Spawn spawn = SpawnTable.getInstance().getAnySpawn(bossId);
if (spawn != null)
{
final Location loc = spawn.getLocation();

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/AI/Lindvior.java vendored
View File

@@ -93,9 +93,9 @@ public class Lindvior extends AbstractNpcAI
}
case "start":
{
_lindviorCamera = SpawnTable.getInstance().findAny(LINDVIOR_CAMERA).getLastSpawn();
_tomaris = SpawnTable.getInstance().findAny(TOMARIS).getLastSpawn();
_artius = SpawnTable.getInstance().findAny(ARTIUS).getLastSpawn();
_lindviorCamera = SpawnTable.getInstance().getAnySpawn(LINDVIOR_CAMERA).getLastSpawn();
_tomaris = SpawnTable.getInstance().getAnySpawn(TOMARIS).getLastSpawn();
_artius = SpawnTable.getInstance().getAnySpawn(ARTIUS).getLastSpawn();
startQuestTimer("tomaris_shout1", 1000, _tomaris, null);
startQuestTimer("artius_shout", 60000, _artius, null);
startQuestTimer("tomaris_shout2", 90000, _tomaris, null);

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.actionshifthandlers;
import java.util.Set;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.datatables.SpawnTable;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IActionShiftHandler;
import com.l2jmobius.gameserver.instancemanager.WalkingManager;
@@ -134,15 +135,19 @@ public class L2NpcActionShift implements IActionShiftHandler
}
else if (((L2Npc) target).getSpawn().hasRespawnRandom())
{
html.replace("%resp%", ((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000 + "-" + (((L2Npc) target).getSpawn().getRespawnMaxDelay() / 1000) + " sec");
html.replace("%resp%", (((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000) + "-" + (((L2Npc) target).getSpawn().getRespawnMaxDelay() / 1000) + " sec");
}
else
{
html.replace("%resp%", ((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000 + " sec");
html.replace("%resp%", (((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000) + " sec");
}
final String spawnFile = SpawnTable.getInstance().getSpawnFile(((L2Npc) target).getSpawn().getNpcSpawnTemplateId());
html.replace("%spawnfile%", spawnFile.substring(spawnFile.lastIndexOf("\\") + 1));
}
else
{
html.replace("%spawnfile%", "<font color=FF0000>--</font>");
html.replace("%territory%", "<font color=FF0000>--</font>");
html.replace("%spawntype%", "<font color=FF0000>--</font>");
html.replace("%spawn%", "<font color=FF0000>null</font>");

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

@@ -23,7 +23,6 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.SevenSigns;
import com.l2jmobius.gameserver.data.xml.impl.AdminData;
import com.l2jmobius.gameserver.data.xml.impl.NpcData;
@@ -417,10 +416,6 @@ public class AdminSpawn implements IAdminCommandHandler
try
{
final L2Spawn spawn = new L2Spawn(template);
if (Config.SAVE_GMSPAWN_ON_CUSTOM)
{
spawn.setCustom(true);
}
spawn.setX(target.getX());
spawn.setY(target.getY());
spawn.setZ(target.getZ());

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@@ -23,7 +23,6 @@ import java.util.NoSuchElementException;
import java.util.StringTokenizer;
import java.util.logging.Logger;
import com.l2jmobius.Config;
import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -545,10 +544,6 @@ public class AdminTeleport implements IAdminCommandHandler
try
{
spawn = new L2Spawn(target.getTemplate().getId());
if (Config.SAVE_GMSPAWN_ON_CUSTOM)
{
spawn.setCustom(true);
}
spawn.setX(activeChar.getX());
spawn.setY(activeChar.getY());
spawn.setZ(activeChar.getZ());
@@ -590,10 +585,6 @@ public class AdminTeleport implements IAdminCommandHandler
try
{
final L2Spawn spawnDat = new L2Spawn(target.getId());
if (Config.SAVE_GMSPAWN_ON_CUSTOM)
{
spawn.setCustom(true);
}
spawnDat.setX(activeChar.getX());
spawnDat.setY(activeChar.getY());
spawnDat.setZ(activeChar.getZ());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -286,7 +286,7 @@ public class DropSearchBoard implements IParseBoardHandler
case "_bbs_npc_trace":
{
int npcId = Integer.parseInt(params[1]);
L2Spawn spawn = SpawnTable.getInstance().findAny(npcId);
L2Spawn spawn = SpawnTable.getInstance().getAnySpawn(npcId);
if (spawn == null)
{
player.sendMessage("Cannot find any spawn. Maybe dropped by a boss or instance monster.");

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java vendored
View File

@@ -267,6 +267,6 @@ public final class Q00604_DaimonTheWhiteEyedPart2 extends Quest
private static boolean isDaimonSpawned()
{
return SpawnTable.getInstance().findAny(DAIMON_THE_WHITE_EYED) != null;
return SpawnTable.getInstance().getAnySpawn(DAIMON_THE_WHITE_EYED) != null;
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java vendored
View File

@@ -280,6 +280,6 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest
private static boolean isBumbalumpSpawned()
{
return SpawnTable.getInstance().findAny(ICICLE_EMPEROR_BUMBALUMP) != null;
return SpawnTable.getInstance().getAnySpawn(ICICLE_EMPEROR_BUMBALUMP) != null;
}
}

38201
L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/chapel_guards.xml vendored
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnlist.xsd">
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawns.xsd">
<spawn name="chapel_guard_spawns">
<AIData>
<disableRandomWalk>true</disableRandomWalk>

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/random_treasurebox_spawns.xml vendored
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnlist.xsd">
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawns.xsd">
<spawn zone="aden03_tb2417_01">
<npc id="18283" respawnDelay="90" count="1" /> <!-- Treasure Chest -->
<npc id="21819" respawnDelay="90" count="1" /> <!-- Treasure Chest -->

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/sel_mahums.xml vendored
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnlist.xsd">
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawns.xsd">
<!-- oren22_2219_a01 -->
<spawn name="smtg_drill_group_01">
<AIData>

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/turek_orcs_fixed_pos.xml vendored
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list enabled="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnlist.xsd">
<list enabled="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawns.xsd">
<!-- gludio15_1621_01m1 -->
<spawn>
<AIData>

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/turek_orcs_zone_based.xml vendored
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawnlist.xsd">
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/spawns.xsd">
<!-- gludio15_1621_01m1 -->
<spawn zone="turek_orc_zone_01">
<AIData>

0
L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/spawnlist.xsd → L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/spawns.xsd vendored
View File