Updated instance names.

This commit is contained in:
MobiusDevelopment
2021-10-11 11:54:13 +00:00
parent 73fe884791
commit d23b658bd8
22 changed files with 138 additions and 121 deletions

View File

@@ -1,43 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/InstanceNames.xsd">
<instance id="147" name="Olympiad" />
<instance id="148" name="Olympiad" />
<instance id="149" name="Olympiad" />
<instance id="150" name="Olympiad" />
<instance id="182" name="Balthus Knights - Baium" />
<instance id="183" name="Balthus Knights - Antharas" />
<instance id="184" name="Balthus Knights - Zaken" />
<instance id="186" name="Orchid Hall" />
<instance id="187" name="Ellia Hall" />
<instance id="188" name="Laurell Hall" />
<instance id="189" name="Orchid Hall" />
<instance id="190" name="Ellia Hall" />
<instance id="191" name="Laurell Hall" />
<instance id="192" name="Monster Arena" />
<instance id="193" name="Elite Monster Arena" />
<instance id="194" name="Clan Arena" />
<instance id="195" name="Residence of King Ignis" />
<instance id="196" name="Residence of Queen Nebula" />
<instance id="197" name="Residence of King Procella" />
<instance id="198" name="Residence of King Petram" />
<instance id="199" name="Lilith" />
<instance id="200" name="Anakim" />
<instance id="201" name="Residence of King Ignis (Epic)" />
<instance id="202" name="Residence of Queen Nebula (Epic)" />
<instance id="203" name="Residence of King Procella (Epic)" />
<instance id="204" name="Residence of King Petram (Epic)" />
<instance id="205" name="Last Imperial Tomb - Frintezza" />
<instance id="206" name="Red Libra Guild Event - Talking Island" />
<instance id="207" name="Goldberg's Room" />
<instance id="1001" name="Primeval Isle" />
<instance id="1002" name="Ancient Pirates' Tomb" />
<instance id="1004" name="Forgotten Primeval Garden" />
<instance id="1011" name="Alligator Island" />
<instance id="1012" name="Antharas' Lair" />
<instance id="1101" name="Transcendent Instance Zone" /> <!-- Sea of Spores -->
<instance id="1102" name="Transcendent Instance Zone" /> <!-- Enchanted Valley -->
<instance id="1103" name="Transcendent Instance Zone" /> <!-- Blazing Swamp -->
<instance id="1104" name="Transcendent Instance Zone" /> <!-- War-Torn Plains -->
<instance id="1106" name="Transcendent Instance Zone" /> <!-- Dragon Valley -->
<instance id="1107" name="Transcendent Instance Zone" /> <!-- Sel Mahum Base -->
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/InstanceNames.xsd">
<instance id="147" name="Olympiad" />
<instance id="148" name="Olympiad" />
<instance id="149" name="Olympiad" />
<instance id="150" name="Olympiad" />
<instance id="151" name="Team Match" />
<instance id="152" name="Team Match" />
<instance id="153" name="Team Match" />
<instance id="182" name="Balthus Knight - Baium Expedition" />
<instance id="183" name="Balthus Knight - Antharas Expedition" />
<instance id="184" name="Balthus Knight - Zaken Expedition" />
<instance id="186" name="Orchid Hall" />
<instance id="187" name="Ellia Hall" />
<instance id="188" name="Laurell Hall" />
<instance id="189" name="Orchid Hall" />
<instance id="190" name="Ellia Hall" />
<instance id="191" name="Laurell Hall" />
<instance id="192" name="Monster Arena" />
<instance id="193" name="Elite Monster Arena" />
<instance id="194" name="Clan Arena" />
<instance id="195" name="Residence of King Ignis" />
<instance id="196" name="Residence of Queen Nebula" />
<instance id="197" name="Residence of King Procella" />
<instance id="198" name="Residence of King Petram" />
<instance id="199" name="Lilith" />
<instance id="200" name="Anakim" />
<instance id="201" name="Residence of King Ignis (extreme)" />
<instance id="202" name="Residence of Queen Nebula (extreme)" />
<instance id="203" name="Residence of King Procella (extreme)" />
<instance id="204" name="Residence of King Petram (extreme)" />
<instance id="205" name="Last Imperial Tomb - Frintezza" />
<instance id="206" name="Red Libra Guild Event - Talking Island" />
<instance id="207" name="Goldberg's Room" />
<instance id="208" name="Transcendent Instance Zone" /> <!-- Sea of Spores -->
<instance id="209" name="Transcendent Instance Zone" /> <!-- Enchanted Valley -->
<instance id="210" name="Transcendent Instance Zone" /> <!-- Blazing Swamp -->
<instance id="211" name="Transcendent Instance Zone" /> <!-- War-Torn Plains -->
<instance id="212" name="Transcendent Instance Zone" /> <!-- Dragon Valley -->
<instance id="213" name="Transcendent Instance Zone" /> <!-- Sel Mahum Base -->
<instance id="214" name="Dwelling of Spirits" />
<instance id="215" name="Transcendent Instance Zone" />
<instance id="216" name="Zaken's Headquarters" />
<instance id="1001" name="Primeval Isle" />
<instance id="1004" name="Ancient Pirates' Tomb" />
<instance id="1005" name="Alligator Island" />
<instance id="1006" name="Antharas' Lair" />
<instance id="1009" name="Forgotten Primeval Garden" />
</list>

