Fix: Fix wrong copy position of TNT

whats2000 · Sep 6, 2024 · c0f0c01 · c0f0c01
1 parent 524f0f0
commit c0f0c01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Components/Manually.razor.cs b/Components/Manually.razor.cs
@@ -242,19 +242,18 @@ private void ManuallyCalculatePearl(string key)
 
     private void CopyGeneralDataToManuallyData()
     {
+        var adjustPosition = Data.Pearl.Position.ToSurface2D().ToSpace3D();
+
         // If the current direction is aligned with DefaultBlueDuper, Blue TNT stays in place
         if ((Data.Direction & Data.DefaultBlueDuper) == 0)
         {
-            // Blue TNT (BTNT) remains in its current position
-            _manuallyData.BTNT = GetTntPosition(Data.DefaultBlueDuper); // Fixed Blue TNT
-
-            // Red TNT (ATNT) moves to the opposite corner
-            _manuallyData.ATNT = GetOppositeTnt(Data.Direction, Data.DefaultBlueDuper); // Moving Red TNT
+            _manuallyData.BTNT = adjustPosition + GetTntPosition(Data.DefaultBlueDuper);
+            _manuallyData.ATNT = adjustPosition + GetOppositeTnt(Data.Direction, Data.DefaultBlueDuper);
         }
         else
         {
-            _manuallyData.ATNT = GetTntPosition(Data.DefaultRedDuper);
-            _manuallyData.BTNT = GetOppositeTnt(Data.Direction, Data.DefaultRedDuper);
+            _manuallyData.ATNT = adjustPosition + GetTntPosition(Data.DefaultRedDuper);
+            _manuallyData.BTNT = adjustPosition + GetOppositeTnt(Data.Direction, Data.DefaultRedDuper);
         }
 
         // Copy the rest of the data

diff --git a/wwwroot/assets/i18n/zh_cn.json b/wwwroot/assets/i18n/zh_cn.json
@@ -2,7 +2,7 @@
   "AmountA": "TNT(A)数量 :",
   "AmountB": "TNT(B)数量 :",
   "BlueTNT": "蓝色阵列",
-  "CalculatePearlMomentum": "计算珍珠动能",
+  "CalculatePearlMomentum": "计算珍珠矢量",
   "CalculatePearlTrace": "计算珍珠轨迹",
   "CalculateTNTAmount": "计算TNT当量",
   "CheckForUpdate": "检查更新",