Improve naming convention

ryzom/tools/extract_r2_required/generate_sitem.py

@@ -677,6 +677,26 @@ def generateSitems():
 		if "armor" in tags and "refugee" in tags and len(name) > 5:
 			continue # No need to generate these for now
 		
+		brickFamily = findBrickFamily(tags)
+		
+		sbrickEntry = None
+		if name in sbrickLookup:
+			sbrickEntry = sbrickLookup[name]
+		else:
+			print("New sbrick entry: " + name + ", Family: " + brickFamily)
+		if sbrickEntry and sbrickEntry[0] != brickFamily:
+			print("Brick family changed: " + name + ", New: " + brickFamily + ", Old: " + sbrickEntry[0])
+			sbrickEntry = None
+		sbrickIndex = None
+		if sbrickEntry:
+			sbrickIndex = int(sbrickEntry[1], 10)
+		else:
+			sbrickIndex = allocFamilyIndex(brickFamily)
+			if sbrickIndex:
+				sbrickEntry = [ brickFamily, str(sbrickIndex) ]
+				print(sbrickEntry)
+		sbrickName = brickFamily.lower() + str(sbrickIndex).zfill(2) + "_" + name[2:];
+		
 		parent = findSitemParent(tags)
 		if not parent:
 			print("No parent for sitem: " + name + ", tags: " + tags)
@@ -698,7 +718,7 @@ def generateSitems():
 				f.write("          <ATOM Value=\"" + armorSlot + "\"/>\n")
 				f.write("        </ARRAY>\n")
 				f.write("      </STRUCT>\n")
-			f.write("      <ATOM Name=\"CraftPlan\" Value=\"b" + name[1:] + ".sbrick\"/>\n") # TODO: extract sbrick ids
+			f.write("      <ATOM Name=\"CraftPlan\" Value=\"" + sbrickName + ".sbrick\"/>\n") # TODO: extract sbrick ids
 			f.write("    </STRUCT>\n")
 			f.write("    <STRUCT Name=\"3d\">\n")
 			f.write("      <ATOM Name=\"shape\" Value=\"" + shapeMale + ".shape\"/>\n")
@@ -716,9 +736,9 @@ def generateSitems():
 			f.write("  </STRUCT>\n")
 			f.write("</FORM>\n")
 			f.flush()
+		#print(brickFamily)
 		
 		# Generate the sbrick
-		sbrickName = "b" + name[1:];
 		sbrickRoot = "Y:\\ryzomcore4\\leveldesign\\game_element\\sbrick\\craft\\effect"
 		sbrickFolder = sbrickRoot + "\\" + folder
 		sbrickFile = sbrickFolder + "\\" + sbrickName + ".sbrick"
@@ -730,9 +750,6 @@ def generateSitems():
 		# 	print(skill)
 		# 	print(tags)
 		
-		brickFamily = findBrickFamily(tags)
-		#print(brickFamily)
-		
 		sbrickIcon = icon # ar_botte
 		sbrickIconBack = "bk_generic_brick.png" # bk_zorai_brick
 		if "fyros" in tags:
@@ -744,25 +761,6 @@ def generateSitems():
 		elif "zorai" in tags:
 			sbrickIconBack = "bk_zorai_brick.png"
 		
-		sbrickEntry = None
-		if sbrickName in sbrickLookup:
-			sbrickEntry = sbrickLookup[sbrickName]
-		elif name in sbrickLookup:
-			sbrickEntry = sbrickLookup[name]
-		else:
-			print("New sbrick entry: " + sbrickName + ", Family: " + brickFamily)
-		if sbrickEntry and sbrickEntry[0] != brickFamily:
-			print("Brick family changed: " + sbrickName + ", New: " + brickFamily + ", Old: " + sbrickEntry[0])
-			sbrickEntry = None
-		sbrickIndex = None
-		if sbrickEntry:
-			sbrickIndex = int(sbrickEntry[1], 10)
-		else:
-			sbrickIndex = allocFamilyIndex(brickFamily)
-			if sbrickIndex:
-				sbrickEntry = [ brickFamily, str(sbrickIndex) ]
-				print(sbrickEntry)
-		
 		minMat = 2
 		randMat = 4
 		if "one-handed" in tags:

ryzom/tools/extract_r2_required/sbrick_index.tsv

@@ -57,22 +57,22 @@ BCBREA	21	bcbsea01_3	icbsb_3	__missing
 BCBREA	22	bcbsea02	icbss	__missing
 BCBREA	23	bcbsea02_2	icbss_2	__missing
 BCBREA	24	bcbsea02_3	icbss_3	__missing
-BCCAEA	7	bccalb	iccalb	bccaea07
-BCCAEA	8	bccalg	iccalg	bccaea08
-BCCAEA	9	bccalp	iccalp	bccaea09
-BCCAEA	10	bccals	iccals	bccaea10
-BCCAEA	11	bccalv	iccalv	bccaea11
-BCCAEB	16	bccamb	iccamb	bccaea12
-BCCAEB	19	bccamg	iccamg	bccaea13
-BCCAEB	22	bccamp	iccamp	bccaea14
-BCCAEB	25	bccams	iccams	bccaea15
-BCCAEB	28	bccamv	iccamv	bccaea16
-BCCAEC	1	bccahb	iccahb	bccaea01
-BCCAEC	2	bccahg	iccahg	bccaea02
-BCCAEC	3	bccahh	iccahh	bccaea03
-BCCAEC	4	bccahp	iccahp	bccaea04
-BCCAEC	5	bccahs	iccahs	bccaea05
-BCCAEC	6	bccahv	iccahv	bccaea06
+BCCAEA	7	bccaea07_calb	iccalb	bccalb	bccaea07
+BCCAEA	8	bccaea08_calg	iccalg	bccalg	bccaea08
+BCCAEA	9	bccaea09_calp	iccalp	bccalp	bccaea09
+BCCAEA	10	bccaea10_cals	iccals	bccals	bccaea10
+BCCAEA	11	bccaea11_calv	iccalv	bccalv	bccaea11
+BCCAEB	16	bccaeb16_camb	iccamb	bccamb	bccaea12
+BCCAEB	19	bccaeb19_camg	iccamg	bccamg	bccaea13
+BCCAEB	22	bccaeb22_camp	iccamp	bccamp	bccaea14
+BCCAEB	25	bccaeb25_cams	iccams	bccams	bccaea15
+BCCAEB	28	bccaeb28_camv	iccamv	bccamv	bccaea16
+BCCAEC	1	bccaec01_cahb	iccahb	bccahb	bccaea01
+BCCAEC	2	bccaec02_cahg	iccahg	bccahg	bccaea02
+BCCAEC	3	bccaec03_cahh	iccahh	bccahh	bccaea03
+BCCAEC	4	bccaec04_cahp	iccahp	bccahp	bccaea04
+BCCAEC	5	bccaec05_cahs	iccahs	bccahs	bccaea05
+BCCAEC	6	bccaec06_cahv	iccahv	bccahv	bccaea06
 BCCAEC	7	bcbahb_m	__missing
 BCCAEC	8	bcbahg_m	__missing
 BCCAEC	9	bcbahh_m	__missing
