pywargame 0.3.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

pywargame/__init__.py

@@ -1,2 +1,8 @@
 '''Top-level of module'''
-version = '0.3.0'
+version = '0.4.2'
+
+import pywargame.common     
+import pywargame.vassal     
+import pywargame.cyberboard 
+import pywargame.zuntzu     
+import pywargame.latex      

pywargame/common/__init__.py

@@ -1,3 +1,6 @@
+'''Common utilites
+
+'''
 from . singleton import Singleton
 from . verbose import Verbose
 from . verboseguard import VerboseGuard

pywargame/common/dicedraw.py

@@ -288,7 +288,12 @@ class DiceDrawer:
                 path.line(to=(0.0000,0.2920))
             
 
-            draw.number(num,yoff=.07,scale=.7)
+            scale = .7
+            yoff  = .07
+            if num > 9:
+                scale *= .8
+                yoff  =  .015
+            draw.number(num,yoff=yoff,scale=scale)
             return draw.image()
 
 

pywargame/common/drawdice.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 
-if __name__ == '__main__':
+# --------------------------------------------------------------------
+def diceMain():
     from sys import path
     
     from argparse import ArgumentParser
-    from dicedraw import DiceDrawer
+    from pywargame.common.dicedraw import DiceDrawer
 
     ap = ArgumentParser(description='Make a series of dice images')
     ap.add_argument('-n','--sides', choices=[4,6,8,10,12,20],
@@ -35,6 +36,14 @@ if __name__ == '__main__':
                 range(1,args.sides+1))
     for val in vals:
         dd.draw(val).save(filename=base.format(sides=args.sides,value=val))
+    
+# --------------------------------------------------------------------
+if __name__ == '__main__':
+    diceMain()
+
+# --------------------------------------------------------------------
+#
+# EOF
+#
 
-        
     

pywargame/common/test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from verboseguard import VerboseGuard
-from verbose import Verbose
+from . verboseguard import VerboseGuard
+from . verbose import Verbose
 
 def inner():
     with VerboseGuard('Entering inner') as g:

pywargame/cyberboard/__init__.py

@@ -15,4 +15,6 @@ from . windows import *
 from . palette import *
 from . tray import *
 from . extractor import *
+from . exporter import *
+
 

pywargame/cyberboard/archive.py

@@ -1,6 +1,6 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
-from common import Verbose
+from .. common import VerboseGuard
+from .. common import Verbose
 from . features import Features
 ## END_IMPORT
 

pywargame/cyberboard/base.py

@@ -1,5 +1,6 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
+from . features import Features
 ## END_IMPORT
 
 # --------------------------------------------------------------------

pywargame/cyberboard/board.py

@@ -1,9 +1,11 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . draw import GBXDrawList
 from . cell import GBXCell, GBXCellGeometry
 from . base import CbManager, CbFont
 from . head import num_version
+from . features import Features
+from . draw import GBXDraw
 ## END_IMPORT
 
 # --------------------------------------------------------------------

pywargame/cyberboard/cell.py

@@ -1,7 +1,8 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . image import GBXImage
 from . draw import GBXDraw
+from . features import Features
 ## END_IMPORT
 
 # ====================================================================

pywargame/cyberboard/draw.py

@@ -1,7 +1,8 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . image import GBXImage
 from . base import CbFont
+from . features import Features
 ## END_IMPORT
 
 # ====================================================================

pywargame/cyberboard/exporter.py

@@ -1,11 +1,12 @@
 ## BEGIN_IMPORTS
-from common import VerboseGuard, Verbose
-from vassal.buildfile import BuildFile
-from vassal.documentation import Documentation
-from vassal.traits import *
-from vassal.base import *
-from vassal.moduledata import ModuleData
-from vassal.exporter import Exporter
+from .. common import VerboseGuard, Verbose
+from .. vassal.buildfile import BuildFile
+from .. vassal.documentation import Documentation
+from .. vassal.traits import *
+from .. vassal.base import *
+from .. vassal.moduledata import ModuleData
+from .. vassal.exporter import Exporter
+from .. vassal.mapelements import LayerControl
 ## END_IMPORTS
 
 class CbExporter(Exporter):

