Skip to content

Commit

Permalink
v3.0.1b
Browse files Browse the repository at this point in the history
  • Loading branch information
ShawnDriscoll committed Feb 7, 2020
1 parent 33ca9a4 commit 3c44903
Show file tree
Hide file tree
Showing 30 changed files with 71 additions and 69 deletions.
18 changes: 10 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

###########
#############
## Eclipse
###########
#############
.plugins/
.lock
.log
Expand Down Expand Up @@ -33,9 +33,10 @@ Desktop.ini
# Mac
.DS_Store

#############

############
## Python
#############
############

*.pyx
*.pyc
Expand All @@ -44,19 +45,20 @@ Desktop.ini
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

###########
#########
## gcc
###########
#########
*.exe

###########
############
## Jython
###########
############
*.class
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. image:: docs/source/python_classic_2_5_tag.png
:target: https://www.python.org/download/releases/2.5.4/

.. image:: docs/source/release_v3_0_0b_tag.png
.. image:: docs/source/release_v3_0_1b_tag.png
:target: https://readthedocs.org/projects/diceroll/downloads/pdf/latest

.. image:: https://readthedocs.org/projects/diceroll/badge/?version=latest
Expand Down
6 changes: 3 additions & 3 deletions diceroll.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
init() # initialize colorama

__version__ = '3.0'
__release__ = '3.0.0b'
__release__ = '3.0.1b'
__author__ = 'Shawn Driscoll <shawndriscoll@hotmail.com>\nshawndriscoll.blogspot.com'

diceroll_log = logging.getLogger('diceroll')
Expand Down Expand Up @@ -106,7 +106,7 @@ def roll(dice):
An invalid roll will return a 0.
'''

log = logging.getLogger('test_dice.diceroll')
log = logging.getLogger('your_code_name_here.diceroll')

# make inputted string argument upper case, and remove spaces
dice = str(dice).upper().replace(' ','')
Expand Down Expand Up @@ -313,7 +313,7 @@ def roll(dice):
return rolled
elif dice_type == 'D099' and num_dice == 1:
roll_1 = (_dierolls(10, 1) - 1) * 10
roll_2 = (_dierolls(10, 1) - 1)
roll_2 = _dierolls(10, 1) - 1
rolled = roll_1 + roll_2 + dice_mod
diceroll_log.info('%s = %d%s+%d = %d and %d + %d = %d' % (dice, num_dice, dice_type, dice_mod, roll_1, roll_2, dice_mod, rolled))
return rolled
Expand Down
Binary file removed diceroll_3.0.0b.zip
Binary file not shown.
Binary file modified docs/build/.doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/.doctrees/index.doctree
Binary file not shown.
Binary file modified docs/build/.doctrees/introduction.doctree
Binary file not shown.
Binary file modified docs/build/.doctrees/license.doctree
Binary file not shown.
Binary file removed docs/build/_images/release_v3_0_0b_tag.png
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/build/about_the_author.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -88,8 +88,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/build/debugging.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -135,8 +135,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/build/designers_notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -202,8 +202,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/build/diceroll.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -112,8 +112,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/build/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -98,8 +98,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/build/glossary.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -177,8 +177,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions docs/build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -57,7 +57,7 @@ <h1><strong>diceroll 3.0 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_v3_0_0b_tag.png" src="_images/release_v3_0_0b_tag.png" />
<img alt="_images/release_v3_0_1b_tag.png" src="_images/release_v3_0_1b_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>
Expand Down Expand Up @@ -164,8 +164,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
12 changes: 6 additions & 6 deletions docs/build/introduction.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -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_3.0.0b.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_3.0.1b.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>
Expand All @@ -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-3.0.0b-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-3.0.1b-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;3.0&#39;, &#39;roll(), release version 3.0.0b for Classic Python 2.5.4&#39;)</span>
<span class="go">(&#39;3.0&#39;, &#39;roll(), release version 3.0.1b 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;4dF&#39;, &#39;D2&#39;, &#39;D3&#39;, &#39;D4&#39;, &#39;D6&#39;, &#39;D8&#39;, &#39;D09&#39;, &#39;D10&#39;,</span>
Expand Down Expand Up @@ -235,8 +235,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions docs/build/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -53,7 +53,7 @@ <h1><strong>Open Source</strong><a class="headerlink" href="#open-source" title=
<div class="section" id="mit-license">
<h2>MIT License<a class="headerlink" href="#mit-license" title="Permalink to this headline"></a></h2>
<p class="centered">
<strong>LICENSE AGREEMENT</strong></p><p>Copyright (c) 2019, SHONNER CORPORATION</p>
<strong>LICENSE AGREEMENT</strong></p><p>Copyright (c) 2020, SHONNER CORPORATION</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the &quot;Software&quot;), to deal
in the Software without restriction, including without limitation the rights
Expand Down Expand Up @@ -125,8 +125,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions docs/build/modindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand All @@ -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 3.0 Operations Manual" href="index.html" />
<generator object at 0x036A4F08>
<generator object at 0x038E5468>

<script type="text/javascript">
DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX = true;
Expand Down Expand Up @@ -91,8 +91,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
6 changes: 3 additions & 3 deletions docs/build/samples.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand Down Expand Up @@ -190,8 +190,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down
8 changes: 4 additions & 4 deletions docs/build/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '3.0.0b',
VERSION: '3.0.1b',
COLLAPSE_MODINDEX: false,
FILE_SUFFIX: '.html'
};
Expand All @@ -20,7 +20,7 @@
<link rel="index" title="Global index" href="genindex.html" />
<link rel="search" title="Search" href="" />
<link rel="top" title="diceroll 3.0 Operations Manual" href="index.html" />
<generator object at 0x037C2DC8>
<generator object at 0x038F2F80>
<script type="text/javascript" src="_static/searchtools.js"></script>

</head>
Expand Down Expand Up @@ -82,8 +82,8 @@ <h3>Navigation</h3>
</ul>
</div>
<div class="footer">
&copy; Copyright 2019, SHONNER CORP.
Last updated on Nov 11, 2019.
&copy; Copyright 2020, SHONNER CORP.
Last updated on Feb 07, 2020.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
</body>
Expand Down

0 comments on commit 3c44903

Please sign in to comment.