Changeset 344


Ignore:
Timestamp:
Jan 5, 2019, 1:12:17 PM (5 months ago)
Author:
alloc
Message:

Linux scripts 111

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • bundle_creation/makefile

    r255 r344  
    1 HOST=178.63.97.203
     1HOST=136.243.11.25
    22PORT=51010
    33SERVERPATH=/srv/www/illy.bz/http/fi/7dtd/
  • scripts/usr/local/lib/7dtd/VERSION

    r310 r344  
    1 Version: 110
    2 Release: 2017-08-26
     1Version: 111
     2Release: 2019-01-05
    33
  • scripts/usr/local/lib/7dtd/commands/updateengine.sh

    r310 r344  
    235235        fi
    236236        if [ "$DOCHECK" = "yes" ]; then
     237                echo "Updating version information..."
    237238                rm /root/Steam/appcache/appinfo.vdf
    238239                cd $SDTD_BASE/steamcmd
  • scripts/usr/local/lib/7dtd/monitor-log.sh

    r308 r344  
    7373
    7474handleChat() {
    75         echo "$(timestamp): $1: $2" >> $CHATLOG
     75        echo "$(timestamp): $1: $2 (SteamID $3, EntityID $4, Target $5)" >> $CHATLOG
    7676       
    7777        for H in $(getHooksFor chat $INSTANCE); do
    78                 $H $INSTANCE "$1" "$2"
     78                $H $INSTANCE "$1" "$2" "$3" "$4" "$5"
    7979        done
    8080}
     
    167167                        handleGmsg "$msg"
    168168                        unset msg
    169                 #Chat: 'name': .*$
    170                 elif [ -n "$(echo "$line" | grep -E '^Chat: .+')" ]; then
    171                         name=$(expr "$line" : "Chat: '\(.*\)': .*$")
    172                         msg=$(expr "$line" : "Chat: '.*': \(.*\)$")
    173                         handleChat "$name" "$msg"
    174                         unset name msg
     169                #Chat (from '<steamid>', entity id '<entityid>', to '<targettype>'): '<senderchatname>': <msg>
     170                elif [ -n "$(echo "$line" | grep -E '^Chat .+')" ]; then
     171                        steamId=$(expr "$line" : "Chat (from '\(.+\)', entity id '[0-9]+', to '[a-fA-F:0-9.]+'): '.*': .*$")
     172                        entityId=$(expr "$line" : "Chat (from '.+', entity id '\([0-9]+\)', to '[a-fA-F:0-9.]+'): '.*': .*$")
     173                        targetType=$(expr "$line" : "Chat (from '.+', entity id '[0-9]+', to '\([a-fA-F:0-9.]+\)'): '.*': .*$")
     174                        name=$(expr "$line" : "Chat (from '.+', entity id '[0-9]+', to '[a-fA-F:0-9.]+'): '\(.*\)': .*$")
     175                        msg=$(expr "$line" : "Chat (from '.+', entity id '[0-9]+', to '[a-fA-F:0-9.]+'): '.*': \(.*\)$")
     176                        handleChat "$name" "$msg" "$steamId" "$entityId" "$targetType"
     177                        unset name msg steamId entityId targetType
    175178                #Executing command ".*" from client ".*"$
    176179                elif [ -n "$(echo "$line" | grep '^Executing command '.*' from client')" ]; then
  • scripts/usr/local/lib/7dtd/serverconfig.sh

    r308 r344  
    5656}
    5757serverconfig_ServerDisabledNetworkProtocols_Values() {
    58         config_allowed_values=("None" "UNET" "UNET,SteamNetworking" "UNET,RakNet" "UNET,SteamNetworking,RakNet" "SteamNetworking" "SteamNetworking,RakNet" "RakNet")
    59 }
    60 
    61 
    62 serverconfig_ServerIsPublic_QueryName() {
     58        config_allowed_values=("None" "SteamNetworking" "SteamNetworking,LiteNetLib" "LiteNetLib")
     59}
     60
     61
     62serverconfig_ServerVisibility_QueryName() {
    6363        echo "Public server"
    6464}
    65 serverconfig_ServerIsPublic_Type() {
    66         echo "boolean"
    67 }
    68 serverconfig_ServerIsPublic_Default() {
    69         echo "true"
    70 }
    71 serverconfig_ServerIsPublic_ErrorMessage() {
    72         echo "Not a valid boolean given (true/false or yes/no or y/n)."
    73 }
    74 
     65serverconfig_ServerVisibility_Type() {
     66        echo "number"
     67}
     68serverconfig_ServerVisibility_Default() {
     69        echo "2"
     70}
     71serverconfig_ServerVisibility_Range() {
     72        echo "0-2"
     73}
     74serverconfig_ServerVisibility_Values() {
     75        config_allowed_values=("Not listed" "Friends only (only works while at least one player is connected manually. Dedi servers do not have friends!)" "Public")
     76}
    7577
    7678
     
    233235}
    234236serverconfig_GameWorld_Values() {
    235         config_allowed_values=("Random Gen" "Navezgane") #  "MP Wasteland Horde" "MP Wasteland Skirmish" "MP Wasteland War"
     237        config_allowed_values=("RWG" "Navezgane") #  "MP Wasteland Horde" "MP Wasteland Skirmish" "MP Wasteland War"
     238}
     239
     240
     241
     242serverconfig_WorldGenSeed_QueryName() {
     243        echo "Random generation seed (if world RWG)"
     244}
     245serverconfig_WorldGenSeed_Type() {
     246        echo "string"
     247}
     248serverconfig_WorldGenSeed_Validate() {
     249        if [ ! -z "$1" ]; then
     250                echo "1"
     251        else
     252                echo "0"
     253        fi
     254}
     255serverconfig_WorldGenSeed_ErrorMessage() {
     256        echo "Seed cannot be empty."
     257}
     258
     259
     260
     261serverconfig_WorldGenSize_QueryName() {
     262        echo "Random generation map size (if world RWG)"
     263}
     264serverconfig_WorldGenSize_Type() {
     265        echo "number"
     266}
     267serverconfig_WorldGenSize_Default() {
     268        echo "6144"
     269}
     270serverconfig_WorldGenSize_Range() {
     271        echo "2048-16384"
    236272}
    237273
     
    239275
    240276serverconfig_GameName_QueryName() {
    241         echo "Random gen seed"
     277        echo "World decoration seed"
    242278}
    243279serverconfig_GameName_Type() {
     
    285321}
    286322serverconfig_GameMode_Values() {
    287         config_allowed_values=("GameModeSurvivalMP" "GameModeSurvivalSP")
    288 }
    289 
    290 
    291 
    292 serverconfig_ZombiesRun_QueryName() {
    293         echo "Zombies run"
    294 }
    295 serverconfig_ZombiesRun_Type() {
    296         echo "number"
    297 }
    298 serverconfig_ZombiesRun_Default() {
     323        config_allowed_values=("GameModeSurvival")
     324}
     325
     326
     327
     328serverconfig_ZombieMove_QueryName() {
     329        echo "Zombie speed, regular"
     330}
     331serverconfig_ZombieMove_Type() {
     332        echo "number"
     333}
     334serverconfig_ZombieMove_Default() {
    299335        echo "0"
    300336}
    301 serverconfig_ZombiesRun_Range() {
    302         echo "0-2"
    303 }
    304 serverconfig_ZombiesRun_Values() {
    305         config_allowed_values=("Default day/night walk/run" "Never run" "Always run")
    306 }
     337serverconfig_ZombieMove_Range() {
     338        echo "0-4"
     339}
     340serverconfig_ZombieMove_Values() {
     341        config_allowed_values=("Walk" "Jog" "Run" "Sprint" "Nightmare")
     342}
     343
     344
     345
     346serverconfig_ZombieMoveNight_QueryName() {
     347        echo "Zombie speed, night"
     348}
     349serverconfig_ZombieMoveNight_Type() {
     350        echo "number"
     351}
     352serverconfig_ZombieMoveNight_Default() {
     353        echo "3"
     354}
     355serverconfig_ZombieMoveNight_Range() {
     356        echo "0-4"
     357}
     358serverconfig_ZombieMoveNight_Values() {
     359        config_allowed_values=("Walk" "Jog" "Run" "Sprint" "Nightmare")
     360}
     361
     362
     363
     364serverconfig_ZombieFeralMove_QueryName() {
     365        echo "Zombie speed, ferals"
     366}
     367serverconfig_ZombieFeralMove_Type() {
     368        echo "number"
     369}
     370serverconfig_ZombieFeralMove_Default() {
     371        echo "3"
     372}
     373serverconfig_ZombieFeralMove_Range() {
     374        echo "0-4"
     375}
     376serverconfig_ZombieFeralMove_Values() {
     377        config_allowed_values=("Walk" "Jog" "Run" "Sprint" "Nightmare")
     378}
     379
     380
     381
     382serverconfig_ZombieBMMove_QueryName() {
     383        echo "Zombie speed, bloodmoons"
     384}
     385serverconfig_ZombieBMMove_Type() {
     386        echo "number"
     387}
     388serverconfig_ZombieBMMove_Default() {
     389        echo "3"
     390}
     391serverconfig_ZombieBMMove_Range() {
     392        echo "0-4"
     393}
     394serverconfig_ZombieBMMove_Values() {
     395        config_allowed_values=("Walk" "Jog" "Run" "Sprint" "Nightmare")
     396}
     397
    307398
    308399
     
    346437serverconfig_DayLightLength_Range() {
    347438        echo "0-24"
     439}
     440
     441
     442
     443serverconfig_PartySharedKillRange_QueryName() {
     444        echo "Party range to share kill / quest XP rewards"
     445}
     446serverconfig_PartySharedKillRange_Type() {
     447        echo "number"
     448}
     449serverconfig_PartySharedKillRange_Default() {
     450        echo "100"
    348451}
    349452
     
    490593
    491594
     595serverconfig_TelnetFailedLoginLimit_QueryName() {
     596        echo "Max failed login attempts (0 to disable)"
     597}
     598serverconfig_TelnetFailedLoginLimit_Type() {
     599        echo "number"
     600}
     601serverconfig_TelnetFailedLoginLimit_Default() {
     602        echo "10"
     603}
     604
     605
     606
     607serverconfig_TelnetFailedLoginsBlocktime_QueryName() {
     608        echo "Telnet login blocktime after failed logins (seconds)"
     609}
     610serverconfig_TelnetFailedLoginsBlocktime_Type() {
     611        echo "number"
     612}
     613serverconfig_TelnetFailedLoginsBlocktime_Default() {
     614        echo "10"
     615}
     616
     617
     618
    492619serverconfig_DropOnDeath_QueryName() {
    493620        echo "Drop on Death"
     
    767894        echo "--------------------------------"
    768895        for CV in \
    769                         ServerName ServerPassword ServerIsPublic ServerPort ServerDisabledNetworkProtocols ServerDescription ServerWebsiteURL \
     896                        ServerName ServerPassword ServerVisibility ServerPort ServerDisabledNetworkProtocols ServerDescription ServerWebsiteURL \
    770897                        HideCommandExecutionLog MaxUncoveredMapChunksPerPlayer EACEnabled MaxSpawnedZombies MaxSpawnedAnimals \
    771898                        ; do
     
    795922        for CV in \
    796923                        ControlPanelEnabled ControlPanelPort ControlPanelPassword \
    797                         TelnetPort TelnetPassword \
     924                        TelnetPort TelnetPassword TelnetFailedLoginLimit TelnetFailedLoginsBlocktime \
    798925                        ; do
    799926                if [ "$CV" = "TelnetPort" ]; then
     
    815942        echo "--------------------------------"
    816943        for CV in \
    817                         GameName GameWorld GameMode \
     944                        GameName GameWorld WorldGenSeed WorldGenSize GameMode \
    818945                        ; do
    819946                $1 $CV
     
    828955        echo "--------------------------------"
    829956        for CV in \
    830                         PlayerKillingMode PersistentPlayerProfiles \
     957                        PartySharedKillRange PlayerKillingMode PersistentPlayerProfiles \
    831958                        PlayerSafeZoneLevel PlayerSafeZoneHours \
    832959                        BuildCreate \
     
    872999        echo "--------------------------------"
    8731000        for CV in \
    874                         GameDifficulty ZombiesRun \
     1001                        GameDifficulty ZombieMove ZombieMoveNight ZombieFeralMove ZombieBMMove \
    8751002                        EnemySpawnMode EnemyDifficulty \
    8761003                        BloodMoonEnemyCount BedrollDeadZoneSize \
Note: See TracChangeset for help on using the changeset viewer.