From cbdeca5546fbbc51cdcc4dacf7ecd96c09088a44 Mon Sep 17 00:00:00 2001 From: Taka Date: Tue, 30 Jul 2019 05:07:03 +0000 Subject: [PATCH] Ignore our own labels when analyzing a VASL scenario. --- vassal-shim/release/vassal-shim.jar | Bin 28367 -> 28399 bytes vassal-shim/src/vassal_shim/VassalShim.java | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/vassal-shim/release/vassal-shim.jar b/vassal-shim/release/vassal-shim.jar index 1fcfebbcb9cbc47e786d6802a23e369f5d245326..3219a8fa2ac4b26dc0b46b5546a7c3e48b3f8ee0 100644 GIT binary patch delta 13364 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 diff --git a/vassal-shim/src/vassal_shim/VassalShim.java b/vassal-shim/src/vassal_shim/VassalShim.java index 0a26594..7fe2a32 100644 --- a/vassal-shim/src/vassal_shim/VassalShim.java +++ b/vassal-shim/src/vassal_shim/VassalShim.java @@ -87,6 +87,7 @@ public class VassalShim private String baseDir ; private Properties config ; + private String labelGpid ; private String vmodFilename ; private String boardsDir ; @@ -118,6 +119,7 @@ public class VassalShim logger.debug( "- {} = {}", key, config.getProperty(key) ) ; } } + labelGpid = config.getProperty( "LABEL_GPID", "6295" ) ; // FUDGE! Need this to be able to load the VASL module :-/ logger.debug( "Creating the menu manager." ) ; @@ -382,7 +384,6 @@ public class VassalShim // then become much more complicated). It's just not worth it for something that will rarely happen. // locate the PieceSlot we will use to create labels - String labelGpid = config.getProperty( "LABEL_GPID", "6295" ) ; logger.debug( "- Locating PieceSlot: gpid={}", labelGpid ) ; PieceSlot labelPieceSlot = null ; GpIdChecker gpidChecker = new GpIdChecker() ; @@ -810,7 +811,7 @@ public class VassalShim buf.append( ": " + cmd.getAllowedIds() ) ; } - private static void analyzeCommand( Command cmd, Map results ) + private void analyzeCommand( Command cmd, Map results ) { // analyze the command if ( cmd instanceof AddPiece ) { @@ -826,12 +827,14 @@ public class VassalShim ) { int pos = target.getState().lastIndexOf( ";" ) ; String gpid = target.getState().substring( pos+1 ) ; - if ( ! results.containsKey( gpid ) ) { - logger.debug( "Found new GPID " + gpid + ": " + target.getName() ) ; - results.put( gpid, new AnalyzeNode( target.getName() ) ) ; - } else { - int newCount = results.get( gpid ).incrementCount() ; - logger.debug( "Updating count for GPID " + gpid + ": #=" + newCount ) ; + if ( ! gpid.equals( labelGpid ) ) { + if ( ! results.containsKey( gpid ) ) { + logger.debug( "Found new GPID " + gpid + ": " + target.getName() ) ; + results.put( gpid, new AnalyzeNode( target.getName() ) ) ; + } else { + int newCount = results.get( gpid ).incrementCount() ; + logger.debug( "Updating count for GPID " + gpid + ": #=" + newCount ) ; + } } } }