Fix Post Merge Baldera

2025-03-16 21:42:48 -05:00
parent 89951e164c
commit 31606b0e9e
7 changed files with 38 additions and 48 deletions
--- a/DataCenter_Final_EUR/Area/Area-00196.xml
+++ b/DataCenter_Final_EUR/Area/Area-00196.xml
@ -1,34 +1,3 @@
-<<<<<<< HEAD
-<Area xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/Area Area.xsd" id="757" areaName="BurningCave_P" continentId="9757" nameId="206" pcMoveCylinder="true" protect="false" recallReviveContinentIdB="0" recallReviveContinentIdC="0" ride="false" worldMapGuardId="6" worldMapWorldId="9999" xmlns="https://vezel.dev/novadrop/dc/Area">
-    <Section id="1" priority="0" desc="새 영역" huntingZoneId="-1" nameId="9757001" pcMoveCylinder="true" protect="false" ride="true" addMaxZ="256" subtractMinZ="256" campId="0" desTex="false" disableItemId="" duel="false" enableItemId="" floor="1" ignoreObstacleShortTel="false" maze="false" pk="false" restBonus="false" trade="true" vender="false" worldMapSectionId="9757">
-        <Fence pos="-78661.41406250,94582.04687500,4882.84375000" />
-        <Fence pos="-78661.41406250,94582.04687500,4882.84375000" />
-        <Fence pos="-76879.17968750,98231.96875000,5760.44628906" />
-        <Fence pos="-76861.26562500,100148.24218750,5592.15136719" />
-        <Fence pos="-77806.42968750,101202.81250000,6247.23095703" />
-        <Fence pos="-78852.85937500,102449.21875000,6247.22949219" />
-        <Fence pos="-78680.32812500,104472.28906250,6247.23144531" />
-        <Fence pos="-83807.32812500,107039.54687500,5357.28515625" />
-        <Fence pos="-83807.32812500,107039.54687500,5357.28515625" />
-        <Fence pos="-83807.32812500,107039.54687500,5357.28515625" />
-        <Fence pos="-85561.50781250,107770.03906250,5357.26464844" />
-        <Fence pos="-87054.98437500,106162.69531250,5357.27343750" />
-        <Fence pos="-89834.43750000,103258.46875000,3815.71875000" />
-        <Fence pos="-92827.93750000,100813.37500000,3955.60351563" />
-        <Fence pos="-93508.49218750,99209.19531250,4841.74023438" />
-        <Fence pos="-89897.56250000,93327.83593750,-2652.48046875" />
-        <Fence pos="-84007.07812500,93582.31250000,4540.43554688" />
-    </Section>
-    <Section id="2" priority="10" desc="새 영역" huntingZoneId="-1" nameId="9757001" pcMoveCylinder="true" protect="false" ride="false" addMaxZ="256" subtractMinZ="256" campId="0" desTex="false" disableItemId="" duel="false" enableItemId="" floor="1" ignoreObstacleShortTel="false" maze="false" pk="false" restBonus="false" trade="true" vender="false" worldMapSectionId="9757">
-        <Fence pos="-83084.01562500,100675.33593750,4114.43603516" />
-        <Fence pos="-83941.25000000,100907.07812500,4114.43359375" />
-        <Fence pos="-84810.21875000,100506.02343750,4114.43359375" />
-        <Fence pos="-85252.62500000,99697.73437500,3390.27050781" />
-        <Fence pos="-84773.14062500,98789.16406250,4114.43457031" />
-        <Fence pos="-84036.09375000,98168.13281250,4114.43554688" />
-        <Fence pos="-83114.28125000,98791.38281250,4114.43457031" />
-        <Fence pos="-82739.79687500,99634.34375000,4114.43115234" />
-=======
 <Area xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/Area Area.xsd" id="1" areaName="ACN_P" continentId="7006" nameId="1001" pcMoveCylinder="true" protect="false" ride="true" worldMapGuardId="7" worldMapWorldId="1" xmlns="https://vezel.dev/novadrop/dc/Area">
    <Section id="4" priority="1" huntingZoneId="-1" nameId="1001" pcMoveCylinder="true" protect="false" ride="true" addMaxZ="2000" subtractMinZ="4000" campId="0" desTex="false" disableItemId="" floor="1" ignoreObstacleShortTel="false" maze="false" optimizeOption="0" pk="safe" restBonus="false" vender="true" worldMapSectionId="4">
        <Fence pos="153529.32812500,43.00323486,5223.66796875" />
