3 files changed, 24 insertions(+), 18 deletions(-)
diff --git config_190719_0756/Quests/quests_daily.txt config_190723_2007/Quests/quests_daily.txt
index 66c3267..90efdae 100644
--- config_190719_0756/Quests/quests_daily.txt
+++ config_190723_2007/Quests/quests_daily.txt
@@ -564,63 +564,63 @@
planeLevelMax: '20'
planeLevelMin: '0'
quests:
- id: tut_complete
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: tunaleader
- id: vampire
unitsPerInstance: '2'
id: bounty2_monday1_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: dragonmama
- id: birdcatcher
unitsPerInstance: '2'
id: bounty2_tuesday1_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: highmountaingruntleader
- id: hammerplanet2
unitsPerInstance: '2'
id: bounty2_wednesday1_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: highmountainhunter
- id: hyperdrive
unitsPerInstance: '2'
id: bounty2_thursday1_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '100'
type: kill
units:
- id: dragonmama
- id: dragonbaby
@@ -641,63 +641,63 @@
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: tunaleader
- id: vampire
unitsPerInstance: '2'
id: bounty2_monday2_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: dragonmama
- id: birdcatcher
unitsPerInstance: '2'
id: bounty2_tuesday2_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: highmountaingruntleader
- id: hammerplanet2
unitsPerInstance: '2'
id: bounty2_wednesday2_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '40'
type: kill
units:
- id: highmountainhunter
- id: hyperdrive
unitsPerInstance: '2'
id: bounty2_thursday2_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '100'
type: kill
units:
- id: dragonmama
- id: dragonbaby
@@ -720,49 +720,49 @@
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: marksman
- id: duelist
unitsPerInstance: '2'
id: bounty2_saturday1_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '20'
type: kill
units:
- id: marksman
- id: duelist
unitsPerInstance: '2'
id: bounty2_saturday2_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '5'
type: kill
units:
- id: lion
unitsPerInstance: '1'
id: bounty2_sunday1_template
showInaccessible: 'false'
source: giver
template: 'true'
tier: '10'
- goals:
- - nearbyPlayersAboveOrEq: '3'
+ - nearbyPlayersAboveOrEq: '2'
target: '5'
type: kill
units:
- id: lion
unitsPerInstance: '1'
diff --git config_190719_0756/Texts/en-US/quests.txt config_190723_2007/Texts/en-US/quests.txt
index 90a2f0e..7218192 100644
--- config_190719_0756/Texts/en-US/quests.txt
+++ config_190723_2007/Texts/en-US/quests.txt
@@ -843,18 +843,18 @@ beta_planexp:
title: '[BETA] Plane XP Faucet'
beta_scrap:
title: '[BETA] Scrap Faucet'
bounty2_friday1:
description: Team up with 2 other Steambirds and take out the designated targets.
- goal_0: Defeat 100 <color=#FBB040>Noble Estates</color> and <color=#FBB040>Imperial City</color> enemies
+ goal_0: Defeat {0} <color=#FBB040>Noble Estates</color> and <color=#FBB040>Imperial City</color> enemies with <color=#FBB040>2+ nearby players</color>
title: 'Bounty 2: Squad Mission'
bounty2_friday1_week5:
description: Team up with 2 other Steambirds and take out the designated targets.
title: 'Bounty 2: Squad Mission'
bounty2_friday2:
description: Team up with 2 other Steambirds and take out the designated targets.
- goal_0: Defeat 100 <color=#FBB040>Noble Estates</color> and <color=#FBB040>Imperial City</color> enemies
+ goal_0: Defeat {0} <color=#FBB040>Noble Estates</color> and <color=#FBB040>Imperial City</color> enemies with <color=#FBB040>2+ nearby players</color>
title: 'Bounty 2: Squad Mission'
bounty2_friday2_week5:
description: Team up with 2 other Steambirds and take out the designated targets.
title: 'Bounty 2: Squad Mission'
bounty2_monday1:
diff --git config_190719_0756/global.txt config_190723_2007/global.txt
index 4cc2e2c..406bae2 100644
--- config_190719_0756/global.txt
+++ config_190723_2007/global.txt
@@ -15,31 +15,33 @@ backendMonkeyDelayMaxMs: '500'
backendMonkeyDelayMinMs: '10'
baseNumHangarSlots: '2'
baseNumInventorySlots: '12'
baseNumStorageSlots: '16'
baseSkillLoadoutSlots: '1'
+bulletMaxDeltaCollide: '0.25'
+bulletMaxDeltaSweep: '0.15'
bulletMultipleSpacing: '0.5'
captureAndUploadDeathGif: 'false'
checkLinkTimeout: '5'
clientFPS: '60'
clientNetworkHeartbeatIntervalMs: '6'
clientOutboundCap: '2000'
clientTimestampPeriod: '60'
cloudMaxDistanceSq: '64'
conversationEndSafety: '3'
+copperClientSmoothTimeSync: 'false'
+copperTimeSyncThresholdResync: '0.4'
countChildrenForSpawning: 'false'
daysIntoFutureToShowEvents: '8'
daysIntoFutureToShowNews: '8'
daysIntoPastToShowEvents: '0'
daysIntoPastToShowNews: '7'
deathCamGifUploadMaxKBytesPerSec: '128'
debugInfo: 'false'
debugLogs:
- isInChat: 'false'
tag: offlinebackend
-- isinchat: 'false'
- tag: audit
- isInChat: 'false'
tag: quests
- isInChat: 'false'
tag: store
- isInChat: 'true'
@@ -79,10 +81,11 @@ doesSimulateLatencyInLocalPlay: 'true'
doesSpawnTutorialOnFirstTime: 'true'
doesSpawnTutorialOnFirstTimeOnlyIfNoPlanes: 'false'
doesUseClientEvents: 'true'
doesntSendCrashesToSentry: 'false'
doesntSpawnDungeons: 'false'
+dontKillPlayersDuringRecentLag: 'true'
dontSpawnWithinDistOfPlayer: '60'
drawDebugPointsForSpawns: 'false'
dungeonExitAppearAnimationSpeedup: '3'
dungeonMarkerSpawnRadius: '15'
dungeonPortalJoinGracePeriod: '30'
@@ -631,10 +634,12 @@ radarQuestWelcomeTime: '8'
radarSelectionAngle: '20'
radarShowsPortraits: 'true'
radarStickyTimeout: '2'
radarVeryStickyAngle: '60'
radarVeryStickyTimeout: '10'
+reallySlowTickDurationMs: '400'
+recentLagDuration: '4'
regularDumpUnitDistributionIntoLogTimeout: '600'
regularDumpUpdateRatesIntoLogTimeout: '60'
reliableStats_nearbyPlayerCountRadius: '15'
reliableStats_nearbyPlayerCountTimeout: '3'
rewardItemsBackIfDungeonSpawningFailed: 'true'
@@ -664,10 +669,11 @@ showSubTerritoriesGroups: 'false'
showTerritoryGrid: 'false'
shutdownCountdown: '10'
shutdownDelayToCountdown: '10'
shutdownWithCameraShake: 'true'
singleFrameSpawning: 'true'
+slowTickDurationMs: '150'
spawnWallsOnServer: 'true'
startingPlaneClass: walker
steamBranchSettings:
beta:
connection_override: beta