diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini index 11457bd0e8..eef2428b89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/Custom/TeamVersusTeam.ini @@ -13,9 +13,9 @@ TvTEventEnabled = False # Default: False TvTEventInInstance = False -# Name of the instance file for TvT -# Default: coliseum.xml -TvTEventInstanceFile = coliseum.xml +# Id of the instance template for TvT +# Default: 3049 (coliseum.xml) +TvTEventInstanceId = 3049 # Times TvT will occur (24h format). # Default: 9:00,15:00,21:00,3:00 diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/AdenDungeon.xml similarity index 58% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/AdenDungeon.xml index e432b1c556..11bb6d8cb8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/AdenDungeon.xml @@ -1,9 +1,10 @@ - - - - - - - - - + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/DionDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/DionDungeon.xml new file mode 100644 index 0000000000..a8c81e26e9 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/DionDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GiranDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GiranDungeon.xml new file mode 100644 index 0000000000..9733ab626a --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GiranDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GludioDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GludioDungeon.xml new file mode 100644 index 0000000000..cc62ba2fdd --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GludioDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GoddardDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GoddardDungeon.xml new file mode 100644 index 0000000000..5ce68504c7 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/GoddardDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/InnadrilDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/InnadrilDungeon.xml new file mode 100644 index 0000000000..66152e1288 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/InnadrilDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/OrenDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/OrenDungeon.xml new file mode 100644 index 0000000000..9d7240cfc0 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/OrenDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/RuneDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/RuneDungeon.xml new file mode 100644 index 0000000000..fca6752814 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/RuneDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/SchuttgartDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/SchuttgartDungeon.xml new file mode 100644 index 0000000000..7b501975dd --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastleDungeon/SchuttgartDungeon.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml index 09d1e17f98..24f56f0de1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml index 4acce1b81e..ecbee1d42c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldNight60.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldNight60.xml index 1a233f90cb..d218e2ae91 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldNight60.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CavernOfThePirateCaptainWorldNight60.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionEast.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionEast.xml similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionEast.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionEast.xml index 835876a736..914bf7ecfa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionEast.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionEast.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionNorth.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionNorth.xml similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionNorth.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionNorth.xml index 0195d3f366..3b7be8dbc5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionNorth.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionNorth.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionSouth.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionSouth.xml similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionSouth.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionSouth.xml index 26bcd503bf..ab42505ed7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionSouth.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionSouth.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionSquare.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionSquare.xml similarity index 96% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionSquare.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionSquare.xml index a4d4f86491..97a4393040 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionSquare.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionSquare.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionTower.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionTower.xml similarity index 97% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionTower.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionTower.xml index 628785fe79..96d3928411 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionTower.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionTower.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionWest.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionWest.xml similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionWest.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionWest.xml index 367c37c583..fb98d8f2a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusionWest.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/ChamberOfDelusion/ChamberOfDelusionWest.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CrystalCaverns.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CrystalCaverns.xml index b196777bd1..a9ad0b37b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CrystalCaverns.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CrystalCaverns.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DarkCloudMansion.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DarkCloudMansion.xml index 6f7f6d624b..54d3fca1ac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DarkCloudMansion.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DarkCloudMansion.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DemonPrince.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DemonPrince.xml index c18ec01b8e..81190b161f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DemonPrince.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/DemonPrince.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FinalEmperialTomb.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FinalEmperialTomb.xml index 79607535a8..732b3db187 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FinalEmperialTomb.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FinalEmperialTomb.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/AaruDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/AaruDungeon.xml new file mode 100644 index 0000000000..8a045dbbec --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/AaruDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/AntharasDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/AntharasDungeon.xml new file mode 100644 index 0000000000..2711d24e40 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/AntharasDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ArchaicDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ArchaicDungeon.xml new file mode 100644 index 0000000000..3a339048b8 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ArchaicDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/BayouDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/BayouDungeon.xml new file mode 100644 index 0000000000..2666401bbc --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/BayouDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/BorderlandDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/BorderlandDungeon.xml new file mode 100644 index 0000000000..d9c37d3bb9 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/BorderlandDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/CloudMountainDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/CloudMountainDungeon.xml new file mode 100644 index 0000000000..b3eb348dc7 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/CloudMountainDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/DemonDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/DemonDungeon.xml new file mode 100644 index 0000000000..fec1812deb --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/DemonDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/DragonspineDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/DragonspineDungeon.xml new file mode 100644 index 0000000000..082a00b1d8 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/DragonspineDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/FloranDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/FloranDungeon.xml new file mode 100644 index 0000000000..8faff7698c --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/FloranDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/HiveDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/HiveDungeon.xml new file mode 100644 index 0000000000..9906c18e68 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/HiveDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/HunterDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/HunterDungeon.xml new file mode 100644 index 0000000000..fdee357b37 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/HunterDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/IvoryDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/IvoryDungeon.xml new file mode 100644 index 0000000000..8e3bc9b26b --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/IvoryDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/MonasticDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/MonasticDungeon.xml new file mode 100644 index 0000000000..f9b3fd1772 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/MonasticDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/NarsellDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/NarsellDungeon.xml new file mode 100644 index 0000000000..df11a9d681 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/NarsellDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ShantyDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ShantyDungeon.xml new file mode 100644 index 0000000000..27a13aac2b --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ShantyDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/SouthernDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/SouthernDungeon.xml new file mode 100644 index 0000000000..5821b3d5dd --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/SouthernDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/SwampDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/SwampDungeon.xml new file mode 100644 index 0000000000..ffb540530d --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/SwampDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/TanorDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/TanorDungeon.xml new file mode 100644 index 0000000000..04c7ee8b09 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/TanorDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ValleyDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ValleyDungeon.xml new file mode 100644 index 0000000000..666bf73cea --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/ValleyDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/WesternDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/WesternDungeon.xml new file mode 100644 index 0000000000..ac8d7207f9 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/WesternDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/WhiteSandsDungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/WhiteSandsDungeon.xml new file mode 100644 index 0000000000..00f18924bb --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/FortressDungeon/WhiteSandsDungeon.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionAttack.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionAttack.xml index b4ffc35cf1..336bf892a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionAttack.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionAttack.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionDefence.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionDefence.xml index b4ffc35cf1..8ac9ebb080 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionDefence.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfErosionDefence.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingAttack.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingAttack.xml index 93fafadabb..70150f8a6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingAttack.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingAttack.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingDefence.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingDefence.xml index 93fafadabb..a345b8942c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingDefence.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HallOfSufferingDefence.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityAttack.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityAttack.xml index ee4315cb5e..2236e8a55c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityAttack.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityAttack.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityDefence.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityDefence.xml index ee4315cb5e..04d0b04428 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityDefence.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartInfinityDefence.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartOfImmortalityAttack.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartOfImmortalityAttack.xml deleted file mode 100644 index 9a4e6deda8..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartOfImmortalityAttack.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartOfImmortalityDefence.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartOfImmortalityDefence.xml deleted file mode 100644 index 9a4e6deda8..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/HeartOfImmortalityDefence.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastle.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastle.xml index 1e3d349039..4e757c4c93 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastle.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastle.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleNormalBattleEasy.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleBattleEasy.xml similarity index 78% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleNormalBattleEasy.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleBattleEasy.xml index 59cbe7a807..f14110e36a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleNormalBattleEasy.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleBattleEasy.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleNormalBattleHardcore.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleBattleHardcore.xml similarity index 77% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleNormalBattleHardcore.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleBattleHardcore.xml index ec901e58cb..0b9a9bbce9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleNormalBattleHardcore.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/IceQueensCastleBattleHardcore.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout1.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout1.xml index 8aef365b53..9e33e56496 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout1.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout1.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout2.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout2.xml index 31d2126f50..a91c7aa417 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout2.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout2.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout3.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout3.xml index 31d2126f50..c7623078a0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout3.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout3.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout4.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout4.xml index 31d2126f50..04ad962f92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout4.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/JiniaGuildHideout4.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/MithrilMine.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/MithrilMine.xml index cad4ff8daf..639988c2ed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/MithrilMine.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/MithrilMine.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGarden.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGarden.xml index f710a1bec5..f0abb86ebe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGarden.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGarden.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGardenQuest.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGardenQuest.xml index 2ff5998344..a984491ac3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGardenQuest.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/NornilsGardenQuest.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadGrassyArena.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadGrassyArena.xml similarity index 70% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadGrassyArena.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadGrassyArena.xml index 68c7568373..1524eac0fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadGrassyArena.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadGrassyArena.xml @@ -1,5 +1,6 @@ - + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadHerossVestigesArena.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadHerossVestigesArena.xml similarity index 69% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadHerossVestigesArena.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadHerossVestigesArena.xml index dd94c6005d..2a78ffd8d6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadHerossVestigesArena.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadHerossVestigesArena.xml @@ -1,5 +1,6 @@ - + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadOrbisArena.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadOrbisArena.xml similarity index 70% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadOrbisArena.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadOrbisArena.xml index 0004233cbd..3453328595 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadOrbisArena.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadOrbisArena.xml @@ -1,5 +1,6 @@ - + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadThreeBridgesArena.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadThreeBridgesArena.xml similarity index 69% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadThreeBridgesArena.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadThreeBridgesArena.xml index a6fc6d8060..7d5e510da0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/OlympiadThreeBridgesArena.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Olympiad/OlympiadThreeBridgesArena.xml @@ -1,5 +1,6 @@ - + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaDevilsLegacy.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaDevilsLegacy.xml similarity index 97% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaDevilsLegacy.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaDevilsLegacy.xml index f4ca703789..49cd0a460d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaDevilsLegacy.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaDevilsLegacy.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaInjuredDragon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml similarity index 96% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaInjuredDragon.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml index dbcaffce5f..b143fcbbb7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaInjuredDragon.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaSongOfIceAndFire.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaSongOfIceAndFire.xml similarity index 97% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaSongOfIceAndFire.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaSongOfIceAndFire.xml index 44e279ee24..f349eec20a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaSongOfIceAndFire.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Pailaka/PailakaSongOfIceAndFire.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastlePailaka.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAaru.xml similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastlePailaka.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAaru.xml index 09e5253bb6..609adba67e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/CastlePailaka.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAaru.xml @@ -1,57 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAden.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAden.xml new file mode 100644 index 0000000000..beb85c0503 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAden.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAntharas.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAntharas.xml new file mode 100644 index 0000000000..5a9b146d23 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleAntharas.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleArchaic.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleArchaic.xml new file mode 100644 index 0000000000..9cb98b5acb --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleArchaic.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleBayou.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleBayou.xml new file mode 100644 index 0000000000..018c473112 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleBayou.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleBorderland.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleBorderland.xml new file mode 100644 index 0000000000..4485c2b222 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleBorderland.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleCloudMountain.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleCloudMountain.xml new file mode 100644 index 0000000000..8dc3ad5cf6 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleCloudMountain.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDemon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDemon.xml new file mode 100644 index 0000000000..8a9c12174e --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDemon.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDion.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDion.xml new file mode 100644 index 0000000000..f1a374a6ad --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDion.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDragonspine.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDragonspine.xml new file mode 100644 index 0000000000..31e3b13aa8 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleDragonspine.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleFloran.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleFloran.xml new file mode 100644 index 0000000000..f77e4e07ee --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleFloran.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGiran.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGiran.xml new file mode 100644 index 0000000000..ab795efedb --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGiran.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGludio.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGludio.xml new file mode 100644 index 0000000000..315c3a38dd --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGludio.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGoddard.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGoddard.xml new file mode 100644 index 0000000000..d713300efa --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleGoddard.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleHive.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleHive.xml new file mode 100644 index 0000000000..bb4cb49648 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleHive.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleHunter.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleHunter.xml new file mode 100644 index 0000000000..321037fa8b --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleHunter.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleInnadril.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleInnadril.xml new file mode 100644 index 0000000000..b58639c09a --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleInnadril.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleIvory.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleIvory.xml new file mode 100644 index 0000000000..10b605bcd8 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleIvory.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleMonastic.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleMonastic.xml new file mode 100644 index 0000000000..fbbd25c454 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleMonastic.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleNarsell.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleNarsell.xml new file mode 100644 index 0000000000..0f7e7c83da --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleNarsell.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleOren.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleOren.xml new file mode 100644 index 0000000000..d255aaf276 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleOren.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleRune.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleRune.xml new file mode 100644 index 0000000000..7981bb65c8 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleRune.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSchuttgart.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSchuttgart.xml new file mode 100644 index 0000000000..cd0630caee --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSchuttgart.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleShanty.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleShanty.xml new file mode 100644 index 0000000000..ce741d9ce3 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleShanty.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSouthern.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSouthern.xml new file mode 100644 index 0000000000..1185d9898f --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSouthern.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSwamp.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSwamp.xml new file mode 100644 index 0000000000..52c088ef95 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleSwamp.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleTanor.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleTanor.xml new file mode 100644 index 0000000000..cc8a4e65a8 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleTanor.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleValley.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleValley.xml new file mode 100644 index 0000000000..3151aca276 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleValley.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleWestern.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleWestern.xml new file mode 100644 index 0000000000..92a95177f6 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleWestern.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleWhiteSands.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleWhiteSands.xml new file mode 100644 index 0000000000..c4e775d2ad --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/PailakaRuneCastle/PailakaRuneCastleWhiteSands.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Ranku.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Ranku.xml index ca2f709df3..100611c57c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Ranku.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/Ranku.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQDisciplesNecropolisPast.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQDisciplesNecropolisPast.xml index 5779739f6a..6f41acd691 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQDisciplesNecropolisPast.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQDisciplesNecropolisPast.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQElcadiasTent.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQElcadiasTent.xml index 1ebd40e89a..211d60cdf9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQElcadiasTent.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQElcadiasTent.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQHideoutOfTheDawn.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQHideoutOfTheDawn.xml index 2bafa5fe16..5de31ca185 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQHideoutOfTheDawn.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQHideoutOfTheDawn.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQLibraryOfSages.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQLibraryOfSages.xml index 634693e282..c0e1324151 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQLibraryOfSages.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQLibraryOfSages.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQMonasteryOfSilence.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQMonasteryOfSilence.xml index e777a599c1..42c6f01133 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQMonasteryOfSilence.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQMonasteryOfSilence.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml index 916f809413..38f3e86952 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SecretArea.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SecretArea.xml index 306e824a2c..00a37e3b3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SecretArea.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SecretArea.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestruction.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestruction.xml index dcbe6cc73e..639ea1a20b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestruction.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestruction.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestructionStage1.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestructionStage1.xml index d5ef7a89a4..17119b04fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestructionStage1.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/SeedOfDestructionStage1.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/UrbanArea.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/UrbanArea.xml index d7150f4236..c068485a2d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/UrbanArea.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/UrbanArea.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/coliseum.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/custom/coliseum.xml similarity index 53% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/coliseum.xml rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/custom/coliseum.xml index 93a59d4b40..f9cc17db99 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/coliseum.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/custom/coliseum.xml @@ -1,5 +1,6 @@ - + + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/demo.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/demo.xml deleted file mode 100644 index 897efa1a1b..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/demo.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/fortdungeon.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/fortdungeon.xml deleted file mode 100644 index b7bb638216..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/instances/fortdungeon.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index 439cc2d22b..2ca7db8289 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -310,7 +310,7 @@ public class HallOfErosionAttack extends AbstractNpcAI return true; } - protected void enterInstance(L2PcInstance player, String template, int[] coords) + protected void enterInstance(L2PcInstance player, int[] coords) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); @@ -328,12 +328,12 @@ public class HallOfErosionAttack extends AbstractNpcAI if (checkConditions(player)) { world = new HEAWorld(); - world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); world.setTemplateId(INSTANCEID); world.setStatus(0); ((HEAWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Hall Of Erosion Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Erosion Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) { @@ -448,7 +448,7 @@ public class HallOfErosionAttack extends AbstractNpcAI { if (npc.getId() == MOUTHOFEKIMUS) { - enterInstance(player, "HallOfErosionAttack.xml", ENTER_TELEPORT); + enterInstance(player, ENTER_TELEPORT); return ""; } return ""; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 8eb01f5f6f..9e4a00ee63 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -312,7 +312,7 @@ public class HallOfErosionDefence extends AbstractNpcAI return true; } - protected void enterInstance(L2PcInstance player, String template, int[] coords) + protected void enterInstance(L2PcInstance player, int[] coords) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) @@ -329,12 +329,12 @@ public class HallOfErosionDefence extends AbstractNpcAI if (checkConditions(player)) { world = new HEDWorld(); - world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); world.setTemplateId(INSTANCEID); world.setStatus(0); ((HEDWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Hall Of Erosion Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Erosion Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) { @@ -469,7 +469,7 @@ public class HallOfErosionDefence extends AbstractNpcAI { if (npc.getId() == MOUTHOFEKIMUS) { - enterInstance(player, "HallOfErosionDefence.xml", ENTER_TELEPORT); + enterInstance(player, ENTER_TELEPORT); return ""; } return ""; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index d7f5977924..2ddf3e7f56 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -207,7 +207,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI player.teleToLocation(coords[0], coords[1], coords[2]); } - protected void enterInstance(L2PcInstance player, String template, int[] coords) + protected void enterInstance(L2PcInstance player, int[] coords) { // check for existing instances for this player InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); @@ -226,12 +226,12 @@ public class HallOfSufferingAttack extends AbstractNpcAI if (checkConditions(player)) { world = new HSAWorld(); - world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); world.setTemplateId(INSTANCEID); world.setStatus(0); ((HSAWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Hall Of Suffering Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Suffering Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSAWorld) world); if (player.getParty() == null) @@ -592,7 +592,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI { if (npc.getId() == MOUTHOFEKIMUS) { - enterInstance(player, "HallOfSufferingAttack.xml", ENTER_TELEPORT); + enterInstance(player, ENTER_TELEPORT); return null; } return ""; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index 9bf57a1286..e4440b33aa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -207,7 +207,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI player.teleToLocation(coords[0], coords[1], coords[2]); } - protected void enterInstance(L2PcInstance player, String template, int[] coords) + protected void enterInstance(L2PcInstance player, int[] coords) { // check for existing instances for this player InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); @@ -226,12 +226,12 @@ public class HallOfSufferingDefence extends AbstractNpcAI if (checkConditions(player)) { world = new HSDWorld(); - world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); world.setTemplateId(INSTANCEID); world.setStatus(0); ((HSDWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Hall Of Suffering Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Hall Of Suffering Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSDWorld) world); if (player.getParty() == null) @@ -592,7 +592,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI { if (npc.getId() == MOUTHOFEKIMUS) { - enterInstance(player, "HallOfSufferingDefence.xml", ENTER_TELEPORT); + enterInstance(player, ENTER_TELEPORT); return null; } return ""; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index 65b5b97006..d0725450d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -296,7 +296,7 @@ public class HeartInfinityAttack extends AbstractNpcAI return true; } - protected void enterInstance(L2PcInstance player, String template, int[] coords) + protected void enterInstance(L2PcInstance player, int[] coords) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); @@ -314,11 +314,11 @@ public class HeartInfinityAttack extends AbstractNpcAI if (checkConditions(player)) { world = new HIAWorld(); - world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); world.setTemplateId(INSTANCEID); world.setStatus(0); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Heart Infinity Attack started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Heart Infinity Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if ((player.getParty() == null) || (player.getParty().getCommandChannel() == null)) { @@ -487,7 +487,7 @@ public class HeartInfinityAttack extends AbstractNpcAI if (npcId == ABYSSGAZE) { - enterInstance(player, "HeartInfinityAttack.xml", ENTER_TELEPORT); + enterInstance(player, ENTER_TELEPORT); } return ""; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index 17dfa73d8f..44de6614e1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -315,7 +315,7 @@ public class HeartInfinityDefence extends AbstractNpcAI return true; } - protected void enterInstance(L2PcInstance player, String template, int[] coords) + protected void enterInstance(L2PcInstance player, int[] coords) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); @@ -333,11 +333,11 @@ public class HeartInfinityDefence extends AbstractNpcAI if (checkConditions(player)) { world = new HIDWorld(); - world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + world.setInstanceId(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); world.setTemplateId(INSTANCEID); world.setStatus(0); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Heart Infinity Defence started " + template + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); + LOGGER.info("Heart Infinity Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isGM()) { @@ -528,7 +528,7 @@ public class HeartInfinityDefence extends AbstractNpcAI if (npcId == ABYSSGAZE) { - enterInstance(player, "HeartInfinityDefence.xml", ENTER_TELEPORT); + enterInstance(player, ENTER_TELEPORT); } return ""; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java index fba76d156e..d38336e909 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SecretArea/SecretArea.java @@ -66,7 +66,7 @@ public final class SecretArea extends AbstractInstance final String htmltext = getNoQuestMsg(player); if ((npc.getId() == GINBY) && event.equalsIgnoreCase("enter")) { - enterInstance(player, "SecretArea.xml", TEMPLATE_ID); + enterInstance(player, TEMPLATE_ID); return "32566-01.html"; } else if ((npc.getId() == LELRIKIA) && event.equalsIgnoreCase("exit")) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 7628e06a11..93f1c404e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -905,7 +905,7 @@ public class SeedOfDestruction extends AbstractNpcAI return 2; } - protected int enterInstance(L2PcInstance player, String template, teleCoord teleto) + protected int enterInstance(L2PcInstance player, teleCoord teleto) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); final int inst = checkworld(player); @@ -927,7 +927,7 @@ public class SeedOfDestruction extends AbstractNpcAI { return 0; } - final int instanceId = InstanceManager.getInstance().createDynamicInstance(template); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID); world = new SODWorld(System.currentTimeMillis() + 5400000); world.setTemplateId(INSTANCE_ID); world.setInstanceId(instanceId); @@ -941,7 +941,7 @@ public class SeedOfDestruction extends AbstractNpcAI door.setIsAttackableDoor(true); } } - LOGGER.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); + LOGGER.info("Seed of Destruction started " + INSTANCE_ID + " Instance: " + instanceId + " created by player: " + player.getName()); ((SODWorld) world).ZoneWaitForTP = true; teleto.instanceId = instanceId; @@ -1640,7 +1640,7 @@ public class SeedOfDestruction extends AbstractNpcAI tele.x = -242759; tele.y = 219981; tele.z = -9986; - enterInstance(player, "SeedOfDestruction.xml", tele); + enterInstance(player, tele); } else if (SoDManager.getInstance().getSoDState() == 2) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java index 2e40019a1e..9e3baa52b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java @@ -81,7 +81,7 @@ public final class DemonPrinceFloor extends AbstractInstance if (htmltext == null) { - enterInstance(player, new DPFWorld(), "DemonPrince.xml", TEMPLATE_ID); + enterInstance(player, new DPFWorld(), TEMPLATE_ID); } } else if (npc.getId() == CUBE) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java index f5c3deb225..add5841d15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java @@ -82,7 +82,7 @@ public final class RankuFloor extends AbstractInstance if (htmltext == null) { - enterInstance(player, new RFWorld(), "Ranku.xml", TEMPLATE_ID); + enterInstance(player, new RFWorld(), TEMPLATE_ID); } } else if (npc.getId() == CUBE) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java index 68a801d292..24f0a1a240 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java @@ -129,7 +129,7 @@ public final class UrbanArea extends AbstractInstance if (htmltext == null) { - enterInstance(player, new UrbanAreaWorld(), "UrbanArea.xml", TEMPLATE_ID); + enterInstance(player, new UrbanAreaWorld(), TEMPLATE_ID); } } else if (npc.getId() == TOMBSTONE) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java index 5d8f2fabca..7118f36c61 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java @@ -24,6 +24,8 @@ import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.instancezone.Instance; +import com.l2jmobius.gameserver.model.instancezone.InstanceWorld; +import com.l2jmobius.gameserver.util.Util; /** * @author evill33t, GodKratos @@ -50,16 +52,16 @@ public class AdminInstance implements IAdminCommandHandler if (command.startsWith("admin_createinstance")) { final String[] parts = command.split(" "); - if (parts.length != 3) + if ((parts.length != 3) || !Util.isDigit(parts[2])) { - activeChar.sendMessage("Example: //createinstance - ids => 300000 are reserved for dynamic instances"); + activeChar.sendMessage("Example: //createinstance - ids => 300000 are reserved for dynamic instances"); } else { try { final int id = Integer.parseInt(parts[1]); - if ((id < 300000) && InstanceManager.getInstance().createInstanceFromTemplate(id, parts[2])) + if ((id < 300000) && InstanceManager.getInstance().createInstanceFromTemplate(id, Integer.parseInt(parts[2]))) { activeChar.sendMessage("Instance created."); } @@ -78,9 +80,19 @@ public class AdminInstance implements IAdminCommandHandler } else if (command.startsWith("admin_listinstances")) { - for (Instance temp : InstanceManager.getInstance().getInstances().values()) + int counter = 0; + for (Instance instance : InstanceManager.getInstance().getInstances().values()) { - activeChar.sendMessage("Id: " + temp.getId() + " Name: " + temp.getName()); + final InstanceWorld world = InstanceManager.getInstance().getWorld(instance.getId()); + if (world != null) + { + counter++; + activeChar.sendMessage("Id: " + instance.getId() + " Name: " + InstanceManager.getInstance().getInstanceIdName(world.getTemplateId())); + } + } + if (counter == 0) + { + activeChar.sendMessage("No active instances."); } } else if (command.startsWith("admin_setinstance")) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java index 542990f2b8..1859ac4524 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java @@ -48,12 +48,12 @@ public abstract class AbstractInstance extends AbstractNpcAI { } - protected void enterInstance(L2PcInstance player, String template, int templateId) + protected void enterInstance(L2PcInstance player, int templateId) { - enterInstance(player, new InstanceWorld(), template, templateId); + enterInstance(player, new InstanceWorld(), templateId); } - protected void enterInstance(L2PcInstance player, InstanceWorld instance, String template, int templateId) + protected void enterInstance(L2PcInstance player, InstanceWorld instance, int templateId) { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) @@ -75,7 +75,7 @@ public abstract class AbstractInstance extends AbstractNpcAI if (checkConditions(player)) { - instance.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template)); + instance.setInstanceId(InstanceManager.getInstance().createDynamicInstance(templateId)); instance.setTemplateId(templateId); instance.setStatus(0); InstanceManager.getInstance().addWorld(instance); @@ -213,7 +213,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if ((player != null) && player.isOnline()) { - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstance(world.getInstanceId()).getName())); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstanceIdName(world.getTemplateId()))); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 43936dafb9..3ff2bea317 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -207,7 +207,7 @@ public final class CastleDungeon extends AbstractInstance } } - enterInstance(player, new CDWorld(), "CastleDungeon.xml", CASTLE_DUNGEON.get(npc.getId())); + enterInstance(player, new CDWorld(), CASTLE_DUNGEON.get(npc.getId())); return super.onTalk(npc, player); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java index c3d8010bf3..fceb419846 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java @@ -292,21 +292,21 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { if (checkConditions(player, TEMPLATE_ID_60)) { - enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay60.xml", TEMPLATE_ID_60); + enterInstance(player, new CavernOfThePirateCaptainWorld(), TEMPLATE_ID_60); } } else if (event.equals("enter60night")) { if (checkConditions(player, TEMPLATE_ID_60_NIGHT)) { - enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldNight60.xml", TEMPLATE_ID_60_NIGHT); + enterInstance(player, new CavernOfThePirateCaptainWorld(), TEMPLATE_ID_60_NIGHT); } } else if (event.equals("enter83")) { if (checkConditions(player, TEMPLATE_ID_83)) { - enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay83.xml", TEMPLATE_ID_83); + enterInstance(player, new CavernOfThePirateCaptainWorld(), TEMPLATE_ID_83); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index 34409ac768..4d7a4012f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -165,16 +165,14 @@ public abstract class Chamber extends AbstractInstance // Following values vary between scripts private final int INSTANCEID; - private final String INSTANCE_TEMPLATE; protected Location[] ROOM_ENTER_POINTS; // Misc private static final String RETURN = Chamber.class.getSimpleName() + "_return"; - protected Chamber(String name, int instanceId, String instanceTemplateName, int entranceGKId, int roomGKFirstId, int roomGKLastId, int aenkinelId, int boxId) + protected Chamber(String name, int instanceId, int entranceGKId, int roomGKFirstId, int roomGKLastId, int aenkinelId, int boxId) { INSTANCEID = instanceId; - INSTANCE_TEMPLATE = instanceTemplateName; ENTRANCE_GATEKEEPER = entranceGKId; ROOM_GATEKEEPER_FIRST = roomGKFirstId; ROOM_GATEKEEPER_LAST = roomGKLastId; @@ -629,7 +627,7 @@ public abstract class Chamber extends AbstractInstance if (checkConditions(player)) { final L2Party party = player.getParty(); - enterInstance(player, new CDWorld(party), INSTANCE_TEMPLATE, INSTANCEID); + enterInstance(player, new CDWorld(party), INSTANCEID); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionEast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionEast.java index d19a0d6e05..c2f26f790b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionEast.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionEast.java @@ -41,11 +41,10 @@ public final class ChamberOfDelusionEast extends Chamber new Location(-121424, -220124, -6720), // Raid room }; private static final int INSTANCEID = 127; - private static final String INSTANCE_TEMPLATE = "ChamberOfDelusionEast.xml"; private ChamberOfDelusionEast() { - super(ChamberOfDelusionEast.class.getSimpleName(), INSTANCEID, INSTANCE_TEMPLATE, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); + super(ChamberOfDelusionEast.class.getSimpleName(), INSTANCEID, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); ROOM_ENTER_POINTS = ENTER_POINTS; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionNorth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionNorth.java index 57f5321b23..3224dbfe6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionNorth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionNorth.java @@ -41,11 +41,10 @@ public final class ChamberOfDelusionNorth extends Chamber new Location(-108048, -209020, -6720), // Raid room }; private static final int INSTANCEID = 130; // this is the client number - private static final String INSTANCE_TEMPLATE = "ChamberOfDelusionNorth.xml"; private ChamberOfDelusionNorth() { - super(ChamberOfDelusionNorth.class.getSimpleName(), INSTANCEID, INSTANCE_TEMPLATE, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); + super(ChamberOfDelusionNorth.class.getSimpleName(), INSTANCEID, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); ROOM_ENTER_POINTS = ENTER_POINTS; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSouth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSouth.java index 1c1d060779..7c71fc5cfe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSouth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSouth.java @@ -41,11 +41,10 @@ public final class ChamberOfDelusionSouth extends Chamber new Location(-121440, -209004, -6720), // Raid room }; private static final int INSTANCEID = 129; // this is the client number - private static final String INSTANCE_TEMPLATE = "ChamberOfDelusionSouth.xml"; private ChamberOfDelusionSouth() { - super(ChamberOfDelusionSouth.class.getSimpleName(), INSTANCEID, INSTANCE_TEMPLATE, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); + super(ChamberOfDelusionSouth.class.getSimpleName(), INSTANCEID, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); ROOM_ENTER_POINTS = ENTER_POINTS; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSquare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSquare.java index 45a90227d8..00b298297c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSquare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionSquare.java @@ -45,11 +45,10 @@ public final class ChamberOfDelusionSquare extends Chamber new Location(-121440, -154572, -6688), // Raid room }; private static final int INSTANCEID = 131; - private static final String INSTANCE_TEMPLATE = "ChamberOfDelusionSquare.xml"; private ChamberOfDelusionSquare() { - super(ChamberOfDelusionSquare.class.getSimpleName(), INSTANCEID, INSTANCE_TEMPLATE, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); + super(ChamberOfDelusionSquare.class.getSimpleName(), INSTANCEID, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); ROOM_ENTER_POINTS = ENTER_POINTS; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionTower.java index 35ed325a41..5a05058ea1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionTower.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionTower.java @@ -45,11 +45,10 @@ public final class ChamberOfDelusionTower extends Chamber new Location(-108048, -154572, -6688), // Raid room }; private static final int INSTANCEID = 132; // this is the client number - private static final String INSTANCE_TEMPLATE = "ChamberOfDelusionTower.xml"; private ChamberOfDelusionTower() { - super(ChamberOfDelusionTower.class.getSimpleName(), INSTANCEID, INSTANCE_TEMPLATE, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); + super(ChamberOfDelusionTower.class.getSimpleName(), INSTANCEID, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); ROOM_ENTER_POINTS = ENTER_POINTS; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionWest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionWest.java index be4a9dde62..db160dfcb3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionWest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/ChamberOfDelusionWest.java @@ -41,11 +41,10 @@ public final class ChamberOfDelusionWest extends Chamber new Location(-108032, -220140, -6720), // Raid room }; private static final int INSTANCEID = 128; // this is the client number - private static final String INSTANCE_TEMPLATE = "ChamberOfDelusionWest.xml"; private ChamberOfDelusionWest() { - super(ChamberOfDelusionWest.class.getSimpleName(), INSTANCEID, INSTANCE_TEMPLATE, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); + super(ChamberOfDelusionWest.class.getSimpleName(), INSTANCEID, ENTRANCE_GATEKEEPER, ROOM_GATEKEEPER_FIRST, ROOM_GATEKEEPER_LAST, AENKINEL, BOX); ROOM_ENTER_POINTS = ENTER_POINTS; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 512cc1380a..d6f058b153 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -1771,7 +1771,7 @@ public final class CrystalCaverns extends AbstractInstance } if (npcId == ORACLE_GUIDE_1) { - enterInstance(player, new CCWorld(System.currentTimeMillis() + 5400000), "CrystalCaverns.xml", TEMPLATE_ID); + enterInstance(player, new CCWorld(System.currentTimeMillis() + 5400000), TEMPLATE_ID); return ""; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 6f0bff0dca..727e221d2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -1113,7 +1113,7 @@ public final class DarkCloudMansion extends AbstractInstance final int npcId = npc.getId(); if (npcId == YIYEN) { - enterInstance(player, new DMCWorld(), "DarkCloudMansion.xml", TEMPLATE_ID); + enterInstance(player, new DMCWorld(), TEMPLATE_ID); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index 1f66ab39ec..ee382397f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -1523,7 +1523,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm getQuestState(player, true); if (npc.getId() == GUIDE) { - enterInstance(player, new FETWorld(), "FinalEmperialTomb.xml", TEMPLATE_ID); + enterInstance(player, new FETWorld(), TEMPLATE_ID); } else if (npc.getId() == CUBE) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java index 6d6e5d063f..0a4163d78a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java @@ -185,7 +185,7 @@ public final class IceQueensCastle extends AbstractInstance @Override public String onTalk(L2Npc npc, L2PcInstance talker) { - enterInstance(talker, new IQCWorld(), "IceQueensCastle.xml", TEMPLATE_ID); + enterInstance(talker, new IQCWorld(), TEMPLATE_ID); return super.onTalk(npc, talker); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java index 93157c3d30..cd552d924d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java @@ -194,11 +194,11 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance { if (event.equals("enterEasy")) { - enterInstance(player, new IQCNBWorld(), "IceQueensCastleNormalBattleEasy.xml", TEMPLATE_ID_EASY); + enterInstance(player, new IQCNBWorld(), TEMPLATE_ID_EASY); } else if (event.equals("enterHardcore")) { - enterInstance(player, new IQCNBWorld(), "IceQueensCastleNormalBattleHardcore.xml", TEMPLATE_ID_HARD); + enterInstance(player, new IQCNBWorld(), TEMPLATE_ID_HARD); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java index 6bc72a0d12..fd38025e64 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java @@ -50,7 +50,7 @@ public final class JiniaGuildHideout1 extends AbstractInstance final QuestState qs = talker.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName()); if ((qs != null) && qs.isCond(1)) { - enterInstance(talker, "JiniaGuildHideout1.xml", TEMPLATE_ID); + enterInstance(talker, TEMPLATE_ID); qs.setCond(2, true); } return super.onTalk(npc, talker); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java index 2138e87d0a..f7692ef952 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java @@ -50,7 +50,7 @@ public final class JiniaGuildHideout2 extends AbstractInstance final QuestState qs = talker.getQuestState(Q10285_MeetingSirra.class.getSimpleName()); if ((qs != null) && qs.isMemoState(1)) { - enterInstance(talker, "JiniaGuildHideout2.xml", TEMPLATE_ID); + enterInstance(talker, TEMPLATE_ID); qs.setCond(2, true); } return super.onTalk(npc, talker); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java index a91270ead8..e4352eab95 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java @@ -50,7 +50,7 @@ public final class JiniaGuildHideout3 extends AbstractInstance final QuestState qs = talker.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName()); if ((qs != null) && qs.isMemoState(1)) { - enterInstance(talker, "JiniaGuildHideout3.xml", TEMPLATE_ID); + enterInstance(talker, TEMPLATE_ID); qs.setCond(2, true); } return super.onTalk(npc, talker); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java index 751ef9f3a1..94ae25a4c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java @@ -50,7 +50,7 @@ public final class JiniaGuildHideout4 extends AbstractInstance final QuestState qs = talker.getQuestState(Q10287_StoryOfThoseLeft.class.getSimpleName()); if ((qs != null) && qs.isMemoState(1)) { - enterInstance(talker, "JiniaGuildHideout4.xml", TEMPLATE_ID); + enterInstance(talker, TEMPLATE_ID); qs.setCond(2, true); } return super.onTalk(npc, talker); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 3a05b208db..7b47a04a07 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -533,7 +533,7 @@ public final class Kamaloka extends AbstractInstance * @param player party leader * @param index (0-18) kamaloka index in arrays */ - private final synchronized void enterInstance(L2PcInstance player, int index) + private final synchronized void enterKamalokaInstance(L2PcInstance player, int index) { int templateId; try @@ -580,10 +580,8 @@ public final class Kamaloka extends AbstractInstance } // Creating dynamic instance without template - final int instanceId = InstanceManager.getInstance().createDynamicInstance(null); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(templateId); final Instance inst = InstanceManager.getInstance().getInstance(instanceId); - // set name for the kamaloka - inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId)); // set return location inst.setExitLoc(new Location(player)); // disable summon friend into instance @@ -738,7 +736,7 @@ public final class Kamaloka extends AbstractInstance { try { - enterInstance(player, Integer.parseInt(event)); + enterKamalokaInstance(player, Integer.parseInt(event)); } catch (Exception e) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index d62bdddbbf..c9de6f51a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -202,7 +202,7 @@ public final class MithrilMine extends AbstractInstance giveItems(talker, COLD_RESISTANCE_POTION, 1); } qs.setCond(4, true); - enterInstance(talker, new MMWorld(), "MithrilMine.xml", TEMPLATE_ID); + enterInstance(talker, new MMWorld(), TEMPLATE_ID); } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index f411d98246..b3ebb1dc81 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -271,10 +271,8 @@ public final class NornilsGarden extends AbstractInstance return result; } - final int instanceId = InstanceManager.getInstance().createDynamicInstance("NornilsGarden.xml"); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(TEMPLATE_ID); final Instance inst = InstanceManager.getInstance().getInstance(instanceId); - - inst.setName(InstanceManager.getInstance().getInstanceIdName(TEMPLATE_ID)); inst.setExitLoc(new Location(player)); inst.setAllowSummon(false); inst.setDuration(DURATION_TIME * 60000); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java index 8bdf0e5556..447993f78f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java @@ -72,7 +72,7 @@ public final class NornilsGardenQuest extends AbstractInstance { final NornilsGardenQuestWorld world = new NornilsGardenQuestWorld(); world.ORIGIN_LOC = player.getLocation(); - enterInstance(player, world, "NornilsGardenQuest.xml", TEMPLATE_ID); + enterInstance(player, world, TEMPLATE_ID); q236.setCond(16, true); htmltext = "32190-02.html"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 55ed7ab0d5..f77e6c238a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -111,7 +111,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance if (event.equals("enter")) { final QuestState qs = player.getQuestState(Q00129_PailakaDevilsLegacy.class.getSimpleName()); - enterInstance(player, new DIWorld(), "PailakaDevilsLegacy.xml", TEMPLATE_ID); + enterInstance(player, new DIWorld(), TEMPLATE_ID); if (qs.isCond(1)) { qs.setCond(2, true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java index 8278190647..be90c8d40e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java @@ -79,7 +79,7 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance { case "enter": { - enterInstance(player, "PailakaSongOfIceAndFire.xml", TEMPLATE_ID); + enterInstance(player, TEMPLATE_ID); break; } case "GARGOS_LAUGH": diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java index c5723aeac2..898ddfbe38 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQDisciplesNecropolisPast/SSQDisciplesNecropolisPast.java @@ -437,7 +437,7 @@ public final class SSQDisciplesNecropolisPast extends AbstractInstance { if (qs.isCond(3) || qs.isCond(4)) { - enterInstance(talker, new DNPWorld(), "SSQDisciplesNecropolisPast.xml", TEMPLATE_ID); + enterInstance(talker, new DNPWorld(), TEMPLATE_ID); return ""; } break; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQElcadiasTent/SSQElcadiasTent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQElcadiasTent/SSQElcadiasTent.java index c5ec7dc078..03d19bbbdf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQElcadiasTent/SSQElcadiasTent.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQElcadiasTent/SSQElcadiasTent.java @@ -71,7 +71,7 @@ public final class SSQElcadiasTent extends AbstractInstance || ((Q10293 != null) && Q10293.isCompleted() && (Q10294 == null)) // || ((Q10296 != null) && (Q10296.getMemoState() > 2) && (Q10296.getMemoState() < 4))) { - enterInstance(talker, new ETWorld(), "SSQElcadiasTent.xml", TEMPLATE_ID); + enterInstance(talker, new ETWorld(), TEMPLATE_ID); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java index 08e593c58d..b07971d7f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQHideoutOfTheDawn/SSQHideoutOfTheDawn.java @@ -71,7 +71,7 @@ public final class SSQHideoutOfTheDawn extends AbstractInstance } case "32593-01.html": { - enterInstance(player, new HotDWorld(), "SSQHideoutOfTheDawn.xml", TEMPLATE_ID); + enterInstance(player, new HotDWorld(), TEMPLATE_ID); htmltext = event; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java index 6bd3ebd6e9..eef0547f1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQLibraryOfSages/SSQLibraryOfSages.java @@ -114,7 +114,7 @@ public final class SSQLibraryOfSages extends AbstractInstance @Override public String onTalk(L2Npc npc, L2PcInstance talker) { - enterInstance(talker, new LoSWorld(), "SSQLibraryOfSages.xml", TEMPLATE_ID); + enterInstance(talker, new LoSWorld(), TEMPLATE_ID); return super.onTalk(npc, talker); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java index 2474fc6ae0..137d80eacd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQMonasteryOfSilence/SSQMonasteryOfSilence.java @@ -542,7 +542,7 @@ public final class SSQMonasteryOfSilence extends AbstractInstance { if (npc.getId() == ODD_GLOBE) { - enterInstance(talker, new MoSWorld(), "SSQMonasteryOfSilence.xml", TEMPLATE_ID); + enterInstance(talker, new MoSWorld(), TEMPLATE_ID); } return super.onTalk(npc, talker); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java index efe9b42dcc..7e8f24714d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java @@ -168,7 +168,7 @@ public final class SSQSanctumOfTheLordsOfDawn extends AbstractInstance final QuestState qs = talker.getQuestState(Q00195_SevenSignsSecretRitualOfThePriests.class.getSimpleName()); if ((qs != null) && qs.isCond(3) && hasQuestItems(talker, IDENTITY_CARD) && (talker.getTransformationId() == 113)) { - enterInstance(talker, new HSWorld(), "SSQSanctumOfTheLordsOfDawn.xml", TEMPLATE_ID); + enterInstance(talker, new HSWorld(), TEMPLATE_ID); return "32575-01.html"; } return "32575-02.html"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 2177b32564..62e6f97b83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -953,8 +953,7 @@ public class Q00144_PailakaInjuredDragon extends Quest // New instance. else { - final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaInjuredDragon.xml"); - + final int instanceId = InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID); world = new InstanceWorld(); world.setInstanceId(instanceId); world.setTemplateId(INSTANCE_ID); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 1f307adffd..80ffa95521 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -260,7 +260,7 @@ public final class Q00511_AwlUnderFoot extends Quest return null; } - protected String enterInstance(L2PcInstance player, String template, int[] coords, FortDungeon dungeon, String ret) + protected String enterInstance(L2PcInstance player, int[] coords, FortDungeon dungeon, String ret) { // check for existing instances for this player InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); @@ -286,7 +286,7 @@ public final class Q00511_AwlUnderFoot extends Quest return ret; } final L2Party party = player.getParty(); - final int instanceId = InstanceManager.getInstance().createDynamicInstance(template); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); final Instance ins = InstanceManager.getInstance().getInstance(instanceId); ins.setExitLoc(new Location(player)); world = new FAUWorld(); @@ -295,7 +295,7 @@ public final class Q00511_AwlUnderFoot extends Quest world.setStatus(0); dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME); InstanceManager.getInstance().addWorld(world); - LOGGER.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName()); + LOGGER.info("Fortress AwlUnderFoot started " + dungeon.getInstanceId() + " Instance: " + instanceId + " created by player: " + player.getName()); ThreadPool.schedule(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY); // teleport players @@ -326,7 +326,7 @@ public final class Q00511_AwlUnderFoot extends Quest tele[0] = 53322; tele[1] = 246380; tele[2] = -6580; - return enterInstance(player, "fortdungeon.xml", tele, _fortDungeons.get(npc.getId()), checkFortCondition(player, npc, true)); + return enterInstance(player, tele, _fortDungeons.get(npc.getId()), checkFortCondition(player, npc, true)); } final QuestState st = getQuestState(player, true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 4cebdc0b93..43a34a9750 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -272,7 +272,7 @@ public class Q00726_LightWithinTheDarkness extends Quest return ret; } final L2Party party = player.getParty(); - final int instanceId = InstanceManager.getInstance().createDynamicInstance(template); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); final Instance ins = InstanceManager.getInstance().getInstance(instanceId); ins.setExitLoc(new Location(player)); world = new PAWORLD(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 39c8512f08..4c7b2ecd8d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -624,7 +624,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest } final L2Party party = player.getParty(); - final int instanceId = InstanceManager.getInstance().createDynamicInstance(template); + final int instanceId = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); final Instance ins = InstanceManager.getInstance().getInstance(instanceId); ins.setExitLoc(new Location(player)); world = new CAUWorld(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/instance.xsd b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/instance.xsd index 306bf72115..08644d9707 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/instance.xsd +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/instance.xsd @@ -176,7 +176,7 @@ - diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java index f021d0ad21..ac939482a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java @@ -1081,7 +1081,7 @@ public final class Config public static boolean CHAMPION_ENABLE_IN_INSTANCES; public static boolean TVT_EVENT_ENABLED; public static boolean TVT_EVENT_IN_INSTANCE; - public static String TVT_EVENT_INSTANCE_FILE; + public static int TVT_EVENT_INSTANCE_ID; public static String[] TVT_EVENT_INTERVAL; public static int TVT_EVENT_PARTICIPATION_TIME; public static int TVT_EVENT_RUNNING_TIME; @@ -3025,7 +3025,7 @@ public final class Config TVT_EVENT_ENABLED = TeamVersusTeam.getBoolean("TvTEventEnabled", false); TVT_EVENT_IN_INSTANCE = TeamVersusTeam.getBoolean("TvTEventInInstance", false); - TVT_EVENT_INSTANCE_FILE = TeamVersusTeam.getString("TvTEventInstanceFile", "coliseum.xml"); + TVT_EVENT_INSTANCE_ID = TeamVersusTeam.getInt("TvTEventInstanceId", 3049); TVT_EVENT_INTERVAL = TeamVersusTeam.getString("TvTEventInterval", "20:00").split(","); TVT_EVENT_PARTICIPATION_TIME = TeamVersusTeam.getInt("TvTEventParticipationTime", 3600); TVT_EVENT_RUNNING_TIME = TeamVersusTeam.getInt("TvTEventRunningTime", 1800); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java index 3cbbfcfb47..67b5e262d9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -16,13 +16,10 @@ */ package com.l2jmobius.gameserver.instancemanager; -import java.util.Arrays; -import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Duel; import com.l2jmobius.gameserver.model.skills.Skill; @@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public final class DuelManager { - private static final List ARENAS = Arrays.asList("OlympiadGrassyArena.xml", "OlympiadThreeBridgesArena.xml", "OlympiadHerossVestigesArena.xml", "OlympiadOrbisArena.xml"); private final Map _duels = new ConcurrentHashMap<>(); private final AtomicInteger _currentDuelId = new AtomicInteger(); @@ -210,15 +206,6 @@ public final class DuelManager } } - /** - * Gets new a random Olympiad Stadium instance name. - * @return an instance name - */ - public String getDuelArena() - { - return ARENAS.get(Rnd.get(ARENAS.size())); - } - public static DuelManager getInstance() { return SingletonHolder._instance; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 8815d3b219..7d4bc41b4c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -44,6 +44,8 @@ public final class InstanceManager implements IGameXmlReader private int _dynamic = 300000; // InstanceId Names private static final Map _instanceIdNames = new HashMap<>(); + // Instance templates + private final Map _instanceTemplates = new HashMap<>(); private final Map> _playerInstanceTimes = new ConcurrentHashMap<>(); // SQL Queries private static final String ADD_INSTANCE_TIME = "INSERT INTO character_instance_time (charId,instanceId,time) values (?,?,?) ON DUPLICATE KEY UPDATE time=?"; @@ -53,10 +55,10 @@ public final class InstanceManager implements IGameXmlReader protected InstanceManager() { // Creates the multiverse. - INSTANCES.put(-1, new Instance(-1, "multiverse")); + INSTANCES.put(-1, new Instance(-1)); LOGGER.info(getClass().getSimpleName() + ": Multiverse Instance created."); // Creates the universe. - INSTANCES.put(0, new Instance(0, "universe")); + INSTANCES.put(0, new Instance(0)); LOGGER.info(getClass().getSimpleName() + ": Universe Instance created."); load(); } @@ -67,6 +69,10 @@ public final class InstanceManager implements IGameXmlReader _instanceIdNames.clear(); parseDatapackFile("data/InstanceNames.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _instanceIdNames.size() + " instance names."); + // Load instance templates + _instanceTemplates.clear(); + parseDatapackDirectory("data/instances", true); + LOGGER.info(getClass().getSimpleName() + ": Loaded " + _instanceTemplates.size() + " instance templates."); } /** @@ -203,16 +209,26 @@ public final class InstanceManager implements IGameXmlReader { for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) { - if ("list".equals(n.getNodeName())) + switch (n.getNodeName()) { - NamedNodeMap attrs; - for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) + case "list": { - if ("instance".equals(d.getNodeName())) + NamedNodeMap attrs; + for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { - attrs = d.getAttributes(); - _instanceIdNames.put(parseInteger(attrs, "id"), attrs.getNamedItem("name").getNodeValue()); + if ("instance".equals(d.getNodeName())) + { + attrs = d.getAttributes(); + _instanceIdNames.put(parseInteger(attrs, "id"), attrs.getNamedItem("name").getNodeValue()); + } } + break; + } + case "instance": + { + NamedNodeMap attrs = n.getAttributes(); + _instanceTemplates.put(parseInteger(attrs, "id"), new File("data/instances/").toURI().relativize(f.toURI()).getPath()); + break; } } } @@ -314,10 +330,10 @@ public final class InstanceManager implements IGameXmlReader /** * @param id - * @param template + * @param templateId * @return */ - public boolean createInstanceFromTemplate(int id, String template) + public boolean createInstanceFromTemplate(int id, int templateId) { if (getInstance(id) != null) { @@ -326,7 +342,7 @@ public final class InstanceManager implements IGameXmlReader final Instance instance = new Instance(id); INSTANCES.put(id, instance); - instance.loadInstanceTemplate(template); + instance.loadInstanceTemplate(templateId); instance.spawnDoors(); instance.spawnGroup("general"); return true; @@ -334,10 +350,10 @@ public final class InstanceManager implements IGameXmlReader /** * Create a new instance with a dynamic instance id based on a template (or null) - * @param template xml file + * @param templateId the instance template id * @return */ - public int createDynamicInstance(String template) + public int createDynamicInstance(int templateId) { while (getInstance(_dynamic) != null) { @@ -350,15 +366,25 @@ public final class InstanceManager implements IGameXmlReader } final Instance instance = new Instance(_dynamic); INSTANCES.put(_dynamic, instance); - if (template != null) + if (templateId > 0) { - instance.loadInstanceTemplate(template); + instance.loadInstanceTemplate(templateId); instance.spawnDoors(); instance.spawnGroup("general"); } return _dynamic; } + /** + * Get instance template file name by template ID. + * @param id template id of instance + * @return instance template if found, otherwise {@code null} + */ + public String getInstanceTemplateFileName(int id) + { + return _instanceTemplates.get(id); + } + /** * Gets the single instance of {@code InstanceManager}. * @return single instance of {@code InstanceManager} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java index 82c7f552b9..c24c87e27b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -594,8 +594,7 @@ public class Duel return; } - final String instanceName = DuelManager.getInstance().getDuelArena(); - _duelInstanceId = InstanceManager.getInstance().createDynamicInstance(instanceName); + _duelInstanceId = InstanceManager.getInstance().createDynamicInstance(Rnd.get(147, 150)); // Random Olympiad arena. final L2OlympiadStadiumZone zone = ZoneManager.getInstance().getZone(InstanceManager.getInstance().getInstance(_duelInstanceId).getNpcs().get(0), L2OlympiadStadiumZone.class); if (zone == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java index c4504c25ec..6d465bc3f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -268,7 +268,7 @@ public class TvTEvent { try { - _TvTEventInstance = InstanceManager.getInstance().createDynamicInstance(Config.TVT_EVENT_INSTANCE_FILE); + _TvTEventInstance = InstanceManager.getInstance().createDynamicInstance(Config.TVT_EVENT_INSTANCE_ID); InstanceManager.getInstance().getInstance(_TvTEventInstance).setAllowSummon(false); InstanceManager.getInstance().getInstance(_TvTEventInstance).setIsPvP(true); InstanceManager.getInstance().getInstance(_TvTEventInstance).setEmptyDestroyTime((Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY * 1000) + 60000L); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index c9b9a28540..e09b8fe8ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -69,7 +69,6 @@ public final class Instance private static final Logger LOGGER = Logger.getLogger(Instance.class.getName()); private final int _id; - private String _name; private int _ejectTime = Config.EJECT_DEAD_PLAYER_TIME; /** Allow random walk for NPCs, global parameter. */ private boolean _allowRandomWalk = true; @@ -78,7 +77,6 @@ public final class Instance private final List _doorTemplates = new CopyOnWriteArrayList<>(); private final Map _doors = new ConcurrentHashMap<>(); private final List _spawnTemplates = new CopyOnWriteArrayList<>(); - // private StartPosType _enterLocationOrder; TODO implement me private List _enterLocations = null; private Location _exitLocation = null; private boolean _allowSummon = true; @@ -106,13 +104,6 @@ public final class Instance _instanceStartTime = System.currentTimeMillis(); } - public Instance(int id, String name) - { - _id = id; - _name = name; - _instanceStartTime = System.currentTimeMillis(); - } - /** * @return the ID of this instance. */ @@ -121,19 +112,6 @@ public final class Instance return _id; } - /** - * @return the name of this instance - */ - public String getName() - { - return _name; - } - - public void setName(String name) - { - _name = name; - } - /** * @return the eject time */ @@ -474,11 +452,11 @@ public final class Instance return spawnedNpcs; } - public void loadInstanceTemplate(String filename) + public void loadInstanceTemplate(int templateId) { + // TODO: Cache templates. Document doc = null; - final File xml = new File(Config.DATAPACK_ROOT, "data/instances/" + filename); - + final File xml = new File(Config.DATAPACK_ROOT, "data/instances/" + InstanceManager.getInstance().getInstanceTemplateFileName(templateId)); try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -506,7 +484,6 @@ public final class Instance private void parseInstance(Node n) throws Exception { - _name = n.getAttributes().getNamedItem("name").getNodeValue(); Node a = n.getAttributes().getNamedItem("ejectTime"); if (a != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 86c18b684f..aa92e682d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -53,22 +53,22 @@ public class OlympiadGameManager implements Runnable { case "Grassy Arena": { - instanceId = InstanceManager.getInstance().createDynamicInstance("OlympiadGrassyArena.xml"); + instanceId = InstanceManager.getInstance().createDynamicInstance(147); break; } case "Three Bridges Arena": { - instanceId = InstanceManager.getInstance().createDynamicInstance("OlympiadThreeBridgesArena.xml"); + instanceId = InstanceManager.getInstance().createDynamicInstance(148); break; } case "Heros's Vestiges Arena": { - instanceId = InstanceManager.getInstance().createDynamicInstance("OlympiadHerossVestigesArena.xml"); + instanceId = InstanceManager.getInstance().createDynamicInstance(149); break; } case "Orbis Arena": { - instanceId = InstanceManager.getInstance().createDynamicInstance("OlympiadOrbisArena.xml"); + instanceId = InstanceManager.getInstance().createDynamicInstance(150); break; } }