Updated for VASSAL 3.6.7 and VASL 6.6.5.

master v1.10
Pacman Ghost 2 years ago
parent 85b625d54e
commit 19734ac076
  1. 4
      vasl_templates/tools/get_piece_info.py
  2. 2
      vasl_templates/webapp/config/site.cfg.example
  3. 49
      vasl_templates/webapp/data/vasl-6.6.5/expected-multiple-images.json
  4. 2
      vasl_templates/webapp/data/vasl-6.6.5/online-counter-images.json
  5. 65
      vasl_templates/webapp/data/vasl-6.6.5/piece-info.json
  6. 147
      vasl_templates/webapp/data/vasl-6.6.5/vasl-overrides.json
  7. 8
      vasl_templates/webapp/data/vehicles/german.json
  8. 10
      vasl_templates/webapp/static/help/index.html
  9. 4
      vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.0.txt
  10. 4
      vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.1.txt
  11. 4
      vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.2.txt
  12. 4
      vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.3.txt
  13. 4
      vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.4.txt
  14. 1362
      vasl_templates/webapp/tests/fixtures/vasl-pieces-6.6.5.txt
  15. 10
      vasl_templates/webapp/vasl_mod.py
  16. 10
      vasl_templates/webapp/vassal.py
  17. 2
      vassal-shim/src/vassal_shim/VassalShim.java

@ -57,7 +57,9 @@ for piece_info in doc.getroot():
continue
info = {}
# check if the next piece is small
if int( piece_info.attrib["height"] ) <= 48:
# FUDGE! We used to check for <= 48, but what we get is GamePiece.boundingBox(), which is
# the click zone for the counter, not the actual size of the counter's image :-/
if int( piece_info.attrib["height"] ) <= 55:
info["is_small"] = True
if info:
report[ gpid ] = info

@ -2,7 +2,7 @@
; configure VASSAL and VASL
VASSAL_DIR = ...configure the VASSAL installation directory...
VASL_MOD = ...configure the VASL module (e.g. vasl-6.6.2.vmod)...
VASL_MOD = ...configure the VASL module (e.g. vasl-6.6.5.vmod)...
VASL_EXTNS_DIR = ...configure the VASL extensions directory...
BOARDS_DIR = ...configure the VASL boards directory...

@ -0,0 +1,49 @@
{
"1555": {
"name": "2pdr Portee",
"front_images": [ "br/vehicles/portee.gif", "br/vehicles/portee0.gif" ],
"back_images": null
},
"2212": {
"name": "76* INF FRC",
"front_images": [ "al/gun/alINF76.gif", "al/gun/alINF76u.gif" ],
"back_images": "al/gun/alINF76b.gif"
},
"2698": {
"name": "SPW 251/10",
"front_images": "ge/veh/spw25110.gif",
"back_images": [ "No_ATR.gif", "No_PSK.gif" ]
},
"7409": {
"name": "76 ItK/28 B(s)",
"front_images": "fi/gun/fiAA76L.png",
"back_images": [ "fi/gun/fiAA76L.png", "fi/gun/fiAA76LB.png" ]
},
"adf:1828": {
"name": "105 ART wz.29",
"front_images": "po/gun/poARTwz29-BFP.png",
"back_images": [ "po/gun/poARTwz29-BFP.png", "po/gun/poARTwz29-BFPb.png" ]
},
"adf:1829": {
"name": "120* ART wz09.31",
"front_images": "po/gun/poARTwz0931-BFP.png",
"back_images": [ "po/gun/poARTwz0931-BFP.png", "po/gun/poARTwz0931-BFPb.png" ]
},
"adf:1830": {
"name": "155 ART wz.17",
"front_images": "po/gun/poARTwz17-BFP.png",
"back_images": [ "po/gun/poARTwz17-BFP.png", "po/gun/poARTwz17-BFPb.png" ]
},
"3b5:3676": {
"name": "M19A1 MGMC",
"front_images": [ "us/veh/usM19A1MGMC(trailer)KFW.png", "us/veh/usM19A1MGMC(KFW).png" ],
"back_images": null
}
}

