Update to PUBG v6.5.6.3

cgcostume · Dec 19, 2019 · b631cd7 · b631cd7
1 parent ae5facc
commit b631cd7
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/erangel/pubg_erangel_height_l16_lod0.png b/erangel/pubg_erangel_height_l16_lod0.png
diff --git a/erangel/pubg_erangel_height_l16_preview.png b/erangel/pubg_erangel_height_l16_preview.png
diff --git a/erangel/pubg_erangel_normal_rg8_lod0.png b/erangel/pubg_erangel_normal_rg8_lod0.png
diff --git a/erangel/pubg_erangel_normal_rg8_preview.png b/erangel/pubg_erangel_normal_rg8_preview.png
diff --git a/miramar/pubg_miramar_height_l16_lod0.png b/miramar/pubg_miramar_height_l16_lod0.png
diff --git a/miramar/pubg_miramar_height_l16_preview.png b/miramar/pubg_miramar_height_l16_preview.png
diff --git a/miramar/pubg_miramar_normal_rg8_lod0.png b/miramar/pubg_miramar_normal_rg8_lod0.png
diff --git a/miramar/pubg_miramar_normal_rg8_preview.png b/miramar/pubg_miramar_normal_rg8_preview.png
diff --git a/pubg-tga-slice.py b/pubg-tga-slice.py
@@ -10,7 +10,7 @@
 # parse arguments
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-p', '--umodel_export_path', help = 'umodel export path')
+parser.add_argument('-p', '--umodel_export_path', help = 'umodel export path', required=True)
 parser.add_argument('-o', '--output_path', help = 'working directory for extracting and stitching assets', default = '.')
 parser.add_argument('-m', '--map', help = 'map identifier, either erangel, erangelclassic, miramar, sanhok, vikendi, or jackal', default = 'erangel')
 # parser.add_argument('-l', '--lod', help = 'level-of-detail, either 0, 1, or 2', default = '0')
@@ -27,8 +27,8 @@
 	'vikendi' : r'Game//Maps//DihorOtok//Art//Heightmap',
 	'jackal'  : r'Game//Maps//Range//Art//Heightmap',
 
-	'rapide'  : r'Game//Maps//Test//Rapide//Art//HeightMap',
-	'airange' : r'Game//Maps//AI_ShootingRange//AI_ShootingRange'
+	#'rapide'  : r'Game//Maps//Test//Rapide//Art//HeightMap',
+	#'airange' : r'Game//Maps//AI_ShootingRange//AI_ShootingRange'
 }
 
 # (width, height, indexRange)
@@ -40,15 +40,15 @@
 	'vikendi' : (12, 12, 3),
 	'jackal'  : ( 8,  8, 4),
 
-	'rapide'  : ( 8,  8, 4),
-	'airange' : ( 5,  1, 1)
+	#'rapide'  : ( 8,  8, 4),
+	#'airange' : ( 5,  1, 1)
 }
 
 map_identifier = args.map.lower()
 if map_identifier not in heightmap_paths:
 	sys.exit('Unknown map identifier \'' + map_identifier + '\'')
 
-map_size = map_size_data.get(map_identifier)
+map_size = map_size_data[map_identifier]
 map_size_max = max(map_size[0], map_size[1])
 small_map = map_size_max <= 8
 num_tiles = map_size[0] * map_size[1]
@@ -164,7 +164,7 @@ def extract_tiles(asset_path, offsets, height_target, normal_target):
 height_composite = Image.new("I", (tile_width * map_size[0], tile_height * map_size[1]))
 
 for indices in [(a, b) for a in range(0, map_size[2]) for b in range(0, map_size[2])]:
-	# example '.\UmodelExport\Maps\Erangel\Art\Heightmap\Heightmap_x0_y0_00_sharedAssets\Texture2D_0.tga'
+	# example '.\UmodelExport\Game\Maps\Erangel\Art\Heightmap\Heightmap_x0_y0_00_sharedAssets\Texture2D_0.tga'
 
 	path = ''
 	if map_identifier != 'airange':