Merged branch feature/ultimatebyte-911 into feature/ultimatebyte-911

lgsm/functions/command_mods_install.sh

@@ -26,7 +26,6 @@ if [ ${installedmodscount} -gt 0 ]; then
 		fn_mod_get_info
 		# Display mod info to the user
 		echo -e " * \e[1m${green}${modcommand}${default}${default}"
-	((totalmodsinstalled++))
 	done
 	echo ""
 fi
@@ -48,7 +47,7 @@ while [ "${compatiblemodslistindex}" -lt "${#compatiblemodslist[@]}" ]; do
 	echo -e " * ${cyan}${displayedmodcommand}${default}"
 	# Increment index from the amount of values we just displayed
 	let "compatiblemodslistindex+=4"
-	((totalmods++))
+	((totalmodsavailable++))
 done
 
 # If no mods are available for a specific game
@@ -57,7 +56,7 @@ if [ -z "${compatiblemodslist}" ]; then
 	fn_script_log_info "No mods are currently available for ${gamename}."
 	core_exit.sh
 fi
-fn_script_log_info "${totalmods} addons/mods are available for install"
+fn_script_log_info "${totalmodsavailable} addons/mods are available for install"
 
 ## User selects a mod
 echo ""

lgsm/functions/mods_core.sh

@@ -169,7 +169,6 @@ fn_mod_get_info(){
 					modinfocommand="1"
 					break
 				fi
-				((totalmods++))
 			done
 		fi
 		# Exit the loop if job is done
@@ -231,8 +230,8 @@ fn_mods_installed_list(){
 		# Increment line check
 		((installedmodsline++))
 	done
-	if [ -n "${totalmods}" ] ;then
-		fn_script_log_info "${totalmods} addons/mods are already installed"
+	if [ -n "${installedmodscount}" ] ;then
+		fn_script_log_info "${installedmodscount} addons/mods are already installed"
 	fi
 }
 

lgsm/functions/mods_list.sh

@@ -59,7 +59,7 @@ mod_info_ulib=( MOD "ulib" "ULib" "https://codeload.github.com/TeamUlysses/ulib/
 mod_info_ulx=( MOD "ulx" "ULX" "https://codeload.github.com/TeamUlysses/ulx/zip/master" "ulx-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Admin Panel (requires ULib)" )
 mod_info_utime=( MOD "utime" "UTime" "https://github.com/TeamUlysses/utime/archive/master.zip" "utime-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "Keep track of players play time" )
 mod_info_uclip=( MOD "uclip" "UClip" "https://github.com/TeamUlysses/uclip/archive/master.zip" "uclip-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://ulyssesmod.net" "An alternative to noclip" )
-mod_info_acf=( MOD "acf" "Armoured Combat Framework" "https://github.com/nrlulz/ACF/archive/master.zip" "acf-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/nrlulz/ACF" "Realistic Wepons & Engines" )
+mod_info_acf=( MOD "acf" "Armoured Combat Framework" "https://github.com/nrlulz/ACF/archive/master.zip" "acf-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "acf-master/lua/acf/shared/guns;" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/nrlulz/ACF" "Realistic Wepons & Engines" )
 mod_info_acf_missiles=( MOD "acfmissiles" "ACF Missiles" "https://github.com/Bubbus/ACF-Missiles/archive/master.zip" "acf-missiles-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "https://github.com/Bubbus/ACF-Missiles" "More missiles for ACF" )
 mod_info_acf_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/wiremod/advdupe2/archive/master.zip" "advdupe2-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://www.wiremod.com" "Save your constructions" )
 mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/addons" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" )