From 96a3fe8d460d1aa6ed30abda34af61ffa1f3598d Mon Sep 17 00:00:00 2001
From: Archgeus <archgeus@archgeus.com>
Date: Mon, 17 Mar 2025 20:16:28 -0500
Subject: [PATCH] Fix AIHM Exit Teleportal pos Add VillagerMenus & Dialogs

---
 Datasheet/TerritoryData_457.xml               |  2 +-
 .../VillagerData/04570000000607.condition     |  8 +++++++
 .../VillagerData/04570000000608.condition     |  8 +++++++
 .../VillagerData/04570000000609.condition     |  8 +++++++
 .../VillagerData/04570000001501.condition     | 10 ++++++++
 .../VillagerData/04570000001502.condition     | 10 ++++++++
 .../VillagerData/04570000001503.condition     | 10 ++++++++
 .../VillagerData/04570000001504.condition     | 10 ++++++++
 .../VillagerData/07570000000607.condition     |  8 +++++++
 .../VillagerData/07570000000608.condition     |  8 +++++++
 .../VillagerData/07570000000609.condition     |  8 +++++++
 .../VillagerData/07570000001501.condition     | 10 ++++++++
 .../VillagerData/07570000001502.condition     | 10 ++++++++
 .../VillagerData/07570000001503.condition     | 10 ++++++++
 .../VillagerData/07570000001504.condition     | 10 ++++++++
 Datasheet/VillagerData/VillagerMenu.xml       | 24 +++++++++++++++++++
 16 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 Datasheet/VillagerData/04570000000607.condition
 create mode 100644 Datasheet/VillagerData/04570000000608.condition
 create mode 100644 Datasheet/VillagerData/04570000000609.condition
 create mode 100644 Datasheet/VillagerData/04570000001501.condition
 create mode 100644 Datasheet/VillagerData/04570000001502.condition
 create mode 100644 Datasheet/VillagerData/04570000001503.condition
 create mode 100644 Datasheet/VillagerData/04570000001504.condition
 create mode 100644 Datasheet/VillagerData/07570000000607.condition
 create mode 100644 Datasheet/VillagerData/07570000000608.condition
 create mode 100644 Datasheet/VillagerData/07570000000609.condition
 create mode 100644 Datasheet/VillagerData/07570000001501.condition
 create mode 100644 Datasheet/VillagerData/07570000001502.condition
 create mode 100644 Datasheet/VillagerData/07570000001503.condition
 create mode 100644 Datasheet/VillagerData/07570000001504.condition

diff --git a/Datasheet/TerritoryData_457.xml b/Datasheet/TerritoryData_457.xml
index f618f9e..7b3d313 100644
--- a/Datasheet/TerritoryData_457.xml
+++ b/Datasheet/TerritoryData_457.xml
@@ -948,7 +948,7 @@
 				<Fence pos="-84199.69531250,99954.39843750,3386.37329102"/>
 				<Fence pos="-84187.10937500,99410.66406250,3385.78710938"/>
 				<Fence pos="-83708.39062500,99423.57812500,3385.75634766"/>