@ -0,0 +1,65 @@
{
"6996": {"is_small": true},
"485": {"is_small": true},
"850": {"is_small": true},
"849": {"is_small": true},
"12689": {"is_small": true},
"856": {"is_small": true},
"857": {"is_small": true},
"11336": {"is_small": true},
"858": {"is_small": true},
"11337": {"is_small": true},
"1149": {"is_small": true},
"1153": {"is_small": true},
"12687": {"is_small": true},
"3b5:7613": {"is_small": true},
"11359": {"is_small": true},
"3b5:11259": {"is_small": true},
"1632": {"is_small": true},
"1636": {"is_small": true},
"1641": {"is_small": true},
"1648": {"is_small": true},
"1982": {"is_small": true},
"1983": {"is_small": true},
"1984": {"is_small": true},
"1985": {"is_small": true},
"1986": {"is_small": true},
"1987": {"is_small": true},
"1988": {"is_small": true},
"2172": {"is_small": true},
"2173": {"is_small": true},
"2176": {"is_small": true},
"2179": {"is_small": true},
"11391": {"is_small": true},
"11392": {"is_small": true},
"11395": {"is_small": true},
"11396": {"is_small": true},
"11440": {"is_small": true},
"3b5:8401": {"is_small": true},
"3b5:8402": {"is_small": true},
"2465": {"is_small": true},
"2474": {"is_small": true},
"3252": {"is_small": true},
"3253": {"is_small": true},
"3263": {"is_small": true},
"3422": {"is_small": true},
"3428": {"is_small": true},
"6730": {"is_small": true},
"3605": {"is_small": true},
"3608": {"is_small": true},
"6763": {"is_small": true},
"3679": {"is_small": true},
"3680": {"is_small": true},
"3681": {"is_small": true},
"3682": {"is_small": true},
"3691": {"is_small": true},
"3692": {"is_small": true},
"3959": {"is_small": true},
"11558": {"is_small": true},
"11559": {"is_small": true},
"3b5:10150": {"is_small": true},
"3b5:10151": {"is_small": true},
"11600": {"is_small": true},
"11604": {"is_small": true},
"3b5:7871": {"is_small": true}
}

@ -0,0 +1,147 @@
{
"2474": {
"expected": {
"name": "Goliath",
"front_images": [ "ge/gegol.gif", "ge/gegolb.gif" ],
"back_images": null
},
"updated": {
"front_images": "ge/gegol.gif"
}
},
"1555": {
"expected": {
"name": "2pdr Portee",
"front_images": "br/vehicles/portee.gif",
"back_images": [ "br/vehicles/portee.gif", "br/vehicles/portee0.gif" ]
},
"updated": {
"front_images": [ "br/vehicles/portee.gif", "br/vehicles/portee0.gif" ],
"back_images": null
}
},
"3463": {
"expected": {
"name": "75L AA 75/46",
"front_images": [ "it/gun/itAA7546.gif", "it/gun/itAA7546b.gif" ],
"back_images": [ "it/gun/itAA7546b.gif", "it/gun/itAA7546lb.gif" ]
},
"updated": {
"front_images": "it/gun/itAA7546.gif",
"back_images": "it/gun/itAA7546b.gif"
}
},
"3776": {
"expected": {
"name": "37* INF Skoda IG",
"front_images": [ "ax/gun/buIN37s.gif", "ax/gun/buIN37s2.gif" ],
"back_images": "ax/gun/buIN37sb.gif"
},
"updated": {
"front_images": "ax/gun/buIN37s.gif"
}
},
"3777": {
"expected": {
"name": "70* INF Skoda IG",
"front_images": [ "ax/gun/buIN37s.gif", "ax/gun/buIN37s2.gif" ],
"back_images": "ax/gun/buIN37sb.gif"
},
"updated": {
"front_images": "ax/gun/buIN37s2.gif"
}
},
"6802": {
"expected": {
"name": "20L (4) AA",
"front_images": [ "fi/gun/fi20L4 _2.png", "fi/gun/fi20L4 _2 LIM.png" ],
"back_images": null
},
"updated": {
"front_images": "fi/gun/fi20L4 _2.png"
}
},
"6803": {
"expected": {
"name": "20L VKT (12) AA",
"front_images": [ "fi/gun/fi20L12.png", "fi/gun/fi20L12L.png" ],
"back_images": null
},
"updated": {
"front_images": "fi/gun/fi20L12.png"
}
},
"6804": {
"expected": {
"name": "40L Bofors AA (s)",
"front_images": [ "fi/gun/fi40L.png", "fi/gun/fi40LL.png" ],
"back_images": null
},
"updated": {
"front_images": "fi/gun/fi40L.png"
}
},
"adf:1824": {
"expected": {
"name": "37L AT PTP obr. 30",
"front_images": "ru/gun/ruAT37L.gif",
"back_images": "ru/gun/ruAT37Lb.gif"
},
"updated": {
"front_images": "ru/gun/ru37LPTPobr30.png"
}
},
"adf:1822": {
"expected": {
"name": "37* INF PP obr. 15R",
"front_images": "ru/gun/ruINF37s.gif",
"back_images": "ru/gun/ruINF37sb.gif"
},
"updated": {
"front_images": "ru/gun/ru37PPobr15R.png"
}
},
"adf:1823": {
"expected": {
"name": "76* INF PP obr. 27",
"front_images": "ru/gun/ruINF76s.gif",
"back_images": "ru/gun/ruINF76sb.gif"
},
"updated": {
"front_images": "ru/gun/ru76PPobr27.png"
}
},
"3b5:10093": {
"expected": {
"name": "SL truck",
"front_images": [ "sh/SL3b(KFW).png", "sh/SL4b(KFW).png", "sh/SL5b(KFW).png", "sh/SL6b(KFW).png", "sh/SL1b(KFW).png", "sh/SL2b(KFW).png" ],
"back_images": [ "sh/SL3(KFW).png", "sh/SL4(KFW).png", "sh/SL5(KFW).png", "sh/SL6(KFW).png", "sh/SL1(KFW).png", "sh/SL2(KFW).png" ]
},
"updated": {
"front_images": "us/veh/usSearchlight(KFW).png",
"back_images": null
}
},
"08d:75": {
"expected": {
"name": "RCL 75*",
"front_images": "amrcl75-malf.png",
"back_images": "dm-75rcl.gif"
},
"updated": {
"front_images": "amrcl75.png"
}
}
}

