Changeset 353

Timestamp:

Mar 5, 2019, 5:27:27 PM (6 years ago)

Author:

alloc

Message:

Scripts 112

Location:

scripts/usr/local/lib/7dtd

Files:

• VERSION (modified) (1 diff)
• commands/backup.sh (modified) (1 diff)
• serverconfig.sh (modified) (6 diffs)

scripts/usr/local/lib/7dtd/VERSION

@@ -1 @@
-Version: 111
-Release: 2019-01-05
+Version: 112
+Release: 2019-03-05
 

scripts/usr/local/lib/7dtd/commands/backup.sh

@@ -29 +29 @@
                 for I in $(getInstanceList); do
                         if [ $(isRunning $I) -eq 1 ]; then
-                                telnetCommand $I saveworld 2
+                                telnetCommand $I saveworld 2 > /dev/null
                         fi
                 done

scripts/usr/local/lib/7dtd/serverconfig.sh

@@ -441 +441 @@
 
 
+
+serverconfig_XPMultiplier_QueryName() {
+        echo "XP gain multiplier (%)"
+}
+serverconfig_XPMultiplier_Type() {
+        echo "number"
+}
+serverconfig_XPMultiplier_Default() {
+        echo "100"
+}
+
+
 serverconfig_PartySharedKillRange_QueryName() {
         echo "Party range to share kill / quest XP rewards"
@@ -700 +712 @@
 
 
-serverconfig_BlockDurabilityModifier_QueryName() {
-        echo "Block durability (%)"
-}
-serverconfig_BlockDurabilityModifier_Type() {
-        echo "number"
-}
-serverconfig_BlockDurabilityModifier_Default() {
+serverconfig_BlockDamagePlayer_QueryName() {
+        echo "Block damage modifier for players (%)"
+}
+serverconfig_BlockDamagePlayer_Type() {
+        echo "number"
+}
+serverconfig_BlockDamagePlayer_Default() {
         echo "100"
 }
+
+
+serverconfig_BlockDamageAI_QueryName() {
+        echo "Block damage modifier for AIs (%)"
+}
+serverconfig_BlockDamageAI_Type() {
+        echo "number"
+}
+serverconfig_BlockDamageAI_Default() {
+        echo "100"
+}
+
+
+serverconfig_BlockDamageAIBM_QueryName() {
+        echo "Block damage modifier for AIs during blood moons (%)"
+}
+serverconfig_BlockDamageAIBM_Type() {
+        echo "number"
+}
+serverconfig_BlockDamageAIBM_Default() {
+        echo "100"
+}
+
 
 
@@ -955 +990 @@
         echo "--------------------------------"
         for CV in \
+                        XPMultiplier \
                         PartySharedKillRange PlayerKillingMode PersistentPlayerProfiles \
                         PlayerSafeZoneLevel PlayerSafeZoneHours \
                         BuildCreate \
-                        BlockDurabilityModifier \
+                        BlockDamagePlayer BlockDamageAI BlockDamageAIBM \
                         ; do
                 $1 $CV
@@ -1214 +1250 @@
 #  - AdminFileName is made to point to the local instance admins.xml
 #  - SaveGameFolder is made to point to the instance folder
+#  - UserDataFolder (for GeneratedWorlds) is made to point to the <user home directory>/serverdata/
 # Params:
 #   1: Instance name
@@ -1220 +1257 @@
         configCurrent_AdminFileName=admins.xml
         configCurrent_SaveGameFolder="$(getInstancePath "$1")"
+        configCurrent_UserDataFolder=$SDTD_BASE/serverdata
 }
 
@@ -1275 +1313 @@
 saveCurrentConfigValues() {
         local CV
-        for CV in $(listConfigValues) TelnetEnabled AdminFileName SaveGameFolder; do
+        for CV in $(listConfigValues) TelnetEnabled AdminFileName SaveGameFolder UserDataFolder; do
                 local currentValName=configCurrent_$CV
                 local val="${!currentValName}"