Skip to content

Commit

Permalink
Integrated StateCounterComposit
Browse files Browse the repository at this point in the history 
added a correct initialization string to buildFile
moved version up one
  • Loading branch information
jrv committed May 31, 2017
1 parent a7a3a00 commit 6f89d81
Show file tree
Hide file tree
Showing 7 changed files with 233 additions and 172 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {

apply plugin: 'java'

version='0.07.00'
version='0.08.00'
sourceCompatibility=1.5
targetCompatibility=1.5

Expand Down
6 changes: 3 additions & 3 deletions dist/buildFile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<VASSAL.build.module.ModuleExtension anyModule="false" description="" extensionId="d58" module="VASL" moduleVersion="6.3.3" nextPieceSlotId="5" vassalVersion="3.2.17" version="0.0">
<VASSAL.build.module.ModuleExtension anyModule="false" description="" extensionId="d58" module="VASL" moduleVersion="6.3.3" nextPieceSlotId="5" vassalVersion="3.2.17" version="0.0.8">
<com.jrvdev.StateCounterExt.StateCounterCommandEncoder />
<!-- this creates a separate button with text "test Pieces" on the tool bar -->
<!-- <VASSAL.build.module.ExtensionElement target="">
Expand All @@ -10,8 +10,8 @@
<VASSAL.build.module.ExtensionElement target="VASSAL.build.module.PieceWindow:VASL Counters/VASSAL.build.widget.TabWidget">
<VASSAL.build.widget.PanelWidget entryName="Orig4-5-8 new4-5-8 new4-4-7" fixed="false" nColumns="3" vert="false">
<VASSAL.build.widget.PieceSlot entryName="4-5-8 Esq" gpid="432" height="48" width="68">+/null/prototype;DBUnit prototype;ruINF\ hideCmd;NoBH;Hide;SQ_Level = 3;81\,130\\ emb2;;2;FV;;2;E;;2;Q;;;0;false;0;0;ru\/ruh7b,ru\/ruh6b,ru\/ruh4b;broken +,broken +,broken +;false;;;;false;;1\\\ emb2;SQ\/HS;2;V;;2;E;;2;Q;;;0;false;0;0;ru\/ru248H,ru\/ru237H,ru\/ru226H;2-4-8 Ehs,2-3-7 1hs,2-2-6 Chs;false;;;;false;;1;1;false;86,130;69,130;81,130\\\\ emb2;;2;F;;2;E;;2;Q;;;0;false;0;0;ru\/rus8b,ru\/rus7b,ru\/rus5b;broken +,broken +,broken +;false;BRK;;;false;;1;1;false;70,130;69,130;81,130\\\\\ emb2;;0;;ELR;2;E;BH;2;Q;;;0;false;0;0;ru\/ru458S,ru\/ru447S,ru\/ru426S;4-5-8 Esq,4-4-7 1sq,4-2-6 Csq;false;SQ;;;false;;1;1;true;;69,130;81,130\\\\\\ piece;K;D; ;4-5-8 Esq/ \ \\ -1;\\\ -1\\\\ -1\\\\\ 1\\\\\\ null;0;0;432</VASSAL.build.widget.PieceSlot>
<VASSAL.build.widget.PieceSlot entryName="Test state 4-5-8" gpid="430" height="48" width="68">SC+/null/prototype;DBUnit prototype;ruINF\ StateCounter;{"name":"Soviet Squad-Hs"}\\ piece;K;D; ;4-5-8x/ \ 4-5-8;\\ null;0;0;430</VASSAL.build.widget.PieceSlot>
<VASSAL.build.widget.PieceSlot entryName="Test state 4-4-7" gpid="430" height="48" width="68">SC+/null/prototype;DBUnit prototype;ruINF\ StateCounter;{"name":"Soviet Squad-Hs"}\\ piece;K;D; ;4-4-7x/ \ 4-4-7;\\ null;0;0;430</VASSAL.build.widget.PieceSlot>
<VASSAL.build.widget.PieceSlot entryName="Test state 4-5-8" gpid="430" height="48" width="68">SC+/null/prototype;DBUnit prototype;ruINF\ StateCounter;{"states":[{"id":"4-5-8","name":"4-5-8 [E] Sq","imagePath":"ru\/ru458S","transitions":[{"command":"ELR","toState":"4-4-7"},{"command":"SquadHalfsquad","toState":"2-4-8"},{"command":"BreakUnbreak","toState":"broken 4-5-8"}]},{"id":"4-4-7","name":"4-4-7 [1] Sq","imagePath":"ru\/ru447S","transitions":[{"command":"ELR","toState":"4-2-6"},{"command":"BattleHarden","toState":"4-5-8"},{"command":"SquadHalfsquad","toState":"2-3-8"},{"command":"BreakUnbreak","toState":"broken 4-4-7"}]},{"id":"4-2-6","name":"4-2-6 C Sq","imagePath":"ru\/ru426S","transitions":[{"command":"BattleHarden","toState":"5-2-7"},{"command":"SquadHalfsquad","toState":"2-2-6"},{"command":"BreakUnbreak","toState":"broken 4-2-6"}]},{"id":"5-2-7","name":"5-2-7 1 Sq","imagePath":"ru\/ru527S","transitions":[{"command":"ELR","toState":"4-2-6"},{"command":"BattleHarden","toState":"6-2-8"},{"command":"SquadHalfsquad","toState":"2-2-7"},{"command":"BreakUnbreak","toState":"broken 5-2-7"}]},{"id":"6-2-8","name":"6-2-8 (E) Sq","imagePath":"ru\/ru628S","transitions":[{"command":"ELR","toState":"5-2-7"},{"command":"SquadHalfsquad","toState":"3-2-8"},{"command":"BreakUnbreak","toState":"broken 6-2-8"}]},{"id":"2-4-8","name":"2-4-8 [E] Hs","imagePath":"ru\/ru248H","transitions":[{"command":"ELR","toState":"2-3-7"},{"command":"SquadHalfsquad","toState":"4-5-8"},{"command":"BreakUnbreak","toState":"broken 2-4-8"}]},{"id":"2-3-7","name":"2-3-7 [1] Hs","imagePath":"ru\/ru237H","transitions":[{"command":"ELR","toState":"2-2-6"},{"command":"BattleHarden","toState":"2-4-8"},{"command":"SquadHalfsquad","toState":"4-4-7"},{"command":"BreakUnbreak","toState":"broken 2-3-7"}]},{"id":"2-2-6","name":"2-2-6 C Hs","imagePath":"ru\/ru226H","transitions":[{"command":"BattleHarden","toState":"2-2-7"},{"command":"SquadHalfsquad","toState":"4-2-6"},{"command":"BreakUnbreak","toState":"broken 2-2-6"}]},{"id":"2-2-7","name":"2-2-7 1 Hs","imagePath":"ru\/ru227H","transitions":[{"command":"ELR","toState":"2-2-6"},{"command":"BattleHarden","toState":"3-2-8"},{"command":"SquadHalfsquad","toState":"5-2-7"},{"command":"BreakUnbreak","toState":"broken 2-2-7"}]},{"id":"3-2-8","name":"3-2-8 (E) Hs","imagePath":"ru\/ru328H","transitions":[{"command":"ELR","toState":"2-2-7"},{"command":"SquadHalfsquad","toState":"6-2-8"},{"command":"BreakUnbreak","toState":"broken 3-2-8"}]},{"id":"broken 4-5-8","name":"broken 4-5-8 [E] Sq","imagePath":"ru\/rus8b","transitions":[{"command":"ELR","toState":"broken 4-4-7"},{"command":"SquadHalfsquad","toState":"broken 2-4-8"},{"command":"BreakUnbreak","toState":"4-5-8"}]},{"id":"broken 4-4-7","name":"broken 4-4-7 [1] Sq","imagePath":"ru\/rus7b","transitions":[{"command":"ELR","toState":"broken 4-2-6"},{"command":"BattleHarden","toState":"broken 4-5-8"},{"command":"SquadHalfsquad","toState":"broken 2-3-8"},{"command":"BreakUnbreak","toState":"4-4-7"}]},{"id":"broken 4-2-6","name":"broken 4-2-6 C Sq","imagePath":"ru\/rus5b","transitions":[{"command":"BattleHarden","toState":"broken 5-2-7"},{"command":"SquadHalfsquad","toState":"broken 2-2-6"},{"command":"BreakUnbreak","toState":"4-2-6"}]},{"id":"broken 5-2-7","name":"broken 5-2-7 1 Sq","imagePath":"ru\/rus7b","transitions":[{"command":"ELR","toState":"broken 4-2-6"},{"command":"BattleHarden","toState":"broken 6-2-8"},{"command":"SquadHalfsquad","toState":"broken 2-2-7"},{"command":"BreakUnbreak","toState":"5-2-7"}]},{"id":"broken 6-2-8","name":"broken 6-2-8 (E) Sq","imagePath":"ru\/rus8b","transitions":[{"command":"ELR","toState":"broken 5-2-7"},{"command":"SquadHalfsquad","toState":"broken 3-2-8"},{"command":"BreakUnbreak","toState":"6-2-8"}]},{"id":"broken 2-4-8","name":"broken 2-4-8 [E] Hs","imagePath":"ru\/ruh7b","transitions":[{"command":"ELR","toState":"broken 2-3-7"},{"command":"SquadHalfsquad","toState":"broken 4-5-8"},{"command":"BreakUnbreak","toState":"2-4-8"}]},{"id":"broken 2-3-7","name":"broken 2-3-7 [1] Hs","imagePath":"ru\/ruh6b","transitions":[{"command":"ELR","toState":"broken 2-2-6"},{"command":"BattleHarden","toState":"broken 2-4-8"},{"command":"SquadHalfsquad","toState":"broken 4-4-7"},{"command":"BreakUnbreak","toState":"2-3-7"}]},{"id":"broken 2-2-6","name":"broken 2-2-6 C Hs","imagePath":"ru\/ruh4b","transitions":[{"command":"BattleHarden","toState":"broken 2-2-7"},{"command":"SquadHalfsquad","toState":"broken 4-2-6"},{"command":"BreakUnbreak","toState":"2-2-6"}]},{"id":"broken 2-2-7","name":"broken 2-2-7 1 Hs","imagePath":"ru\/ruh6b","transitions":[{"command":"ELR","toState":"broken 2-2-6"},{"command":"BattleHarden","toState":"broken 3-2-8"},{"command":"SquadHalfsquad","toState":"broken 5-2-7"},{"command":"BreakUnbreak","toState":"2-2-7"}]},{"id":"broken 3-2-8","name":"broken 3-2-8 (E) Hs","imagePath":"ru\/ruh7b","transitions":[{"command":"ELR","toState":"broken 2-2-7"},{"command":"SquadHalfsquad","toState":"broken 6-2-8"},{"command":"BreakUnbreak","toState":"3-2-8"}]}],"keyToCommandMap":[{"keyStroke":"ctrl pressed E","command":"ELR"},{"keyStroke":"ctrl pressed Q","command":"BattleHarden"},{"keyStroke":"ctrl pressed V","command":"SquadHalfsquad"},{"keyStroke":"ctrl pressed F","command":"BreakUnbreak"}]}\\ piece;K;D; ;4-5-8x/ \ 4-5-8;\\ null;0;0;430</VASSAL.build.widget.PieceSlot>
<VASSAL.build.widget.PieceSlot entryName="Test state 4-4-7" gpid="430" height="48" width="68">SC+/null/prototype;DBUnit prototype;ruINF\ StateCounter;{"states":[{"id":"4-5-8","name":"4-5-8 [E] Sq","imagePath":"ru\/ru458S","transitions":[{"command":"ELR","toState":"4-4-7"},{"command":"SquadHalfsquad","toState":"2-4-8"},{"command":"BreakUnbreak","toState":"broken 4-5-8"}]},{"id":"4-4-7","name":"4-4-7 [1] Sq","imagePath":"ru\/ru447S","transitions":[{"command":"ELR","toState":"4-2-6"},{"command":"BattleHarden","toState":"4-5-8"},{"command":"SquadHalfsquad","toState":"2-3-8"},{"command":"BreakUnbreak","toState":"broken 4-4-7"}]},{"id":"4-2-6","name":"4-2-6 C Sq","imagePath":"ru\/ru426S","transitions":[{"command":"BattleHarden","toState":"5-2-7"},{"command":"SquadHalfsquad","toState":"2-2-6"},{"command":"BreakUnbreak","toState":"broken 4-2-6"}]},{"id":"5-2-7","name":"5-2-7 1 Sq","imagePath":"ru\/ru527S","transitions":[{"command":"ELR","toState":"4-2-6"},{"command":"BattleHarden","toState":"6-2-8"},{"command":"SquadHalfsquad","toState":"2-2-7"},{"command":"BreakUnbreak","toState":"broken 5-2-7"}]},{"id":"6-2-8","name":"6-2-8 (E) Sq","imagePath":"ru\/ru628S","transitions":[{"command":"ELR","toState":"5-2-7"},{"command":"SquadHalfsquad","toState":"3-2-8"},{"command":"BreakUnbreak","toState":"broken 6-2-8"}]},{"id":"2-4-8","name":"2-4-8 [E] Hs","imagePath":"ru\/ru248H","transitions":[{"command":"ELR","toState":"2-3-7"},{"command":"SquadHalfsquad","toState":"4-5-8"},{"command":"BreakUnbreak","toState":"broken 2-4-8"}]},{"id":"2-3-7","name":"2-3-7 [1] Hs","imagePath":"ru\/ru237H","transitions":[{"command":"ELR","toState":"2-2-6"},{"command":"BattleHarden","toState":"2-4-8"},{"command":"SquadHalfsquad","toState":"4-4-7"},{"command":"BreakUnbreak","toState":"broken 2-3-7"}]},{"id":"2-2-6","name":"2-2-6 C Hs","imagePath":"ru\/ru226H","transitions":[{"command":"BattleHarden","toState":"2-2-7"},{"command":"SquadHalfsquad","toState":"4-2-6"},{"command":"BreakUnbreak","toState":"broken 2-2-6"}]},{"id":"2-2-7","name":"2-2-7 1 Hs","imagePath":"ru\/ru227H","transitions":[{"command":"ELR","toState":"2-2-6"},{"command":"BattleHarden","toState":"3-2-8"},{"command":"SquadHalfsquad","toState":"5-2-7"},{"command":"BreakUnbreak","toState":"broken 2-2-7"}]},{"id":"3-2-8","name":"3-2-8 (E) Hs","imagePath":"ru\/ru328H","transitions":[{"command":"ELR","toState":"2-2-7"},{"command":"SquadHalfsquad","toState":"6-2-8"},{"command":"BreakUnbreak","toState":"broken 3-2-8"}]},{"id":"broken 4-5-8","name":"broken 4-5-8 [E] Sq","imagePath":"ru\/rus8b","transitions":[{"command":"ELR","toState":"broken 4-4-7"},{"command":"SquadHalfsquad","toState":"broken 2-4-8"},{"command":"BreakUnbreak","toState":"4-5-8"}]},{"id":"broken 4-4-7","name":"broken 4-4-7 [1] Sq","imagePath":"ru\/rus7b","transitions":[{"command":"ELR","toState":"broken 4-2-6"},{"command":"BattleHarden","toState":"broken 4-5-8"},{"command":"SquadHalfsquad","toState":"broken 2-3-8"},{"command":"BreakUnbreak","toState":"4-4-7"}]},{"id":"broken 4-2-6","name":"broken 4-2-6 C Sq","imagePath":"ru\/rus5b","transitions":[{"command":"BattleHarden","toState":"broken 5-2-7"},{"command":"SquadHalfsquad","toState":"broken 2-2-6"},{"command":"BreakUnbreak","toState":"4-2-6"}]},{"id":"broken 5-2-7","name":"broken 5-2-7 1 Sq","imagePath":"ru\/rus7b","transitions":[{"command":"ELR","toState":"broken 4-2-6"},{"command":"BattleHarden","toState":"broken 6-2-8"},{"command":"SquadHalfsquad","toState":"broken 2-2-7"},{"command":"BreakUnbreak","toState":"5-2-7"}]},{"id":"broken 6-2-8","name":"broken 6-2-8 (E) Sq","imagePath":"ru\/rus8b","transitions":[{"command":"ELR","toState":"broken 5-2-7"},{"command":"SquadHalfsquad","toState":"broken 3-2-8"},{"command":"BreakUnbreak","toState":"6-2-8"}]},{"id":"broken 2-4-8","name":"broken 2-4-8 [E] Hs","imagePath":"ru\/ruh7b","transitions":[{"command":"ELR","toState":"broken 2-3-7"},{"command":"SquadHalfsquad","toState":"broken 4-5-8"},{"command":"BreakUnbreak","toState":"2-4-8"}]},{"id":"broken 2-3-7","name":"broken 2-3-7 [1] Hs","imagePath":"ru\/ruh6b","transitions":[{"command":"ELR","toState":"broken 2-2-6"},{"command":"BattleHarden","toState":"broken 2-4-8"},{"command":"SquadHalfsquad","toState":"broken 4-4-7"},{"command":"BreakUnbreak","toState":"2-3-7"}]},{"id":"broken 2-2-6","name":"broken 2-2-6 C Hs","imagePath":"ru\/ruh4b","transitions":[{"command":"BattleHarden","toState":"broken 2-2-7"},{"command":"SquadHalfsquad","toState":"broken 4-2-6"},{"command":"BreakUnbreak","toState":"2-2-6"}]},{"id":"broken 2-2-7","name":"broken 2-2-7 1 Hs","imagePath":"ru\/ruh6b","transitions":[{"command":"ELR","toState":"broken 2-2-6"},{"command":"BattleHarden","toState":"broken 3-2-8"},{"command":"SquadHalfsquad","toState":"broken 5-2-7"},{"command":"BreakUnbreak","toState":"2-2-7"}]},{"id":"broken 3-2-8","name":"broken 3-2-8 (E) Hs","imagePath":"ru\/ruh7b","transitions":[{"command":"ELR","toState":"broken 2-2-7"},{"command":"SquadHalfsquad","toState":"broken 6-2-8"},{"command":"BreakUnbreak","toState":"3-2-8"}]}],"keyToCommandMap":[{"keyStroke":"ctrl pressed E","command":"ELR"},{"keyStroke":"ctrl pressed Q","command":"BattleHarden"},{"keyStroke":"ctrl pressed V","command":"SquadHalfsquad"},{"keyStroke":"ctrl pressed F","command":"BreakUnbreak"}]}\\ piece;K;D; ;4-4-7x/ \ 4-4-7;\\ null;0;0;430</VASSAL.build.widget.PieceSlot>
</VASSAL.build.widget.PanelWidget>
</VASSAL.build.module.ExtensionElement>
</VASSAL.build.module.ModuleExtension>
Loading

0 comments on commit 6f89d81

Please sign in to comment.