Thread: [vassalengine-svn] SF.net SVN: vassalengine:[8884] ASL-src/trunk (Page 2)
Brought to you by:
rodneykinney,
uckelman
From: <dav...@us...> - 2013-10-31 04:21:56
|
Revision: 8884 http://sourceforge.net/p/vassalengine/svn/8884 Author: davidsullivan1 Date: 2013-10-31 04:21:52 +0000 (Thu, 31 Oct 2013) Log Message: ----------- Module changes from Allan and Jeff: * Added level 1 bldg counter to the Basic panel * Corrected black and blue 658s flip to broken side upon ctrl-R for Berserk * Added the new Russian AAMG counter from the FrF Pack at ASLOK 2013 * Corrected black and blue broken 658s not reporting on the Broken window * Added right-click menu/shortcut keys for placing prep and defensive fire counters * Removed location marker from location, cellar, roof, sewer, climb counters. No change necessary for fortified building counters * Corrected allied minors activating assault fire are given spraying fire instead. * Allied minor fixes: - Broken MMCs now report on the broken inventory window - Broken MMCs with a +1 morale vs Italians will now appear in the chat window as: ?\226?\128?\156+1 vs Italians broken...?\226?\128?\157 vice ?\226?\128?\156broken broken...?\226?\128?\157 - Corrected the normal broken morale of all MMCs - Corrected the +1 broken morale vs Italians of all MMCs Modified Paths: -------------- ASL-src/trunk/dist/buildFile ASL-src/trunk/src/VASL/build/module/map/CASLThread.java Added Paths: ----------- ASL-src/trunk/dist/images/ru/gun/ruAA762s.gif ASL-src/trunk/dist/images/ru/gun/ruAA762sb.gif Modified: ASL-src/trunk/dist/buildFile =================================================================== --- ASL-src/trunk/dist/buildFile 2013-10-30 18:21:21 UTC (rev 8883) +++ ASL-src/trunk/dist/buildFile 2013-10-31 04:21:52 UTC (rev 8884) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<VASSAL.launch.BasicModule VassalVersion="3.2.2" description="Virtual Advanced Squad Leader" name="VASL" nextPieceSlotId="6367" version="6.0.0"> +<VASSAL.launch.BasicModule VassalVersion="3.2.8" description="Virtual Advanced Squad Leader" name="VASL" nextPieceSlotId="6666" version="6.0.0"> <VASL.build.module.OBA hotkey="117,0"/> <VASL.build.module.ScenInfo/> <VASSAL.build.module.GlobalOptions autoReport="Use Preferences Setting" centerOnMove="Use Preferences Setting" nonOwnerUnmaskable="Use Preferences Setting" playerIdFormat="$playerName$" promptString="Let opponent unconceal my units" specifyExtensionDirInPrefs="true"> @@ -17,12 +17,12 @@ <VASSAL.build.module.map.Scroller/> <VASSAL.build.module.map.MenuDisplayer/> <VASL.build.module.map.MapCenterer/> - <VASL.build.module.map.ASLPieceFinder/> + <VASL.build.module.map.ASLPieceFinder Name="ASL Piece Finder"/> <VASSAL.build.module.map.ForwardToChatter/> <VASSAL.build.module.map.StackExpander/> <VASL.build.module.map.BoardVersionChecker boardPageURL="http://goo.gl/N52DL" boardVersionURL="http://home.comcast.net/~tomrepetti/boards/v5boardVersions" overlayVersionURL="http://home.comcast.net/~tomrepetti/boards/v5overlayVersions"/> <VASL.build.module.map.CASLThread drawRange="true" global="Always" hideCounters="true" hideOpacity="0" hotkey="121,0" iconName="/images/thread.gif" label="L" persistence="Never" persistentIconName="" rangeBg="0,0,0" rangeFg="255,255,255" report="$playerId$ Checked LOS from $FromLocation$ to $ToLocation$, Range=$Range$" round="Nearest whole number" scale="0" snapEnd="false" snapStart="false" threadColor="0,0,0" threadName="LOS" tooltip="Draw LOS Thread"/> - <VASL.build.module.map.CASLThread drawRange="true" global="Never" hideCounters="true" hideOpacity="0" hotkey="121,129" iconName="/images/thread.gif" label="l" persistence="Never" persistentIconName="" rangeBg="255,255,255" rangeFg="0,0,0" report="$playerId$ Checked LOS" round="Nearest whole number" scale="0" snapEnd="false" snapStart="false" threadColor="255,40,39" tooltip="Draw silent LOS"/> + <VASL.build.module.map.CASLThread drawRange="true" global="Never" hideCounters="true" hideOpacity="0" hotkey="121,195" iconName="/images/thread.gif" label="l" persistence="Never" persistentIconName="" rangeBg="255,255,255" rangeFg="0,0,0" report="$playerId$ Checked LOS" round="Nearest whole number" scale="0" snapEnd="false" snapStart="false" threadColor="255,40,39" threadName="los" tooltip="Draw silent LOS"/> <VASSAL.build.module.map.Zoomer inButtonText="" inIconName="/images/zoomIn.gif" inTooltip="Zoom in" outButtonText="" outIconName="/images/zoomOut.gif" outTooltip="Zoom out" pickButtonText="" pickIconName="/images/zoom.png" pickTooltip="Select Zoom" zoomInKey="114,0" zoomLevels="0.19753086419753085,0.2962962962962963,0.4444444444444444,0.6666666666666666,1.0,1.5" zoomOutKey="115,0" zoomPickKey="" zoomStart="3"/> <VASL.build.module.map.MassRemover> <entry name=" - ">-</entry> @@ -101,7 +101,7 @@ </VASL.build.module.map.MassRemover> <VASSAL.build.module.map.KeyBufferer/> <VASL.build.module.map.ASLImageSaver buttonText="" hotkey="" icon="/images/camera.gif" tooltip="Save Map as PNG file"/> - <VASL.build.module.map.ASLTextSaver buttonText="Save Text" hotkey="" tooltip="Save map contents as plain text file"/> + <VASL.build.module.map.ASLTextSaver buttonText="Save Text" hotkey="" icon="" tooltip="Save map contents as plain text file"/> <VASL.build.module.map.BoardSwapper/> <VASL.build.module.map.ASLStackMetrics bottom="40,0" color="255,255,255" disabled="false" down="37,0" exSepX="16" exSepY="32" top="38,0" unexSepX="2" unexSepY="4" up="39,0"/> <VASSAL.build.module.map.HidePiecesButton buttonText="" hiddenIcon="/images/globe_selected.gif" hotkey="121,130" showingIcon="/images/globe_unselected.gif" tooltip="Hide all pieces on this map"/> @@ -114,44 +114,44 @@ <VASL.build.module.map.MapCenterer/> <VASL.build.module.map.ASLPieceMover hotkey="119,0"/> <VASL.build.module.map.QC> - <entry name="7_PREP" image="QC/FirePrep" menu="false">0</entry> - <entry name="7_OPP" image="QC/FireOpp" menu="false">11</entry> - <entry name="7_ADVF" image="QC/FireAdv" menu="false">12</entry> - <entry name="7_PREPINT" image="QC/PrepInt" menu="false">13</entry> - <entry name="7_FIRST" image="QC/FirstFire" menu="false">15</entry> - <entry name="7_FINAL" image="QC/FinalFire" menu="false">18</entry> - <entry name="7_INTFIRE" image="QC/IntensiveFire" menu="false">19</entry> - <entry name="7_VEHFIRE" image="QC/VehFire" menu="false">21</entry> - <entry name="7_PIN" image="QC/PIN" menu="false">1</entry> - <entry name="7_DM" image="QC/DM" menu="false">2</entry> - <entry name="7_DISR" image="QC/Disrupted" menu="false">63</entry> - <entry name="7_RFP" image="QC/RFP" menu="true">Res. 1 FP:47,Res. 2 FP:48,Res. 4 FP:49,Res. 6 FP:50,Res. 8 FP:51,Res. 12 FP:52</entry> - <entry name="7_FL" image="QC/FL" menu="true">F. Lane 1 FP:53,F. Lane 2 FP:54,F. Lane 4 FP:55,F. Lane 6 FP:56</entry> - <entry name="7_SMOKE" image="QC/Smoke" menu="true">Smoke grenade:6,Smoke white +3:57,Smoke white +2:59,Smoke gray +2:61,WP grenade:72,WP white +2:58,WP white +1:60,WP gray +1:62,Blaze/Flame:114</entry> - <entry name="4_WA" image="QC/WA69" menu="false">69</entry> - <entry name="4_CREST" image="QC/Crest" menu="false">146</entry> - <entry name="4_ENCIR" image="QC/Encircled" menu="false">64</entry> - <entry name="3_OTHSWA" image="QC/WA" menu="true">WA:69,Crest:146,Encircled:64</entry> - <entry name="7_CC" image="QC/CC" menu="true">CC:73,Melee:74,Human Wave:83,HW DIrection:85,HW Range:88</entry> - <entry name="6_POW" image="QC/POW" menu="true">POW:6390,POW SMC:6391</entry> - <entry name="6_OTHSMALL" image="QC/OTHER" menu="true">TI:68,Labor:66,CA:5903,Low Ammo:5902</entry> - <entry name="1_OTHER" image="QC/OTHER" menu="true">TI:68,Labor:66,POW:6390,POW SMC:6391,CA:5903,Low Ammo:5902</entry> - <entry name="7_ACQ" image="QC/ACQ" menu="true">Russian Acq:423,American Acq:773,British Acq:1066,French Acq:1589,Chinese Acq:1939,Allied Minor Acq:2122,German Acq:2353,Waffen SS Acq:2831,Japanese Acq:3192,Italian Acq:3380,Finnish Acq:3573,Axis Minor Acq:3634,Hungarian Acq:3916</entry> - <entry name="4_MA" image="QC/MA" menu="true">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920</entry> - <entry name="4_ABAND" image="QC/Abandoned" menu="false">109</entry> - <entry name="4_IMMOB" image="QC/Immobile" menu="false">111</entry> - <entry name="4_SCROUN" image="QC/Scrounged" menu="false">113</entry> - <entry name="4_SHOCK" image="QC/Shock" menu="false">126</entry> - <entry name="4_STUNL" image="QC/StunL" menu="false">128</entry> - <entry name="4_STUNB" image="QC/StunB" menu="false">129</entry> - <entry name="4_BOG" image="QC/Bog" menu="false">116</entry> - <entry name="4_HD" image="QC/HD" menu="false">123</entry> - <entry name="4_TRAIL" image="QC/TrailBreak" menu="false">104</entry> - <entry name="3_TANK" image="QC/TANK" menu="true">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920,Abandoned:109,Immobile:111,Scrounged:113,Shock:126,stun:128,STUN:129,Bog:116,Hulldown:123,Trailbreak:104</entry> - <entry name="7_OBA" image="QC/OBA" menu="false">344</entry> - <entry name="7_BUILD" image="QC/BUILD" menu="true">Cellar:171,Level 1:167,Level 2:169,Level 3:163,Roof:165,Stone rubble:202,Wood rubble:203,Shellhole:204</entry> - <entry name="7_SASL" image="QC/SASL" menu="true">Letter Chit:359,Axis VPO:360,Allied VPO:361,Suspect:362,Suspect:363,Suspect:364,In Command:365,Move:366,Panic:367</entry> - </VASL.build.module.map.QC> + <entry image="QC/FirePrep" menu="false" name="7_PREP">0</entry> + <entry image="QC/FireOpp" menu="false" name="7_OPP">11</entry> + <entry image="QC/FireAdv" menu="false" name="7_ADVF">12</entry> + <entry image="QC/PrepInt" menu="false" name="7_PREPINT">13</entry> + <entry image="QC/FirstFire" menu="false" name="7_FIRST">15</entry> + <entry image="QC/FinalFire" menu="false" name="7_FINAL">18</entry> + <entry image="QC/IntensiveFire" menu="false" name="7_INTFIRE">19</entry> + <entry image="QC/VehFire" menu="false" name="7_VEHFIRE">21</entry> + <entry image="QC/PIN" menu="false" name="7_PIN">1</entry> + <entry image="QC/DM" menu="false" name="7_DM">2</entry> + <entry image="QC/Disrupted" menu="false" name="7_DISR">63</entry> + <entry image="QC/RFP" menu="true" name="7_RFP">Res. 1 FP:47,Res. 2 FP:48,Res. 4 FP:49,Res. 6 FP:50,Res. 8 FP:51,Res. 12 FP:52</entry> + <entry image="QC/FL" menu="true" name="7_FL">F. Lane 1 FP:53,F. Lane 2 FP:54,F. Lane 4 FP:55,F. Lane 6 FP:56</entry> + <entry image="QC/Smoke" menu="true" name="7_SMOKE">Smoke grenade:6,Smoke white +3:57,Smoke white +2:59,Smoke gray +2:61,WP grenade:72,WP white +2:58,WP white +1:60,WP gray +1:62,Blaze/Flame:114</entry> + <entry image="QC/WA69" menu="false" name="4_WA">69</entry> + <entry image="QC/Crest" menu="false" name="4_CREST">146</entry> + <entry image="QC/Encircled" menu="false" name="4_ENCIR">64</entry> + <entry image="QC/WA" menu="true" name="3_OTHSWA">WA:69,Crest:146,Encircled:64</entry> + <entry image="QC/CC" menu="true" name="7_CC">CC:73,Melee:74,Human Wave:83,HW DIrection:85,HW Range:88</entry> + <entry image="QC/POW" menu="true" name="6_POW">POW:6390,POW SMC:6391</entry> + <entry image="QC/OTHER" menu="true" name="6_OTHSMALL">TI:68,Labor:66,CA:5903,Low Ammo:5902</entry> + <entry image="QC/OTHER" menu="true" name="1_OTHER">TI:68,Labor:66,POW:6390,POW SMC:6391,CA:5903,Low Ammo:5902</entry> + <entry image="QC/ACQ" menu="true" name="7_ACQ">Russian Acq:423,American Acq:773,British Acq:1066,French Acq:1589,Chinese Acq:1939,Allied Minor Acq:2122,German Acq:2353,Waffen SS Acq:2831,Japanese Acq:3192,Italian Acq:3380,Finnish Acq:3573,Axis Minor Acq:3634,Hungarian Acq:3916</entry> + <entry image="QC/MA" menu="true" name="4_MA">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920</entry> + <entry image="QC/Abandoned" menu="false" name="4_ABAND">109</entry> + <entry image="QC/Immobile" menu="false" name="4_IMMOB">111</entry> + <entry image="QC/Scrounged" menu="false" name="4_SCROUN">113</entry> + <entry image="QC/Shock" menu="false" name="4_SHOCK">126</entry> + <entry image="QC/StunL" menu="false" name="4_STUNL">128</entry> + <entry image="QC/StunB" menu="false" name="4_STUNB">129</entry> + <entry image="QC/Bog" menu="false" name="4_BOG">116</entry> + <entry image="QC/HD" menu="false" name="4_HD">123</entry> + <entry image="QC/TrailBreak" menu="false" name="4_TRAIL">104</entry> + <entry image="QC/TANK" menu="true" name="3_TANK">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920,Abandoned:109,Immobile:111,Scrounged:113,Shock:126,stun:128,STUN:129,Bog:116,Hulldown:123,Trailbreak:104</entry> + <entry image="QC/OBA" menu="false" name="7_OBA">344</entry> + <entry image="QC/BUILD" menu="true" name="7_BUILD">Cellar:171,Level 1:167,Level 2:169,Level 3:163,Roof:165,Stone rubble:202,Wood rubble:203,Shellhole:204</entry> + <entry image="QC/SASL" menu="true" name="7_SASL">Letter Chit:359,Axis VPO:360,Allied VPO:361,Suspect:362,Suspect:363,Suspect:364,In Command:365,Move:366,Panic:367</entry> + </VASL.build.module.map.QC> </VASL.build.module.ASLMap> <VASSAL.build.module.NotesWindow buttonText="" hotkey="" icon="notesV.gif" tooltip="Notes"/> <VASSAL.build.module.Documentation> @@ -166,269 +166,270 @@ <VASSAL.build.module.documentation.HelpFile fileName="Credits.txt" fileType="archive" title="Credits"/> </VASSAL.build.module.Documentation> <VASSAL.build.module.Inventory centerOnPiece="true" drawPieces="true" foldersOnly="false" forwardKeystroke="true" groupBy="CurrentBoard,LocationName" hotkey="" icon="malf" include="InvisibleToOthers != true && BRK_Active = true || PieceName = DM || PieceName = Disrupt" leafFormat="$PieceName$" name="Broken" nonLeafFormat="$PropertyValue$" pieceZoom="0.75" showMenu="true" sides="" sortFormat="$PieceName$" sortPieces="true" sorting="alpha" text="" tooltip="Show inventory of broken units"/> - <VASL.build.module.ASLCommandEncoder noColorPreferences="true"/> + <VASL.build.module.ASLCommandEncoder noColorPreferences=""/> <VASSAL.build.module.PieceWindow hidden="false" hotkey="67,520" icon="counters" name="VASL Counters" text="" tooltip="Show/Hide the VASL Counters window"> <VASSAL.build.widget.TabWidget> <VASSAL.build.widget.TabWidget entryName="Unit"> <VASSAL.build.widget.PanelWidget entryName="Basic" fixed="true" nColumns="3" vert="false"> - <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="0" height="48" width="48">+/null/hide;72,130;HIP;;player: AreaOfEffect;;30;0;true;;;Night;true;;\ emb2;;0;;Flip;2;F;;0;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1\\ piece;K;D; ;Prep Fire/null \ 1;\\ null;0;0;0</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Pin" gpid="1" height="48" width="68">+/null/moved;moved emb2;;0;;Flip;2;F;;0;;;;0;false;0;0;MS\/pin,MS\/pinb;,;true;;;;false;;1\ piece;K;D; ;Pin/false 1;\ null;0;0;1</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="0" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;0;;Flip;2;F;;0;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Prep Fire/ 1\ null;0;0;0</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Pin" gpid="1" height="48" width="68">+/null/moved;moved emb2;;0;;Flip;2;F;;0;;;;0;false;0;0;MS\/pin,MS\/pinb;,;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Pin/false 1\ null;0;0;1</VASSAL.build.widget.PieceSlot> <VASSAL.build.widget.PieceSlot entryName="DM" gpid="2" height="48" width="68">+/null/prototype;Info piece;K;D;MS\/dm;DM/ null;0;0;2</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="3" height="48" width="48">+/null/hide;72,130;HIP;;player: AreaOfEffect;;30;0;true;;;Night;true;;\ emb2;D1F\/DFF;2;F;;0;;;0;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1\\ emb2;;0;;IFP\/SW;2;S;;0;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1\\\ piece;K;D; ;First Fire/null \ -1;\\ 1;\\\ null;0;0;3</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="3" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;0;;;0;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1;1;false;70,130;;\ emb2;;0;;IFP\/SW;2;S;;0;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1;1;true;;83,130;\\ piece;K;D; ;First Fire/ -1\ 1\\ null;0;0;3</VASSAL.build.widget.PieceSlot> <VASSAL.build.widget.PieceSlot entryName="CX" gpid="4" height="48" width="68">+/null/prototype;Info piece;K;D;MS\/cx;CX/ null;0;0;4</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Motion" gpid="5" height="48" width="68">+/null/hide;72,130;HIP;;player: prototype;Info\ emb2;;0;;Flip;2;F;;0;;;;0;false;0;0;MS\/Motion,MS\/MotionR;,Reverse +;true;;;;false;;1\\ piece;K;D; ;Motion/null \ 1;\\ null;0;0;5</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Smoke" gpid="6" height="48" width="48">+/null/rotate;4;82,130;;Rotate;;;; label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;WG;;0;;;0;;;;0;false;0;0;ML\/WP1gr;Gray \+1 WP;true;;;;false;;1\\ emb2;Gray;2;G;;0;;;0;;;;0;false;0;0;ML\/Smk2gr;Gray \+2 Smoke;true;;;;false;;1\\\ emb2;;2;WS;Strength;2;N;;0;;;;0;false;0;0;ML\/WP2,ML\/WP1;White \+2 WP,White \+1 WP;true;;;;false;;1\\\\ emb2;Size;2;S;Strength;2;N;;0;;;;0;false;0;0;ML\/Smk3,ML\/Smk2;White \+3 Smoke,White \+2 Smoke ;true;;;;false;;1\\\\\ emb2;;0;;WP;2;W;;0;;;;0;false;0;0;MS\/Smk12,MS\/WP12;Smoke grenade \+2,WP grenade \+1;true;;;;false;;1\\\\\\ mark;Hindrance\\\\\\\ mark;Location\\\\\\\\ piece;K;D; ;Smoke/0 \ -1;\\ -1;\\\ -1;\\\\ -1;\\\\\ 1;\\\\\\ true\\\\\\\ \\\\\\\\ null;0;0;6</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Residual FP" gpid="7" height="48" width="48">+/null/mark;Location emb2;;0;;Incr;2;];Decr;2;[;;;0;false;0;0;MS\/RFP01,MS\/RFP02,MS\/RFP04,MS\/RFP06,MS\/RFP08,MS\/RFP12;1 FP,2 FP,4 FP,6 FP,8 FP,12 FP;true;;;;false;;1\ piece;K;D;MS\/_white12;Residual FP/ 1;\ null;0;0;7</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Firelane" gpid="8" height="48" width="48">+/null/label;76,130;Label;10;;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel mark;Location\ rotate;12;88,130;90,130;cw;ccw;;;\\ emb2;;0;;Alt Grain;2;A;;0;;;;0;false;0;0;MS\/FL1,MS\/FL1A;,;true;;;;false;;1\\\ emb2;;0;;Incr;2;];Decr;2;[;;;0;false;0;0;MS\/FL-1,MS\/FL-2,MS\/FL-4,MS\/FL-6;1 FP FL,2 FP FL,4 FP FL,6 FP FL;true;;;;false;;1\\\\ piece;K;D;MS\/_white12;Firelane/ \ 0\\ 1;\\\ 1;\\\\ null;0;0;8</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Motion" gpid="5" height="48" width="68">+/null/hide;72,130;HIP;;player:;0.30000001192092896 prototype;Info\ emb2;;0;;Flip;2;F;;0;;;;0;false;0;0;MS\/Motion,MS\/MotionR;,Reverse +;true;;;;false;;1;1;true;;70,130;\\ piece;K;D; ;Motion/null \ 1\\ null;0;0;5</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Smoke" gpid="6" height="48" width="48">+/null/rotate;4;82,130;;Rotate;;;; label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;WG;;0;;;0;;;;0;false;0;0;ML\/WP1gr;Gray \+1 WP;true;;;;false;;1\\ emb2;Gray;2;G;;0;;;0;;;;0;false;0;0;ML\/Smk2gr;Gray \+2 Smoke;true;;;;false;;1;1;false;71,130;;\\\ emb2;;2;WS;Strength;2;N;;0;;;;0;false;0;0;ML\/WP2,ML\/WP1;White \+2 WP,White \+1 WP;true;;;;false;;1\\\\ emb2;Size;2;S;Strength;2;N;;0;;;;0;false;0;0;ML\/Smk3,ML\/Smk2;White \+3 Smoke,White \+2 Smoke ;true;;;;false;;1;1;false;83,130;78,130;\\\\\ emb2;;0;;WP;2;W;;0;;;;0;false;0;0;MS\/Smk12,MS\/WP12;Smoke grenade \+2,WP grenade \+1;true;;;;false;;1;1;true;;87,130;\\\\\\ mark;Hindrance\\\\\\\ mark;Location\\\\\\\\ piece;K;D; ;Smoke/0 \ -1;\\ -1\\\ -1;\\\\ -1\\\\\ 1\\\\\\ true\\\\\\\ \\\\\\\\ null;0;0;6</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Residual FP" gpid="7" height="48" width="48">+/null/mark;Location emb2;;0;;Incr;2;];Decr;2;[;;;0;false;0;0;MS\/RFP01,MS\/RFP02,MS\/RFP04,MS\/RFP06,MS\/RFP08,MS\/RFP12;1 FP,2 FP,4 FP,6 FP,8 FP,12 FP;true;;;;false;;1;1;true;;93,130;91,130\ piece;K;D;MS\/_white12;Residual FP/ 1\ null;0;0;7</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Firelane" gpid="8" height="48" width="48">+/null/label;76,130;Label;10;;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel; mark;Location\ rotate;12;88,130;90,130;cw;ccw;;;\\ emb2;;0;;Alt Grain;2;A;;0;;;;0;false;0;0;MS\/FL1,MS\/FL1A;,;true;;;;false;;1;1;true;;65,130;\\\ emb2;;0;;Incr;2;];Decr;2;[;;;0;false;0;0;MS\/FL-1,MS\/FL-2,MS\/FL-4,MS\/FL-6;1 FP FL,2 FP FL,4 FP FL,6 FP FL;true;;;;false;;1;1;true;;93,130;91,130\\\\ piece;K;D;MS\/_white12;Firelane/ \ 0\\ 1\\\ 1\\\\ null;0;0;8</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Building" gpid="6663" height="60" width="60">+/null/hide;72,130;HIP;;player:;0.30000001192092896 emb2;;2;;Higher;2;];Lower;2;[;;;0;false;0;0;ML\/Lev-1,ML\/Lev0,ML\/Lev1,ML\/Lev2,ML\/Lev3,ML\/LevRoof;+ Cellar,+ Ground Level,+ Level 1,+ Level 2,+ Level 3,+ Roof Level;true;;;;false;;1;1;true;;93,130;91,130\ replace;Fort;70,130;VASSAL.build.module.PieceWindow:?\/VASSAL.build.widget.PieceSlot:Fort Bldg;null;0;0;true;;;6664;0;false\\ piece;K;D;ML\/_white58;Building/null 3\ \\ null;0;0;6663</VASSAL.build.widget.PieceSlot> </VASSAL.build.widget.PanelWidget> - <VASSAL.build.widget.ListWidget divider="333" entryName="Fire" height="527" width="585"> + <VASSAL.build.widget.ListWidget divider="252" entryName="Fire" height="250" width="334"> <VASSAL.build.widget.PanelWidget entryName="Prep" fixed="true" nColumns="2" vert="false"> - <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="9" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1\ piece;K;D; ;Prep Fire/ 1;\ null;0;0;9</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="10" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1\ piece;K;D; ;Prep Fire/ 2;\ null;0;0;10</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="11" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1\ piece;K;D; ;Prep Fire/ 3;\ null;0;0;11</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="12" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1\ piece;K;D; ;Prep Fire/ 4;\ null;0;0;12</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="13" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireInt,MS\/FireNo;Int. Fire,No Fire;true;;;;false;;1\ piece;K;D; ;Int. Fire/ 1;\ null;0;0;13</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="14" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireInt,MS\/FireNo;Int. Fire,No Fire;true;;;;false;;1\ piece;K;D; ;Int. Fire/ 2;\ null;0;0;14</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Veh Prep Fire" gpid="6371" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Fire MA;2;M;;2;;;88,130;2;false;0;0;MS\/FFminiMA, ;,;true;;;;false;;1\ emb2;;2;;Fire BMG;2;B;;2;;;88,130;2;false;0;0;MS\/FFminiBMG, ;,;true;;;;false;;1\\ emb2;;2;;Fire CMG;2;C;;2;;;88,130;2;false;0;0;MS\/FFminiCMG, ;,;true;;;;false;;1\\\ emb2;;2;;Fire AAMG;2;A;;2;;;88,130;2;false;0;0;MS\/FFminiAAMG, ;,;true;;;;false;;1\\\\ emb2;;2;;Fire RMG;2;R;;2;;;88,130;2;false;0;0;MS\/FFminiRMG, ;,;true;;;;false;;1\\\\\ emb2;;2;;Fire SA;2;S;;2;;Clear;88,130;2;false;0;0;MS\/FFminiSA, ;,;true;;;;false;;1\\\\\\ mark;isDF\\\\\\\ globalkey;Remove All;88,520;68,130;isDF = true;false;1;true;true;;;-1\\\\\\\\ piece;K;D;PrepMini.png;Veh Prep Fire/ 1;\ 2;\\ 1;\\\ 2;\\\\ 2;\\\\\ 2;\\\\\\ true\\\\\\\ \\\\\\\\ null;0;0;6371</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="9" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Prep Fire/ 1\ null;0;0;9</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="10" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Prep Fire/ 2\ null;0;0;10</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="11" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Prep Fire/ 3\ null;0;0;11</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Prep Fire" gpid="12" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FirePrep,MS\/FireBnd,MS\/FireOpp,MS\/FireAdv;Prep Fire,Bnd. Fire,Opp. Fire,Adv. Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Prep Fire/ 4\ null;0;0;12</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="13" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireInt,MS\/FireNo;Int. Fire,No Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Int. Fire/ 1\ null;0;0;13</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="14" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireInt,MS\/FireNo;Int. Fire,No Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Int. Fire/ 2\ null;0;0;14</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Veh Prep Fire" gpid="6371" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Fire MA;2;M;;2;;;88,130;2;false;0;0;MS\/FFminiMA, ;,;true;;;;false;;1;1;true;;77,130;\ emb2;;2;;Fire BMG;2;B;;2;;;88,130;2;false;0;0;MS\/FFminiBMG, ;,;true;;;;false;;1;1;true;;66,130;\\ emb2;;2;;Fire CMG;2;C;;2;;;88,130;2;false;0;0;MS\/FFminiCMG, ;,;true;;;;false;;1;1;true;;67,130;\\\ emb2;;2;;Fire AAMG;2;A;;2;;;88,130;2;false;0;0;MS\/FFminiAAMG, ;,;true;;;;false;;1;1;true;;65,130;\\\\ emb2;;2;;Fire RMG;2;R;;2;;;88,130;2;false;0;0;MS\/FFminiRMG, ;,;true;;;;false;;1;1;true;;82,130;\\\\\ emb2;;2;;Fire SA;2;S;;2;;Clear;88,130;2;false;0;0;MS\/FFminiSA, ;,;true;;;;false;;1;1;true;;83,130;\\\\\\ mark;isDF\\\\\\\ globalkey;Remove All;88,520;68,130;isDF = true;false;1;true;true;;;-1\\\\\\\\ piece;K;D;PrepMini.png;Veh Prep Fire/ 1\ 2\\ 1\\\ 2\\\\ 2\\\\\ 2\\\\\\ true\\\\\\\ \\\\\\\\ null;0;0;6371</VASSAL.build.widget.PieceSlot> </VASSAL.build.widget.PanelWidget> <VASSAL.build.widget.PanelWidget entryName="Def" fixed="true" nColumns="2" vert="false"> - <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="15" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1\\ piece;K;D; ;First Fire/ -1;\ 1;\\ null;0;0;15</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="16" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1\\ piece;K;D; ;First Fire/ -1;\ 2;\\ null;0;0;16</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="17" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1\\ piece;K;D; ;First Fire/ -1;\ 3;\\ null;0;0;17</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="18" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1\\ piece;K;D; ;First Fire/ 1;F\ 1;\\ null;0;0;18</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="19" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireIntD,MS\/FireNoD;Int. Def Fire,No Def Fire;true;;;;false;;1\ piece;K;D; ;Int. Fire/ 1;\ null;0;0;19</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="20" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireIntD,MS\/FireNoD;Int. Def Fire,No Def Fire;true;;;;false;;1\ piece;K;D; ;Int. Fire/ 2;\ null;0;0;20</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Veh First Fire" gpid="21" height="48" width="48">+/null/emb2;First\/Final;2;F;;2;;;2;;;;0;false;0;0;MS\/FFinal;Veh Final Fire;true;;;;false;;1 AreaOfEffect;;30;0;true;;;Night;true;;\ emb2;;2;;Fire MA;2;M;;2;;;88,130;2;false;0;0;MS\/FFminiMA, ;,;true;;;;false;;1\\ emb2;;2;;Fire BMG;2;B;;2;;;88,130;2;false;0;0;MS\/FFminiBMG, ;,;true;;;;false;;1\\\ emb2;;2;;Fire CMG;2;C;;2;;;88,130;2;false;0;0;MS\/FFminiCMG, ;,;true;;;;false;;1\\\\ emb2;;2;;Fire AAMG;2;A;;2;;;88,130;2;false;0;0;MS\/FFminiAAMG, ;,;true;;;;false;;1\\\\\ emb2;;2;;Fire RMG;2;R;;2;;;88,130;2;false;0;0;MS\/FFminiRMG, ;,;true;;;;false;;1\\\\\\ emb2;;2;;Fire SA;2;S;;2;;Clear;88,130;2;false;0;0;MS\/FFminiSA, ;,;true;;;;false;;1\\\\\\\ mark;isDF\\\\\\\\ globalkey;Remove All;88,520;68,130;isDF = true;false;1;true;true;;;-1\\\\\\\\\ piece;K;D;MS\/FFmini;Veh First Fire/-1; \ 1;\\ 2;\\\ 1;\\\\ 2;\\\\\ 2;\\\\\\ 2;\\\\\\\ true\\\\\\\\ \\\\\\\\\ null;0;0;21</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Veh First Fire" gpid="22" height="48" width="48">+/null/emb2;First\/Final;2;F;;2;;;2;;;;0;false;0;0;MS\/FFinal;Veh Final Fire;true;;;;false;;1 AreaOfEffect;;30;0;true;;;Night;true;;\ emb2;;2;;Fire MA;2;M;;2;;;88,130;2;false;0;0;MS\/FFminiMA, ;,;true;;;;false;;1\\ emb2;;2;;Fire BMG;2;B;;2;;;88,130;2;false;0;0;MS\/FFminiBMG, ;,;true;;;;false;;1\\\ emb2;;2;;Fire CMG;2;C;;2;;;88,130;2;false;0;0;MS\/FFminiCMG, ;,;true;;;;false;;1\\\\ emb2;;2;;Fire AAMG;2;A;;2;;;88,130;2;false;0;0;MS\/FFminiAAMG, ;,;true;;;;false;;1\\\\\ emb2;;2;;Fire RMG;2;R;;2;;;88,130;2;false;0;0;MS\/FFminiRMG, ;,;true;;;;false;;1\\\\\\ emb2;;2;;Fire SA;2;S;;2;;Clear;88,130;2;false;0;0;MS\/FFminiSA, ;,;true;;;;false;;1\\\\\\\ mark;isDF\\\\\\\\ globalkey;Remove All;88,520;68,130;isDF = true;false;1;true;true;;;-1\\\\\\\\\ piece;K;D;MS\/FFmini;Veh First Fire/1;F \ 1;\\ 2;\\\ 1;\\\\ 2;\\\\\ 2;\\\\\\ 2;\\\\\\\ true\\\\\\\\ \\\\\\\\\ null;0;0;22</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="15" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1;1;false;70,130;;\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1;1;true;;83,130;\\ piece;K;D; ;First Fire/ -1\ 1\\ null;0;0;15</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="16" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1;1;false;70,130;;\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1;1;true;;83,130;\\ piece;K;D; ;First Fire/ -1\ 2\\ null;0;0;16</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="17" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1;1;false;70,130;;\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1;1;true;;83,130;\\ piece;K;D; ;First Fire/ -1\ 3\\ null;0;0;17</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="First Fire" gpid="18" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;D1F\/DFF;2;F;;2;;;2;;;;0;false;0;0;MS\/Final;Final Fire;true;;;;false;;1;1;false;70,130;;\ emb2;;2;;IFP\/SW;2;S;;2;;;;0;false;0;0;MS\/First,MS\/FirstFireIFP,MS\/FirstFireSW;First Fire,First Fire IFP,First Fire SW;true;;;;false;;1;1;true;;83,130;\\ piece;K;D; ;First Fire/ 1\ 1\\ null;0;0;18</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="19" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireIntD,MS\/FireNoD;Int. Def Fire,No Def Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Int. Fire/ 1\ null;0;0;19</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Int. Fire" gpid="20" height="48" width="48">+/null/AreaOfEffect;;30;0;true;;;Night;true;; emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/FireIntD,MS\/FireNoD;Int. Def Fire,No Def Fire;true;;;;false;;1;1;true;;70,130;\ piece;K;D; ;Int. Fire/ 2\ null;0;0;20</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Veh First Fire" gpid="21" height="48" width="48">+/null/emb2;First\/Final;2;F;;2;;;2;;;;0;false;0;0;MS\/FFinal;Veh Final Fire;true;;;;false;;1;1;false;70,130;; AreaOfEffect;;30;0;true;;;Night;true;;\ emb2;;2;;Fire MA;2;M;;2;;;88,130;2;false;0;0;MS\/FFminiMA, ;,;true;;;;false;;1;1;true;;77,130;\\ emb2;;2;;Fire BMG;2;B;;2;;;88,130;2;false;0;0;MS\/FFminiBMG, ;,;true;;;;false;;1;1;true;;66,130;\\\ emb2;;2;;Fire CMG;2;C;;2;;;88,130;2;false;0;0;MS\/FFminiCMG, ;,;true;;;;false;;1;1;true;;67,130;\\\\ emb2;;2;;Fire AAMG;2;A;;2;;;88,130;2;false;0;0;MS\/FFminiAAMG, ;,;true;;;;false;;1;1;true;;65,130;\\\\\ emb2;;2;;Fire RMG;2;R;;2;;;88,130;2;false;0;0;MS\/FFminiRMG, ;,;true;;;;false;;1;1;true;;82,130;\\\\\\ emb2;;2;;Fire SA;2;S;;2;;Clear;88,130;2;false;0;0;MS\/FFminiSA, ;,;true;;;;false;;1;1;true;;83,130;\\\\\\\ mark;isDF\\\\\\\\ globalkey;Remove All;88,520;68,130;isDF = true;false;1;true;true;;;-1\\\\\\\\\ piece;K;D;MS\/FFmini;Veh First Fire/-1 \ 1\\ 2\\\ 1\\\\ 2\\\\\ 2\\\\\\ 2\\\\\\\ true\\\\\\\\ \\\\\\\\\ null;0;0;21</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Veh First Fire" gpid="22" height="48" width="48">+/null/emb2;First\/Final;2;F;;2;;;2;;;;0;false;0;0;MS\/FFinal;Veh Final Fire;true;;;;false;;1;1;false;70,130;; AreaOfEffect;;30;0;true;;;Night;true;;\ emb2;;2;;Fire MA;2;M;;2;;;88,130;2;false;0;0;MS\/FFminiMA, ;,;true;;;;false;;1;1;true;;77,130;\\ emb2;;2;;Fire BMG;2;B;;2;;;88,130;2;false;0;0;MS\/FFminiBMG, ;,;true;;;;false;;1;1;true;;66,130;\\\ emb2;;2;;Fire CMG;2;C;;2;;;88,130;2;false;0;0;MS\/FFminiCMG, ;,;true;;;;false;;1;1;true;;67,130;\\\\ emb2;;2;;Fire AAMG;2;A;;2;;;88,130;2;false;0;0;MS\/FFminiAAMG, ;,;true;;;;false;;1;1;true;;65,130;\\\\\ emb2;;2;;Fire RMG;2;R;;2;;;88,130;2;false;0;0;MS\/FFminiRMG, ;,;true;;;;false;;1;1;true;;82,130;\\\\\\ emb2;;2;;Fire SA;2;S;;2;;Clear;88,130;2;false;0;0;MS\/FFminiSA, ;,;true;;;;false;;1;1;true;;83,130;\\\\\\\ mark;isDF\\\\\\\\ globalkey;Remove All;88,520;68,130;isDF = true;false;1;true;true;;;-1\\\\\\\\\ piece;K;D;MS\/FFmini;Veh First Fire/1 \ 1\\ 2\\\ 1\\\\ 2\\\\\ 2\\\\\\ 2\\\\\\\ true\\\\\\\\ \\\\\\\\\ null;0;0;22</VASSAL.build.widget.PieceSlot> </VASSAL.build.widget.PanelWidget> <VASSAL.build.widget.PanelWidget entryName="Acq" fixed="true" nColumns="2" vert="false"> - <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="23" height="48" width="48">+/null/mark;Location hide;72,130;HIP;255,255,255;player:\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ -1;\\\\ -1;\\\\\ 1;\\\\\\ 1;\\\\\\\ null;0;0;23</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="24" height="60" width="60">+/null/mark;Location hide;72,130;HIP;255,255,255;player:\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ 1;S\\\\ 1;S\\\\\ 1;\\\\\\ 1;\\\\\\\ null;0;0;24</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="25" height="48" width="48">+/null/mark;Location hide;72,130;HIP;255,255,255;player:\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ -1;\\\\ -2;\\\\\ 1;\\\\\\ 2;\\\\\\\ null;0;0;25</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="26" height="60" width="60">+/null/mark;Location hide;72,130;HIP;255,255,255;player:\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ 1;S\\\\ 2;S\\\\\ 1;\\\\\\ 2;\\\\\\\ null;0;0;26</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="27" height="48" width="48">+/null/mark;Location hide;72,130;HIP;255,255,255;player:\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ -1;\\\\ -3;\\\\\ 1;\\\\\\ 3;\\\\\\\ null;0;0;27</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="28" height="60" width="60">+/null/mark;Location hide;72,130;HIP;255,255,255;player:\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ 1;S\\\\ 3;S\\\\\ 1;\\\\\\ 3;\\\\\\\ null;0;0;28</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="23" height="48" width="48">+/null/mark;Location hide;72,130;HIP;255,255,255;player:;0.30000001192092896\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1;1;false;83,130;70,130;\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1;1;false;83,130;67,130;\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1;1;true;;70,130;\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1;1;true;;67,130;\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ -1\\\\ -1\\\\\ 1\\\\\\ 1\\\\\\\ null;0;0;23</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="24" height="60" width="60">+/null/mark;Location hide;72,130;HIP;255,255,255;player:;0.30000001192092896\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1;1;false;83,130;70,130;\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1;1;false;83,130;67,130;\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1;1;true;;70,130;\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1;1;true;;67,130;\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ 1\\\\ 1\\\\\ 1\\\\\\ 1\\\\\\\ null;0;0;24</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="25" height="48" width="48">+/null/mark;Location hide;72,130;HIP;255,255,255;player:;0.30000001192092896\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1;1;false;83,130;70,130;\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1;1;false;83,130;67,130;\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1;1;true;;70,130;\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1;1;true;;67,130;\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ -1\\\\ -2\\\\\ 1\\\\\\ 2\\\\\\\ null;0;0;25</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="26" height="60" width="60">+/null/mark;Location hide;72,130;HIP;255,255,255;player:;0.30000001192092896\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1;1;false;83,130;70,130;\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1;1;false;83,130;67,130;\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1;1;true;;70,130;\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1;1;true;;67,130;\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ 1\\\\ 2\\\\\ 1\\\\\\ 2\\\\\\\ null;0;0;26</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="27" height="48" width="48">+/null/mark;Location hide;72,130;HIP;255,255,255;player:;0.30000001192092896\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1;1;false;83,130;70,130;\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1;1;false;83,130;67,130;\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1;1;true;;70,130;\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1;1;true;;67,130;\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ -1\\\\ -3\\\\\ 1\\\\\\ 3\\\\\\\ null;0;0;27</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Acq" gpid="28" height="60" width="60">+/null/mark;Location hide;72,130;HIP;255,255,255;player:;0.30000001192092896\ report;67\,130,83\,130,70\,130;$location$: $newPieceName$ *;;;\\ label;76,130;Label;10;0,0,0;255,255,255;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\\ emb2;Size;2;S;;2;F;;2;;;;0;false;0;0;ML\/Aacq1tr,ML\/Aacq2tr;,;true;;;;false;;1;1;false;83,130;70,130;\\\\ emb2;Size;2;S;;2;C;;2;;;;0;false;0;0;ML\/_red58,ML\/_noba58,ML\/_blue58;Area +,Area +,Area +;true;;;;false;;1;1;false;83,130;67,130;\\\\\ emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/acq1tr,MS\/acq2tr;-1 +,-2 +;true;;;;false;;1;1;true;;70,130;\\\\\\ emb2;;2;;Color;2;C;;2;;;;0;false;0;0;MS\/_red12,MS\/_noba12,MS\/_blue12;Red +,Green +,Blue +;true;;;;false;;1;1;true;;67,130;\\\\\\\ piece;K;D; ;Acq/ null\ -1\\ \\\ 1\\\\ 3\\\\\ 1\\\\\\ 3\\\\\\\ null;0;0;28</VASSAL.build.widget.PieceSlot> </VASSAL.build.widget.PanelWidget> <VASSAL.build.widget.PanelWidget entryName="Ammo" fixed="true" nColumns="2" vert="false"> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="29" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 1;\\ null;0;0;29</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="30" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 2;\\ null;0;0;30</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="31" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 3;\\ null;0;0;31</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="32" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 4;\\ null;0;0;32</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="33" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 5;\\ null;0;0;33</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="34" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 6;\\ null;0;0;34</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="35" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 7;\\ null;0;0;35</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="36" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1\\ piece;K;D; ;No Ammo/ \ 8;\\ null;0;0;36</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="29" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 1\\ null;0;0;29</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="30" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 2\\ null;0;0;30</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="31" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 3\\ null;0;0;31</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="32" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 4\\ null;0;0;32</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="33" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 5\\ null;0;0;33</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="34" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 6\\ null;0;0;34</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="35" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 7\\ null;0;0;35</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="No Ammo" gpid="36" height="48" width="68">+/null/prototype;Unit label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\ emb2;;2;;Type;2;T;;2;;;;0;false;0;0;MS\/NoAP,MS\/NoHE,MS\/NoHEAT,MS\/NoAPCR,MS\/NoAPDS,MS\/NoCannister,MS\/NoSmoke,MS\/NoWP;No AP,No HE,No HEAT,No APCR,No APDS,No Canister,No Smoke,No WP;true;;;;false;;1;1;true;;84,130;\\ piece;K;D; ;No Ammo/ \ 8\\ null;0;0;36</VASSAL.build.widget.PieceSlot> <VASSAL.build.widget.PieceSlot entryName="Low Ammo" gpid="37" height="48" width="68">+/null/prototype;Unit piece;K;D;MS\/LowAmmo;Low Ammo/ null;0;0;37</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Ammo" gpid="38" height="48" width="68">+/null/prototype;Unit emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/Ammo,MS\/AmmoB;,;true;;;;false;;1\ label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel\\ piece;K;D;MS\/_white12;Ammo/ 1;\ \\ null;0;0;38</VASSAL.build.widget.PieceSlot> + <VASSAL.build.widget.PieceSlot entryName="Ammo" gpid="38" height="48" width="68">+/null/prototype;Unit emb2;;2;;Flip;2;F;;2;;;;0;false;0;0;MS\/Ammo,MS\/AmmoB;,;true;;;;false;;1;1;true;;70,130;\ label;76,130;Label;10;255,255,255;0,0,0;t;0;c;0;b;c;$pieceName$ ($label$);Dialog;0;0;TextLabel;\\ piece;K;D;MS\/_white12;Ammo/ 1\ \\ null;0;0;38</VASSAL.build.widget.PieceSlot> </VASSAL.build.widget.PanelWidget> <VASSAL.build.widget.PanelWidget entryName="Malfunction" fixed="true" nColumns="2" vert="false"> - <VASSAL.build.widget.PieceSlot entryName="MG Malf" gpid="39" height="48" width="68">+/null/prototype;Unit emb2;Flip;2;F;;2;;;2;;;;0;false;0;0;MS\/MalfMG;MG malf;true;BRK;;;false;;1\ piece;K;D;MS\/DisMG;MG Malf/ 1;F\ null;0;0;39</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="Gun Malf" gpid="40" height="48" width="68">+/null/prototype;Unit emb2;Flip;2;F;;2;;;2;;;;0;false;0;0;MS\/MalfGun;Gun Malf;true;BRK;;;false;;1\ piece;K;D;MS\/DisGun;Gun Malf/ 1;F\ null;0;0;40</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="MA/SA Malf" gpid="41" height="48" width="68">+/null/prototype;Unit emb2;Flip;2;F;Type;2;T;;2;;;;0;false;0;0;MS\/MalfMA,MS\/MalfSA;MA Malf,SA Malf;true;BRK;;;false;;1\ emb2;;2;;;2;T;;2;;;;0;false;0;0;MS\/DisMA,MS\/DisSA;MA disabled,SA disabled;true;;;;false;;1\\ piece;K;D; ;MA\/SA Malf/ 1;F\ 1;\\ null;0;0;41</VASSAL.build.widget.PieceSlot> - <VASSAL.build.widget.PieceSlot entryName="MA/SA Malf" gpid="42" height="48" width="68">+/null/prototype;Unit emb2;Flip;2;F;Type;2;T;;2;;;;0;false;0;0;MS\/MalfMA,MS\/MalfSA;MA Malf,SA Malf;true;BRK;;;false;;1\ emb2;;2;;;2;T;;2;;;;0;false;0;0;MS\/DisMA,MS\/DisSA;MA disabled,SA disabled;true;;;;false;;1\\ piece;K;D; ;M... [truncated message content] |
From: <fre...@us...> - 2013-11-14 22:23:45
|
Revision: 8921 http://sourceforge.net/p/vassalengine/svn/8921 Author: fredkors Date: 2013-11-14 22:23:42 +0000 (Thu, 14 Nov 2013) Log Message: ----------- - Added CX and Motion button to QC toolbar - Fixed the overlapping overlay bug (ASLBoardSlot file - search FredKors) Modified Paths: -------------- ASL-src/trunk/dist/buildFile ASL-src/trunk/src/VASL/build/module/map/boardPicker/ASLBoardSlot.java Added Paths: ----------- ASL-src/trunk/dist/images/QC/CX.png ASL-src/trunk/dist/images/QC/MOTION.png ASL-src/trunk/dist/images/QC/TANK101.png Modified: ASL-src/trunk/dist/buildFile =================================================================== --- ASL-src/trunk/dist/buildFile 2013-11-14 00:41:59 UTC (rev 8920) +++ ASL-src/trunk/dist/buildFile 2013-11-14 22:23:42 UTC (rev 8921) @@ -124,6 +124,7 @@ <entry image="QC/VehFire" menu="false" name="7_VEHFIRE">21</entry> <entry image="QC/PIN" menu="false" name="7_PIN">1</entry> <entry image="QC/DM" menu="false" name="7_DM">2</entry> + <entry image="QC/CX" menu="false" name="7_CX">4</entry> <entry image="QC/Disrupted" menu="false" name="7_DISR">63</entry> <entry image="QC/RFP" menu="true" name="7_RFP">Res. 1 FP:47,Res. 2 FP:48,Res. 4 FP:49,Res. 6 FP:50,Res. 8 FP:51,Res. 12 FP:52</entry> <entry image="QC/FL" menu="true" name="7_FL">F. Lane 1 FP:53,F. Lane 2 FP:54,F. Lane 4 FP:55,F. Lane 6 FP:56</entry> @@ -138,6 +139,7 @@ <entry image="QC/OTHER" menu="true" name="1_OTHER">TI:68,Labor:66,POW:6390,POW SMC:6391,CA:5903,Low Ammo:5902</entry> <entry image="QC/ACQ" menu="true" name="7_ACQ">Russian Acq:423,American Acq:773,British Acq:1066,French Acq:1589,Chinese Acq:1939,Allied Minor Acq:2122,German Acq:2353,Waffen SS Acq:2831,Japanese Acq:3192,Italian Acq:3380,Finnish Acq:3573,Axis Minor Acq:3634,Hungarian Acq:3916</entry> <entry image="QC/MA" menu="true" name="4_MA">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920</entry> + <entry image="QC/MOTION" menu="false" name="4_MOTION">101</entry> <entry image="QC/Abandoned" menu="false" name="4_ABAND">109</entry> <entry image="QC/Immobile" menu="false" name="4_IMMOB">111</entry> <entry image="QC/Scrounged" menu="false" name="4_SCROUN">113</entry> @@ -147,7 +149,7 @@ <entry image="QC/Bog" menu="false" name="4_BOG">116</entry> <entry image="QC/HD" menu="false" name="4_HD">123</entry> <entry image="QC/TrailBreak" menu="false" name="4_TRAIL">104</entry> - <entry image="QC/TANK" menu="true" name="3_TANK">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920,Abandoned:109,Immobile:111,Scrounged:113,Shock:126,stun:128,STUN:129,Bog:116,Hulldown:123,Trailbreak:104</entry> + <entry image="QC/TANK" menu="true" name="3_TANK">Malf. MA:41,Malf. BMG:5918,Malf. CMG:5919,Malf. AAMG:5920,Motion:101,Abandoned:109,Immobile:111,Scrounged:113,Shock:126,stun:128,STUN:129,Bog:116,Hulldown:123,Trailbreak:104</entry> <entry image="QC/OBA" menu="false" name="7_OBA">344</entry> <entry image="QC/BUILD" menu="true" name="7_BUILD">Cellar:171,Level 1:167,Level 2:169,Level 3:163,Roof:165,Stone rubble:202,Wood rubble:203,Shellhole:204</entry> <entry image="QC/SASL" menu="true" name="7_SASL">Letter Chit:359,Axis VPO:360,Allied VPO:361,Suspect:362,Suspect:363,Suspect:364,In Command:365,Move:366,Panic:367</entry> Added: ASL-src/trunk/dist/images/QC/CX.png =================================================================== (Binary files differ) Index: ASL-src/trunk/dist/images/QC/CX.png =================================================================== --- ASL-src/trunk/dist/images/QC/CX.png 2013-11-14 00:41:59 UTC (rev 8920) +++ ASL-src/trunk/dist/images/QC/CX.png 2013-11-14 22:23:42 UTC (rev 8921) Property changes on: ASL-src/trunk/dist/images/QC/CX.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: ASL-src/trunk/dist/images/QC/MOTION.png =================================================================== (Binary files differ) Index: ASL-src/trunk/dist/images/QC/MOTION.png =================================================================== --- ASL-src/trunk/dist/images/QC/MOTION.png 2013-11-14 00:41:59 UTC (rev 8920) +++ ASL-src/trunk/dist/images/QC/MOTION.png 2013-11-14 22:23:42 UTC (rev 8921) Property changes on: ASL-src/trunk/dist/images/QC/MOTION.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: ASL-src/trunk/dist/images/QC/TANK101.png =================================================================== (Binary files differ) Index: ASL-src/trunk/dist/images/QC/TANK101.png =================================================================== --- ASL-src/trunk/dist/images/QC/TANK101.png 2013-11-14 00:41:59 UTC (rev 8920) +++ ASL-src/trunk/dist/images/QC/TANK101.png 2013-11-14 22:23:42 UTC (rev 8921) Property changes on: ASL-src/trunk/dist/images/QC/TANK101.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: ASL-src/trunk/src/VASL/build/module/map/boardPicker/ASLBoardSlot.java =================================================================== --- ASL-src/trunk/src/VASL/build/module/map/boardPicker/ASLBoardSlot.java 2013-11-14 00:41:59 UTC (rev 8920) +++ ASL-src/trunk/src/VASL/build/module/map/boardPicker/ASLBoardSlot.java 2013-11-14 22:23:42 UTC (rev 8921) @@ -114,10 +114,21 @@ if (board.isReversed()) { obox.translate(-obox.width, -obox.height); } - boolean overlapLeft = obox.x < bbox.x; - boolean overlapRight = obox.x + obox.width > bbox.x + bbox.width; - boolean overlapTop = obox.y < bbox.y; - boolean overlapBottom = obox.y + obox.height > bbox.y + bbox.height; + + // fredkors 14.nov.2013 + // bbox rect is in 'screen' coordinates (only width and height count) + // while obox rect is in 'map' coordinates + + //boolean overlapLeft = obox.x < bbox.x; + //boolean overlapRight = obox.x + obox.width > bbox.x + bbox.width; + //boolean overlapTop = obox.y < bbox.y; + //boolean overlapBottom = obox.y + obox.height > bbox.y + bbox.height; + + boolean overlapLeft = obox.x < 0; + boolean overlapRight = obox.x + obox.width > bbox.width; + boolean overlapTop = obox.y < 0; + boolean overlapBottom = obox.y + obox.height > bbox.height; + if (overlapLeft) { if (overlapTop) { overlap(o, -1, -1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |