added 12.11.0.ru

Monstrofil · Jan 10, 2024 · 00c0971 · 00c0971
1 parent 3ce03df
commit 00c0971
Show file tree

Hide file tree

Showing 20 changed files with 314 additions and 108 deletions.
diff --git a/replay_unpack/clients/wows/versions/12_11_0/battle_controller.py b/replay_unpack/clients/wows/versions/12_11_0/battle_controller.py
@@ -225,7 +225,7 @@ def receiveVehicleDeath(self, avatar, killedVehicleId, fraggerVehicleId, typeDea
     def g_receiveDamagesOnShip(self, vehicle, damages):
         for damage_info in damages:
             self._shots_damage_map.setdefault(vehicle.id, {}).setdefault(damage_info['vehicleID'], 0)
-            self._shots_damage_map[vehicle.id][damage_info['vehicleID']] += damage_info['damage']
+            self._shots_damage_map[vehicle.id][damage_info['vehicleID']] += damage_info['instantDamage'] + damage_info['periodicDamage']
 
     def receive_planeDeath(self, avatar, squadronID, planeIDs, reason, attackerId):
         self._dead_planes.setdefault(attackerId, 0)

diff --git a/replay_unpack/clients/wows/versions/12_11_0/scripts/component_defs/BattlePassComponent.def b/replay_unpack/clients/wows/versions/12_11_0/scripts/component_defs/BattlePassComponent.def
@@ -29,6 +29,12 @@
 				<result>BOOL</result>
 			</ReturnValues>
 		</claimAllRewards>
+		<dev_changeBattlePassType>
+			<Exposed/>
+			<Args>
+				<newType> UINT8 </newType>
+			</Args>
+		</dev_changeBattlePassType>
 	</BaseMethods>
 
 	<ClientMethods>

diff --git a/...ack/clients/wows/versions/12_11_0/scripts/component_defs/ControllerToAccountConnector.def b/...ack/clients/wows/versions/12_11_0/scripts/component_defs/ControllerToAccountConnector.def
@@ -12,7 +12,7 @@
 
 		<getReadyAccountMBox>
 		    <Args>
-		        <timeout>ENTITYAPI_TIMEOUT</timeout>
+		        <timeout>UINT16</timeout>
 		    </Args>
 			<ReturnValues>
 				<Arg> MAILBOX </Arg>
@@ -29,7 +29,7 @@
 			<Args>
 				<masterID>MASTER_ID</masterID>
 				<masterService>MAILBOX</masterService>
-				<loadArgs>ENTITY_LOAD_ARGS</loadArgs>
+				<loadArgs>ACCOUNT_LOAD_ARGS</loadArgs>
 			</Args>
  			<ReturnValues>
 				<mailbox> MAILBOX </mailbox>
@@ -43,6 +43,8 @@
 				<masterChanger> MAILBOX </masterChanger>
 			</Args>
 		</onAccountDestroy>
+
+		<onMasterChangeProcessStarted/>
 	</BaseMethods>
 
 	<ofEntity>

diff --git a/replay_unpack/clients/wows/versions/12_11_0/scripts/component_defs/DevFlagsComponent.def b/replay_unpack/clients/wows/versions/12_11_0/scripts/component_defs/DevFlagsComponent.def
@@ -0,0 +1,40 @@
+<root>
+
+	<TempProperties>
+		<devFlags/>
+	</TempProperties>
+
+    <BaseMethods>
+
+    	<setDevFlag>
+    		<Exposed/>
+			<Args>
+				<flag> STRING </flag>
+				<enabled> BOOL </enabled>
+			</Args>
+    	</setDevFlag>
+
+    </BaseMethods>
+
+	<ClientMethods>
+
+		<syncDevFlag>
+	    	<Args>
+				<flag> STRING </flag>
+				<enabled> BOOL </enabled>
+			</Args>
+		</syncDevFlag>
+
+		<syncAllDevFlags>
+			<Args>
+				<mask> DEV_FLAGS </mask>
+			</Args>
+		</syncAllDevFlags>
+
+	</ClientMethods>
+
+	<ofEntity>
+		<Account/>
+		<Avatar/>
+	</ofEntity>
+</root>
diff --git a/..._unpack/clients/wows/versions/12_11_0/scripts/component_defs/MasterEntityAPIComponent.def b/..._unpack/clients/wows/versions/12_11_0/scripts/component_defs/MasterEntityAPIComponent.def
@@ -6,9 +6,8 @@
 		<createEntityOnCluster>
 			<Args>
 				<clusterID> CLUSTER_ID </clusterID>
-				<entityType>STRING</entityType>
+				<entityType> STRING </entityType>
 				<entityParams>ZIPPED_BLOB</entityParams>
-				<entityCreateArgs>ENTITY_CREATE_ARGS</entityCreateArgs>
 			</Args>
 			<ReturnValues>
 				<entityMailbox> MAILBOX </entityMailbox>
@@ -18,7 +17,6 @@
 		<lookupAccountEntityByDBID>
 			<Args>
 				<accountDBID> DB_ID </accountDBID>
-				<lookupArgs>ENTITY_LOOKUP_ARGS</lookupArgs>
 				<redirectRequestToOtherCluster> BOOL </redirectRequestToOtherCluster>
 			</Args>
 			<ReturnValues>
@@ -27,10 +25,8 @@
 		</lookupAccountEntityByDBID>
 
 		<loadAccount>
-			<Args>
-				<accountDBID> DB_ID </accountDBID>
-				<loadArgs> ENTITY_LOAD_ARGS </loadArgs>
-			</Args>
+			<Arg>DB_ID</Arg>
+			<Arg>ACCOUNT_LOAD_ARGS</Arg>
 			<ReturnValues>
 				<account> MAILBOX </account>
 			</ReturnValues>
@@ -40,7 +36,6 @@
 			<Args>
 				<entityType> STRING </entityType>
 				<entityID> DB_ID </entityID>
-				<entityLoadArgs> ENTITY_LOAD_ARGS </entityLoadArgs>
 				<entityParams>ZIPPED_BLOB</entityParams>
 			</Args>
 			<ReturnValues>
@@ -62,7 +57,6 @@
 			<Args>
 				<clusterID> CLUSTER_ID </clusterID>
 				<entityParams> CREATE_BATTLE_SESSION_PARAMS </entityParams>
-				<entityCreateArgs>ENTITY_CREATE_ARGS</entityCreateArgs>
 			</Args>
 			<ReturnValues>
 				<entityMailbox> MAILBOX </entityMailbox>
@@ -73,7 +67,6 @@
 			<Args>
 				<clusterID> CLUSTER_ID </clusterID>
 				<entityParams> CREATE_PRE_BATTLE_PARAMS </entityParams>
-				<entityCreateArgs>ENTITY_CREATE_ARGS</entityCreateArgs>
 			</Args>
 			<ReturnValues>
 				<entityMailbox> MAILBOX </entityMailbox>
@@ -84,7 +77,6 @@
 			<Args>
 				<clusterID> CLUSTER_ID </clusterID>
 				<entityParams> CREATE_TRAINING_ROOM_PARAMS </entityParams>
-				<entityCreateArgs>ENTITY_CREATE_ARGS</entityCreateArgs>
 			</Args>
 			<ReturnValues>
 				<entityMailbox> MAILBOX </entityMailbox>

diff --git a/...unpack/clients/wows/versions/12_11_0/scripts/component_defs/StrategicActionsComponent.def b/...unpack/clients/wows/versions/12_11_0/scripts/component_defs/StrategicActionsComponent.def
@@ -41,7 +41,8 @@
 			<Args>
 				<territoryID> STRING </territoryID>
 				<progress> UINT16 </progress>
-				<progressData> ARRAY<of>STRING</of> </progressData>
+				<unlocks> ARRAY <of> STRING </of> </unlocks>
+				<autoselectedTerritoryID> STRING </autoselectedTerritoryID>
 			</Args>
 		</onProgressUpdated>
 		<onCurrentTaskChanged>

diff --git a/...y_unpack/clients/wows/versions/12_11_0/scripts/component_defs/SuperEntityAPIComponent.def b/...y_unpack/clients/wows/versions/12_11_0/scripts/component_defs/SuperEntityAPIComponent.def
@@ -11,7 +11,7 @@
 		<loadAccount>
 			<Args>
 				<accountDBID> DB_ID </accountDBID>
-				<loadArgs> ENTITY_LOAD_ARGS </loadArgs>
+				<loadArgs> ACCOUNT_LOAD_ARGS </loadArgs>
 			</Args>
 			<ReturnValues>
 				<account> MAILBOX </account>
@@ -21,10 +21,10 @@
 		<loadAccountController>
 			<Args>
 				<accountControllerDBID> DB_ID </accountControllerDBID>
-				<loadArgs> ENTITY_LOAD_ARGS </loadArgs>
+				<loadArgs> ACCOUNT_LOAD_ARGS </loadArgs>
 			</Args>
 			<ReturnValues>
-				<account> MAILBOX </account>
+				<account> MAILBOX </account>\
 			</ReturnValues>
 		</loadAccountController>
 

diff --git a/replay_unpack/clients/wows/versions/12_11_0/scripts/components.xml b/replay_unpack/clients/wows/versions/12_11_0/scripts/components.xml
@@ -28,4 +28,5 @@
 	<MasterEntityAPIComponent/>
 	<PdataResetComponent/>
 	<StrategicActionsComponent/>
+	<DevFlagsComponent/>
 </root>
diff --git a/replay_unpack/clients/wows/versions/12_11_0/scripts/entity_defs/Account.def b/replay_unpack/clients/wows/versions/12_11_0/scripts/entity_defs/Account.def
@@ -111,7 +111,7 @@
             </VariableLengthHeaderSize>
         </enterPreBattle>
         <changePreBattleGrants>
-            <Arg>INT32</Arg>
+            <Arg>INT64</Arg>
         </changePreBattleGrants>
         <onPreBattleCountdown>
             <Arg>UINT8</Arg>
@@ -129,7 +129,7 @@
         <enterTrainingRoom>
             <Arg>BLOB</Arg>
             <Arg>COUNTDOWN_INFO</Arg>
-            <Arg>INT32</Arg>
+            <Arg>INT64</Arg>
             <Arg>BOOL</Arg>
             <VariableLengthHeaderSize>
                 <WarnLevel>none</WarnLevel>
@@ -199,7 +199,7 @@
         <setTrace>
             <Arg>BOOL</Arg>
         </setTrace>
-        <curVersion_12_11_1_7814610></curVersion_12_11_1_7814610>
+        <curVersion_12_11_0_7880979></curVersion_12_11_0_7880979>
         <updateSSEProgress>
             <Arg>STRING</Arg>
             <VariableLengthHeaderSize>