@ -85,7 +85,7 @@
"notes": [ "a", "c", "f" ],
"comments": [ "Road Rate NA" ],
"id": "ge/v:009",
"gpid": [ 2542, 7124 ]
"gpid": [ 2542 ]
},
{ "name": "FT-17 730(f)",
"type": "Tt",
@ -95,7 +95,7 @@
"notes": [ "a", "c", "f" ],
"comments": [ "Road Rate NA" ],
"id": "ge/v:010",
"gpid": [ 2544, 7128 ]
"gpid": [ 2544 ]
},
{ "name": "38H 735(f)",
"type": "LT",
@ -104,7 +104,7 @@
"note_number": "9.2",
"notes": [ "a", "b\u2020", "f" ],
"id": "ge/v:011",
"gpid": [ 2546, 7132 ]
"gpid": [ 2546 ]
},
{ "name": "35-S 739(f)",
"type": "MT",
@ -112,7 +112,7 @@
"note_number": "9.3",
"notes": [ "a", "b\u2020<sup>2</sup>", "d\u2020<sup>1</sup>", "f" ],
"id": "ge/v:012",
"gpid": [ 2548, 7136 ]
"gpid": [ 2548 ]
},
{ "name": "PzKpfw IIID",
"type": "MT",

@ -54,8 +54,8 @@ If you have Docker installed, the webapp can be run in a container e.g.
<div class="code">
./run-container.sh \
--port 5010 \
--vassal ~/vassal-3.6.6/ \
--vasl ~/vasl/vasl-6.6.4.vmod \
--vassal ~/vassal-3.6.7/ \
--vasl ~/vasl/vasl-6.6.5.vmod \
--vasl-extensions ~/vasl/extensions/ \
--boards ~/vasl/boards/ \
--chapter-h ~/vasl/chapter-h/ \
@ -154,11 +154,11 @@ Configuring the program
<p> Choose <em>Settings</em> from the <em>File</em> menu and configure the highlighted settings. As a guide, here are some example settings:
<table class="settings">
<tr> <td class="key"> VASSAL&nbsp;installation: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.6.6\</nobr>
<tr> <td class="key"> VASL&nbsp;module: </td> <td class="val"> <nobr>C:\bin\vasl\vasl-6.6.4.vmod</nobr>
<tr> <td class="key"> VASSAL&nbsp;installation: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.6.7\</nobr>
<tr> <td class="key"> VASL&nbsp;module: </td> <td class="val"> <nobr>C:\bin\vasl\vasl-6.6.5.vmod</nobr>
<tr> <td class="key"> VASL&nbsp;extensions: </td> <td class="val"> <nobr>C:\bin\vasl\extensions\</nobr>
<tr> <td class="key"> VASL&nbsp;boards: </td> <td class="val"> <nobr>C:\bin\vasl\boards\</nobr>
<tr> <td class="key" valign="top"> Java: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.6.6\jre\bin\java.exe</nobr>
<tr> <td class="key" valign="top"> Java: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.6.7\jre\bin\java.exe</nobr>
<div class="hint" style="margin:0.5em 1em;"> Leave this field blank to use the Java that comes with VASSAL (Windows only), or on your PATH. </div>
<tr> <td class="key"> Web&nbsp;driver: </td> <td class="val"> <nobr>C:\bin\geckodriver.exe</nobr>
</table>

@ -1207,9 +1207,6 @@ GPID Name Front images
7115 Churchill III ru/veh/ruChurchilIII.png
7119 Jeep GPA(a) ru/veh/ruJeep GPA.png
7120 DUKW (a) ru/veh/ruDUKW.png
7128 FT-17 730(m) ge/veh/geFT-17 37.png
7132 38H 735(f) ge/veh/ge38H 735.png
7136 35-S 739(f) ge/veh/ge35S 739.png
7150 Matilda II ru/veh/ruMatilda.png
7220 T-26B (r) fi/veh/fiT-26b2(r).png
7409 76 ItK/28 B(s) fiAA76L.png fiAA76LB.png
@ -1245,7 +1242,6 @@ GPID Name Front images
11423 155 ART M1 sk/gun/skART155-M1(KFW).png sk/gun/skART155-M1(KFW)-malf.png
11424 M36B2 GMC(a) sk/veh/skM36B2GMC(a)KFW.png
11440 60* MTR un/unMTR60(KFW).png un/unMTR60(KFW)x.png
11479 FT-17 730(f) ge/veh/geFT-17 CMG.png
11500 45L AT PTP obr. 32 ax/gun/roAT45L.gif ax/gun/roAT45Lb.gif
11501 150L ART Skoda M28(NOa) ax/gun/roAR150L.gif ax/gun/roAR150Lb.gif
11502 47L AA Skoda 47L40(t) ax/gun/slAA47L.gif ax/gun/slAA47Lb.gif

@ -1207,9 +1207,6 @@ GPID Name Front images
7115 Churchill III ru/veh/ruChurchilIII.png
7119 Jeep GPA(a) ru/veh/ruJeep GPA.png
7120 DUKW (a) ru/veh/ruDUKW.png
7128 FT-17 730(m) ge/veh/geFT-17 37.png
7132 38H 735(f) ge/veh/ge38H 735.png
7136 35-S 739(f) ge/veh/ge35S 739.png
7150 Matilda II ru/veh/ruMatilda.png
7220 T-26B (r) fi/veh/fiT-26b2(r).png
7409 76 ItK/28 B(s) fiAA76L.png fiAA76LB.png
@ -1245,7 +1242,6 @@ GPID Name Front images
11423 155 ART M1 sk/gun/skART155-M1(KFW).png sk/gun/skART155-M1(KFW)-malf.png
11424 M36B2 GMC(a) sk/veh/skM36B2GMC(a)KFW.png
11440 60* MTR un/unMTR60(KFW).png un/unMTR60(KFW)x.png
11479 FT-17 730(f) ge/veh/geFT-17 CMG.png
11500 45L AT PTP obr. 32 ax/gun/roAT45L.gif ax/gun/roAT45Lb.gif
11501 150L ART Skoda M28(NOa) ax/gun/roAR150L.gif ax/gun/roAR150Lb.gif
11502 47L AA Skoda 47L40(t) ax/gun/slAA47L.gif ax/gun/slAA47Lb.gif

@ -1207,9 +1207,6 @@ GPID Name Front images
7115 Churchill III ru/veh/ruChurchilIII.png
7119 Jeep GPA(a) ru/veh/ruJeep GPA.png
7120 DUKW (a) ru/veh/ruDUKW.png
7128 FT-17 730(m) ge/veh/geFT-17 37.png
7132 38H 735(f) ge/veh/ge38H 735.png
7136 35-S 739(f) ge/veh/ge35S 739.png
7150 Matilda II ru/veh/ruMatilda.png
7220 T-26B (r) fi/veh/fiT-26b2(r).png
7409 76 ItK/28 B(s) fi/gun/fiAA76L.png ['fi/gun/fiAA76L.png', 'fi/gun/fiAA76LB.png']
@ -1245,7 +1242,6 @@ GPID Name Front images
11423 155 ART M1 sk/gun/skART155-M1(KFW).png sk/gun/skART155-M1(KFW)-malf.png
11424 M36B2 GMC(a) sk/veh/skM36B2GMC(a)KFW.png
11440 60* MTR un/unMTR60(KFW).png un/unMTR60(KFW)x.png
11479 FT-17 730(f) ge/veh/geFT-17 CMG.png
11500 45L AT PTP obr. 32 ax/gun/roAT45L.gif ax/gun/roAT45Lb.gif
11501 150L ART Skoda M28(NOa) ax/gun/roAR150L.gif ax/gun/roAR150Lb.gif
11502 47L AA Skoda 47L40(t) ax/gun/slAA47L.gif ax/gun/slAA47Lb.gif

@ -1207,9 +1207,6 @@ GPID Name Front images
7115 Churchill III ru/veh/ruChurchilIII.png
7119 Jeep GPA(a) ru/veh/ruJeep GPA.png
7120 DUKW (a) ru/veh/ruDUKW.png
7128 FT-17 730(m) ge/veh/geFT-17 37.png
7132 38H 735(f) ge/veh/ge38H 735.png
7136 35-S 739(f) ge/veh/ge35S 739.png
7150 Matilda II ru/veh/ruMatilda.png
7220 T-26B (r) fi/veh/fiT-26b2(r).png
7409 76 ItK/28 B(s) fi/gun/fiAA76L.png ['fi/gun/fiAA76L.png', 'fi/gun/fiAA76LB.png']
@ -1245,7 +1242,6 @@ GPID Name Front images
11423 155 ART M1 sk/gun/skART155-M1(KFW).png sk/gun/skART155-M1(KFW)-malf.png
11424 M36B2 GMC(a) sk/veh/skM36B2GMC(a)KFW.png
11440 60* MTR un/unMTR60(KFW).png un/unMTR60(KFW)x.png
11479 FT-17 730(f) ge/veh/geFT-17 CMG.png
11500 45L AT PTP obr. 32 ax/gun/roAT45L.gif ax/gun/roAT45Lb.gif
11501 150L ART Skoda M28(NOa) ax/gun/roAR150L.gif ax/gun/roAR150Lb.gif
11502 47L AA Skoda 47L40(t) ax/gun/slAA47L.gif ax/gun/slAA47Lb.gif

@ -1207,9 +1207,6 @@ GPID Name Front images
7115 Churchill III ru/veh/ruChurchilIII.png
7119 Jeep GPA(a) ru/veh/ruJeep GPA.png
7120 DUKW (a) ru/veh/ruDUKW.png
7128 FT-17 730(f) ge/veh/geFT-17 37.png
7132 38H 735(f) ge/veh/ge38H 735.png
7136 35-S 739(f) ge/veh/ge35S 739.png
7150 Matilda II ru/veh/ruMatilda.png
7220 T-26B (r) fi/veh/fiT-26b2(r).png
7409 76 ItK/28 B(s) fi/gun/fiAA76L.png ['fi/gun/fiAA76L.png', 'fi/gun/fiAA76LB.png']
@ -1245,7 +1242,6 @@ GPID Name Front images
11423 155 ART M1 sk/gun/skART155-M1(KFW).png sk/gun/skART155-M1(KFW)-malf.png
11424 M36B2 GMC(a) sk/veh/skM36B2GMC(a)KFW.png
11440 60* MTR un/unMTR60(KFW).png un/unMTR60(KFW)x.png
11479 FT-17 730m(f) ge/veh/geFT-17 CMG.png
11500 45L AT PTP obr. 32 ax/gun/roAT45L.gif ax/gun/roAT45Lb.gif
11501 150L ART Skoda M28(NOa) ax/gun/roAR150L.gif ax/gun/roAR150Lb.gif
11502 47L AA Skoda 47L40(t) ax/gun/slAA47L.gif ax/gun/slAA47Lb.gif

File diff suppressed because it is too large Load Diff

@ -16,8 +16,8 @@ from vasl_templates.webapp.config.constants import DATA_DIR
from vasl_templates.webapp.vo import get_vo_listings
from vasl_templates.webapp.utils import compare_version_strings
SUPPORTED_VASL_MOD_VERSIONS = [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4" ]
SUPPORTED_VASL_MOD_VERSIONS_DISPLAY = "6.6.0-.3, 6.6.3.1, 6.6.4"
SUPPORTED_VASL_MOD_VERSIONS = [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5" ]
SUPPORTED_VASL_MOD_VERSIONS_DISPLAY = "6.6.0-.3, 6.6.3.1, 6.6.4-.5"
_zip_file_lock = threading.Lock()
@ -521,10 +521,14 @@ GPID_REMAPPINGS = [
# to "FT-17 730(f)" and "FT-17 730(m)". However, the 7124 -> 11479 GPID change is still probably correct.
# He also suggests that 7124 and 7128 are incorrectly-added duplicates, and the correct ones
# are 2542 and 2544.
"7124": "11479", # FT-17 730m(f) (German)
# NOTE: GPID 11479 was removed in VASL 6.6.5.
#"7124": "11479", # FT-17 730m(f) (German)
} ],
[ "6.5.1", {
"1527": "12730" # IP Carrier AOV (British)
} ],
[ "6.6.5", {
"6812": "3627" # 37L AT PstK/37 (g) (Finnish)
} ]
]

@ -37,6 +37,7 @@ from vasl_templates.webapp.vasl_mod import get_reverse_remapped_gpid
# 6.6.2 | 3.5.5 16+36
# 6.6.3 | 3.5.8 16+36
# 6.6.4 | 3.6.6 17.0.2+8-LTS
# 6.6.5 | 3.6.7 18.0.1
# NOTE: VASSAL+VASL back-compat has gone out the window :-/ We have to tie versions of VASL
# to specific versions of VASSAL. Sigh...
SUPPORTED_VASSAL_VERSIONS = {
@ -44,9 +45,10 @@ SUPPORTED_VASSAL_VERSIONS = {
"3.4.6": [ "6.6.0", "6.6.1" ],
"3.5.5": [ "6.6.0", "6.6.1", "6.6.2" ],
"3.5.8": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1" ],
"3.6.6": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4" ],
"3.6.6": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5" ],
"3.6.7": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5" ],
}
SUPPORTED_VASSAL_VERSIONS_DISPLAY = "3.4.2, 3.4.6, 3.5.5, 3.5.8"
SUPPORTED_VASSAL_VERSIONS_DISPLAY = "3.4.2, 3.4.6, 3.5.5, 3.5.8, 3.6.6, 3.6.7"
# ---------------------------------------------------------------------
@ -590,7 +592,9 @@ class VassalShim:
if not VassalShim.is_compatible_version( version, globvars.vasl_mod.vasl_version ):
if msg_store:
msg_store.error(
"VASSAL {} and VASL {} are not compatible.".format( version, globvars.vasl_mod.vasl_version ),
"VASSAL {} and VASL {} may not be compatible.".format(
version, globvars.vasl_mod.vasl_version
),
version
)

@ -1046,6 +1046,8 @@ public class VassalShim
int nPieces = 0 ;
for ( PieceSlot pieceSlot : GameModule.getGameModule().getAllDescendantComponentsOf( PieceSlot.class ) ) {
GamePiece gamePiece = pieceSlot.getPiece() ;
// NOTE: From GamePiece.java: the bounding box is "the area in which the user must click
// to select or move the piece", which is not quite the same thing as the size of the counter :-/
Rectangle bbox = gamePiece.boundingBox() ;
Element elem = doc.createElement( "pieceInfo" ) ;
elem.setAttribute( "gpid", pieceSlot.getGpId() ) ;

Loading…
Cancel
Save