new release

ShawnDriscoll · Nov 10, 2019 · cf439b3 · cf439b3
1 parent 6e7c2ad
commit cf439b3
Show file tree

Hide file tree

Showing 32 changed files with 69 additions and 61 deletions.
diff --git a/README.rst b/README.rst
@@ -1,15 +1,15 @@
-.. image:: docs/source/python_classic_2_5_tag.png
+.. image:: images/python_classic_2_5_tag.png
     :target: https://www.python.org/download/releases/2.5.4/
 
-.. image:: docs/source/release_v2_4_3b_tag.png
+.. image:: images/release_v2_4_7b_tag.png
     :target: https://readthedocs.org/projects/diceroll/downloads/pdf/latest
 
 .. image:: https://readthedocs.org/projects/diceroll/badge/?version=latest
     :target: http://diceroll.readthedocs.io/en/latest/?badge=latest
     :alt: Doc Status
 
 
-.. figure:: docs/source/diceroll_manual_cover_pdf_art.png
+.. figure:: images/diceroll_manual_cover_pdf_art.png
 
 **diceroll 2.4 for Classic Python 2.5**
 =======================================
@@ -22,7 +22,7 @@ Download the PDF from https://readthedocs.org/projects/diceroll/downloads/pdf/la
 
 or the EPUB from https://readthedocs.org/projects/diceroll/downloads/epub/latest
 
-.. image:: docs/source/video.png
+.. image:: images/video.png
     :target: https://www.youtube.com/watch?v=xuyfLJbdDso
 
 Warning

diff --git a/diceroll.py b/diceroll.py
@@ -29,7 +29,7 @@
 init() # initialize colorama
 
 __version__ = '2.4'
-__release__ = '2.4.3b'
+__release__ = '2.4.7b'
 __author__ = 'Shawn Driscoll <shawndriscoll@hotmail.com>\nshawndriscoll.blogspot.com'
 
 diceroll_log = logging.getLogger('diceroll')
@@ -107,8 +107,8 @@ def roll(dice):
 
     log = logging.getLogger('your_code_name_here.diceroll')
 
-    # make inputted string argument upper case, and strip spaces
-    dice = str(dice).upper().strip()
+    # make inputted string argument upper case, and remove spaces
+    dice = str(dice).upper().replace(' ','')
 
     # was information for this program asked for?
     if dice == 'INFO':
@@ -261,7 +261,8 @@ def roll(dice):
             # how many dice are being rolled?
             num_dice = int(dice[0:ichar1])
             if num_dice < 1:
-                log.error('Negative dice count! [ERROR]')
+                if num_dice < 0:
+                    log.error('Negative dice count! [ERROR]')
                 diceroll_log.error('Number of dice = ' + str(num_dice) + ' [ERROR]')
 
         if num_dice >= 1:
@@ -278,7 +279,6 @@ def roll(dice):
             # what kind of dice are being rolled? D6? D66? etc.
             if ichar2 <> -1:
                 dice_type = dice[ichar1: ichar2]
-                dice_type = dice_type.rstrip()
             else:
                 dice_type = dice[ichar1: len(dice)]
 
@@ -315,6 +315,7 @@ def roll(dice):
             elif dice_type == 'D00' and num_dice == 1:
                 log.warning('D00 was deprecated in 1.9. Use D100 instead.')
                 diceroll_log.warning('D00 was deprecated in 1.9. Use D100 instead.')
+                dice_type = 'D100'
                 roll_1 = (_dierolls(10, 1) - 1) * 10
                 roll_2 = _dierolls(10, 1)
                 rolled = roll_1 + roll_2 + dice_mod

diff --git a/diceroll_2.4.3b.zip b/diceroll_2.4.3b.zip
diff --git a/docs/build/.doctrees/environment.pickle b/docs/build/.doctrees/environment.pickle
diff --git a/docs/build/.doctrees/glossary.doctree b/docs/build/.doctrees/glossary.doctree
diff --git a/docs/build/.doctrees/index.doctree b/docs/build/.doctrees/index.doctree
diff --git a/docs/build/.doctrees/introduction.doctree b/docs/build/.doctrees/introduction.doctree
diff --git a/docs/build/.doctrees/tutorial.doctree b/docs/build/.doctrees/tutorial.doctree
diff --git a/docs/build/_images/release_v2_4_3b_tag.png b/docs/build/_images/release_v2_4_3b_tag.png
diff --git a/docs/build/_images/release_v2_4_7b_tag.png b/docs/build/_images/release_v2_4_7b_tag.png
diff --git a/docs/build/about_the_author.html b/docs/build/about_the_author.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -89,7 +89,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/debugging.html b/docs/build/debugging.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -136,7 +136,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/designers_notes.html b/docs/build/designers_notes.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -203,7 +203,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/diceroll.html b/docs/build/diceroll.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -113,7 +113,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/genindex.html b/docs/build/genindex.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -99,7 +99,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/glossary.html b/docs/build/glossary.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -113,7 +113,7 @@ <h1><strong>Glossary</strong><a class="headerlink" href="#glossary" title="Perma
 until the program is linked.</dd>
 <dt id="term-no-dice">no dice</dt>
 <dd>Used to refuse a request or indicate no chance of success.</dd>
-<dt id="term-python-3-6">Python 3.6+</dt>
+<dt id="term-python-3-8">Python 3.8+</dt>
 <dd>A newfangled version of Python that's different from what Classic Python 2.5
 programmers are used to.</dd>
 <dt id="term-rabbit-hole">rabbit hole</dt>
@@ -178,7 +178,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/index.html b/docs/build/index.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -57,7 +57,7 @@ <h1><strong>diceroll 2.4 Overview</strong><a class="headerlink" href="#diceroll-
 <p>The free-to-use source is available at its <a class="reference external" href="https://github.com/ShawnDriscoll/diceroll/">GitHub</a> repository.</p>
 <p>This documentation explains how to install and use the <strong>diceroll module</strong> for your gaming projects.</p>
 <a class="reference external image-reference" href="https://www.python.org/download/releases/2.5.4/"><img alt="_images/python_classic_2_5_tag.png" src="_images/python_classic_2_5_tag.png" /></a>
-<img alt="_images/release_v2_4_3b_tag.png" src="_images/release_v2_4_3b_tag.png" />
+<img alt="_images/release_v2_4_7b_tag.png" src="_images/release_v2_4_7b_tag.png" />
 <a class="reference external image-reference" href="http://diceroll.readthedocs.io/en/latest/?badge=latest"><img alt="Doc Status" src="https://readthedocs.org/projects/diceroll/badge/?version=latest" /></a>
 <p>Download the <a class="reference external" href="https://readthedocs.org/projects/diceroll/downloads/pdf/latest">PDF</a> or the <a class="reference external" href="https://readthedocs.org/projects/diceroll/downloads/epub/latest">EPUB</a></p>
 <iframe width="560" height="315" src="https://www.youtube.com/embed/xuyfLJbdDso" frameborder="0" allowfullscreen></iframe><ul>
@@ -165,7 +165,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/introduction.html b/docs/build/introduction.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -139,7 +139,7 @@ <h2>Installing Automatically<a class="headerlink" href="#installing-automaticall
 <img alt="_images/egg.png" src="_images/egg.png" />
 </div>
 <p><em>New in version 2.3</em></p>
-<p>Extract <tt class="docutils literal"><span class="pre">diceroll_2.4.3b.zip</span></tt> and start a CMD window at the folder location of the <tt class="docutils literal"><span class="pre">setup.py</span></tt> file. At the
+<p>Extract <tt class="docutils literal"><span class="pre">diceroll_2.4.7b.zip</span></tt> and start a CMD window at the folder location of the <tt class="docutils literal"><span class="pre">setup.py</span></tt> file. At the
 CMD prompt you can type:</p>
 <pre>setup.py install</pre>
 <p>or:</p>
