Merge pull request #23 from BigBang1112/production

Nations Converter 1.3.5
BigBang1112 · Dec 19, 2021 · acc6fb0 · acc6fb0
2 parents 7104164 + 6f78043
commit acc6fb0
Show file tree

Hide file tree

Showing 53 changed files with 85 additions and 85 deletions.
diff --git a/NationsConverter/NationsConverter.csproj b/NationsConverter/NationsConverter.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
 		<PlatformTarget>x86</PlatformTarget>
-		<Version>1.3.4</Version>
+		<Version>1.3.5</Version>
 		<Authors>BigBang1112</Authors>
 		<Product>Nations Converter</Product>
 		<Company>BigBang1112</Company>

diff --git a/NationsConverter/Sheets/Custom.yml b/NationsConverter/Sheets/Custom.yml
diff --git a/NationsConverter/Stages/BlockConverter.cs b/NationsConverter/Stages/BlockConverter.cs
@@ -466,7 +466,7 @@ CGameCtnBlock ConvertBlock(CGameCtnBlock referenceBlock, Conversion conversion,
 
                 if (version <= GameVersion.TMUF)
                 {
-                    if (referenceBlock.Name.Contains("Checkpoint"))
+                    if (map.Checkpoints.Contains(referenceBlock.Coord))
                     {
                         var waypoint = new CGameWaypointSpecialProperty();
                         waypoint.CreateChunk<CGameWaypointSpecialProperty.Chunk2E009000>();

diff --git a/...Converter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Down_2X_v2.Item.Gbx b/...Converter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Down_2X_v2.Item.Gbx
diff --git a/...Converter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Left_2X_v2.Item.Gbx b/...Converter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Left_2X_v2.Item.Gbx
diff --git a/...onverter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Right_2X_v2.Item.Gbx b/...onverter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Right_2X_v2.Item.Gbx
diff --git a/...nsConverter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Up_2X_v2.Item.Gbx b/...nsConverter/UserData/Items/NationsConverter/Signs/ControlPub/ControlPub_Up_2X_v2.Item.Gbx
diff --git a/...tems/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Down_v2.Item.Gbx b/...tems/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Down_v2.Item.Gbx
diff --git a/...tems/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Left_v2.Item.Gbx b/...tems/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Left_v2.Item.Gbx
diff --git a/...ems/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Right_v2.Item.Gbx b/...ems/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Right_v2.Item.Gbx
diff --git a/.../Items/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Up_v2.Item.Gbx b/.../Items/NationsConverter/Signs/PlatformWallPub1x1/StadiumPlatformWallPub1x1_Up_v2.Item.Gbx
diff --git a/...tems/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Down_v2.Item.Gbx b/...tems/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Down_v2.Item.Gbx
diff --git a/...tems/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Left_v2.Item.Gbx b/...tems/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Left_v2.Item.Gbx
diff --git a/...ems/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Right_v2.Item.Gbx b/...ems/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Right_v2.Item.Gbx
diff --git a/.../Items/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Up_v2.Item.Gbx b/.../Items/NationsConverter/Signs/PlatformWallPub2x1/StadiumPlatformWallPub2x1_Up_v2.Item.Gbx
diff --git a/...erter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Down_4X_v2.Item.Gbx b/...erter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Down_4X_v2.Item.Gbx
diff --git a/...erter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Left_4X_v2.Item.Gbx b/...erter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Left_4X_v2.Item.Gbx
diff --git a/...rter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Right_4X_v2.Item.Gbx b/...rter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Right_4X_v2.Item.Gbx
diff --git a/...nverter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Up_4X_v2.Item.Gbx b/...nverter/UserData/Items/NationsConverter/Signs/PubBase_OneCredit/PubBase_Up_4X_v2.Item.Gbx
diff --git a/...rData/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Down_v2.Item.Gbx b/...rData/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Down_v2.Item.Gbx
diff --git a/...rData/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Left_v2.Item.Gbx b/...rData/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Left_v2.Item.Gbx
diff --git a/...Data/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Right_v2.Item.Gbx b/...Data/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Right_v2.Item.Gbx
diff --git a/...serData/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Up_v2.Item.Gbx b/...serData/Items/NationsConverter/Signs/PubCornerStructure/PubCornerStructure_Up_v2.Item.Gbx
diff --git a/...Data/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Down_4X_v2.Item.Gbx b/...Data/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Down_4X_v2.Item.Gbx
diff --git a/...Data/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Left_4X_v2.Item.Gbx b/...Data/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Left_4X_v2.Item.Gbx
diff --git a/...ata/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Right_4X_v2.Item.Gbx b/...ata/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Right_4X_v2.Item.Gbx
diff --git a/...erData/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Up_4X_v2.Item.Gbx b/...erData/Items/NationsConverter/Signs/PubCrossStructure/PubCrossStructure_Up_4X_v2.Item.Gbx
diff --git a/...ata/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Down_v2.Item.Gbx b/...ata/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Down_v2.Item.Gbx
diff --git a/...ata/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Left_v2.Item.Gbx b/...ata/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Left_v2.Item.Gbx
diff --git a/...ta/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Right_v2.Item.Gbx b/...ta/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Right_v2.Item.Gbx
diff --git a/...rData/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Up_v2.Item.Gbx b/...rData/Items/NationsConverter/Signs/PubDeadendStructure/PubDeadendStructure_Up_v2.Item.Gbx
diff --git a/...sConverter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Down_v2.Item.Gbx b/...sConverter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Down_v2.Item.Gbx
diff --git a/...sConverter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Left_v2.Item.Gbx b/...sConverter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Left_v2.Item.Gbx
diff --git a/...Converter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Right_v2.Item.Gbx b/...Converter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Right_v2.Item.Gbx
diff --git a/...onsConverter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Up_v2.Item.Gbx b/...onsConverter/UserData/Items/NationsConverter/Signs/PubStraight/PubStraight_Up_v2.Item.Gbx
diff --git a/...verter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Down_v2.Item.Gbx b/...verter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Down_v2.Item.Gbx
diff --git a/...verter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Left_v2.Item.Gbx b/...verter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Left_v2.Item.Gbx
diff --git a/...erter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Right_v2.Item.Gbx b/...erter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Right_v2.Item.Gbx
diff --git a/...onverter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Up_v2.Item.Gbx b/...onverter/UserData/Items/NationsConverter/Signs/PubTStructure/PubTStructure_Up_v2.Item.Gbx
diff --git a/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Down_v2.Item.Gbx b/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Down_v2.Item.Gbx
diff --git a/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Left_v2.Item.Gbx b/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Left_v2.Item.Gbx
diff --git a/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Right_v2.Item.Gbx b/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Right_v2.Item.Gbx
diff --git a/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Up_v2.Item.Gbx b/NationsConverter/UserData/Items/NationsConverter/Signs/Signs2x1/IDX_Sign_Up_v2.Item.Gbx
diff --git a/...Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Down_v2.Item.Gbx b/...Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Down_v2.Item.Gbx
diff --git a/...Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Left_v2.Item.Gbx b/...Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Left_v2.Item.Gbx
diff --git a/...igns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Right_v2.Item.Gbx b/...igns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Right_v2.Item.Gbx
diff --git a/...r/Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Up_v2.Item.Gbx b/...r/Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarAirScreen_Ground_Up_v2.Item.Gbx
diff --git a/...gns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Down_v2.Item.Gbx b/...gns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Down_v2.Item.Gbx
diff --git a/...gns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Left_v2.Item.Gbx b/...gns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Left_v2.Item.Gbx
diff --git a/...ns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Right_v2.Item.Gbx b/...ns/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Right_v2.Item.Gbx
diff --git a/...Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Up_v2.Item.Gbx b/...Signs/StadiumFabricPillarScreens/IDX_StadiumFabricPillarScreenSmall_Ground_Up_v2.Item.Gbx
diff --git a/.../UserData/Items/NationsConverter/y_roadFlat/x_turbo/RoadTechSpecialRouletteTurbo.Item.Gbx b/.../UserData/Items/NationsConverter/y_roadFlat/x_turbo/RoadTechSpecialRouletteTurbo.Item.Gbx
diff --git a/NationsConverterGUI/NationsConverterGUI.csproj b/NationsConverterGUI/NationsConverterGUI.csproj
@@ -8,7 +8,7 @@
 		<Platforms>x86</Platforms>
 		<PlatformTarget>x86</PlatformTarget>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
-		<Version>1.3.4</Version>
+		<Version>1.3.5</Version>
 	</PropertyGroup>
 
 	<ItemGroup>