From: bones_was_here Date: Thu, 3 Oct 2024 08:13:09 +0000 (+1000) Subject: Allow weapons classified as "new toys" to spawn if placed by the mapper X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e471246d8ed49ac79d6ac6756b159c5ca1a34184;p=xonotic%2Fxonotic-data.pk3dir.git Allow weapons classified as "new toys" to spawn if placed by the mapper See https://xonotic.org/balancevotes/24/ Changes the pipeline hash because bots may now use these weapons due to `g_weaponarena all` in serverbench.cfg. Signed-off-by: bones_was_here --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2a97d8d4..d1ed8f093 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ test_compilation_units: test_sv_game: stage: test script: - - export EXPECT=32efa2daf5e8198a880fd228a46d540c + - export EXPECT=7004fcba787d0fbe17240beb84d8af3c - qcsrc/tools/sv_game-hashtest.sh - exit $? diff --git a/mutators.cfg b/mutators.cfg index bed614445..7bf69658d 100644 --- a/mutators.cfg +++ b/mutators.cfg @@ -324,8 +324,8 @@ set g_campcheck_typecheck 0 "damage campers who are typing" // ========== // new toys // ========== -set g_new_toys 0 "Mutator 'New Toys': enable extra fun guns" -set g_new_toys_autoreplace 2 "0: never replace, 1: always auto replace guns by available new toys, 2: randomly auto replace guns by available new toys" +set g_new_toys 1 "Mutator 'New Toys': enable extra fun guns" +set g_new_toys_autoreplace 0 "0: never replace, 1: always auto replace guns by available new toys, 2: randomly auto replace guns by available new toys" set g_new_toys_use_pickupsound 0 "play the 'new toys, new toys!' roflsound when picking up a new toys weapon"