big update to many structs

youneuoy · Oct 10, 2023 · af42136 · af42136
1 parent 8f1cb96
commit af42136
Show file tree

Hide file tree

Showing 20 changed files with 3,740 additions and 262 deletions.
diff --git a/M2TWEOP Code/M2TWEOP library/fastFuncts.cpp b/M2TWEOP Code/M2TWEOP library/fastFuncts.cpp
@@ -879,8 +879,8 @@ namespace fastFuncts
 			}
 			return;
 		}
-		un->general->movepoints1 = movepoints;
-		un->general->movepoints2 = movepoints;
+		un->general->movePointsCharacter = movepoints;
+		un->general->movePointsArmy = movepoints;
 
 
 		general* gen = un->general;
@@ -926,7 +926,7 @@ namespace fastFuncts
 
 
 
-		int diff = count - un->number;
+		int diff = count - un->SoldierCountStrat;
 		if (diff == 0)
 		{
 			return;
@@ -947,7 +947,7 @@ namespace fastFuncts
 		}
 		else
 		{
-			un->number = count;
+			un->SoldierCountStrat = count;
 		}
 
 

diff --git a/M2TWEOP Code/M2TWEOP library/onlineThings.cpp b/M2TWEOP Code/M2TWEOP library/onlineThings.cpp
@@ -370,7 +370,7 @@ namespace battleCreator
 					unit* un = army->units[k];
 					tempS = "unit		";
 					tempS.append(un->eduEntry->Type);
-					tempS.append("				soldiers ").append(to_string(un->number));
+					tempS.append("				soldiers ").append(to_string(un->SoldierCountStrat));
 					tempS.append(" exp ").append(to_string(un->expScreen));
 					tempS.append(" armour ").append(to_string(un->stats >> 0xd & 0x1f));
 					tempS.append(" weapon_lvl ").append(to_string(un->stats >> 0x8 & 0x1f));

diff --git a/M2TWEOP Code/M2TWEOP library/onlineThings2.cpp b/M2TWEOP Code/M2TWEOP library/onlineThings2.cpp
@@ -26,7 +26,7 @@ namespace battleCreator
 		{
 			numberInArmy = pnumberInArmy;
 			type = un->eduEntry->Type;
-			soldiersNumber = un->number;
+			soldiersNumber = un->SoldierCountStrat;
 			exp = un->expScreen;
 
 
@@ -232,7 +232,7 @@ namespace battleCreator
 			{
 				unitJson["general"] = 0;
 			}
-			unitJson["soldiers"] = unit->number;
+			unitJson["soldiers"] = unit->SoldierCountStrat;
 			unitJson["exp"] = unit->expScreen;
 
 			j.push_back(unitJson);