-				<Npc instanceId="75700057" desc="새 NPC(75700057)" memberId="0" npcTemplateId="1501" ai="48" randomPos="false" spawnCount="1" pos="-83947.71875000,99675.26562500,3392.20947266" offsetZ="0" dir="-179" respawnTime="90000" delaySpawnTimeWhenWorldStart="0" isAggressiveMonster="false" viewRadius="200" viewAngle="360" alertRadius="250" alertAngle="360" aggroSendToClanDistance="300" aggroSendToPartyDistance="400" aggroSendToTerritory="" aggroReceiveOnlyInSight="false" aggroIgnorePartyId="" aggroShareGroupId="0" escapeLocation="0.00000000,0.00000000,0.00000000" isReturn="true" isReturnMyTerritory="false" conditionalSpawn="false" returnDistance="2000" questPatrol="false" peaceStateNoMoving="false" cautionStateNoMoving="false" voidSpawn="false" respawnRandomTime="0" moveInTerritory="true" popupMsg="" msgProb="0.000000" msgInterval="0" msgBroadcastingChannel="false" excludeAggroLimit="false">
+				<Npc instanceId="75700057" desc="새 NPC(75700057)" memberId="0" npcTemplateId="1501" ai="48" randomPos="false" spawnCount="1" pos="-83967.9609375,99675.26562500,3392" offsetZ="0" dir="-179" respawnTime="90000" delaySpawnTimeWhenWorldStart="0" isAggressiveMonster="false" viewRadius="200" viewAngle="360" alertRadius="250" alertAngle="360" aggroSendToClanDistance="300" aggroSendToPartyDistance="400" aggroSendToTerritory="" aggroReceiveOnlyInSight="false" aggroIgnorePartyId="" aggroShareGroupId="0" escapeLocation="0.00000000,0.00000000,0.00000000" isReturn="true" isReturnMyTerritory="false" conditionalSpawn="false" returnDistance="2000" questPatrol="false" peaceStateNoMoving="false" cautionStateNoMoving="false" voidSpawn="false" respawnRandomTime="0" moveInTerritory="true" popupMsg="" msgProb="0.000000" msgInterval="0" msgBroadcastingChannel="false" excludeAggroLimit="false">
 					<PatrolList type="default" socialDuration="0" randomSocial="false"/>
 					<SocialSet checkInterval="0" probSocial="0.000000"/>
 				</Npc>