@ -208,6 +177,5 @@
            <Fence pos="135060.37500000,31881.21679688,3752.74829102" />
            <Fence pos="135067.76562500,31383.55859375,3759.62792969" />
        </Section>
->>>>>>> baldera
    </Section>
 </Area>
--- a/DataCenter_Final_EUR/Area/Area-00197.xml
+++ b/DataCenter_Final_EUR/Area/Area-00197.xml
@ -0,0 +1,31 @@
+<Area xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/Area Area.xsd" id="757" areaName="BurningCave_P" continentId="9757" nameId="206" pcMoveCylinder="true" protect="false" recallReviveContinentIdB="0" recallReviveContinentIdC="0" ride="false" worldMapGuardId="6" worldMapWorldId="9999" xmlns="https://vezel.dev/novadrop/dc/Area">
+    <Section id="1" priority="0" desc="새 영역" huntingZoneId="-1" nameId="9757001" pcMoveCylinder="true" protect="false" ride="true" addMaxZ="256" subtractMinZ="256" campId="0" desTex="false" disableItemId="" duel="false" enableItemId="" floor="1" ignoreObstacleShortTel="false" maze="false" pk="false" restBonus="false" trade="true" vender="false" worldMapSectionId="9757">
+        <Fence pos="-78661.41406250,94582.04687500,4882.84375000" />
+        <Fence pos="-78661.41406250,94582.04687500,4882.84375000" />
+        <Fence pos="-76879.17968750,98231.96875000,5760.44628906" />
+        <Fence pos="-76861.26562500,100148.24218750,5592.15136719" />
+        <Fence pos="-77806.42968750,101202.81250000,6247.23095703" />
+        <Fence pos="-78852.85937500,102449.21875000,6247.22949219" />
+        <Fence pos="-78680.32812500,104472.28906250,6247.23144531" />
+        <Fence pos="-83807.32812500,107039.54687500,5357.28515625" />
+        <Fence pos="-83807.32812500,107039.54687500,5357.28515625" />
+        <Fence pos="-83807.32812500,107039.54687500,5357.28515625" />
+        <Fence pos="-85561.50781250,107770.03906250,5357.26464844" />
+        <Fence pos="-87054.98437500,106162.69531250,5357.27343750" />
+        <Fence pos="-89834.43750000,103258.46875000,3815.71875000" />
+        <Fence pos="-92827.93750000,100813.37500000,3955.60351563" />
+        <Fence pos="-93508.49218750,99209.19531250,4841.74023438" />
+        <Fence pos="-89897.56250000,93327.83593750,-2652.48046875" />
+        <Fence pos="-84007.07812500,93582.31250000,4540.43554688" />
+    </Section>
+    <Section id="2" priority="10" desc="새 영역" huntingZoneId="-1" nameId="9757001" pcMoveCylinder="true" protect="false" ride="false" addMaxZ="256" subtractMinZ="256" campId="0" desTex="false" disableItemId="" duel="false" enableItemId="" floor="1" ignoreObstacleShortTel="false" maze="false" pk="false" restBonus="false" trade="true" vender="false" worldMapSectionId="9757">
+        <Fence pos="-83084.01562500,100675.33593750,4114.43603516" />
+        <Fence pos="-83941.25000000,100907.07812500,4114.43359375" />
+        <Fence pos="-84810.21875000,100506.02343750,4114.43359375" />
+        <Fence pos="-85252.62500000,99697.73437500,3390.27050781" />
+        <Fence pos="-84773.14062500,98789.16406250,4114.43457031" />
+        <Fence pos="-84036.09375000,98168.13281250,4114.43554688" />
+        <Fence pos="-83114.28125000,98791.38281250,4114.43457031" />
+        <Fence pos="-82739.79687500,99634.34375000,4114.43115234" />
+    </Section>
+</Area>
--- a/DataCenter_Final_EUR/MapDefineData/MapDefineData-00331.xml
+++ b/DataCenter_Final_EUR/MapDefineData/MapDefineData-00331.xml
@ -1,12 +1,7 @@
 <MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