@@ -149,15 +149,15 @@ <h2>Installing Automatically<a class="headerlink" href="#installing-automaticall
 <p class="first admonition-title">Note</p>
 <p class="last">During the installation process,
 a <tt class="docutils literal"><span class="pre">Python25\Lib\site-packages\game_utils</span></tt> folder will be created. It will contain <tt class="docutils literal"><span class="pre">__init__.py</span></tt> and <tt class="docutils literal"><span class="pre">diceroll.py</span></tt> if your Python
-doesn't have <tt class="docutils literal"><span class="pre">setuptools</span></tt> installed. Otherwise, an .egg file called <tt class="docutils literal"><span class="pre">diceroll-2.4.3b-py2.5.egg</span></tt> will be
+doesn't have <tt class="docutils literal"><span class="pre">setuptools</span></tt> installed. Otherwise, an .egg file called <tt class="docutils literal"><span class="pre">diceroll-2.4.7b-py2.5.egg</span></tt> will be
 created and copied into the <tt class="docutils literal"><span class="pre">Python25\Lib\site-packages</span></tt> folder.</p>
 </div>
 <p>No matter the automated installation that your Python performed, importing will be the same:</p>
 <div class="highlight"><pre><span class="kn">from</span> <span class="nn">game_utils.diceroll</span> <span class="kn">import</span> <span class="n">roll</span>
 </pre></div>
 <p>Some ways to see if the <tt class="docutils literal"><span class="pre">diceroll</span></tt> module was installed correctly is by typing:</p>
 <div class="highlight"><pre><span class="gp">&gt;&gt;&gt; </span><span class="k">print</span> <span class="n">roll</span><span class="p">(</span><span class="s">&#39;info&#39;</span><span class="p">)</span>
-<span class="go">(&#39;2.4&#39;, &#39;roll(), release version 2.4.3b for Classic Python 2.5.4&#39;)</span>
+<span class="go">(&#39;2.4&#39;, &#39;roll(), release version 2.4.7b for Classic Python 2.5.4&#39;)</span>
 <span class="gp">&gt;&gt;&gt; </span><span class="k">print</span> <span class="n">roll</span><span class="o">.</span><span class="n">__doc__</span>
 <span class="go">    The dice types to roll are:</span>
 <span class="go">        &#39;D2&#39;, &#39;D3&#39;, &#39;D4&#39;, &#39;D6&#39;, &#39;D8&#39;, &#39;D09&#39;, &#39;D10&#39;,</span>
@@ -235,7 +235,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/license.html b/docs/build/license.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -126,7 +126,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/modindex.html b/docs/build/modindex.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -20,7 +20,7 @@
     <link rel="index" title="Global index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
     <link rel="top" title="diceroll 2.4 Operations Manual" href="index.html" />
-<generator object at 0x0373A738>
+<generator object at 0x03389850>
 
     <script type="text/javascript">
       DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX = true;
@@ -92,7 +92,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/samples.html b/docs/build/samples.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -191,7 +191,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>

diff --git a/docs/build/search.html b/docs/build/search.html
@@ -8,7 +8,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
           URL_ROOT:    '',
-          VERSION:     '2.4.3b',
+          VERSION:     '2.4.7b',
           COLLAPSE_MODINDEX: false,
           FILE_SUFFIX: '.html'
       };
@@ -20,7 +20,7 @@
     <link rel="index" title="Global index" href="genindex.html" />
     <link rel="search" title="Search" href="" />
     <link rel="top" title="diceroll 2.4 Operations Manual" href="index.html" />
-<generator object at 0x03721D00>
+<generator object at 0x033ECA08>
     <script type="text/javascript" src="_static/searchtools.js"></script>
 
   </head>
@@ -83,7 +83,7 @@ <h3>Navigation</h3>
     </div>
     <div class="footer">
       &copy; Copyright 2019, SHONNER CORP.
-      Last updated on Oct 16, 2019.
+      Last updated on Nov 10, 2019.
       Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
     </div>
   </body>