Rearranged test to make trail inheritance a seperate category

AsherGlick · Sep 19, 2024 · 631ba3c · 631ba3c
1 parent 7364bd8
commit 631ba3c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml
@@ -1,14 +1,19 @@
 <OverlayData>
     <MarkerCategory Name="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83"></MarkerCategory>
 
-    <MarkerCategory Name="NestedLevel1" XPos="000" MapID="999" IconFile="texture_one.png" Texture="texture_one.png" TrailData="trail.trl" AnimationSpeed="1">
+    <MarkerCategory Name="NestedLevel1" XPos="000" MapID="999">
         <MarkerCategory Name="NestedLevel2" YPos="222">
             <MarkerCategory Name="NestedLevel3" ZPos="333"></MarkerCategory>
         </MarkerCategory>
     </MarkerCategory>
 
+    <MarkerCategory Name="TrailNestedLevel1" Texture="texture_one.png" TrailData="trail.trl" AnimationSpeed="1">
+        <MarkerCategory Name="TrailNestedLevel2"></MarkerCategory>
+    </MarkerCategory>
+
     <MarkerCategory Name="NestedLevel1" XPos="111"></MarkerCategory>
 
+
     <POIs>
         <POI Type="mycategory" MapID="50" />
         <POI Type="mycategory" XPos="170.81" MapID="50" />
@@ -17,6 +22,6 @@
         <POI Type="nestedlevel1" MapID="50" />
         <POI Type="nestedlevel1.nestedlevel2" MapID="50" />
         <POI Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" />
-        <Trail Type="nestedlevel1.nestedlevel2.nestedlevel3" />
+        <Trail Type="trailnestedlevel1.trailnestedlevel2" />
     </POIs>
 </OverlayData>
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml
@@ -9,13 +9,18 @@
 </MarkerCategory>
 </MarkerCategory>
 
+<MarkerCategory  ID="c+9VhmatoOU=" Name="TrailNestedLevel1">
+	<MarkerCategory  ID="8UCi0C+KhAE=" Name="TrailNestedLevel2">
+</MarkerCategory>
+</MarkerCategory>
+
 <POIs>
 <POI  Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
 <POI  Type="mycategory" MapID="50" XPos="170.809998" YPos="210.649994" ZPos="215.830002"/>
 <POI  Type="mycategory" MapID="50" XPos="169.809998" YPos="211.649994" ZPos="215.830002"/>
-<POI  Type="nestedlevel1" IconFile="texture_one.png" MapID="50" XPos="111.000000" YPos="0.000000" ZPos="0.000000"/>
-<POI  Type="nestedlevel1.nestedlevel2" IconFile="texture_one.png" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="0.000000"/>
-<POI  Type="nestedlevel1.nestedlevel2.nestedlevel3" IconFile="texture_one.png" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="333.000000"/>
-<Trail  AnimSpeed="1.000000" Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" Texture="texture_one.png" TrailData="037aa160e392f1c8.trl"/>
+<POI  Type="nestedlevel1" MapID="50" XPos="111.000000" YPos="0.000000" ZPos="0.000000"/>
+<POI  Type="nestedlevel1.nestedlevel2" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="0.000000"/>
+<POI  Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="333.000000"/>
+<Trail  AnimSpeed="1.000000" Type="trailnestedlevel1.trailnestedlevel2" MapID="50" Texture="texture_one.png" TrailData="037aa160e392f1c8.trl"/>
 </POIs>
 </OverlayData>