View File

@@ -55,7 +55,7 @@
<entryFee>10000</entryFee>
<minLevel>40</minLevel>
<maxLevel>49</maxLevel>
<instanceId>1101</instanceId>
<instanceId>208</instanceId>
</zone>
<zone id="102" name="Transcendent Instance Zone 2">
<enterLocation>125277,70262,-4408</enterLocation>
@@ -67,7 +67,7 @@
<entryFee>10000</entryFee>
<minLevel>50</minLevel>
<maxLevel>59</maxLevel>
<instanceId>1102</instanceId>
<instanceId>209</instanceId>
</zone>
<zone id="103" name="Transcendent Instance Zone 3">
<enterLocation>148724,-22366,-3436</enterLocation>
@@ -79,7 +79,7 @@
<entryFee>10000</entryFee>
<minLevel>60</minLevel>
<maxLevel>69</maxLevel>
<instanceId>1103</instanceId>
<instanceId>210</instanceId>
</zone>
<zone id="104" name="Transcendent Instance Zone 4">
<enterLocation>167965,28800,-3606</enterLocation>
@@ -91,7 +91,7 @@
<entryFee>10000</entryFee>
<minLevel>70</minLevel>
<maxLevel>79</maxLevel>
<instanceId>1104</instanceId>
<instanceId>211</instanceId>
</zone>
<zone id="106" name="Transcendent Instance Zone 6">
<enterLocation>99797,110524,-3702</enterLocation>
@@ -103,7 +103,7 @@
<entryFee>10000</entryFee>
<minLevel>80</minLevel>
<maxLevel>999</maxLevel>
<instanceId>1106</instanceId>
<instanceId>212</instanceId>
</zone>
<zone id="107" name="Transcendent Instance Zone 7">
<enterLocation>-50416,145363,-2825</enterLocation>
@@ -115,6 +115,6 @@
<entryFee>10000</entryFee>
<minLevel>85</minLevel>
<maxLevel>999</maxLevel>
<instanceId>1107</instanceId>
<instanceId>213</instanceId>
</zone>
</list>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance id="1103" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<instance id="210" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<time duration="15" empty="300000" />
<locations>
<enter type="FIXED">

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance id="1106" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<instance id="212" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<time duration="15" empty="300000" />
<locations>
<enter type="FIXED">

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance id="1102" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<instance id="209" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<time duration="15" empty="300000" />
<locations>
<enter type="FIXED">

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance id="1101" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<instance id="208" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<time duration="15" empty="300000" />
<locations>
<enter type="FIXED">

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance id="1107" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<instance id="213" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<time duration="15" empty="300000" />
<locations>
<enter type="FIXED">

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<instance id="1104" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<instance id="211" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/instance.xsd">
<time duration="15" empty="300000" />
<locations>
<enter type="FIXED">

View File

@@ -64,12 +64,12 @@ public class TranscendentZone extends AbstractInstance
// Misc
private static final int[] TEMPLATES =
{
1101, // Sea of Spores
1102, // Enchanted Valley
1103, // Blazing Swamp
1104, // War-Torn Plains
1106, // Dragon Valley
1107, // Sel Mahum Base
208, // Sea of Spores
209, // Enchanted Valley
210, // Blazing Swamp
211, // War-Torn Plains
212, // Dragon Valley
213, // Sel Mahum Base
};
private static final Map<Integer, Integer> SKILL_REPLACEMENTS = new HashMap<>();
static

View File

@@ -113,7 +113,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket
{
// Shared cooldown for all Transcendent instances.
// TODO: Move shared instance cooldown to XML.
for (int instId = 1101; instId < 1108; instId++)
for (int instId = 208; instId <= 213; instId++)
{
if (InstanceManager.getInstance().getInstanceTime(player, instId) > currentTime)
{