MKWiimm stuff

ChangeLog

@@ -4,9 +4,18 @@ v6.1.0:
 - show "Enter ID (...)" message at the end of menu
 - show "ID	Name" header/footer in menu
 - show proper version number in --help
-- support for MKWiimm 2015-08
-- support for MKWiimm 2015-12
-- support for MKWiimm 2016-02
+- support for new MKWiimm config.def variables ID >= 29
+  - default set:
+    - MSGLANG1 = -
+    - MSGLANG2 = E
+  - set from ~/.patchimage.rc
+    - TRACKLANG = x,${MKWIIMM_MSG_LANG}
+    - CTRENAME = ${MKWIIMM_CTRENAME}
+    - REORDER = ${MKWIIMM_CTREORDER}
+    - see README.RC for more infos
+- support for MKWiimm 2015-08 (ID 29)
+- support for MKWiimm 2015-12 (ID 30)
+- support for MKWiimm 2016-02 (ID 31)
 - support for The Legend of Yoshi (SMN?66)
 - support for Remixed Super Mario Bros. Wii (SMN?60)
 - support for Ghostly Super Mario Boos. Wii (SMN?65)

README.RC

@@ -50,10 +50,20 @@ PATCHIMAGE_SHARE_SAVE=TRUE
 # en+ = all languages will be english
 MKWIIMM_MSG_LANG="de"
 
-# use own savegame
+# Eigenes Savegame verwenden
 # 1=ja    (use own save, no sharing)
-# 2=nein  (share save with original game)
+# 0=nein  (share save with original game)
 MKWIIMM_OWN_SAVE="1=ja"
 
-# override szs tools
-MKWIIMM_OVERRIDE_SZS="TRUE"
+# szs von MKWiimm überschreiben
+MKWIIMM_OVERRIDE_SZS="FALSE"
+
+# Custom Track-Namen übersetzen
+# 1=ja
+# 0=nein
+MKWIIMM_CTRENAME="0=nein"
+
+# Custom Tracks alphabetisch sortieren
+# 1=ja
+# 0=nein
+MKWIIMM_CTREORDER="1=ja"

script.d/mkwiimm.sh

@@ -30,7 +30,7 @@ download_wiimm () {
 	echo "Choose a Mario Kart Wiimm Distribution
 
 ALL	Build all distributions."
-	gawk -F \: 'NR>1 {print $1 "\t" $2}' < script.d/mkwiimm.db
+	gawk -F \: 'NR>1 {print $1 "\t" $2}' < ${PATCHIMAGE_SCRIPT_DIR}/mkwiimm.db
 	echo "
 type in ALL or an ID (multiple separated by space)"
 	read ID
@@ -88,10 +88,11 @@ build_mkwiimm () {
 		fi
 
 		cd ${FILENAME/.7z}
-		ln -s ${IMAGE} .
 
 		REG=$(gawk '/^RMC/{print $3}' <(wit ll ${IMAGE}))
 
+		ln -s ${IMAGE} .
+
 		case $REG in
 			PAL)	REG=P	;;
 			NTSC-J)	REG=J	;;
@@ -99,22 +100,47 @@ build_mkwiimm () {
 		esac
 		chmod +x *.sh
 
-		if [[ ${MKWIIMM_OVERRIDE_SZS} == "TRUE" && ${MY_ID} -lt 27 ]]; then
+		if [[ ${MKWIIMM_OVERRIDE_SZS} == "TRUE" ]]; then
 			cp -r ${PATCHIMAGE_SCRIPT_DIR}/../override/* ${PWD}/bin/
 		fi
 
-		if [[ ${MKWIIMM_GAME_LANG} && ${MKWIIMM_MSG_LANG} && ${MKWIIMM_OWN_SAVE} ]]; then
-			echo "LANGUAGE=${MKWIIMM_GAME_LANG}
+		if [[ ${MY_ID} -lt 27 ]]; then
+
+			if [[ ${MKWIIMM_MSG_LANG} && ${MKWIIMM_OWN_SAVE} ]]; then
+				echo "LANGUAGE=${MKWIIMM_MSG_LANG}
 MSGLANG=${MKWIIMM_MSG_LANG}
 ISOMODE=wbfs
 SPLITISO=
 PRIV_SAVEGAME=${MKWIIMM_OWN_SAVE}" > ${PWD}/config.def
+				echo "*** 6) creating >${DIST}< (can take some time)"
+				./create-image.sh -a --dest=${XD}/RMC${REG}${MY_ID}.wbfs || exit 51
+			else
+				echo "*** 6) creating >${DIST}< (can take some time)"
+				./create-image.sh --dest=${XD}/RMC${REG}${MY_ID}.wbfs || exit 51
+			fi
 
-			echo "*** 6) creating >${DIST}< (can take some time)"
-			./create-image.sh -a --dest=${XD}/RMC${REG}${MY_ID}.wbfs >/dev/null || exit 51
 		else
-			echo "*** 6) creating >${DIST}< (can take some time)"
-			./create-image.sh --dest=${XD}/RMC${REG}${MY_ID}.wbfs || exit 51
+
+			if [[ ${MKWIIMM_MSG_LANG} && ${MKWIIMM_OWN_SAVE} && ${MKWIIMM_CTRENAME} && ${MKWIIMM_CTREORDER} ]]; then
+				echo "LANGUAGE=${MKWIIMM_MSG_LANG}
+MSGLANG1=-
+MSGLANG2=E
+TRACKLANG=x,${MKWIIMM_MSG_LANG}
+CTRENAME=${MKWIIMM_CTRENAME}
+REORDER=${MKWIIMM_CTREORDER}
+ISOMODE=wbfs
+SPLITISO=
+PRIV_SAVEGAME=${MKWIIMM_OWN_SAVE}" > ${PWD}/config.def
+
+				echo "*** 6) creating >${DIST}< (can take some time)"
+				./create-image.sh -a --dest=${XD}/RMC${REG}${MY_ID}.wbfs || exit 51
+			else
+				echo "*** 6) creating >${DIST}< (can take some time)"
+				./create-image.sh --dest=${XD}/RMC${REG}${MY_ID}.wbfs || exit 51
+			fi
+
+			echo ${XD}/RMC${REG}${MY_ID}.wbfs
+
 		fi
 
 		if [[ ${MY_ID} -lt 23 ]]; then
@@ -150,7 +176,7 @@ patch_wiimm () {
 
 	XD=${PWD}
 	if [[ ${ID} == ALL ]]; then
-		for ID in {06..27}; do
+		for ID in {06..31}; do
 			build_mkwiimm ${ID}
 		done
 	else