Enhance: RN config alignment

FA2sp.UnitTest/FA2sp.UnitTest.vcxproj

@@ -115,6 +115,7 @@
     <ClCompile Include="main.cpp" />
     <ClCompile Include="SequencedKeyListTest.cpp" />
     <ClCompile Include="CINIOrderTrackerTest.cpp" />
+    <ClCompile Include="SHPVehicleFacingTest.cpp" />
     <ClCompile Include="..\FA2sp\Helpers\CINIOrderTracker.cpp" />
     <ClCompile Include="..\FA2sp\Miscs\Hooks.INI.cpp" />
     <ClCompile Include="..\FA2sp\Helpers\FString.cpp" />

FA2sp.UnitTest/SHPVehicleFacingTest.cpp

@@ -0,0 +1,86 @@
+#include "TestCommon.h"
+#include <vector>
+#include <algorithm>
+
+TEST(SHPVehicleFacingTest, ZeroOffsetDoesNotRotateFrames)
+{
+    // When SHPVehicle.FacingOffset = 0 (RN configuration):
+    // std::rotate(begin, begin + 0 * targetFacings / 8, end) is a no-op.
+    const int offset = 0;
+    const int targetFacings = 8;
+    std::vector<int> framesToRead = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+    std::rotate(framesToRead.begin(), framesToRead.begin() + offset * targetFacings / 8, framesToRead.end());
+
+    std::vector<int> expected = { 0, 1, 2, 3, 4, 5, 6, 7 };
+    EXPECT_EQ(framesToRead, expected);
+    EXPECT_EQ(framesToRead[0], 0);
+}
+
+TEST(SHPVehicleFacingTest, ZeroOffsetTurretFacingAlignsWithBody)
+{
+    // Turret facing formula: (((offset * targetFacings / 8 + i) % targetFacings) * 32 / targetFacings) % 32
+    // With offset = 0, facing 0 produces turret facing 0, perfectly aligned with body frame 0.
+    const int offset = 0;
+    const int targetFacings = 8;
+
+    for (int i = 0; i < targetFacings; ++i)
+    {
+        int turrentFacing = (((offset * targetFacings / 8 + i) % targetFacings) * 32 / targetFacings) % 32;
+        EXPECT_EQ(turrentFacing, i * (32 / targetFacings));
+    }
+
+    int facing0Turret = (((offset * targetFacings / 8 + 0) % targetFacings) * 32 / targetFacings) % 32;
+    EXPECT_EQ(facing0Turret, 0);
+}
+
+TEST(SHPVehicleFacingTest, LegacyOffsetOneShiftsFramesAndTurretBy45Degrees)
+{
+    // When SHPVehicle.FacingOffset = 1 (legacy FA2sp cmcc patch default):
+    // Shifts frames forward by 1 step (45 degrees), reading frame 1 for facing 0.
+    const int offset = 1;
+    const int targetFacings = 8;
+    std::vector<int> framesToRead = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+    std::rotate(framesToRead.begin(), framesToRead.begin() + offset * targetFacings / 8, framesToRead.end());
+
+    std::vector<int> expected = { 1, 2, 3, 4, 5, 6, 7, 0 };
+    EXPECT_EQ(framesToRead, expected);
+    EXPECT_EQ(framesToRead[0], 1);
+
+    // Turret facing also shifted by +4 (45 degrees in 32-facing space)
+    int facing0Turret = (((offset * targetFacings / 8 + 0) % targetFacings) * 32 / targetFacings) % 32;
+    EXPECT_EQ(facing0Turret, 4);
+}
+
+TEST(SHPVehicleFacingTest, ExtFacings32Support)
+{
+    // Verification with 32 facings (ExtFacings enabled):
+    const int targetFacings = 32;
+
+    // Offset = 0: no rotate
+    {
+        const int offset = 0;
+        std::vector<int> frames(32);
+        for (int i = 0; i < 32; ++i) frames[i] = i;
+
+        std::rotate(frames.begin(), frames.begin() + offset * targetFacings / 8, frames.end());
+        EXPECT_EQ(frames[0], 0);
+
+        int turrentFacing = (((offset * targetFacings / 8 + 0) % targetFacings) * 32 / targetFacings) % 32;
+        EXPECT_EQ(turrentFacing, 0);
+    }
+
+    // Offset = 1: rotate by 4 steps (32 / 8 = 4, 45 degrees)
+    {
+        const int offset = 1;
+        std::vector<int> frames(32);
+        for (int i = 0; i < 32; ++i) frames[i] = i;
+
+        std::rotate(frames.begin(), frames.begin() + offset * targetFacings / 8, frames.end());
+        EXPECT_EQ(frames[0], 4);
+
+        int turrentFacing = (((offset * targetFacings / 8 + 0) % targetFacings) * 32 / targetFacings) % 32;
+        EXPECT_EQ(turrentFacing, 4);
+    }
+}