diff --git a/Datasheet/VillagerData/04570000000607.condition b/Datasheet/VillagerData/04570000000607.condition
new file mode 100644
index 0000000..5d18d1b
--- /dev/null
+++ b/Datasheet/VillagerData/04570000000607.condition
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="607" note="457 [아케론의 염옥] - 607 [벨리카 장군 남]" />
+  <Normal>
+    <Text id="1" />
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/04570000000608.condition b/Datasheet/VillagerData/04570000000608.condition
new file mode 100644
index 0000000..a97a49e
--- /dev/null
+++ b/Datasheet/VillagerData/04570000000608.condition
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="608" note="457 [아케론의 염옥] - 608 [군인 하사관(캐스타닉 여자 검투사)]" />
+  <Normal>
+    <Text id="1" />
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/04570000000609.condition b/Datasheet/VillagerData/04570000000609.condition
new file mode 100644
index 0000000..47ecaf9
--- /dev/null
+++ b/Datasheet/VillagerData/04570000000609.condition
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="609" note="457 [아케론의 염옥] - 609 [군인 하사관(케스타닉 남자 무사)]" />
+  <Normal>
+    <Text id="1" />
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/04570000001501.condition b/Datasheet/VillagerData/04570000001501.condition
new file mode 100644
index 0000000..d5401e0
--- /dev/null
+++ b/Datasheet/VillagerData/04570000001501.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="1501" note="457 [오만한 아케론의 염옥] - 1501 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/04570000001502.condition b/Datasheet/VillagerData/04570000001502.condition
new file mode 100644
index 0000000..dfa6924
--- /dev/null
+++ b/Datasheet/VillagerData/04570000001502.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="1502" note="457 [오만한 아케론의 염옥] - 1502 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/04570000001503.condition b/Datasheet/VillagerData/04570000001503.condition
new file mode 100644
index 0000000..2e8f9ce
--- /dev/null
+++ b/Datasheet/VillagerData/04570000001503.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="1503" note="457 [오만한 아케론의 염옥] - 1503 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/04570000001504.condition b/Datasheet/VillagerData/04570000001504.condition
new file mode 100644
index 0000000..a784c86
--- /dev/null
+++ b/Datasheet/VillagerData/04570000001504.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="457" id="1504" note="457 [오만한 아케론의 염옥] - 1504 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000000607.condition b/Datasheet/VillagerData/07570000000607.condition
new file mode 100644
index 0000000..1accde9
--- /dev/null
+++ b/Datasheet/VillagerData/07570000000607.condition
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="607" note="757 [아케론의 염옥] - 607 [벨리카 장군 남]" />
+  <Normal>
+    <Text id="1" />
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000000608.condition b/Datasheet/VillagerData/07570000000608.condition
new file mode 100644
index 0000000..2c279d7
--- /dev/null
+++ b/Datasheet/VillagerData/07570000000608.condition
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="608" note="757 [아케론의 염옥] - 608 [군인 하사관(캐스타닉 여자 검투사)]" />
+  <Normal>
+    <Text id="1" />
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000000609.condition b/Datasheet/VillagerData/07570000000609.condition
new file mode 100644
index 0000000..e9ad9b5
--- /dev/null
+++ b/Datasheet/VillagerData/07570000000609.condition
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="609" note="757 [아케론의 염옥] - 609 [군인 하사관(케스타닉 남자 무사)]" />
+  <Normal>
+    <Text id="1" />
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000001501.condition b/Datasheet/VillagerData/07570000001501.condition
new file mode 100644
index 0000000..e94d6ae
--- /dev/null
+++ b/Datasheet/VillagerData/07570000001501.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="1501" note="429 [부활한 회당] - 1501 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000001502.condition b/Datasheet/VillagerData/07570000001502.condition
new file mode 100644
index 0000000..1a9ee77
--- /dev/null
+++ b/Datasheet/VillagerData/07570000001502.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="1502" note="757 [아케론의 염옥] - 1502 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000001503.condition b/Datasheet/VillagerData/07570000001503.condition
new file mode 100644
index 0000000..9d9a221
--- /dev/null
+++ b/Datasheet/VillagerData/07570000001503.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="1503" note="757 [아케론의 염옥] - 1503 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/07570000001504.condition b/Datasheet/VillagerData/07570000001504.condition
new file mode 100644
index 0000000..f936051
--- /dev/null
+++ b/Datasheet/VillagerData/07570000001504.condition
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<SpeechCondition>
+  <Villager huntingZoneId="757" id="1504" note="757 [아케론의 염옥] - 1504 [차원의마법석]" />
+  <Normal>
+    <Text id="1">
+      <Param type="random" />
+    </Text>
+  </Normal>
+  <Popup />
+</SpeechCondition>
\ No newline at end of file
diff --git a/Datasheet/VillagerData/VillagerMenu.xml b/Datasheet/VillagerData/VillagerMenu.xml
index d02ef1b..2acf28c 100644
--- a/Datasheet/VillagerData/VillagerMenu.xml
+++ b/Datasheet/VillagerData/VillagerMenu.xml
@@ -6293,6 +6293,18 @@
 	<Villager id="455,1502">
 		<Menu type="Teleport" id="4551502"/>
 	</Villager>
+	<Villager id="457,1501">
+		<Menu type="Teleport" id="4571501"/>
+	</Villager>
+	<Villager id="457,1502">
+		<Menu type="Teleport" id="4571502"/>
+	</Villager>
+	<Villager id="457,1503">
+		<Menu type="Teleport" id="4571503"/>
+	</Villager>
+	<Villager id="457,1504">
+		<Menu type="Teleport" id="4571504"/>
+	</Villager>
 	<Villager id="461,1001">
 		<Menu type="Teleport" id="4611001"/>
 	</Villager>
@@ -6628,6 +6640,18 @@
 	<Villager id="754,4002">
 		<Menu type="Teleport" id="7544002"/>
 	</Villager>
+	<Villager id="757,1501">
+		<Menu type="Teleport" id="7571501"/>
+	</Villager>
+	<Villager id="757,1502">
+		<Menu type="Teleport" id="7571502"/>
+	</Villager>
+	<Villager id="757,1503">
+		<Menu type="Teleport" id="7571503"/>
+	</Villager>
+	<Villager id="757,1504">
+		<Menu type="Teleport" id="7571504"/>
+	</Villager>
 	<Villager id="766,1501">
 		<Menu type="Teleport" id="7661501"/>
 	</Villager>