- Timestamp:
- Oct 6, 2016, 4:45:58 PM (8 years ago)
- Location:
- scripts/usr/local/lib/7dtd
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
scripts/usr/local/lib/7dtd/VERSION
r275 r294 1 Version: 10 12 Release: 2016- 05-171 Version: 103 2 Release: 2016-10-06 3 3 -
scripts/usr/local/lib/7dtd/commands/start.sh
r261 r294 56 56 SSD_DAEMON="--background --no-close" 57 57 SSD_USER="--chuid $SDTD_USER:$SDTD_GROUP --user $SDTD_USER" 58 OPTS="-logfile $LOG - configfile=$(getInstancePath $1)/config.xml"58 OPTS="-logfile $LOG -nographics -configfile=$(getInstancePath $1)/config.xml" 59 59 60 60 if [ "$(uname -m)" = "x86_64" ]; then -
scripts/usr/local/lib/7dtd/monitor-log.sh
r275 r294 39 39 local steamId="$3" 40 40 local ip="$4" 41 local ownerId="$5" 41 42 42 logPlayerConnect $INSTANCE "$entityId" "$name" "$steamId" "$ip" 43 logPlayerConnect $INSTANCE "$entityId" "$name" "$steamId" "$ip" "$ownerId" 43 44 44 45 for H in $(getHooksFor playerConnect $INSTANCE); do 45 $H $INSTANCE "$entityId" "$name" "$steamId" "$ip" 46 $H $INSTANCE "$entityId" "$name" "$steamId" "$ip" "$ownerId" 46 47 done 47 48 } … … 121 122 while read line ; do 122 123 if [ -n "$line" ]; then 123 #Player connected, entityid=1278, name=termo2, steamid=76561197997439820, ip=178.203.27.140124 #Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=[0-9.]*$124 #Player connected, entityid=1278, name=termo2, steamid=76561197997439820, steamOwner=76561197997439820, ip=178.203.27.140 125 #Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, steamOwner=[0-9]*, ip=[0-9.]*$ 125 126 if [ -n "$(echo "$line" | grep '^Player connected,')" ]; then 126 entityId=$(expr "$line" : 'Player connected, entityid=\([0-9]*\), name=.*, steamid=[0-9]*, ip=[0-9.]*$') 127 playerName=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=\(.*\), steamid=[0-9]*, ip=[0-9.]*$') 128 steamId=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=\([0-9]*\), ip=[0-9.]*$') 129 ip=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, ip=\([0-9.]*\)$') 127 entityId=$(expr "$line" : 'Player connected, entityid=\([0-9]*\), name=.*, steamid=[0-9]*, steamOwner=[0-9]*, ip=[0-9.]*$') 128 playerName=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=\(.*\), steamid=[0-9]*, steamOwner=[0-9]*, ip=[0-9.]*$') 129 steamId=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=\([0-9]*\), steamOwner=[0-9]*, ip=[0-9.]*$') 130 steamOwner=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, steamOwner=\([0-9]*\), ip=[0-9.]*$') 131 ip=$(expr "$line" : 'Player connected, entityid=[0-9]*, name=.*, steamid=[0-9]*, steamOwner=[0-9]*, ip=\([0-9.]*\)$') 130 132 sleep 1 131 handleConnect "$entityId" "$playerName" "$steamId" "$ip" 132 unset entityId playerName steamId ip133 handleConnect "$entityId" "$playerName" "$steamId" "$ip" "$steamOwner" 134 unset entityId playerName steamId steamOwner ip 133 135 else 134 136 #Player disconnected: EntityID=[0-9]*, PlayerID='[0-9]*', OwnerID='[0-9]*', PlayerName='.*'$ -
scripts/usr/local/lib/7dtd/playerlog.sh
r258 r294 49 49 # 3: Steam ID 50 50 # 4: Nick name 51 # 5: IP 52 # 6: Steam Owner ID 51 53 logPlayerConnect() { 52 54 local ENTITYID="$2" … … 54 56 local STEAMID="$4" 55 57 local IP="$5" 58 local OWNERID="$6" 56 59 57 echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID $IP " >> "$PLAYERSLOG"60 echo "$(timestamp) +++ $ENTITYID $NICKNAME $STEAMID $IP $OWNERID" >> "$PLAYERSLOG" 58 61 59 62 createPlayerList … … 72 75 -i "$XPATHBASE" -t attr -n "entityid" -v "$ENTITYID" \ 73 76 -i "$XPATHBASE" -t attr -n "lastIp" -v "$IP" \ 77 -i "$XPATHBASE" -t attr -n "steamOwner" -v "$OWNERID" \ 74 78 "$PLAYERSXML" 75 79 else … … 83 87 -u "$XPATHBASE/@logins" -v "$LOGINS" \ 84 88 -u "$XPATHBASE/@lastIp" -v "$IP" \ 89 -u "$XPATHBASE/@steamOwner" -v "$OWNERID" \ 85 90 "$PLAYERSXML" 86 91 fi -
scripts/usr/local/lib/7dtd/serverconfig.sh
r262 r294 133 133 } 134 134 serverconfig_GameWorld_Values() { 135 config_allowed_values=("Random Gen" "Navezgane" "MP Wasteland Horde" "MP Wasteland Skirmish" "MP Wasteland War")135 config_allowed_values=("Random Gen" "Navezgane") # "MP Wasteland Horde" "MP Wasteland Skirmish" "MP Wasteland War" 136 136 } 137 137 … … 230 230 } 231 231 serverconfig_DayNightLength_Default() { 232 echo "40" 233 } 234 235 236 237 serverconfig_FriendlyFire_QueryName() { 238 echo "Friendly fire" 239 } 240 serverconfig_FriendlyFire_Type() { 232 echo "50" 233 } 234 235 236 237 serverconfig_DayLightLength_QueryName() { 238 echo "Duration of daylight (in ingame hours)" 239 } 240 serverconfig_DayLightLength_Type() { 241 echo "number" 242 } 243 serverconfig_DayLightLength_Default() { 244 echo "18" 245 } 246 serverconfig_DayLightLength_Range() { 247 echo "0-24" 248 } 249 250 251 252 serverconfig_PlayerKillingMode_QueryName() { 253 echo "Player killing" 254 } 255 serverconfig_PlayerKillingMode_Type() { 256 echo "enum" 257 } 258 serverconfig_PlayerKillingMode_Default() { 259 echo "3" 260 } 261 serverconfig_PlayerKillingMode_Values() { 262 config_allowed_values=("No player killing" "Kill allies only" "Kill strangers only" "Kill everyone") 263 } 264 265 266 267 serverconfig_PersistentPlayerProfiles_QueryName() { 268 echo "Persistent player profiles" 269 } 270 serverconfig_PersistentPlayerProfiles_Type() { 241 271 echo "boolean" 242 272 } 243 serverconfig_ FriendlyFire_Default() {273 serverconfig_PersistentPlayerProfiles_Default() { 244 274 echo "false" 245 275 } 246 serverconfig_ FriendlyFire_ErrorMessage() {276 serverconfig_PersistentPlayerProfiles_ErrorMessage() { 247 277 echo "Not a valid boolean given (true/false or yes/no or y/n)." 248 278 } 249 279 280 281 282 serverconfig_PlayerSafeZoneLevel_QueryName() { 283 echo "Safe zone up to player level" 284 } 285 serverconfig_PlayerSafeZoneLevel_Type() { 286 echo "number" 287 } 288 serverconfig_PlayerSafeZoneLevel_Default() { 289 echo "5" 290 } 291 292 293 serverconfig_PlayerSafeZoneHours_QueryName() { 294 echo "Safe zone up to played hours" 295 } 296 serverconfig_PlayerSafeZoneHours_Type() { 297 echo "number" 298 } 299 serverconfig_PlayerSafeZoneHours_Default() { 300 echo "5" 301 } 250 302 251 303 … … 418 470 419 471 420 serverconfig_DayLightLength_QueryName() {421 echo "Day length"422 }423 serverconfig_DayLightLength_Type() {424 echo "number"425 }426 serverconfig_DayLightLength_Default() {427 echo "18"428 }429 serverconfig_DayLightLength_Range() {430 echo "0-24"431 }432 433 434 435 472 serverconfig_BlockDurabilityModifier_QueryName() { 436 473 echo "Block durability (%)" … … 555 592 556 593 594 serverconfig_AirDropMarker_QueryName() { 595 echo "Enable AirDrop markers" 596 } 597 serverconfig_AirDropMarker_Type() { 598 echo "boolean" 599 } 600 serverconfig_AirDropMarker_Default() { 601 echo "false" 602 } 603 serverconfig_AirDropMarker_ErrorMessage() { 604 echo "Not a valid boolean given (true/false or yes/no or y/n)." 605 } 606 607 608 557 609 serverconfig_MaxSpawnedZombies_QueryName() { 558 610 echo "Maximum number of concurrent zombies" … … 563 615 serverconfig_MaxSpawnedZombies_Default() { 564 616 echo "60" 617 } 618 619 620 serverconfig_MaxSpawnedAnimals_QueryName() { 621 echo "Maximum number of concurrent animals" 622 } 623 serverconfig_MaxSpawnedAnimals_Type() { 624 echo "number" 625 } 626 serverconfig_MaxSpawnedAnimals_Default() { 627 echo "50" 565 628 } 566 629 … … 592 655 for CV in \ 593 656 ServerName ServerPassword ServerIsPublic ServerPort ServerMaxPlayerCount ServerDescription ServerWebsiteURL \ 594 EACEnabled MaxSpawnedZombies \657 EACEnabled MaxSpawnedZombies MaxSpawnedAnimals \ 595 658 ; do 596 659 $1 $CV … … 639 702 echo "--------------------------------" 640 703 for CV in \ 641 FriendlyFire BuildCreate \ 704 PlayerKillingMode PersistentProfiles \ 705 PlayerSafeZoneLevel PlayerSafeZoneHours \ 706 BuildCreate \ 642 707 BlockDurabilityModifier \ 643 708 ; do … … 654 719 for CV in \ 655 720 DropOnDeath DropOnQuit \ 656 LootAbundance LootRespawnDays AirDropFrequency \ 721 LootAbundance LootRespawnDays \ 722 AirDropFrequency AirDropMarker \ 657 723 ; do 658 724 $1 $CV
Note:
See TracChangeset
for help on using the changeset viewer.