From 029bcd197b5ea4c5aec788b4eada82db662a459c Mon Sep 17 00:00:00 2001 From: Taka Date: Tue, 30 Jul 2019 03:19:17 +0000 Subject: [PATCH] Added a workaround to detect more pieces when analyzing a VASL scenario. --- vassal-shim/release/vassal-shim.jar | Bin 28183 -> 28219 bytes vassal-shim/src/vassal_shim/VassalShim.java | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/vassal-shim/release/vassal-shim.jar b/vassal-shim/release/vassal-shim.jar index 049abb78cb697b7a42e2d2fbb8738b883ebb6cb2..54d9fc406ff783b512b08d109a8c337ecdf0c106 100644 GIT binary patch delta 13296 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 delta 13235 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 JE7t!D{y(9XLnr_M diff --git a/vassal-shim/src/vassal_shim/VassalShim.java b/vassal-shim/src/vassal_shim/VassalShim.java index c360497..3fa89e8 100644 --- a/vassal-shim/src/vassal_shim/VassalShim.java +++ b/vassal-shim/src/vassal_shim/VassalShim.java @@ -59,6 +59,7 @@ import VASSAL.counters.GamePiece ; import VASSAL.counters.BasicPiece ; import VASSAL.counters.DynamicProperty ; import VASSAL.counters.Hideable ; +import VASSAL.counters.FreeRotator ; import VASSAL.counters.PieceCloner ; import VASSAL.preferences.Prefs ; import VASSAL.tools.DataArchive ; @@ -814,8 +815,13 @@ public class VassalShim if ( cmd instanceof AddPiece ) { GamePiece target = ((AddPiece)cmd).getTarget() ; // NOTE: Hideable's don't seem to be just a thing with old versions of VASSAL. We still get them - // when adding a "46mm granatnik wz. 36" (GPID 2172) using VASL 6.4.4 :-/ - if ( target instanceof DynamicProperty || target instanceof Hideable || target.getClass().getName().equals("VASL.counters.TextInfo") ) { + // when adding a "46mm granatnik wz. 36" (GPID 2172) using VASL 6.4.4 :-/ This also seems to happen + // with other 1/2" SW counters. + // NOTE: Other pieces also occasionally appear with weird class types e.g. the Japanese Type 88 75 AA Gun + // appears as a FreeRotator?! + if ( target instanceof DynamicProperty || target instanceof Hideable || target instanceof FreeRotator + || target.getClass().getName().equals("VASL.counters.TextInfo") + ) { int pos = target.getState().lastIndexOf( ";" ) ; String gpid = target.getState().substring( pos+1 ) ; if ( ! results.containsKey( gpid ) )