FA2sp/Ext/CFinalSunDlg/Body.ObjectBrowserControl.cpp

@@ -1369,6 +1369,11 @@ void CViewObjectsExt::Redraw_Owner()
                 size_t i = 0;
                 for (auto& itr : section)
                 {
+                    if (strcmp(itr.second, "Nod") == 0 || strcmp(itr.second, "GDI") == 0)
+                    {
+                        i++;
+                        continue;
+                    }
                     FString uiname = itr.second;
 
                     if (!ExtConfigs::NoHouseNameTranslation)
@@ -1416,6 +1421,11 @@ void CViewObjectsExt::Redraw_Owner()
                 size_t i = 0;
                 for (auto& itr : section)
                 {
+                    if (strcmp(itr.second, "Nod") == 0 || strcmp(itr.second, "GDI") == 0)
+                    {
+                        i++;
+                        continue;
+                    }
                     FString uiname = itr.second;
 
                     if (!ExtConfigs::NoHouseNameTranslation)
@@ -1486,6 +1496,11 @@ void CViewObjectsExt::Redraw_Owner()
                 size_t i = 0;
                 for (auto& itr : section)
                 {
+                    if (strcmp(itr.second, "Nod") == 0 || strcmp(itr.second, "GDI") == 0)
+                    {
+                        i++;
+                        continue;
+                    }
                     FString uiname = itr.second;
 
                     if (!ExtConfigs::NoHouseNameTranslation)

FA2sp/Ext/CLoading/Body.LoadObjects.cpp

@@ -2591,7 +2591,8 @@ void CLoadingExt::LoadVehicleOrAircraft(const FString& ID, int tiltType)
 			}
 		}
 
-		std::rotate(framesToRead.begin(), framesToRead.begin() + 1 * targetFacings / 8, framesToRead.end());
+		int offset = ExtConfigs::SHPVehicle_FacingOffset;
+		std::rotate(framesToRead.begin(), framesToRead.begin() + offset * targetFacings / 8, framesToRead.end());
 
 		FString FileName = ImageID + ".shp";
 		FString FileNameTurret = ImageID + "tur.shp";
@@ -2648,7 +2649,7 @@ void CLoadingExt::LoadVehicleOrAircraft(const FString& ID, int tiltType)
 
 						// turret start from 0 + WalkFrames * Facings, ignore StartWalkFrame
 						// and always has 32 facings
-						turrentFacing = (((targetFacings / 8 + i) % targetFacings) * 32 / targetFacings) % 32;
+						turrentFacing = (((offset * targetFacings / 8 + i) % targetFacings) * 32 / targetFacings) % 32;
 						turretFrameToRead = bUseTurrentFile ? turrentFacing : (facingCount * nWalkFrames + turrentFacing);
 						if (KratosWeaponTurretFrameIndex >= 0)
 						{
@@ -2697,7 +2698,7 @@ void CLoadingExt::LoadVehicleOrAircraft(const FString& ID, int tiltType)
 					int nWalkFrames = CINI::Art->GetInteger(ArtID, "WalkFrames", 1);
 					int turrentFacing;
 
-					turrentFacing = (((targetFacings / 8 + i) % targetFacings) * 32 / targetFacings) % 32;
+					turrentFacing = (((offset * targetFacings / 8 + i) % targetFacings) * 32 / targetFacings) % 32;
 
 					bool barrelInFront = IsBarrelInFront(i, targetFacings);
 					if (hasVoxelBarl)

FA2sp/FA2sp.cpp

@@ -103,6 +103,7 @@ bool ExtConfigs::ExtTilts;
 bool ExtConfigs::ExtFacings_Drag;
 bool ExtConfigs::ExtFacings_Scroll;
 bool ExtConfigs::ExtFacings_DragPreview;
+int ExtConfigs::SHPVehicle_FacingOffset = 1;
 int ExtConfigs::UndoRedoLimit;
 bool ExtConfigs::UndoRedo_ShiftPlaceTile;
 bool ExtConfigs::UndoRedo_RecordObjects;
@@ -375,6 +376,7 @@ void FA2sp::ExtConfigsInitialize()
 	ExtConfigs::ExtFacings_Drag = CINI::FAData->GetBool("ExtConfigs", "ExtFacings.Drag");
 	ExtConfigs::ExtFacings_Scroll = CINI::FAData->GetBool("ExtConfigs", "ExtFacings.Scroll");
 	ExtConfigs::ExtFacings_DragPreview = CINI::FAData->GetBool("ExtConfigs", "ExtFacings.DragPreview", true);
+	ExtConfigs::SHPVehicle_FacingOffset = CINI::FAData->GetInteger("ExtConfigs", "SHPVehicle.FacingOffset", 1);
 	ExtConfigs::ExtVariables = CINI::FAData->GetBool("ExtConfigs", "ExtVariables");
 	ExtConfigs::AIRepairDefaultYes = CINI::FAData->GetBool("ExtConfigs", "AIRepairDefaultYes");
 	ExtConfigs::AISellableDefaultYes = CINI::FAData->GetBool("ExtConfigs", "AISellableDefaultYes");

FA2sp/FA2sp.h

@@ -112,6 +112,7 @@ class ExtConfigs
     static bool ExtFacings_Drag;
     static bool ExtFacings_Scroll;
     static bool ExtFacings_DragPreview;
+    static int SHPVehicle_FacingOffset;
     static int UndoRedoLimit;
     static bool UndoRedo_RecordObjects;
     static bool UndoRedo_ShiftPlaceTile;

Supplementary/FAData.ini

@@ -288,6 +288,10 @@ ExtFacings.DragPreview=true
 ; BOOLEAN ; 启用32向的摆放时滚轮调整朝向, 否则为8向, 默认为 false
 ExtFacings.Scroll=false
 
+; INTEGER ; Facing offset index for SHP vehicles (default 1 for legacy cmcc patch behavior; set to 0 to restore pre-patch behavior and remove hardcoded offset)
+; INTEGER ; SHP载具朝向帧偏移 (默认为 1 保持 cmcc patch 的历史效果; 设置为 0 则可以保持 cmcc patch 之前的效果，消除这个硬编码限制)
+SHPVehicle.FacingOffset=1
+
 ; BOOLEAN ; Allow vehicles and aircraft to tilt on slopes. Default false
 ; BOOLEAN ; 车辆和飞行器在斜坡上显示倾斜图像, 默认为 false
 ExtTilts=false

Supplementary/MentalOmega/FAData.ini

@@ -288,6 +288,10 @@ ExtFacings.DragPreview=true
 ; BOOLEAN ; 启用32向的摆放时滚轮调整朝向, 否则为8向, 默认为 false
 ExtFacings.Scroll=false
 
+; INTEGER ; Facing offset index for SHP vehicles (default 1 for legacy cmcc patch behavior; set to 0 to restore pre-patch behavior and remove hardcoded offset)
+; INTEGER ; SHP载具朝向帧偏移 (默认为 1 保持 cmcc patch 的历史效果; 设置为 0 则可以保持 cmcc patch 之前的效果，消除这个硬编码限制)
+SHPVehicle.FacingOffset=1
+
 ; BOOLEAN ; Allow vehicles and aircraft to tilt on slopes. Default false
 ; BOOLEAN ; 车辆和飞行器在斜坡上显示倾斜图像, 默认为 false
 ExtTilts=false