Merge pull request #2 from BigBang1112/production

Nations Converter 0.2.1 (Early Access)
BigBang1112 · Nov 28, 2020 · 5974989 · 5974989
2 parents c97aadc + b4f6ffb
commit 5974989
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 59 deletions.
diff --git a/NationsConverter/EmbedManager.cs b/NationsConverter/EmbedManager.cs
@@ -11,9 +11,6 @@ public class EmbedManager
     {
         public void CopyUsedEmbed(CGameCtnChallenge map, Definitions definitions)
         {
-            var assembly = Assembly.GetExecutingAssembly();
-            var localDirectory = Path.GetDirectoryName(assembly.Location);
-
             var previousEmbed = map.Embeds; // TODO: maybe later some kind of embed transfer support
 
             map.CreateChunk<CGameCtnChallenge.Chunk03043054>();
@@ -50,7 +47,7 @@ void ImportBlock(ConversionBlock conversionBlock)
                                         try
                                         {
                                             if (conversionBlock.Name.EndsWith(".Block.Gbx_CustomBlock"))
-                                                map.ImportFileToEmbed($"{localDirectory}UserData/Blocks/{conversionBlock.Name}", $"Blocks/{Path.GetDirectoryName(conversionBlock.Name)}");
+                                                map.ImportFileToEmbed($"{Converter.LocalDirectory}/UserData/Blocks/{conversionBlock.Name}", $"Blocks/{Path.GetDirectoryName(conversionBlock.Name)}");
                                         }
                                         catch (Exception e) when (e is DirectoryNotFoundException || e is FileNotFoundException)
                                         {
@@ -73,7 +70,7 @@ void ImportItem(ConversionItem conversionItem)
                                         {
                                             var itemName = conversionItem.Name.Split(' ');
                                             if (itemName.Length >= 3 && itemName[2] != "Nadeo")
-                                                map.ImportFileToEmbed($"UserData/Items/{itemName[0]}", $"Items/{Path.GetDirectoryName(itemName[0])}");
+                                                map.ImportFileToEmbed($"{Converter.LocalDirectory}/UserData/Items/{itemName[0]}", $"Items/{Path.GetDirectoryName(itemName[0])}");
                                         }
                                         catch (Exception e) when (e is DirectoryNotFoundException || e is FileNotFoundException)
                                         {

diff --git a/NationsConverter/Sheets/Custom.yml b/NationsConverter/Sheets/Custom.yml
@@ -878,34 +878,44 @@ Blocks:
         OffsetPivot: [16, 0, 16]
 
   StadiumControlRoadGlass:
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlGlassBase.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassBaseAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlGlassDeadend.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassDeadendAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlGlassCorner.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassCornerAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlGlassStraight.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlGlassBase.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlGlassBaseAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlGlassDeadend.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlGlassDeadendAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlGlassCorner.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-      OffsetRot: [180, 0, 0]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlGlassT.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlGlassCornerAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlGlassStraight.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Items:
+      - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+      - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+        OffsetRot: [180, 0, 0]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlGlassT.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
   - Item:
       Name: NationsConverter\r_support\v_control\ControlGlassCross.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
@@ -929,46 +939,58 @@ Blocks:
       Name: NationsConverter\r_support\v_control\PubCrossStructure.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
   StadiumControlRoadCamera:
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlCameraBase.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlCameraBaseAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlCameraDeadend.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlCameraDeadendAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlCameraCorner.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlCameraCornerAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlCameraStraight.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlCameraBase.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlCameraStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlCameraBaseAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlCameraDeadend.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlCameraStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlCameraDeadendAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlCameraCorner.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-      OffsetRot: [180, 0, 0]
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlCameraT.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlCameraCornerAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlCameraStraight.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlCameraStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+    Air:
+      Items:
+      - Name: NationsConverter\r_support\v_control\ControlCameraStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+      - Name: NationsConverter\r_support\v_control\ControlCameraStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+        OffsetRot: [180, 0, 0]
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlCameraT.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
+    Air:
+      Item:
+        Name: NationsConverter\r_support\v_control\ControlCameraStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
   - Item:
       Name: NationsConverter\r_support\v_control\ControlCameraCross.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
   StadiumControlCameraPub:
-  - Items:
-    - Name: NationsConverter\r_support\v_control\ControlPub.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
-      OffsetPivot: [16, 0, 16]
-    - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+  - Item:
+      Name: NationsConverter\r_support\v_control\ControlPub.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
       OffsetPivot: [16, 0, 16]
-      OffsetRot: [180, 0, 0]
+    Air:
+      Items:
+      - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+      - Name: NationsConverter\r_support\v_control\ControlGlassStraightAir.Item.Gbx 26 akPfIM0aSzuHuaaDWptBbQ
+        OffsetPivot: [16, 0, 16]
+        OffsetRot: [180, 0, 0]
 
 # Inflatables
 

diff --git a/NationsConverterCLI/NationsConverterCLI.csproj b/NationsConverterCLI/NationsConverterCLI.csproj
@@ -6,7 +6,7 @@
 		<PlatformTarget>x86</PlatformTarget>
 		<Product>Nations Converter (CLI)</Product>
 		<Authors>BigBang1112</Authors>
-		<Version>0.1.0</Version>
+		<Version>0.2.1</Version>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 		<Platforms>x86</Platforms>