From 000263fdcf878b598450d4217f48659c077791a4 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 26 May 2021 09:33:12 +0200 Subject: [PATCH] Ignore cluster zero maps for stats (e.g.: Kinsie's Test Map). --- language.version | 4 ++-- zscript/handler/swwm_handler_worldload.zsc | 24 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/language.version b/language.version index 1215fb8a1..b0112ae48 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r509 \cu(Wed 26 May 09:18:26 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r509 \cu(2021-05-26 09:18:26)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r510 \cu(Wed 26 May 09:33:12 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r510 \cu(2021-05-26 09:33:12)\c-"; diff --git a/zscript/handler/swwm_handler_worldload.zsc b/zscript/handler/swwm_handler_worldload.zsc index c1739849c..2e93f92b1 100644 --- a/zscript/handler/swwm_handler_worldload.zsc +++ b/zscript/handler/swwm_handler_worldload.zsc @@ -42,19 +42,21 @@ extend Class SWWMHandler secret = true; clust = level.cluster; } - int csiz = s.clustervisit.Size(); - if ( csiz == 0 ) + // avoid cluster zero (ignores test maps and such) + if ( clust != 0 ) { - s.clustervisit.Push(clust); - s.secretdone.Push(secret); + int csiz = s.clustervisit.Size(); + if ( csiz == 0 ) + { + s.secretdone.Push(secret); + } + else if ( s.clustervisit[csiz-1] != clust ) + { + s.secretdone.Push(secret|s.secretdone[csiz-1]); + } + s.AddLevelStats(); + s.lastcluster = level.cluster; } - else if ( s.clustervisit[csiz-1] != clust ) - { - s.clustervisit.Push(clust); - s.secretdone.Push(secret|s.secretdone[csiz-1]); - } - s.AddLevelStats(); - s.lastcluster = level.cluster; } // reset score on dead players (death exitâ„¢) for ( int i=0; i