@@ -85,7 +85,7 @@ BCCAEC	19	bcbahh	iccahh_b	__missing
 BCCAEC	20	bcbahp	iccahp_b	__missing
 BCCAEC	21	bcbahs	iccahs_b	__missing
 BCCAEC	22	bcbahv	iccahv_b	__missing
-BCCAED	7	bccacp	iccacp	bccaea19
+BCCAED	7	bccaed07_cacp	iccacp	bccacp	bccaea19
 BCCMEA	01	bccmea01	iccm2sa	__missing
 BCCMEA	02	bccmea02	iccm2pp	__missing
 BCCMEA	03	bccmea03	iccm2bm	__missing
@@ -157,65 +157,65 @@ BCFACA	22	bcfaca22	__missing
 BCFACA	23	bcfaca23	__missing
 BCFACA	24	bcfaca24	__missing
 BCFACA	25	bcfaca25	__missing
-BCFAEA	1	bcfalb	icfalb	bcfaea07
-BCFAEA	2	bcfalb_2	icfalb_2	bcfaea07_2
-BCFAEA	3	bcfalb_3	icfalb_3	bcfaea07_3
-BCFAEA	4	bcfalg	icfalg	bcfaea08
-BCFAEA	5	bcfalg_2	icfalg_2	bcfaea08_2
-BCFAEA	6	bcfalg_3	icfalg_3	bcfaea08_3
-BCFAEA	7	bcfalp	icfalp	bcfaea09
-BCFAEA	8	bcfalp_2	icfalp_2	bcfaea09_2
-BCFAEA	9	bcfalp_3	icfalp_3	bcfaea09_3
-BCFAEA	10	bcfals	icfals	bcfaea10
-BCFAEA	11	bcfals_2	icfals_2	bcfaea10_2
-BCFAEA	12	bcfals_3	icfals_3	bcfaea10_3
-BCFAEA	13	bcfalv	icfalv	bcfaea11
-BCFAEA	14	bcfalv_2	icfalv_2	bcfaea11_2
-BCFAEA	15	bcfalv_3	icfalv_3	bcfaea11_3
-BCFAEA	16	bcfauwv	icfauwv
-BCFAEA	17	bcfauwp	icfauwp
-BCFAEB	16	bcfamb	icfamb	bcfaea12
-BCFAEB	17	bcfamb_2	icfamb_2	bcfaea12_2
-BCFAEB	18	bcfamb_3	icfamb_3	bcfaea12_3
-BCFAEB	19	bcfamg	icfamg	bcfaea13
-BCFAEB	20	bcfamg_2	icfamg_2	bcfaea13_2
-BCFAEB	21	bcfamg_3	icfamg_3	bcfaea13_3
-BCFAEB	22	bcfamp	icfamp	bcfaea14
-BCFAEB	23	bcfamp_2	icfamp_2	bcfaea14_2
-BCFAEB	24	bcfamp_3	icfamp_3	bcfaea14_3
-BCFAEB	25	bcfams	icfams	bcfaea15
-BCFAEB	26	bcfams_2	icfams_2	bcfaea15_2
-BCFAEB	27	bcfams_3	icfams_3	bcfaea15_3
-BCFAEB	28	bcfamv	icfamv	bcfaea16
-BCFAEB	29	bcfamv_2	icfamv_2	bcfaea16_2
-BCFAEB	30	bcfamv_3	icfamv_3	bcfaea16_3
-BCFAEC	1	bcfahb	icfahb	bcfaea01
-BCFAEC	2	bcfahb_2	icfahb_2	bcfaea01_2
-BCFAEC	3	bcfahb_3	icfahb_3	bcfaea01_3
-BCFAEC	4	bcfahg	icfahg	bcfaea02
-BCFAEC	5	bcfahg_2	icfahg_2	bcfaea02_2
-BCFAEC	6	bcfahg_3	icfahg_3	bcfaea02_3
-BCFAEC	7	bcfahh	icfahh	bcfaea03
-BCFAEC	8	bcfahh_2	icfahh_2	bcfaea03_2
-BCFAEC	9	bcfahh_3	icfahh_3	bcfaea03_3
-BCFAEC	10	bcfahp	icfahp	bcfaea04
-BCFAEC	11	bcfahp_2	icfahp_2	bcfaea04_2
-BCFAEC	12	bcfahp_3	icfahp_3	bcfaea04_3
-BCFAEC	13	bcfahs	icfahs	bcfaea05
-BCFAEC	14	bcfahs_2	icfahs_2	bcfaea05_2
-BCFAEC	15	bcfahs_3	icfahs_3	bcfaea05_3
-BCFAEC	16	bcfahv	icfahv	bcfaea06
-BCFAEC	17	bcfahv_2	icfahv_2	bcfaea06_2
-BCFAEC	18	bcfahv_3	icfahv_3	bcfaea06_3
+BCFAEA	1	bcfaea01_falb	icfalb	bcfalb	bcfaea07
+BCFAEA	2	bcfaea02_falb_2	icfalb_2	bcfalb_2	bcfaea07_2
+BCFAEA	3	bcfaea03_falb_3	icfalb_3	bcfalb_3	bcfaea07_3
+BCFAEA	4	bcfaea04_falg	icfalg	bcfalg	bcfaea08
+BCFAEA	5	bcfaea05_falg_2	icfalg_2	bcfalg_2	bcfaea08_2
+BCFAEA	6	bcfaea06_falg_3	icfalg_3	bcfalg_3	bcfaea08_3
+BCFAEA	7	bcfaea07_falp	icfalp	bcfalp	bcfaea09
+BCFAEA	8	bcfaea08_falp_2	icfalp_2	bcfalp_2	bcfaea09_2
+BCFAEA	9	bcfaea09_falp_3	icfalp_3	bcfalp_3	bcfaea09_3
+BCFAEA	10	bcfaea10_fals	icfals	bcfals	bcfaea10
+BCFAEA	11	bcfaea11_fals_2	icfals_2	bcfals_2	bcfaea10_2
+BCFAEA	12	bcfaea12_fals_3	icfals_3	bcfals_3	bcfaea10_3
+BCFAEA	13	bcfaea13_falv	icfalv	bcfalv	bcfaea11
+BCFAEA	14	bcfaea14_falv_2	icfalv_2	bcfalv_2	bcfaea11_2
+BCFAEA	15	bcfaea15_falv_3	icfalv_3	bcfalv_3	bcfaea11_3
+BCFAEA	16	bcfaea16_fauwv	icfauwv	bcfauwv
+BCFAEA	17	bcfaea17_fauwp	icfauwp	bcfauwp
+BCFAEB	16	bcfaeb16_famb	icfamb	bcfamb	bcfaea12
+BCFAEB	17	bcfaeb17_famb_2	icfamb_2	bcfamb_2	bcfaea12_2
+BCFAEB	18	bcfaeb18_famb_3	icfamb_3	bcfamb_3	bcfaea12_3
+BCFAEB	19	bcfaeb19_famg	icfamg	bcfamg	bcfaea13
+BCFAEB	20	bcfaeb20_famg_2	icfamg_2	bcfamg_2	bcfaea13_2
+BCFAEB	21	bcfaeb21_famg_3	icfamg_3	bcfamg_3	bcfaea13_3
+BCFAEB	22	bcfaeb22_famp	icfamp	bcfamp	bcfaea14
+BCFAEB	23	bcfaeb23_famp_2	icfamp_2	bcfamp_2	bcfaea14_2
+BCFAEB	24	bcfaeb24_famp_3	icfamp_3	bcfamp_3	bcfaea14_3
+BCFAEB	25	bcfaeb25_fams	icfams	bcfams	bcfaea15
+BCFAEB	26	bcfaeb26_fams_2	icfams_2	bcfams_2	bcfaea15_2
+BCFAEB	27	bcfaeb27_fams_3	icfams_3	bcfams_3	bcfaea15_3
+BCFAEB	28	bcfaeb28_famv	icfamv	bcfamv	bcfaea16
+BCFAEB	29	bcfaeb29_famv_2	icfamv_2	bcfamv_2	bcfaea16_2
+BCFAEB	30	bcfaeb30_famv_3	icfamv_3	bcfamv_3	bcfaea16_3
+BCFAEC	1	bcfaec01_fahb	icfahb	bcfahb	bcfaea01
+BCFAEC	2	bcfaec02_fahb_2	icfahb_2	bcfahb_2	bcfaea01_2
+BCFAEC	3	bcfaec03_fahb_3	icfahb_3	bcfahb_3	bcfaea01_3
+BCFAEC	4	bcfaec04_fahg	icfahg	bcfahg	bcfaea02
+BCFAEC	5	bcfaec05_fahg_2	icfahg_2	bcfahg_2	bcfaea02_2
+BCFAEC	6	bcfaec06_fahg_3	icfahg_3	bcfahg_3	bcfaea02_3
+BCFAEC	7	bcfaec07_fahh	icfahh	bcfahh	bcfaea03
+BCFAEC	8	bcfaec08_fahh_2	icfahh_2	bcfahh_2	bcfaea03_2
+BCFAEC	9	bcfaec09_fahh_3	icfahh_3	bcfahh_3	bcfaea03_3
+BCFAEC	10	bcfaec10_fahp	icfahp	bcfahp	bcfaea04
+BCFAEC	11	bcfaec11_fahp_2	icfahp_2	bcfahp_2	bcfaea04_2
+BCFAEC	12	bcfaec12_fahp_3	icfahp_3	bcfahp_3	bcfaea04_3
+BCFAEC	13	bcfaec13_fahs	icfahs	bcfahs	bcfaea05
+BCFAEC	14	bcfaec14_fahs_2	icfahs_2	bcfahs_2	bcfaea05_2
+BCFAEC	15	bcfaec15_fahs_3	icfahs_3	bcfahs_3	bcfaea05_3
+BCFAEC	16	bcfaec16_fahv	icfahv	bcfahv	bcfaea06
+BCFAEC	17	bcfaec17_fahv_2	icfahv_2	bcfahv_2	bcfaea06_2
+BCFAEC	18	bcfaec18_fahv_3	icfahv_3	bcfahv_3	bcfaea06_3
 BCFAED	1	bcfaea17	icfacb	__missing
 BCFAED	2	bcfaea17_2	icfacb_2	__missing
 BCFAED	3	bcfaea17_3	icfacb_3	__missing
 BCFAED	4	bcfaea18	icfacg	__missing
 BCFAED	5	bcfaea18_2	icfacg_2	__missing
 BCFAED	6	bcfaea18_3	icfacg_3	__missing
