ms2 - pad after last bone info

OpenNaja · Jan 2, 2024 · 6feb121 · 6feb121
1 parent ed1584e
commit 6feb121
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/constants/Jurassic World Evolution 2/texchannels.py b/constants/Jurassic World Evolution 2/texchannels.py
@@ -1,7 +1,7 @@
 texchannels = {
 	'pAOTexture': {"": "AO"},
 	'pAlphaTexture': {"": "OP"},
-	'pBaseAOTexture': {"": "AO"},
+	'pBaseAOTexture': {"R": "AO", "G": ""},  # BC5 - not sure what G is, maybe baldness
 	'pBaseColourTexture': {"RGB": "BC", "A": "CA"},  # check if A is used here  # Metallic_Roughness_Clip A = OP
 	# 'pBaseColourTextureDetailBase': {"RGB": "", "A": ""},
 	# 'pBaseColourTextureDetailBlend': {"RGB": "", "A": ""},

diff --git a/generated/formats/bnk/bnk.xml b/generated/formats/bnk/bnk.xml
@@ -178,14 +178,11 @@
 
     <compound name="HircPointer">
         <add name="id" type="HircType"/>
-<!--        <add name="data" type="TypeOther" />-->
         <add name="data" type="SoundSfxVoice" cond="id == 2"/>
         <add name="data" type="EventAction" cond="id == 3"/>
         <add name="data" type="Event" cond="id == 4"/>
-<!--        <add name="data" type="TypeOther" cond="id != 2"/>-->
         <add name="data" type="MusicTrack" cond="id == 11"/>
-        <add name="data" type="TypeOther" cond="(id != 2) #AND# (id != 11) #AND# (id != 3) #AND# (id != 4)"/>
-<!--        <add name="data" type="TypeOther" cond="(id != 2) #AND# (id != 11) #AND# (id != 4)"/>-->
+        <add name="data" type="TypeOther" cond="(id != 2) #AND# (id != 3) #AND# (id != 4) #AND# (id != 11)"/>
     </compound>
 
     <compound name="HIRCSection">

diff --git a/generated/formats/bnk/compounds/HircPointer.py b/generated/formats/bnk/compounds/HircPointer.py
@@ -36,5 +36,5 @@ def _get_filtered_attribute_list(cls, instance, include_abstract=True):
 			yield 'data', name_type_map['Event'], (0, None), (False, None)
 		if instance.id == 11:
 			yield 'data', name_type_map['MusicTrack'], (0, None), (False, None)
-		if (instance.id != 2) and ((instance.id != 11) and ((instance.id != 3) and (instance.id != 4))):
+		if (instance.id != 2) and ((instance.id != 3) and ((instance.id != 4) and (instance.id != 11))):
 			yield 'data', name_type_map['TypeOther'], (0, None), (False, None)
diff --git a/generated/formats/ms2/compounds/ModelReader.py b/generated/formats/ms2/compounds/ModelReader.py
@@ -244,6 +244,7 @@ def write_fields(cls, stream, instance):
 			instance.start_of_buffer = stream.tell()
 			for model_info in instance.arg.model_infos:
 				previous_bone_info = cls.write_bone_info(instance, model_info, previous_bone_info, stream)
+		instance.align_to(stream, alignment=16)
 		instance.bone_info_size = stream.tell() - instance.buffer_1_start
 		logging.debug(f"instance.bone_info_size = {instance.bone_info_size}")
 		instance.io_size = stream.tell() - instance.io_start

diff --git a/source/formats/bnk/bnk.xml b/source/formats/bnk/bnk.xml
@@ -178,14 +178,11 @@
 
     <compound name="HircPointer">
         <add name="id" type="HircType"/>
-<!--        <add name="data" type="TypeOther" />-->
         <add name="data" type="SoundSfxVoice" cond="id == 2"/>
         <add name="data" type="EventAction" cond="id == 3"/>
         <add name="data" type="Event" cond="id == 4"/>
-<!--        <add name="data" type="TypeOther" cond="id != 2"/>-->
         <add name="data" type="MusicTrack" cond="id == 11"/>
-        <add name="data" type="TypeOther" cond="(id != 2) #AND# (id != 11) #AND# (id != 3) #AND# (id != 4)"/>
-<!--        <add name="data" type="TypeOther" cond="(id != 2) #AND# (id != 11) #AND# (id != 4)"/>-->
+        <add name="data" type="TypeOther" cond="(id != 2) #AND# (id != 3) #AND# (id != 4) #AND# (id != 11)"/>
     </compound>
 
     <compound name="HIRCSection">

diff --git a/source/formats/ms2/compounds/ModelReader.py b/source/formats/ms2/compounds/ModelReader.py
@@ -232,6 +232,7 @@ def write_fields(cls, stream, instance):
 			instance.start_of_buffer = stream.tell()
 			for model_info in instance.arg.model_infos:
 				previous_bone_info = cls.write_bone_info(instance, model_info, previous_bone_info, stream)
+		instance.align_to(stream, alignment=16)
 		instance.bone_info_size = stream.tell() - instance.buffer_1_start
 		logging.debug(f"instance.bone_info_size = {instance.bone_info_size}")
 		instance.io_size = stream.tell() - instance.io_start

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-aff9a28e5 - Mon Jan 1 23:42:20 2024 +0100
+ed1584eee - Tue Jan 2 00:07:23 2024 +0100
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aff9a28e5 - Mon Jan 1 23:42:20 2024 +0100
		ed1584eee - Tue Jan 2 00:07:23 2024 +0100