pywargame/cyberboard/extractor.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 ## END_IMPORT
 
 # ====================================================================

pywargame/cyberboard/features.py

@@ -1,6 +1,6 @@
 # --------------------------------------------------------------------
 ## BEGIN_IMPORT
-from common.singleton import Singleton
+from .. common.singleton import Singleton
 ## END_IMPORT
 
 class Features(metaclass=Singleton):

pywargame/cyberboard/gamebox.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . head import *
 from . tile import GBXTileManager
 from . piece import GBXPieceManager

pywargame/cyberboard/gbxext.py

@@ -5,17 +5,16 @@
 #    https://github.com/CyberBoardPBEM/cbwindows
 #
 #
-
+## BEGIN_IMPORT
+from pywargame.cyberboard.gamebox   import GameBox
+from pywargame.cyberboard.extractor import GBXExtractor
+from pywargame.common               import Verbose
+## END_IMPORT
 
 # ====================================================================
-if __name__ == '__main__':
+def extractMain():
     from argparse import ArgumentParser, FileType
     from pathlib import Path
-## BEGIN_IMPORT
-    from gamebox   import GameBox
-    from extractor import GBXExtractor
-    from common    import Verbose
-## END_IMPORT
 
     ap = ArgumentParser(description='Extract information from a '
                         'CyberBoard GameBox file and store in ZIP archive',
@@ -58,7 +57,12 @@ if __name__ == '__main__':
         print(rat)
     if 'gbx' in args.dump:
         print(gbx)
-
     
 
-    
+# ====================================================================
+if __name__ == '__main__':
+    extractMain()
+
+#
+# EOF
+#

pywargame/cyberboard/gsnexp.py

@@ -1,16 +1,15 @@
 #!/usr/bin/env python
 ## BEGIN_IMPORTS
-from sys import path
-path.append('..')
-from exporter    import GSNExporter
-from common      import Verbose
-from scenario    import Scenario
-from extractor   import GSNExtractor
-from head        import GBXHeader
+from pywargame.common     import Verbose
+from pywargame.cyberboard.exporter    import GSNExporter
+from pywargame.cyberboard.scenario    import Scenario
+from pywargame.cyberboard.extractor   import GSNExtractor
+from pywargame.cyberboard.head        import GBXHeader
 ## END_IMPORTS
 
 # ====================================================================
-if __name__ == '__main__':
+def exportMain():
+    
     from argparse import ArgumentParser, FileType, \
          RawDescriptionHelpFormatter 
     from textwrap import wrap, dedent
@@ -145,3 +144,13 @@ if __name__ == '__main__':
 
         raise e
 
+
+# ====================================================================
+if __name__ == '__main__':
+    gsnexp()
+
+# ====================================================================
+#
+# EOF
+#
+

pywargame/cyberboard/gsnext.py

@@ -5,17 +5,18 @@
 #    https://github.com/CyberBoardPBEM/cbwindows
 #
 #
-
+# ====================================================================
+## BEGIN_IMPORT
+from pywargame.cyberboard.scenario  import Scenario
+from pywargame.cyberboard.extractor import GSNExtractor
+from pywargame.common               import Verbose
+## END_IMPORT
+    
 
 # ====================================================================
-if __name__ == '__main__':
+def extractMain():
     from argparse import ArgumentParser, FileType
     from pathlib import Path
-## BEGIN_IMPORT
-    from scenario  import Scenario
-    from extractor import GSNExtractor
-    from common    import Verbose
-## END_IMPORT
 
     ap = ArgumentParser(description='Extract information from a '
                         'CyberBoard Scenario file and store in ZIP archive',
@@ -50,6 +51,10 @@ if __name__ == '__main__':
     if 'gsn' in args.dump:
         print(gsn)
 
+# ====================================================================
+if __name__ == '__main__':
+    gsnext()
+    
 #
 # EOF
 #

pywargame/cyberboard/head.py

@@ -1,6 +1,7 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . archive import Archive
+from . features import Features
 ## END_IMPORT
 
 def num_version(major,minor):

pywargame/cyberboard/image.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 ## END_IMPORT
 
 # ====================================================================

pywargame/cyberboard/mark.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import CbManager
 ## END_IMPORT
 

pywargame/cyberboard/palette.py

@@ -1,6 +1,7 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . head import num_version, readVector
+from . features import Features
 ## END_IMPORT
 
 class GSNPalette:

pywargame/cyberboard/piece.py

@@ -1,6 +1,7 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . head   import num_version
+from . features import Features
 ## END_IMPORT
 # ====================================================================
 class GBXPieceDef:

pywargame/cyberboard/player.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 ## END_IMPORT
 
 class GSNPlayerManager:

pywargame/cyberboard/scenario.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . head    import *
 from . player  import GSNPlayerManager
 from . windows import GSNWindows

pywargame/cyberboard/testgrid.py

@@ -146,7 +146,8 @@ def testall():
 
 
 
-testall()
+if __name__ == '__main__':
+    testall()
     
     
                 

pywargame/cyberboard/tile.py

@@ -1,7 +1,8 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . image import GBXImage
 from . base import CbManager
+from . features import Features
 ## END_IMPORT
 
 # ====================================================================

pywargame/cyberboard/tray.py

@@ -1,6 +1,7 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . head import num_version, readVector
+from . features import Features
 ## END_IMPORT
     
 class GSNTraySet:

pywargame/cyberboard/windows.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 ## END_IMPORT
 
 class GSNWindow:

pywargame/cyberboard/zeropwd.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python
 ## BEGIN_IMPORT
-from gamebox import GBXInfo
-from head    import GBXHeader
-from archive import Archive
+from pywargame.cyberboard.gamebox import GBXInfo
+from pywargame.cyberboard.head    import GBXHeader
+from pywargame.cyberboard.archive import Archive
 ## END_IMPORT
 
+# --------------------------------------------------------------------
 nullpwd = b'\xee\n\xcbg\xbc\xdb\x92\x1a\x0c\xd2\xf1y\x83*\x96\xc9'
 
+# --------------------------------------------------------------------
 def zeropwd(filename):
     from pathlib import Path
     
@@ -14,9 +16,7 @@ def zeropwd(filename):
     with Archive(filename,'rb') as ar:
         header       = GBXHeader(ar,GBXHeader.BOX)
         box          = GBXInfo(ar)
-
-
-        pos = ar.tell() - 4*2 - 2 - 2 - 16
+        pos          = ar.tell() - 4*2 - 2 - 2 - 16
 
     with open(filename,'rb') as file:
         cnt = file.read()
@@ -31,15 +31,22 @@ def zeropwd(filename):
     with open(on,'wb') as file:
         file.write(ncnt)
 
-
-if __name__ == '__main__':
+# --------------------------------------------------------------------
+def zeroPwdMain():        
     from argparse import ArgumentParser, FileType
     ap = ArgumentParser(description='Disable password in gamebox')
-    ap.add_argument('input', type=str, help='The file')
+    ap.add_argument('input', type=str, help='The game box file')
 
     args = ap.parse_args()
 
     zeropwd(args.input)
+
+# --------------------------------------------------------------------
+if __name__ == '__main__':
+    zeroPwdMain()
     
-    
-    
+# --------------------------------------------------------------------
+#
+# EOF
+#
+

pywargame/latex/latexexporter.py

@@ -1,11 +1,11 @@
 ## BEGIN_IMPORTS
-from common import VerboseGuard, Verbose
-from vassal.buildfile import BuildFile
-from vassal.documentation import Documentation
-from vassal.traits import *
-from vassal.base import *
-from vassal.moduledata import ModuleData
-from vassal.exporter import Exporter
+from .. common import VerboseGuard, Verbose
+from .. vassal.buildfile import BuildFile
+from .. vassal.documentation import Documentation
+from .. vassal.traits import *
+from .. vassal.base import *
+from .. vassal.moduledata import ModuleData
+from .. vassal.exporter import Exporter
 from pprint import pprint
 
 ## END_IMPORTS

pywargame/latex/main.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 ## BEGIN_IMPORTS
-from latexexporter import LaTeXExporter
-from vassal.vmod import VMod
-from common import Verbose
+from pywargame.latex.latexexporter import LaTeXExporter
+from pywargame.vassal.vmod import VMod
+from pywargame.common import Verbose
 ## END_IMPORTS
 
 from argparse import ArgumentParser
@@ -88,9 +88,9 @@ def exportIt(args):
         
         raise e
     
-    
+
 # ====================================================================
-if __name__ == '__main__':
+def exportMain():
     from argparse import ArgumentParser, FileType
 
     ap = DefaultSubcommandArgParse(description='Create draft VASSAL module')
@@ -178,7 +178,11 @@ if __name__ == '__main__':
         patchIt(args)
     else:
         exportIt(args)
-        
+    
+# ====================================================================
+if __name__ == '__main__':
+    exportMain()
+    
 #
 # EOF
 #

pywargame/vassal/__init__.py

@@ -54,9 +54,9 @@ from . traits.click import *
 from . traits.mat import MatTrait
 from . traits.cargo import CargoTrait
 from . traits.movefixed import MoveFixedTrait
-from . traits.sheet import SheeTrait
+from . traits.sheet import SheetTrait
 from . traits.hide import HideTrait
-from . traits.return import ReturnTrait
+from . traits.retrn import ReturnTrait
 from . game import *
 from . buildfile import *
 from . moduledata import *
@@ -64,3 +64,4 @@ from . save import *
 from . vsav import *
 from . vmod import *
 from . exporter import *
+from . merger import Merger

pywargame/vassal/board.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
 from . element import Element
 from . gameelements import GameElement

pywargame/vassal/buildfile.py

@@ -1,8 +1,9 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
 from . element import Element
 from . game import Game
+from . xmlns import xmlns
 ## END_IMPORT
 
 # --------------------------------------------------------------------

pywargame/vassal/chart.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
 from . element import Element
 from . gameelements import GameElement

pywargame/vassal/chessclock.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
 from . element import Element
 from . gameelements import GameElement

pywargame/vassal/collect.py

@@ -28,7 +28,7 @@ if __name__ == '__main__':
           '../common/verbose.py',
           '../common/verboseguard.py',
           '../common/dicedraw.py',
-          'xml.py',
+          'xmlns.py',
           'base.py',
           'element.py',
           'folder.py',
@@ -85,7 +85,7 @@ if __name__ == '__main__':
           'traits/movefixed.py',
           'traits/sheet.py',
           'traits/hide.py',
-          'traits/return.py',
+          'traits/retrn.py',
           'game.py',
           'buildfile.py',
           'moduledata.py',
@@ -93,6 +93,7 @@ if __name__ == '__main__':
           'vsav.py',
           'vmod.py',
           'upgrade.py',
-          'exporter.py')
+          'exporter.py',
+          'merger.py')
 
     