-BCFAED	7	bcfacp	icfacp	bcfaea19
-BCFAED	8	bcfacp_2	icfacp_2	bcfaea19_2
-BCFAED	9	bcfacp_3	icfacp_3	bcfaea19_3
+BCFAED	7	bcfaed07_facp	icfacp	bcfacp	bcfaea19
+BCFAED	8	bcfaed08_facp_2	icfacp_2	bcfacp_2	bcfaea19_2
+BCFAED	9	bcfaed09_facp_3	icfacp_3	bcfacp_3	bcfaea19_3
 BCFAED	10	bcfaea20	icfacs	__missing
 BCFAED	11	bcfaea20_2	icfacs_2	__missing
 BCFAED	12	bcfaea20_3	icfacs_3	__missing
@@ -578,65 +578,65 @@ BCMACA	22	bcmaca22	__missing
 BCMACA	23	bcmaca23	__missing
 BCMACA	24	bcmaca24	__missing
 BCMACA	25	bcmaca25	__missing
-BCMAEA	1	bcmalb	icmalb	bcmaea07
-BCMAEA	2	bcmalb_2	icmalb_2	bcmaea07_2
-BCMAEA	3	bcmalb_3	icmalb_3	bcmaea07_3
-BCMAEA	4	bcmalg	icmalg	bcmaea08
-BCMAEA	5	bcmalg_2	icmalg_2	bcmaea08_2
-BCMAEA	6	bcmalg_3	icmalg_3	bcmaea08_3
-BCMAEA	7	bcmalp	icmalp	bcmaea09
-BCMAEA	8	bcmalp_2	icmalp_2	bcmaea09_2
-BCMAEA	9	bcmalp_3	icmalp_3	bcmaea09_3
-BCMAEA	10	bcmals	icmals	bcmaea10
-BCMAEA	11	bcmals_2	icmals_2	bcmaea10_2
-BCMAEA	12	bcmals_3	icmals_3	bcmaea10_3
-BCMAEA	13	bcmalv	icmalv	bcmaea11
-BCMAEA	14	bcmalv_2	icmalv_2	bcmaea11_2
-BCMAEA	15	bcmalv_3	icmalv_3	bcmaea11_3
-BCMAEA	16	bcmauwv	icmauwv
-BCMAEA	17	bcmauwp	icmauwp
-BCMAEB	1	bcmamb	icmamb	bcmaea12
-BCMAEB	2	bcmamb_2	icmamb_2	bcmaea12_2
-BCMAEB	3	bcmamb_3	icmamb_3	bcmaea12_3
-BCMAEB	4	bcmamg	icmamg	bcmaea13
-BCMAEB	5	bcmamg_2	icmamg_2	bcmaea13_2
-BCMAEB	6	bcmamg_3	icmamg_3	bcmaea13_3
-BCMAEB	7	bcmamp	icmamp	bcmaea14
-BCMAEB	8	bcmamp_2	icmamp_2	bcmaea14_2
-BCMAEB	9	bcmamp_3	icmamp_3	bcmaea14_3
-BCMAEB	10	bcmams	icmams	bcmaea15
-BCMAEB	11	bcmams_2	icmams_2	bcmaea15_2
-BCMAEB	12	bcmams_3	icmams_3	bcmaea15_3
-BCMAEB	13	bcmamv	icmamv	bcmaea16
-BCMAEB	14	bcmamv_2	icmamv_2	bcmaea16_2
-BCMAEB	15	bcmamv_3	icmamv_3	bcmaea16_3
-BCMAEC	1	bcmahb	icmahb	bcmaea01
-BCMAEC	2	bcmahb_2	icmahb_2	bcmaea01_2
-BCMAEC	3	bcmahb_3	icmahb_3	bcmaea01_3
-BCMAEC	4	bcmahg	icmahg	bcmaea02
-BCMAEC	5	bcmahg_2	icmahg_2	bcmaea02_2
-BCMAEC	6	bcmahg_3	icmahg_3	bcmaea02_3
-BCMAEC	7	bcmahh	icmahh	bcmaea03
-BCMAEC	8	bcmahh_2	icmahh_2	bcmaea03_2
-BCMAEC	9	bcmahh_3	icmahh_3	bcmaea03_3
-BCMAEC	10	bcmahp	icmahp	bcmaea04
-BCMAEC	11	bcmahp_2	icmahp_2	bcmaea04_2
-BCMAEC	12	bcmahp_3	icmahp_3	bcmaea04_3
-BCMAEC	13	bcmahs	icmahs	bcmaea05
-BCMAEC	14	bcmahs_2	icmahs_2	bcmaea05_2
-BCMAEC	15	bcmahs_3	icmahs_3	bcmaea05_3
-BCMAEC	16	bcmahv	icmahv	bcmaea06
-BCMAEC	17	bcmahv_2	icmahv_2	bcmaea06_2
-BCMAEC	18	bcmahv_3	icmahv_3	bcmaea06_3
+BCMAEA	1	bcmaea01_malb	icmalb	bcmalb	bcmaea07
+BCMAEA	2	bcmaea02_malb_2	icmalb_2	bcmalb_2	bcmaea07_2
+BCMAEA	3	bcmaea03_malb_3	icmalb_3	bcmalb_3	bcmaea07_3
+BCMAEA	4	bcmaea04_malg	icmalg	bcmalg	bcmaea08
+BCMAEA	5	bcmaea05_malg_2	icmalg_2	bcmalg_2	bcmaea08_2
+BCMAEA	6	bcmaea06_malg_3	icmalg_3	bcmalg_3	bcmaea08_3
+BCMAEA	7	bcmaea07_malp	icmalp	bcmalp	bcmaea09
+BCMAEA	8	bcmaea08_malp_2	icmalp_2	bcmalp_2	bcmaea09_2
+BCMAEA	9	bcmaea09_malp_3	icmalp_3	bcmalp_3	bcmaea09_3
+BCMAEA	10	bcmaea10_mals	icmals	bcmals	bcmaea10
+BCMAEA	11	bcmaea11_mals_2	icmals_2	bcmals_2	bcmaea10_2
+BCMAEA	12	bcmaea12_mals_3	icmals_3	bcmals_3	bcmaea10_3
+BCMAEA	13	bcmaea13_malv	icmalv	bcmalv	bcmaea11
+BCMAEA	14	bcmaea14_malv_2	icmalv_2	bcmalv_2	bcmaea11_2
+BCMAEA	15	bcmaea15_malv_3	icmalv_3	bcmalv_3	bcmaea11_3
+BCMAEA	16	bcmaea16_mauwv	icmauwv	bcmauwv
+BCMAEA	17	bcmaea17_mauwp	icmauwp	bcmauwp
+BCMAEB	1	bcmaeb01_mamb	icmamb	bcmamb	bcmaea12
+BCMAEB	2	bcmaeb02_mamb_2	icmamb_2	bcmamb_2	bcmaea12_2
+BCMAEB	3	bcmaeb03_mamb_3	icmamb_3	bcmamb_3	bcmaea12_3
+BCMAEB	4	bcmaeb04_mamg	icmamg	bcmamg	bcmaea13
+BCMAEB	5	bcmaeb05_mamg_2	icmamg_2	bcmamg_2	bcmaea13_2
+BCMAEB	6	bcmaeb06_mamg_3	icmamg_3	bcmamg_3	bcmaea13_3
+BCMAEB	7	bcmaeb07_mamp	icmamp	bcmamp	bcmaea14
+BCMAEB	8	bcmaeb08_mamp_2	icmamp_2	bcmamp_2	bcmaea14_2
+BCMAEB	9	bcmaeb09_mamp_3	icmamp_3	bcmamp_3	bcmaea14_3
+BCMAEB	10	bcmaeb10_mams	icmams	bcmams	bcmaea15
+BCMAEB	11	bcmaeb11_mams_2	icmams_2	bcmams_2	bcmaea15_2
+BCMAEB	12	bcmaeb12_mams_3	icmams_3	bcmams_3	bcmaea15_3
+BCMAEB	13	bcmaeb13_mamv	icmamv	bcmamv	bcmaea16
+BCMAEB	14	bcmaeb14_mamv_2	icmamv_2	bcmamv_2	bcmaea16_2
+BCMAEB	15	bcmaeb15_mamv_3	icmamv_3	bcmamv_3	bcmaea16_3
+BCMAEC	1	bcmaec01_mahb	icmahb	bcmahb	bcmaea01
+BCMAEC	2	bcmaec02_mahb_2	icmahb_2	bcmahb_2	bcmaea01_2
+BCMAEC	3	bcmaec03_mahb_3	icmahb_3	bcmahb_3	bcmaea01_3
+BCMAEC	4	bcmaec04_mahg	icmahg	bcmahg	bcmaea02
+BCMAEC	5	bcmaec05_mahg_2	icmahg_2	bcmahg_2	bcmaea02_2
+BCMAEC	6	bcmaec06_mahg_3	icmahg_3	bcmahg_3	bcmaea02_3
+BCMAEC	7	bcmaec07_mahh	icmahh	bcmahh	bcmaea03
+BCMAEC	8	bcmaec08_mahh_2	icmahh_2	bcmahh_2	bcmaea03_2
+BCMAEC	9	bcmaec09_mahh_3	icmahh_3	bcmahh_3	bcmaea03_3
+BCMAEC	10	bcmaec10_mahp	icmahp	bcmahp	bcmaea04
+BCMAEC	11	bcmaec11_mahp_2	icmahp_2	bcmahp_2	bcmaea04_2
+BCMAEC	12	bcmaec12_mahp_3	icmahp_3	bcmahp_3	bcmaea04_3
+BCMAEC	13	bcmaec13_mahs	icmahs	bcmahs	bcmaea05
+BCMAEC	14	bcmaec14_mahs_2	icmahs_2	bcmahs_2	bcmaea05_2
+BCMAEC	15	bcmaec15_mahs_3	icmahs_3	bcmahs_3	bcmaea05_3
+BCMAEC	16	bcmaec16_mahv	icmahv	bcmahv	bcmaea06
+BCMAEC	17	bcmaec17_mahv_2	icmahv_2	bcmahv_2	bcmaea06_2
+BCMAEC	18	bcmaec18_mahv_3	icmahv_3	bcmahv_3	bcmaea06_3
 BCMAED	1	bcmaea17	icmacb	__missing
 BCMAED	2	bcmaea17_2	icmacb_2	__missing
 BCMAED	3	bcmaea17_3	icmacb_3	__missing
 BCMAED	4	bcmaea18	icmacg	__missing
 BCMAED	5	bcmaea18_2	icmacg_2	__missing
 BCMAED	6	bcmaea18_3	icmacg_3	__missing
-BCMAED	7	bcmacp	icmacp	bcmaea19
-BCMAED	8	bcmacp_2	icmacp_2	bcmaea19_2
-BCMAED	9	bcmacp_3	icmacp_3	bcmaea19_3
+BCMAED	7	bcmaed07_macp	icmacp	bcmacp	bcmaea19
+BCMAED	8	bcmaed08_macp_2	icmacp_2	bcmacp_2	bcmaea19_2
+BCMAED	9	bcmaed09_macp_3	icmacp_3	bcmacp_3	bcmaea19_3
 BCMAED	10	bcmaea20	icmacs	__missing
 BCMAED	11	bcmaea20_2	icmacs_2	__missing
 BCMAED	12	bcmaea20_3	icmacs_3	__missing
@@ -1118,48 +1118,48 @@ BCPA	30	bcpa30	__missing
 BCPA	31	bcpa31	__missing
 BCPA	32	bcpa32	__missing
 BCPA	33	bcpa33	__missing
-BCRAEA	01	bcraea01	icraba
-BCRAEA	02	bcraea02	icrabe
-BCRAEA	03	bcraea03	icrabu
-BCRAEA	04	bcraea04	icrabg
-BCRAEA	05	bcraea05	icrabr
-BCRAEA	06	bcraea06	icrabt
-BCRAEA	07	bcraea07	icrabv
-BCRAEA	08	bcraea08	icrabw
-BCRAEA	09	bcraea09	icrage
-BCRAEA	10	bcraea10	icraga
-BCRAEA	11	bcraea11	icragu
-BCRAEA	12	bcraea12	icragg
-BCRAEA	13	bcraea13	icragr
-BCRAEA	14	bcraea14	icragt
-BCRAEA	15	bcraea15	icragv
-BCRAEA	16	bcraea16	icragw
-BCRAEA	17	bcraea17	icrape
-BCRAEA	18	bcraea18	icrapa
-BCRAEA	19	bcraea19	icrapu
-BCRAEA	20	bcraea20	icrapg
-BCRAEA	21	bcraea21	icrapr
-BCRAEA	22	bcraea22	icrapt
-BCRAEA	23	bcraea23	icrapv
-BCRAEA	24	bcraea24	icrapw
-BCRAEA	25	bcraea25	icrase
-BCRAEA	26	bcraea26	icrasa
-BCRAEA	27	bcraea27	icrasu
-BCRAEA	28	bcraea28	icrasg
-BCRAEA	29	bcraea29	icrasr
-BCRAEA	30	bcraea30	icrast
-BCRAEA	31	bcraea31	icrasv
-BCRAEA	32	bcraea32	icrasw
-BCRAEA	33	bcraea33	icrave
-BCRAEA	34	bcraea34	icrava
-BCRAEA	35	bcraea35	icravu
-BCRAEA	36	bcraea36	icravg
-BCRAEA	37	bcraea37	icravr
-BCRAEA	38	bcraea38	icravt
-BCRAEA	39	bcraea39	icravv
-BCRAEA	40	bcraea40	icravw
-BCRAEA	41	bcrav	icrav
-BCRAEA	42	bcrap	icrap
+BCRAEA	01	bcraea01	icraba	__missing
+BCRAEA	02	bcraea02	icrabe	__missing
+BCRAEA	03	bcraea03	icrabu	__missing
+BCRAEA	04	bcraea04	icrabg	__missing
+BCRAEA	05	bcraea05	icrabr	__missing
+BCRAEA	06	bcraea06	icrabt	__missing
+BCRAEA	07	bcraea07	icrabv	__missing
+BCRAEA	08	bcraea08	icrabw	__missing
+BCRAEA	09	bcraea09	icrage	__missing
+BCRAEA	10	bcraea10	icraga	__missing
+BCRAEA	11	bcraea11	icragu	__missing
+BCRAEA	12	bcraea12	icragg	__missing
+BCRAEA	13	bcraea13	icragr	__missing
+BCRAEA	14	bcraea14	icragt	__missing
+BCRAEA	15	bcraea15	icragv	__missing
+BCRAEA	16	bcraea16	icragw	__missing
+BCRAEA	17	bcraea17	icrape	__missing
+BCRAEA	18	bcraea18	icrapa	__missing
+BCRAEA	19	bcraea19	icrapu	__missing
+BCRAEA	20	bcraea20	icrapg	__missing
+BCRAEA	21	bcraea21	icrapr	__missing
+BCRAEA	22	bcraea22	icrapt	__missing
+BCRAEA	23	bcraea23	icrapv	__missing
+BCRAEA	24	bcraea24	icrapw	__missing
+BCRAEA	25	bcraea25	icrase	__missing
+BCRAEA	26	bcraea26	icrasa	__missing
+BCRAEA	27	bcraea27	icrasu	__missing
+BCRAEA	28	bcraea28	icrasg	__missing
+BCRAEA	29	bcraea29	icrasr	__missing
+BCRAEA	30	bcraea30	icrast	__missing
+BCRAEA	31	bcraea31	icrasv	__missing
+BCRAEA	32	bcraea32	icrasw	__missing
+BCRAEA	33	bcraea33	icrave	__missing
+BCRAEA	34	bcraea34	icrava	__missing
+BCRAEA	35	bcraea35	icravu	__missing
+BCRAEA	36	bcraea36	icravg	__missing
+BCRAEA	37	bcraea37	icravr	__missing
+BCRAEA	38	bcraea38	icravt	__missing
+BCRAEA	39	bcraea39	icravv	__missing
+BCRAEA	40	bcraea40	icravw	__missing
+BCRAEA	41	bcraea41_rav	icrav	bcrav
+BCRAEA	42	bcraea42_rap	icrap	bcrap
 BCRMEA	12	bcrmea06	icrm1pd
 BCRMEA	13	bcrmea10	icrm1ss	__missing
 BCRMEA	14	bcrmea15	icrm2ms
@@ -1188,65 +1188,65 @@ BCTACA	22	bctaca22	__missing
 BCTACA	23	bctaca23	__missing
 BCTACA	24	bctaca24	__missing
 BCTACA	25	bctaca25	__missing
-BCTAEA	1	bctalb	ictalb	bctaea07
-BCTAEA	2	bctalb_2	ictalb_2	bctaea07_2
-BCTAEA	3	bctalb_3	ictalb_3	bctaea07_3
-BCTAEA	4	bctalg	ictalg	bctaea08
-BCTAEA	5	bctalg_2	ictalg_2	bctaea08_2
-BCTAEA	6	bctalg_3	ictalg_3	bctaea08_3
-BCTAEA	7	bctalp	ictalp	bctaea09
-BCTAEA	8	bctalp_2	ictalp_2	bctaea09_2
-BCTAEA	9	bctalp_3	ictalp_3	bctaea09_3
-BCTAEA	10	bctals	ictals	bctaea10
-BCTAEA	11	bctals_2	ictals_2	bctaea10_2
-BCTAEA	12	bctals_3	ictals_3	bctaea10_3
-BCTAEA	13	bctalv	ictalv	bctaea11
-BCTAEA	14	bctalv_2	ictalv_2	bctaea11_2
-BCTAEA	15	bctalv_3	ictalv_3	bctaea11_3
-BCTAEA	16	bctauwv	ictauwv
-BCTAEA	17	bctauwp	ictauwp
-BCTAEB	1	bctamb	ictamb	bctaea12
-BCTAEB	2	bctamb_2	ictamb_2	bctaea12_2
-BCTAEB	3	bctamb_3	ictamb_3	bctaea12_3
-BCTAEB	4	bctamg	ictamg	bctaea13
-BCTAEB	5	bctamg_2	ictamg_2	bctaea13_2
-BCTAEB	6	bctamg_3	ictamg_3	bctaea13_3
-BCTAEB	7	bctamp	ictamp	bctaea14
-BCTAEB	8	bctamp_2	ictamp_2	bctaea14_2
-BCTAEB	9	bctamp_3	ictamp_3	bctaea14_3
-BCTAEB	10	bctams	ictams	bctaea15
-BCTAEB	11	bctams_2	ictams_2	bctaea15_2
-BCTAEB	12	bctams_3	ictams_3	bctaea15_3
-BCTAEB	13	bctamv	ictamv	bctaea16
-BCTAEB	14	bctamv_2	ictamv_2	bctaea16_2
-BCTAEB	15	bctamv_3	ictamv_3	bctaea16_3
-BCTAEC	1	bctahb	ictahb	bctaea01
-BCTAEC	2	bctahb_2	ictahb_2	bctaea01_2
-BCTAEC	3	bctahb_3	ictahb_3	bctaea01_3
-BCTAEC	4	bctahg	ictahg	bctaea02
-BCTAEC	5	bctahg_2	ictahg_2	bctaea02_2
-BCTAEC	6	bctahg_3	ictahg_3	bctaea02_3
-BCTAEC	7	bctahh	ictahh	bctaea03
-BCTAEC	8	bctahh_2	ictahh_2	bctaea03_2
-BCTAEC	9	bctahh_3	ictahh_3	bctaea03_3
-BCTAEC	10	bctahp	ictahp	bctaea04
-BCTAEC	11	bctahp_2	ictahp_2	bctaea04_2
-BCTAEC	12	bctahp_3	ictahp_3	bctaea04_3
-BCTAEC	13	bctahs	ictahs	bctaea05
-BCTAEC	14	bctahs_2	ictahs_2	bctaea05_2
-BCTAEC	15	bctahs_3	ictahs_3	bctaea05_3
-BCTAEC	16	bctahv	ictahv	bctaea06
-BCTAEC	17	bctahv_2	ictahv_2	bctaea06_2
-BCTAEC	18	bctahv_3	ictahv_3	bctaea06_3
+BCTAEA	1	bctaea01_talb	ictalb	bctalb	bctaea07
+BCTAEA	2	bctaea02_talb_2	ictalb_2	bctalb_2	bctaea07_2
+BCTAEA	3	bctaea03_talb_3	ictalb_3	bctalb_3	bctaea07_3
+BCTAEA	4	bctaea04_talg	ictalg	bctalg	bctaea08
+BCTAEA	5	bctaea05_talg_2	ictalg_2	bctalg_2	bctaea08_2
+BCTAEA	6	bctaea06_talg_3	ictalg_3	bctalg_3	bctaea08_3
+BCTAEA	7	bctaea07_talp	ictalp	bctalp	bctaea09
+BCTAEA	8	bctaea08_talp_2	ictalp_2	bctalp_2	bctaea09_2
+BCTAEA	9	bctaea09_talp_3	ictalp_3	bctalp_3	bctaea09_3
+BCTAEA	10	bctaea10_tals	ictals	bctals	bctaea10
+BCTAEA	11	bctaea11_tals_2	ictals_2	bctals_2	bctaea10_2
+BCTAEA	12	bctaea12_tals_3	ictals_3	bctals_3	bctaea10_3
+BCTAEA	13	bctaea13_talv	ictalv	bctalv	bctaea11
+BCTAEA	14	bctaea14_talv_2	ictalv_2	bctalv_2	bctaea11_2
+BCTAEA	15	bctaea15_talv_3	ictalv_3	bctalv_3	bctaea11_3
+BCTAEA	16	bctaea16_tauwv	ictauwv	bctauwv
+BCTAEA	17	bctaea17_tauwp	ictauwp	bctauwp
+BCTAEB	1	bctaeb01_tamb	ictamb	bctamb	bctaea12
+BCTAEB	2	bctaeb02_tamb_2	ictamb_2	bctamb_2	bctaea12_2
+BCTAEB	3	bctaeb03_tamb_3	ictamb_3	bctamb_3	bctaea12_3
+BCTAEB	4	bctaeb04_tamg	ictamg	bctamg	bctaea13
+BCTAEB	5	bctaeb05_tamg_2	ictamg_2	bctamg_2	bctaea13_2
+BCTAEB	6	bctaeb06_tamg_3	ictamg_3	bctamg_3	bctaea13_3
+BCTAEB	7	bctaeb07_tamp	ictamp	bctamp	bctaea14
+BCTAEB	8	bctaeb08_tamp_2	ictamp_2	bctamp_2	bctaea14_2
+BCTAEB	9	bctaeb09_tamp_3	ictamp_3	bctamp_3	bctaea14_3
+BCTAEB	10	bctaeb10_tams	ictams	bctams	bctaea15
+BCTAEB	11	bctaeb11_tams_2	ictams_2	bctams_2	bctaea15_2
+BCTAEB	12	bctaeb12_tams_3	ictams_3	bctams_3	bctaea15_3
+BCTAEB	13	bctaeb13_tamv	ictamv	bctamv	bctaea16
+BCTAEB	14	bctaeb14_tamv_2	ictamv_2	bctamv_2	bctaea16_2
+BCTAEB	15	bctaeb15_tamv_3	ictamv_3	bctamv_3	bctaea16_3
+BCTAEC	1	bctaec01_tahb	ictahb	bctahb	bctaea01
+BCTAEC	2	bctaec02_tahb_2	ictahb_2	bctahb_2	bctaea01_2
+BCTAEC	3	bctaec03_tahb_3	ictahb_3	bctahb_3	bctaea01_3
+BCTAEC	4	bctaec04_tahg	ictahg	bctahg	bctaea02
+BCTAEC	5	bctaec05_tahg_2	ictahg_2	bctahg_2	bctaea02_2
+BCTAEC	6	bctaec06_tahg_3	ictahg_3	bctahg_3	bctaea02_3
+BCTAEC	7	bctaec07_tahh	ictahh	bctahh	bctaea03
+BCTAEC	8	bctaec08_tahh_2	ictahh_2	bctahh_2	bctaea03_2
+BCTAEC	9	bctaec09_tahh_3	ictahh_3	bctahh_3	bctaea03_3
+BCTAEC	10	bctaec10_tahp	ictahp	bctahp	bctaea04
+BCTAEC	11	bctaec11_tahp_2	ictahp_2	bctahp_2	bctaea04_2
+BCTAEC	12	bctaec12_tahp_3	ictahp_3	bctahp_3	bctaea04_3
+BCTAEC	13	bctaec13_tahs	ictahs	bctahs	bctaea05
+BCTAEC	14	bctaec14_tahs_2	ictahs_2	bctahs_2	bctaea05_2
+BCTAEC	15	bctaec15_tahs_3	ictahs_3	bctahs_3	bctaea05_3
+BCTAEC	16	bctaec16_tahv	ictahv	bctahv	bctaea06
+BCTAEC	17	bctaec17_tahv_2	ictahv_2	bctahv_2	bctaea06_2
+BCTAEC	18	bctaec18_tahv_3	ictahv_3	bctahv_3	bctaea06_3
 BCTAED	1	bctaea17	ictacb	__missing
 BCTAED	2	bctaea17_2	ictacb_2	__missing
 BCTAED	3	bctaea17_3	ictacb_3	__missing
 BCTAED	4	bctaea18	ictacg	__missing
 BCTAED	5	bctaea18_2	ictacg_2	__missing
 BCTAED	6	bctaea18_3	ictacg_3	__missing
-BCTAED	7	bctacp	ictacp	bctaea19
-BCTAED	8	bctacp_2	ictacp_2	bctaea19_2
-BCTAED	9	bctacp_3	ictacp_3	bctaea19_3
+BCTAED	7	bctaed07_tacp	ictacp	bctacp	bctaea19
+BCTAED	8	bctaed08_tacp_2	ictacp_2	bctacp_2	bctaea19_2
+BCTAED	9	bctaed09_tacp_3	ictacp_3	bctacp_3	bctaea19_3
 BCTAED	10	bctaea20	ictacs	__missing
 BCTAED	11	bctaea20_2	ictacs_2	__missing
 BCTAED	12	bctaea20_3	ictacs_3	__missing
@@ -1529,65 +1529,65 @@ BCZACA	22	bczaca22	__missing
 BCZACA	23	bczaca23	__missing
 BCZACA	24	bczaca24	__missing
 BCZACA	25	bczaca25	__missing
-BCZAEA	1	bczalb	iczalb	bczaea07
-BCZAEA	2	bczalb_2	iczalb_2	bczaea07_2
-BCZAEA	3	bczalb_3	iczalb_3	bczaea07_3
-BCZAEA	4	bczalg	iczalg	bczaea08
-BCZAEA	5	bczalg_2	iczalg_2	bczaea08_2
-BCZAEA	6	bczalg_3	iczalg_3	bczaea08_3
-BCZAEA	7	bczalp	iczalp	bczaea09
-BCZAEA	8	bczalp_2	iczalp_2	bczaea09_2
-BCZAEA	9	bczalp_3	iczalp_3	bczaea09_3
-BCZAEA	10	bczals	iczals	bczaea10
-BCZAEA	11	bczals_2	iczals_2	bczaea10_2
-BCZAEA	12	bczals_3	iczals_3	bczaea10_3
-BCZAEA	13	bczalv	iczalv	bczaea11
-BCZAEA	14	bczalv_2	iczalv_2	bczaea11_2
-BCZAEA	15	bczalv_3	iczalv_3	bczaea11_3
-BCZAEA	16	bczauwv	iczauwv
-BCZAEA	17	bczauwp	iczauwp
-BCZAEB	1	bczamb	iczamb	bczaea12
-BCZAEB	2	bczamb_2	iczamb_2	bczaea12_2
-BCZAEB	3	bczamb_3	iczamb_3	bczaea12_3
-BCZAEB	4	bczamg	iczamg	bczaea13
-BCZAEB	5	bczamg_2	iczamg_2	bczaea13_2
-BCZAEB	6	bczamg_3	iczamg_3	bczaea13_3
-BCZAEB	7	bczamp	iczamp	bczaea14
-BCZAEB	8	bczamp_2	iczamp_2	bczaea14_2
-BCZAEB	9	bczamp_3	iczamp_3	bczaea14_3
-BCZAEB	10	bczams	iczams	bczaea15
-BCZAEB	11	bczams_2	iczams_2	bczaea15_2
-BCZAEB	12	bczams_3	iczams_3	bczaea15_3
-BCZAEB	13	bczamv	iczamv	bczaea16
-BCZAEB	14	bczamv_2	iczamv_2	bczaea16_2
-BCZAEB	15	bczamv_3	iczamv_3	bczaea16_3
-BCZAEC	1	bczahb	iczahb	bczaea01
-BCZAEC	2	bczahb_2	iczahb_2	bczaea01_2
-BCZAEC	3	bczahb_3	iczahb_3	bczaea01_3
-BCZAEC	4	bczahg	iczahg	bczaea02
-BCZAEC	5	bczahg_2	iczahg_2	bczaea02_2
-BCZAEC	6	bczahg_3	iczahg_3	bczaea02_3
-BCZAEC	7	bczahh	iczahh	bczaea03
-BCZAEC	8	bczahh_2	iczahh_2	bczaea03_2
-BCZAEC	9	bczahh_3	iczahh_3	bczaea03_3
-BCZAEC	10	bczahp	iczahp	bczaea04
-BCZAEC	11	bczahp_2	iczahp_2	bczaea04_2
-BCZAEC	12	bczahp_3	iczahp_3	bczaea04_3
-BCZAEC	13	bczahs	iczahs	bczaea05
-BCZAEC	14	bczahs_2	iczahs_2	bczaea05_2
-BCZAEC	15	bczahs_3	iczahs_3	bczaea05_3
-BCZAEC	16	bczahv	iczahv	bczaea06
-BCZAEC	17	bczahv_2	iczahv_2	bczaea06_2
-BCZAEC	18	bczahv_3	iczahv_3	bczaea06_3
+BCZAEA	1	bczaea01_zalb	iczalb	bczalb	bczaea07
+BCZAEA	2	bczaea02_zalb_2	iczalb_2	bczalb_2	bczaea07_2
+BCZAEA	3	bczaea03_zalb_3	iczalb_3	bczalb_3	bczaea07_3
+BCZAEA	4	bczaea04_zalg	iczalg	bczalg	bczaea08
+BCZAEA	5	bczaea05_zalg_2	iczalg_2	bczalg_2	bczaea08_2
+BCZAEA	6	bczaea06_zalg_3	iczalg_3	bczalg_3	bczaea08_3
+BCZAEA	7	bczaea07_zalp	iczalp	bczalp	bczaea09
+BCZAEA	8	bczaea08_zalp_2	iczalp_2	bczalp_2	bczaea09_2
+BCZAEA	9	bczaea09_zalp_3	iczalp_3	bczalp_3	bczaea09_3
+BCZAEA	10	bczaea10_zals	iczals	bczals	bczaea10
+BCZAEA	11	bczaea11_zals_2	iczals_2	bczals_2	bczaea10_2
+BCZAEA	12	bczaea12_zals_3	iczals_3	bczals_3	bczaea10_3
+BCZAEA	13	bczaea13_zalv	iczalv	bczalv	bczaea11
+BCZAEA	14	bczaea14_zalv_2	iczalv_2	bczalv_2	bczaea11_2
+BCZAEA	15	bczaea15_zalv_3	iczalv_3	bczalv_3	bczaea11_3
+BCZAEA	16	bczaea16_zauwv	iczauwv	bczauwv
+BCZAEA	17	bczaea17_zauwp	iczauwp	bczauwp
+BCZAEB	1	bczaeb01_zamb	iczamb	bczamb	bczaea12
+BCZAEB	2	bczaeb02_zamb_2	iczamb_2	bczamb_2	bczaea12_2
+BCZAEB	3	bczaeb03_zamb_3	iczamb_3	bczamb_3	bczaea12_3
+BCZAEB	4	bczaeb04_zamg	iczamg	bczamg	bczaea13
+BCZAEB	5	bczaeb05_zamg_2	iczamg_2	bczamg_2	bczaea13_2
+BCZAEB	6	bczaeb06_zamg_3	iczamg_3	bczamg_3	bczaea13_3
+BCZAEB	7	bczaeb07_zamp	iczamp	bczamp	bczaea14
+BCZAEB	8	bczaeb08_zamp_2	iczamp_2	bczamp_2	bczaea14_2
+BCZAEB	9	bczaeb09_zamp_3	iczamp_3	bczamp_3	bczaea14_3
+BCZAEB	10	bczaeb10_zams	iczams	bczams	bczaea15
+BCZAEB	11	bczaeb11_zams_2	iczams_2	bczams_2	bczaea15_2
+BCZAEB	12	bczaeb12_zams_3	iczams_3	bczams_3	bczaea15_3
+BCZAEB	13	bczaeb13_zamv	iczamv	bczamv	bczaea16
+BCZAEB	14	bczaeb14_zamv_2	iczamv_2	bczamv_2	bczaea16_2
+BCZAEB	15	bczaeb15_zamv_3	iczamv_3	bczamv_3	bczaea16_3
+BCZAEC	1	bczaec01_zahb	iczahb	bczahb	bczaea01
+BCZAEC	2	bczaec02_zahb_2	iczahb_2	bczahb_2	bczaea01_2
+BCZAEC	3	bczaec03_zahb_3	iczahb_3	bczahb_3	bczaea01_3
+BCZAEC	4	bczaec04_zahg	iczahg	bczahg	bczaea02
+BCZAEC	5	bczaec05_zahg_2	iczahg_2	bczahg_2	bczaea02_2
+BCZAEC	6	bczaec06_zahg_3	iczahg_3	bczahg_3	bczaea02_3
+BCZAEC	7	bczaec07_zahh	iczahh	bczahh	bczaea03
+BCZAEC	8	bczaec08_zahh_2	iczahh_2	bczahh_2	bczaea03_2
+BCZAEC	9	bczaec09_zahh_3	iczahh_3	bczahh_3	bczaea03_3
+BCZAEC	10	bczaec10_zahp	iczahp	bczahp	bczaea04
+BCZAEC	11	bczaec11_zahp_2	iczahp_2	bczahp_2	bczaea04_2
+BCZAEC	12	bczaec12_zahp_3	iczahp_3	bczahp_3	bczaea04_3
+BCZAEC	13	bczaec13_zahs	iczahs	bczahs	bczaea05
+BCZAEC	14	bczaec14_zahs_2	iczahs_2	bczahs_2	bczaea05_2
+BCZAEC	15	bczaec15_zahs_3	iczahs_3	bczahs_3	bczaea05_3
+BCZAEC	16	bczaec16_zahv	iczahv	bczahv	bczaea06
+BCZAEC	17	bczaec17_zahv_2	iczahv_2	bczahv_2	bczaea06_2
+BCZAEC	18	bczaec18_zahv_3	iczahv_3	bczahv_3	bczaea06_3
 BCZAED	1	bczaea17	iczacb	__missing
 BCZAED	2	bczaea17_2	iczacb_2	__missing
 BCZAED	3	bczaea17_3	iczacb_3	__missing
 BCZAED	4	bczaea18	iczacg	__missing
 BCZAED	5	bczaea18_2	iczacg_2	__missing
 BCZAED	6	bczaea18_3	iczacg_3	__missing
-BCZAED	7	bczacp	iczacp	bczaea19
-BCZAED	8	bczacp_2	iczacp_2	bczaea19_2
-BCZAED	9	bczacp_3	iczacp_3	bczaea19_3
+BCZAED	7	bczaed07_zacp	iczacp	bczacp	bczaea19
+BCZAED	8	bczaed08_zacp_2	iczacp_2	bczacp_2	bczaea19_2
+BCZAED	9	bczaed09_zacp_3	iczacp_3	bczacp_3	bczaea19_3
 BCZAED	10	bczaea20	iczacs	__missing
 BCZAED	11	bczaea20_2	iczacs_2	__missing
 BCZAED	12	bczaea20_3	iczacs_3	__missing