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

Door data moved from CSV to XML.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-25 11:48:18 +00:00
parent 3965ed7615
commit 0ef951835a
49 changed files with 1598 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java vendored
View File

@@ -20,7 +20,7 @@ import java.util.Collection;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Location;
@@ -270,12 +270,12 @@ public class Benom extends Quest
}
case "DoorOpen":
{
DoorTable.getInstance().getDoor(20160005).openMe();
DoorData.getInstance().getDoor(20160005).openMe();
break;
}
case "DoorClose":
{
DoorTable.getInstance().getDoor(20160005).closeMe();
DoorData.getInstance().getDoor(20160005).closeMe();
break;
}
case "Talk":

36
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java vendored
View File

@@ -23,7 +23,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
@@ -332,7 +332,7 @@ public class Frintezza extends Quest
// tempfix for messed door cords
for (int i = 0; i < 8; i++)
{
DoorTable.getInstance().getDoor(25150051 + i).setRange(0, 0, 0, 0, 0, 0);
DoorData.getInstance().getDoor(25150051 + i).setRange(0, 0, 0, 0, 0, 0);
}
}
@@ -519,17 +519,17 @@ public class Frintezza extends Quest
{
for (int i = 25150051; i <= 25150058; i++)
{
DoorTable.getInstance().getDoor(i).closeMe();
DoorData.getInstance().getDoor(i).closeMe();
}
for (int i = 25150061; i <= 25150070; i++)
{
DoorTable.getInstance().getDoor(i).closeMe();
DoorData.getInstance().getDoor(i).closeMe();
}
DoorTable.getInstance().getDoor(25150042).closeMe();
DoorTable.getInstance().getDoor(25150043).closeMe();
DoorTable.getInstance().getDoor(25150045).closeMe();
DoorTable.getInstance().getDoor(25150046).closeMe();
DoorData.getInstance().getDoor(25150042).closeMe();
DoorData.getInstance().getDoor(25150043).closeMe();
DoorData.getInstance().getDoor(25150045).closeMe();
DoorData.getInstance().getDoor(25150046).closeMe();
}
/*
* else if (event.equals("loc_check")) { Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == FIGHTING) { if (!_Zone.isInsideZone(npc)) npc.teleToLocation(getXFix(174232),getYFix(-88020),getZFix(-5116)); if (npc.getX() < getXFix(171932) || npc.getX() >
@@ -1753,7 +1753,7 @@ public class Frintezza extends Quest
{
for (int i = 25150051; i <= 25150058; i++)
{
DoorTable.getInstance().getDoor(i).openMe();
DoorData.getInstance().getDoor(i).openMe();
}
}
if (_killHallAlarmDevice == 4)
@@ -1761,8 +1761,8 @@ public class Frintezza extends Quest
startQuestTimer("room1_del", 100, npc, null);
startQuestTimer("room2_spawn", 100, npc, null);
DoorTable.getInstance().getDoor(25150042).openMe();
DoorTable.getInstance().getDoor(25150043).openMe();
DoorData.getInstance().getDoor(25150042).openMe();
DoorData.getInstance().getDoor(25150043).openMe();
}
/*
* _KillHallAlarmDevice++; if (_KillHallAlarmDevice == 4) { startQuestTimer("room1_del", 100, npc, null); startQuestTimer("room2_spawn", 100, npc, null); DoorTable.getInstance().getDoor(17130042).openMe(); DoorTable.getInstance().getDoor(17130043).openMe(); //
@@ -1774,10 +1774,10 @@ public class Frintezza extends Quest
_killDarkChoirPlayer++;
if (_killDarkChoirPlayer == 2)
{
DoorTable.getInstance().getDoor(25150042).closeMe();
DoorTable.getInstance().getDoor(25150043).closeMe();
DoorTable.getInstance().getDoor(25150045).closeMe();
DoorTable.getInstance().getDoor(25150046).closeMe();
DoorData.getInstance().getDoor(25150042).closeMe();
DoorData.getInstance().getDoor(25150043).closeMe();
DoorData.getInstance().getDoor(25150045).closeMe();
DoorData.getInstance().getDoor(25150046).closeMe();
int outside = 0;
synchronized (_playersInside)
{
@@ -1800,7 +1800,7 @@ public class Frintezza extends Quest
{
for (int i = 25150061; i <= 25150070; i++)
{
DoorTable.getInstance().getDoor(i).openMe();
DoorData.getInstance().getDoor(i).openMe();
}
startQuestTimer("room2_spawn2", 1000, npc, null);
@@ -1814,8 +1814,8 @@ public class Frintezza extends Quest
{
startQuestTimer("room2_del", 100, npc, null);
DoorTable.getInstance().getDoor(25150045).openMe();
DoorTable.getInstance().getDoor(25150046).openMe();
DoorData.getInstance().getDoor(25150045).openMe();
DoorData.getInstance().getDoor(25150046).openMe();
startQuestTimer("waiting", 180000, npc, null);
cancelQuestTimer("room_final", null, null);

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java vendored
View File

@@ -22,9 +22,9 @@ import java.util.concurrent.Future;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@@ -230,7 +230,7 @@ public class IceFairySirra extends Quest
{
try
{
final DoorInstance door = DoorTable.getInstance().getDoor(i);
final DoorInstance door = DoorData.getInstance().getDoor(i);
if (door != null)
{
door.openMe();
@@ -253,7 +253,7 @@ public class IceFairySirra extends Quest
{
try
{
final DoorInstance door = DoorTable.getInstance().getDoor(i);
final DoorInstance door = DoorData.getInstance().getDoor(i);
if (door != null)
{
door.closeMe();

10
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java vendored
View File

@@ -34,9 +34,9 @@ import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.sql.NpcTable;
import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Location;
@@ -147,11 +147,11 @@ public class VanHalter extends Quest
_isHalterSpawned = false;
// Setting door state.
_doorOfAltar.add(DoorTable.getInstance().getDoor(19160014));
_doorOfAltar.add(DoorTable.getInstance().getDoor(19160015));
_doorOfAltar.add(DoorData.getInstance().getDoor(19160014));
_doorOfAltar.add(DoorData.getInstance().getDoor(19160015));
openDoorOfAltar(true);
_doorOfSacrifice.add(DoorTable.getInstance().getDoor(19160016));
_doorOfSacrifice.add(DoorTable.getInstance().getDoor(19160017));
_doorOfSacrifice.add(DoorData.getInstance().getDoor(19160016));
_doorOfSacrifice.add(DoorData.getInstance().getDoor(19160017));
closeDoorOfSacrifice();
// Load spawn data of monsters.

6
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java vendored
View File

@@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
@@ -137,13 +137,13 @@ public class Zaken extends Quest
if (getTimeHour() == 0)
{
LOGGER.info("Zaken door id 21240006 opened, game time 00.00.");
DoorTable.getInstance().getDoor(21240006).openMe();
DoorData.getInstance().getDoor(21240006).openMe();
ThreadPool.schedule(() ->
{
try
{
LOGGER.info("Zaken door id 21240006 closed.");
DoorTable.getInstance().getDoor(21240006).closeMe();
DoorData.getInstance().getDoor(21240006).closeMe();
}
catch (Throwable e)
{

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java vendored
View File

@@ -18,7 +18,7 @@ package teleports.GrandBossTeleporters;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
@@ -192,15 +192,15 @@ public class GrandBossTeleporters extends Quest
}
else if (npcId == 31384) // Gatekeeper of Fire Dragon
{
DoorTable.getInstance().getDoor(24210004).openMe();
DoorData.getInstance().getDoor(24210004).openMe();
}
else if (npcId == 31686) // Gatekeeper of Fire Dragon
{
DoorTable.getInstance().getDoor(24210005).openMe();
DoorData.getInstance().getDoor(24210005).openMe();
}
else if (npcId == 31687) // Gatekeeper of Fire Dragon
{
DoorTable.getInstance().getDoor(24210006).openMe();
DoorData.getInstance().getDoor(24210006).openMe();
}
else if (npcId == 31540) // Watcher of Valakas Klein
{

20
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/PaganTeleporters/PaganTeleporters.java vendored
View File

@@ -16,7 +16,7 @@
*/
package teleports.PaganTeleporters;
import org.l2jmobius.gameserver.datatables.csv.DoorTable;
import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -41,12 +41,12 @@ public class PaganTeleporters extends Quest
{
if (event.equalsIgnoreCase("Close_Door1"))
{
DoorTable.getInstance().getDoor(19160001).closeMe();
DoorData.getInstance().getDoor(19160001).closeMe();
}
else if (event.equalsIgnoreCase("Close_Door2"))
{
DoorTable.getInstance().getDoor(19160010).closeMe();
DoorTable.getInstance().getDoor(19160011).closeMe();
DoorData.getInstance().getDoor(19160010).closeMe();
DoorData.getInstance().getDoor(19160011).closeMe();
}
return null;
}
@@ -66,7 +66,7 @@ public class PaganTeleporters extends Quest
case 32034:
if (st.hasQuestItems(VISITOR_MARK) || st.hasQuestItems(PAGAN_MARK))
{
DoorTable.getInstance().getDoor(19160001).openMe();
DoorData.getInstance().getDoor(19160001).openMe();
startQuestTimer("Close_Door1", 10000, npc, player, false);
htmltext = "FadedMark.htm";
}
@@ -78,7 +78,7 @@ public class PaganTeleporters extends Quest
break;
case 32035:
DoorTable.getInstance().getDoor(19160001).openMe();
DoorData.getInstance().getDoor(19160001).openMe();
startQuestTimer("Close_Door1", 10000, npc, player, false);
htmltext = "FadedMark.htm";
break;
@@ -90,16 +90,16 @@ public class PaganTeleporters extends Quest
}
else
{
DoorTable.getInstance().getDoor(19160010).openMe();
DoorTable.getInstance().getDoor(19160011).openMe();
DoorData.getInstance().getDoor(19160010).openMe();
DoorData.getInstance().getDoor(19160011).openMe();
startQuestTimer("Close_Door2", 10000, npc, player, false);
htmltext = "32036-2.htm";
}
break;
case 32037:
DoorTable.getInstance().getDoor(19160010).openMe();
DoorTable.getInstance().getDoor(19160011).openMe();
DoorData.getInstance().getDoor(19160010).openMe();
DoorData.getInstance().getDoor(19160011).openMe();
startQuestTimer("Close_Door2", 10000, npc, player, false);
htmltext = "FadedMark.htm";
break;