pywargame/vassal/command.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
 from . element import Element
 ## END_IMPORT

pywargame/vassal/documentation.py

@@ -1,5 +1,5 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
 from . element import Element
 from . gameelements import GameElement

pywargame/vassal/dumpvsav.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 ## BEGIN_IMPORT
-from vassal import SaveIO
+from pywargame.vassal import SaveIO
 ## END_IMPORT
 
-if __name__ == '__main__':
+# ====================================================================
+def dumpMain():
     from argparse import ArgumentParser 
 
     ap = ArgumentParser(description='Dump VASSAL save or log')
@@ -19,6 +20,10 @@ if __name__ == '__main__':
         savemeta, modulemeta = ret[2], ret[3]
 
     print('\n'.join(lines))
+
+# ====================================================================
+if __name__ == '__main__':
+    dumpMain()
 #
 #
 #

pywargame/vassal/element.py

@@ -1,6 +1,7 @@
 ## BEGIN_IMPORT
-from common import VerboseGuard
+from .. common import VerboseGuard
 from . base import *
+from . xmlns import xmlns
 ## END_IMPORT
 
 # ====================================================================

pywargame/vassal/exporter.py

@@ -1,6 +1,6 @@
 ## BEGIN_IMPORT
-from vassal.vmod import VMod
-from common import VerboseGuard, Verbose 
+from . vmod import VMod
+from .. common import VerboseGuard, Verbose 
 ## END_IMPORT
 
 class Exporter: