From 03ba9bc1bc4d5cd52dea6ea86c033867cc77e180 Mon Sep 17 00:00:00 2001 From: Mitch Weaver Date: Mon, 20 Nov 2023 21:49:37 -0600 Subject: [PATCH] asdf --- modserver/globals.sh | 3 ++- modserver/update_mods.sh | 29 ++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/modserver/globals.sh b/modserver/globals.sh index 5c55c94..ebda81e 100644 --- a/modserver/globals.sh +++ b/modserver/globals.sh @@ -21,7 +21,8 @@ export CHERNARUS_MAP_NAME=dayzOffline.chernarusplus export NAMALSK_MAP_NAME=regular.namalsk export TAKISTAN_MAP_NAME=Offline.TakistanPlus -export NAMALSK_MOD_ID=2289461232 +export NAMALSK_SURVIVAL_MOD_ID=2289461232 +export NAMALSK_ISLAND_MOD_ID=2289456201 export TAKISTAN_MOD_ID=2563233742 ################### GLOBAL VARS ############################## diff --git a/modserver/update_mods.sh b/modserver/update_mods.sh index e8bc4f4..7a2eda0 100644 --- a/modserver/update_mods.sh +++ b/modserver/update_mods.sh @@ -213,19 +213,42 @@ update_stock_maps() { +login "$STEAM_USER" \ +workshop_download_item \ "$DAYZ_GAME_ID" \ - "$NAMALSK_MOD_ID" \ + "$NAMALSK_SURVIVAL_MOD_ID" \ +quit if [ $? -ne 0 ] ; then die "Failed to update Namalsk Survival" fi - if [ -d "$LOCAL_MODS/steamapps/workshop/content/$DAYZ_GAME_ID/$NAMALSK_MOD_ID/Extras/Regular/$NAMALSK_MAP_NAME" ] ; then - do_sync "$LOCAL_MODS/steamapps/workshop/content/$DAYZ_GAME_ID/$NAMALSK_MOD_ID/Extras/Regular/$NAMALSK_MAP_NAME"/ \ + if [ -d "$LOCAL_MODS/steamapps/workshop/content/$DAYZ_GAME_ID/$NAMALSK_SURVIVAL_MOD_ID/Extras/Regular/$NAMALSK_MAP_NAME" ] ; then + do_sync "$LOCAL_MODS/steamapps/workshop/content/$DAYZ_GAME_ID/$NAMALSK_SURVIVAL_MOD_ID/Extras/Regular/$NAMALSK_MAP_NAME"/ \ "$REMOTE_MAPS/$NAMALSK_MAP_NAME" || \ die "failed to copy Namalsk map files" fi + msg "Updating Namalsk Island" + steamcmd \ + -tcp \ + +force_install_dir "$LOCAL_MODS" \ + +@sSteamCmdForcePlatformType windows \ + +@ShutdownOnFailedCommand 1 \ + +login "$STEAM_USER" \ + +workshop_download_item \ + "$DAYZ_GAME_ID" \ + "$NAMALSK_ISLAND_MOD_ID" \ + +quit + + if [ $? -ne 0 ] ; then + die "Failed to update Namalsk Survival" + fi + + if [ -d "$LOCAL_MODS/steamapps/workshop/content/$DAYZ_GAME_ID/$NAMALSK_ISLAND_MOD_ID/Extras/Regular/$NAMALSK_MAP_NAME" ] ; then + do_sync "$LOCAL_MODS/steamapps/workshop/content/$DAYZ_GAME_ID/$NAMALSK_ISLAND_MOD_ID/Extras/Regular/$NAMALSK_MAP_NAME"/ \ + "$REMOTE_MAPS/$NAMALSK_MAP_NAME" || \ + die "failed to copy Namalsk map files" + fi + + ####################TODO: # msg "Updating Optimized Namalsk Server PBOs" msg "Updating TakistanPlus"