-<<<<<<< HEAD
-    <MapDefine id="WMap_DG_BurningCave" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9757001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
-</MapDefineData>
-=======
    <MapDefine id="WMap_ACN_Guard" backgroundImage="WMap_ACN.WMap_ACN_Guard" titleStringId="207" height="768" width="1024" leftMargin="0" topMargin="0">
        <MapButton id="WMap_ACN_BTN" x="182" y="45" stringId="99100" click="WMap_ACN_Field" txtX="230" txtY="230" />
        <Text x="695" y="400" stringId="58001" click="WMap_ACN_Vill_01" align="center" fontStyle="village" />
        <Text x="397" y="630" stringId="203" click="" align="left" fontStyle="outside" />
    </MapDefine>
 </MapDefineData>
->>>>>>> baldera
--- a/DataCenter_Final_EUR/MapDefineData/MapDefineData-00332.xml
+++ b/DataCenter_Final_EUR/MapDefineData/MapDefineData-00332.xml
@ -1,8 +1,4 @@
 <MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
-<<<<<<< HEAD
-    <MapDefine id="WMap_DG_BurningCave_h" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9057001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
-</MapDefineData>
-=======
    <MapDefine id="WMap_ACN_Vill_01" backgroundImage="WMap_ACN.WMap_ACN_Vill_01" titleStringId="1002" height="768" width="1024" leftMargin="0" overlayMapId="img://__WMap_Vill_Over.WMap_ACN_Vill_01_over" overlayMapType="village" topMargin="0">
        <Text x="270" y="650" stringId="207" click="" align="left" fontStyle="outside" />
        <Text x="430" y="280" stringId="5801007" click="" align="left" fontStyle="village" />
@ -15,4 +11,4 @@
        <Text x="300" y="600" stringId="5801015" click="" align="left" fontStyle="spot" />
    </MapDefine>
 </MapDefineData>
->>>>>>> baldera
+
--- a/DataCenter_Final_EUR/MapDefineData/MapDefineData-00335.xml
+++ b/DataCenter_Final_EUR/MapDefineData/MapDefineData-00335.xml
@ -0,0 +1,3 @@
+<MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
+    <MapDefine id="WMap_DG_BurningCave" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9757001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
+</MapDefineData>
--- a/DataCenter_Final_EUR/MapDefineData/MapDefineData-00336.xml
+++ b/DataCenter_Final_EUR/MapDefineData/MapDefineData-00336.xml
@ -0,0 +1,3 @@
+<MapDefineData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/MapDefineData MapDefineData.xsd" xmlns="https://vezel.dev/novadrop/dc/MapDefineData">
+    <MapDefine id="WMap_DG_BurningCave_h" backgroundImage="WMap_DG_BurningCave.WMap_DG_BurningCave" titleStringId="9057001" height="512" width="512" leftMargin="300" overlayMapId="img://__WMap_DG_BurningCave.WMap_DG_BurningCave" overlayMapType="dungeon" topMargin="100" />
+</MapDefineData>
--- a/DataCenter_Final_EUR/VillagerDialog/VillagerDialog-00110.xml
+++ b/DataCenter_Final_EUR/VillagerDialog/VillagerDialog-00110.xml
@ -1,11 +1,5 @@
-<<<<<<< HEAD
-<VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="1005" huntingZoneId="58" voiceTypeId="76" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
-    <Text id="1" huntingZoneId="58" prevId="0" villagerId="1005" endSocial="14">
-        <Page social="0">What? Why do you think you have a healthy body? Train yourself, Train!</Page>
-=======
 <VillagerDialog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://vezel.dev/novadrop/dc/VillagerDialog VillagerDialog.xsd" id="1005" huntingZoneId="58" voiceTypeId="80" xmlns="https://vezel.dev/novadrop/dc/VillagerDialog">
    <Text id="1" huntingZoneId="58" prevId="0" villagerId="1005" endSocial="14">
        <Page social="4">What? Why do you think you have a healthy body? Train yourself, Train!</Page>
->>>>>>> baldera
    </Text>
 </VillagerDialog>