diff options
| -rwxr-xr-x | bin/pre-generate | 2 | ||||
| -rw-r--r-- | out/changelog.html | 5 | ||||
| -rw-r--r-- | out/dnd/index.html | 4 | ||||
| -rw-r--r-- | out/dnd/psionist2.html (renamed from out/dnd/Psionist2.html) | 15 | ||||
| -rw-r--r-- | out/index.atom | 78 | ||||
| -rw-r--r-- | out/index.html | 4 | ||||
| -rw-r--r-- | out/main.css | 2 | ||||
| -rw-r--r-- | out/tags/HB.html | 1 | ||||
| -rw-r--r-- | out/tags/index.html | 1 | ||||
| -rw-r--r-- | src/changelog.md | 8 | ||||
| -rw-r--r-- | src/dnd/psionist2.org (renamed from src/dnd/Psionist2.org) | 8 | ||||
| -rw-r--r-- | src/main.scss | 2 |
12 files changed, 77 insertions, 53 deletions
diff --git a/bin/pre-generate b/bin/pre-generate index bd1c21e..ece3385 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -24,6 +24,8 @@ if [[ $branch == master ]]; then git add . git commit -m "make: $msg" + git checkout pre-generated + git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated git merge pre-generated.tmp diff --git a/out/changelog.html b/out/changelog.html index ad94865..5d7bbc0 100644 --- a/out/changelog.html +++ b/out/changelog.html @@ -26,6 +26,11 @@ <h1 id="changelog">ChangeLog</h1> <h2 id="andrew-murrell-merlneo.andrewdm.me">2017-01-14 Andrew Murrell <merl@neo.andrewdm.me></h2> +<p>updated Psionist Title page</p> +<pre><code>bin/pre-generate | 2 ++ +src/dnd/{Psionist2.org =&gt; psionist2.org} | 4 ++++ +2 files changed, 6 insertions(+)</code></pre> +<h2 id="andrew-murrell-merlneo.andrewdm.me-1">2017-01-14 Andrew Murrell <merl@neo.andrewdm.me></h2> <p>Added an updated Psionist class with more complete domains, but no mind powers yet.</p> <pre><code>src/dnd/Psionist2.org | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 566 insertions(+)</code></pre> diff --git a/out/dnd/index.html b/out/dnd/index.html index bda561d..fceb0cf 100644 --- a/out/dnd/index.html +++ b/out/dnd/index.html @@ -31,9 +31,7 @@ <li><span><a class="" href="tastavi.html" title="Published on 2016-08-30">Tastavi D'Maelnor of Llolethane</a></span><span><a class="tag SS" href="/tags/SS.html">Short Story</a></span></li> <li><span><a class="" href="psionic-schools.html" title="Published on 2017-01-09">Schools of Psionics</a></span><span><a class="tag ES" href="/tags/ES.html">Essay</a><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> <li><span><a class="" href="spell-gauntlet.html" title="Published on 2017-01-09">Spell Gauntlet: Practical Spellcasting</a></span><span><a class="tag FF" href="/tags/FF.html">Flash Fiction</a><a class="tag SS" href="/tags/SS.html">Short Story</a><a class="tag WP" href="/tags/WP.html">WIP</a></span></li> -<li><span><a class="" href="Psionist2.html" title="Published on 2017-01-14">#+HTML_HEAD_EXTRA: -<style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style> -</a></span><span></span></li> +<li><span><a class="" href="psionist2.html" title="Published on 2017-01-14 (updated on 2017-01-13)">[5e] Psionist Class - Rewrite [ALPHA]</a></span><span><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> </ul> </article> diff --git a/out/dnd/Psionist2.html b/out/dnd/psionist2.html index 55543fd..47da048 100644 --- a/out/dnd/Psionist2.html +++ b/out/dnd/psionist2.html @@ -2,14 +2,14 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>#+HTML_HEAD_EXTRA: <style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style> — AndrewDM</title> + <title>[5e] Psionist Class - Rewrite [ALPHA] — AndrewDM</title> <link rel="stylesheet" href="/main.css"> <link rel="alternate" type="application/atom+xml" href="/index.atom" /> <style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style> </head> - <body class=""> + <body class="dnd"> <header> - <h1 class=breadcrumbs><a href="../">AndrewDM</a> » <a href="./">Dungeons & Dragons</a> » <a href="">#+HTML_HEAD_EXTRA: <style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style></a></h1> + <h1 class=breadcrumbs><a href="../">AndrewDM</a> » <a href="./">Dungeons & Dragons</a> » <a href="">[5e] Psionist Class - Rewrite [ALPHA]</a></h1> <nav> <ul> <li><a href="/">Projects</a> @@ -23,8 +23,9 @@ </nav> </header> <article> - - <h1 id="introduction-to-the-psionist-class-5e">Introduction to the Psionist Class [5e]</h1> + <p>Tags: <a class="tag HB" href="/tags/HB.html">Homebrew</a></p> + <h1 class=title>[5e] Psionist Class - Rewrite [ALPHA]</h1> +<h1 id="introduction-to-the-psionist-class-5e">Introduction to the Psionist Class [5e]</h1> <h1 id="the-psionist">The Psionist</h1> <p>As a Psionist, you gain the following class features.</p> <h2 id="hit-points">Hit Points</h2> @@ -39,7 +40,7 @@ <li><strong>Weapons</strong>: Simple Weapons</li> <li><strong>Tools</strong>: None</li> <li><strong>Saving Throws</strong>: Intelligence, Wisdom</li> -<li><strong>Skills</strong>: Choose two skills from Arcana, History, Insight, Investigation, Medicine, Perception, or Religion</li> +<li><strong>Skills</strong>: Choose two skills from History, Insight, Investigation, Medicine, Perception, or Religion</li> </ul> <h2 id="equipment">Equipment</h2> <p>You start with the following equipment, in addition to the equipment granted by your background:</p> @@ -475,7 +476,7 @@ <footer> <p>The content of this page is Copyright © 2017 <a href="mailto:ImFromNASA@gmail.com">Andrew Murrell</a>.</p> <p>This page is licensed under the <a href="">CC BS-SA-3.0</a> license.</p> - <p>Page source: <a href="Psionist2.org">Psionist2.org</a></p> + <p>Page source: <a href="psionist2.org">psionist2.org</a></p> <p>Website source: <a href="https://git.andrewdm.me/www.git">www.git</a></p> </footer> </body> diff --git a/out/index.atom b/out/index.atom index 1a512e6..9eaa7de 100644 --- a/out/index.atom +++ b/out/index.atom @@ -5,46 +5,20 @@ <link rel="self" type="application/atom+xml" href="./index.atom"/> <link rel="alternate" type="text/html" href="./"/> <link rel="alternate" type="text/markdown" href="./index.md"/> - <updated>2017-01-14T02:30:57+00:00</updated> + <updated>2017-01-13T22:19:50-05:00</updated> <author><name>Andrew Murrell</name><uri>https://andrewdm.me/</uri><email>ImFromNASA@gmail.com</email></author> <id>https://www.andrewdm.me/</id> <entry xmlns="http://www.w3.org/2005/Atom"> - <link rel="alternate" type="text/html" href="https://www.andrewdm.me/changelog.html"/> - <id>https://www.andrewdm.me/changelog.html</id> - <updated>2017-01-14T02:30:57+00:00</updated> - <published>2017-01-09T18:17:41-05:00</published> - <title>ChangeLog</title> + <link rel="alternate" type="text/html" href="https://www.andrewdm.me/dnd/psionist2.html"/> + <id>https://www.andrewdm.me/dnd/psionist2.html</id> + <updated>2017-01-13T22:19:50-05:00</updated> + <published>2017-01-14T03:02:57+00:00</published> + <title>[5e] Psionist Class - Rewrite [ALPHA]</title> <author><name>Andrew Murrell</name><uri>https://andrewdm.me/</uri><email>ImFromNASA@gmail.com</email></author> - - <content type="html"><h1 id="changelog">ChangeLog</h1> -<h2 id="andrew-murrell-merlneo.andrewdm.me">2017-01-14 Andrew Murrell &lt;merl@neo.andrewdm.me&gt;</h2> -<p>Added an updated Psionist class with more complete domains, but no mind powers yet.</p> -<pre><code>src/dnd/Psionist2.org | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++ -1 file changed, 566 insertions(+)</code></pre> -<h2 id="luke-shumaker-lukeshusbcglobal.net">2017-01-04 Luke Shumaker &lt;lukeshu@sbcglobal.net&gt;</h2> -<p>Change the title of &quot;Psionist&quot; -&gt; &quot;Psionist Class [5e]&quot;</p> -<pre><code>src/dnd/Psionist.md | 2 +- -1 file changed, 1 insertion(+), 1 deletion(-)</code></pre> -<h2 id="august-2016">31 August 2016</h2> -<p>Decided that the 1/5th of 'Magic is Magic' that was 'finished' was actually trash.</p> -<p>Worked on &quot;Harvey's Adventure&quot; for a pair of paragraphs.</p> -<h2 id="august-2016-1">30 August 2016</h2> -<p>Updated Tastavi with my introduction and 'Andrew Stamp of Approval'™ rewrite.</p> -<p>Decided that there are not enough hours in a day.</p> -</content> - <rights type="html"><p>The content of this page is Copyright © 2017 <a href="mailto:ImFromNASA@gmail.com">Andrew Murrell</a>.</p> -<p>This page is licensed under the <a href="">CC BS-SA-3.0</a> license.</p></rights> -</entry> -<entry xmlns="http://www.w3.org/2005/Atom"> - <link rel="alternate" type="text/html" href="https://www.andrewdm.me/dnd/Psionist2.html"/> - <id>https://www.andrewdm.me/dnd/Psionist2.html</id> - <updated>2017-01-14T02:30:39+00:00</updated> - <published>2017-01-14T02:30:39+00:00</published> - <title>#+HTML_HEAD_EXTRA: <style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style></title> - <author><name>Andrew Murrell</name><uri>https://andrewdm.me/</uri><email>ImFromNASA@gmail.com</email></author> - - <content type="html"><h1 id="introduction-to-the-psionist-class-5e">Introduction to the Psionist Class [5e]</h1> + <category term="HB" label="Homebrew" /> + <content type="html"><h1 class=title>[5e] Psionist Class - Rewrite [ALPHA]</h1> +<h1 id="introduction-to-the-psionist-class-5e">Introduction to the Psionist Class [5e]</h1> <h1 id="the-psionist">The Psionist</h1> <p>As a Psionist, you gain the following class features.</p> <h2 id="hit-points">Hit Points</h2> @@ -59,7 +33,7 @@ <li><strong>Weapons</strong>: Simple Weapons</li> <li><strong>Tools</strong>: None</li> <li><strong>Saving Throws</strong>: Intelligence, Wisdom</li> -<li><strong>Skills</strong>: Choose two skills from Arcana, History, Insight, Investigation, Medicine, Perception, or Religion</li> +<li><strong>Skills</strong>: Choose two skills from History, Insight, Investigation, Medicine, Perception, or Religion</li> </ul> <h2 id="equipment">Equipment</h2> <p>You start with the following equipment, in addition to the equipment granted by your background:</p> @@ -495,6 +469,38 @@ <p>This page is licensed under the <a href="">CC BS-SA-3.0</a> license.</p></rights> </entry> <entry xmlns="http://www.w3.org/2005/Atom"> + <link rel="alternate" type="text/html" href="https://www.andrewdm.me/changelog.html"/> + <id>https://www.andrewdm.me/changelog.html</id> + <updated>2017-01-14T03:02:57+00:00</updated> + <published>2017-01-09T18:17:41-05:00</published> + <title>ChangeLog</title> + <author><name>Andrew Murrell</name><uri>https://andrewdm.me/</uri><email>ImFromNASA@gmail.com</email></author> + + <content type="html"><h1 id="changelog">ChangeLog</h1> +<h2 id="andrew-murrell-merlneo.andrewdm.me">2017-01-14 Andrew Murrell &lt;merl@neo.andrewdm.me&gt;</h2> +<p>updated Psionist Title page</p> +<pre><code>bin/pre-generate | 2 ++ +src/dnd/{Psionist2.org =&amp;gt; psionist2.org} | 4 ++++ +2 files changed, 6 insertions(+)</code></pre> +<h2 id="andrew-murrell-merlneo.andrewdm.me-1">2017-01-14 Andrew Murrell &lt;merl@neo.andrewdm.me&gt;</h2> +<p>Added an updated Psionist class with more complete domains, but no mind powers yet.</p> +<pre><code>src/dnd/Psionist2.org | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++ +1 file changed, 566 insertions(+)</code></pre> +<h2 id="luke-shumaker-lukeshusbcglobal.net">2017-01-04 Luke Shumaker &lt;lukeshu@sbcglobal.net&gt;</h2> +<p>Change the title of &quot;Psionist&quot; -&gt; &quot;Psionist Class [5e]&quot;</p> +<pre><code>src/dnd/Psionist.md | 2 +- +1 file changed, 1 insertion(+), 1 deletion(-)</code></pre> +<h2 id="august-2016">31 August 2016</h2> +<p>Decided that the 1/5th of 'Magic is Magic' that was 'finished' was actually trash.</p> +<p>Worked on &quot;Harvey's Adventure&quot; for a pair of paragraphs.</p> +<h2 id="august-2016-1">30 August 2016</h2> +<p>Updated Tastavi with my introduction and 'Andrew Stamp of Approval'™ rewrite.</p> +<p>Decided that there are not enough hours in a day.</p> +</content> + <rights type="html"><p>The content of this page is Copyright © 2017 <a href="mailto:ImFromNASA@gmail.com">Andrew Murrell</a>.</p> +<p>This page is licensed under the <a href="">CC BS-SA-3.0</a> license.</p></rights> +</entry> +<entry xmlns="http://www.w3.org/2005/Atom"> <link rel="alternate" type="text/html" href="https://www.andrewdm.me/dnd/spell-gauntlet.html"/> <id>https://www.andrewdm.me/dnd/spell-gauntlet.html</id> <updated>2017-01-09T18:17:41-05:00</updated> diff --git a/out/index.html b/out/index.html index 243a0ca..0f6efb1 100644 --- a/out/index.html +++ b/out/index.html @@ -38,9 +38,7 @@ <li><span><a class="" href="dnd/tastavi.html" title="Published on 2016-08-30">Tastavi D'Maelnor of Llolethane</a></span><span><a class="tag SS" href="/tags/SS.html">Short Story</a></span></li> <li><span><a class="" href="dnd/psionic-schools.html" title="Published on 2017-01-09">Schools of Psionics</a></span><span><a class="tag ES" href="/tags/ES.html">Essay</a><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> <li><span><a class="" href="dnd/spell-gauntlet.html" title="Published on 2017-01-09">Spell Gauntlet: Practical Spellcasting</a></span><span><a class="tag FF" href="/tags/FF.html">Flash Fiction</a><a class="tag SS" href="/tags/SS.html">Short Story</a><a class="tag WP" href="/tags/WP.html">WIP</a></span></li> -<li><span><a class="" href="dnd/Psionist2.html" title="Published on 2017-01-14">#+HTML_HEAD_EXTRA: -<style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style> -</a></span><span></span></li> +<li><span><a class="" href="dnd/psionist2.html" title="Published on 2017-01-14 (updated on 2017-01-13)">[5e] Psionist Class - Rewrite [ALPHA]</a></span><span><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> </ul> <h2> <a href="writing/">Writing</a> diff --git a/out/main.css b/out/main.css index aa54f37..2d09e56 100644 --- a/out/main.css +++ b/out/main.css @@ -71,7 +71,7 @@ article { border-bottom: solid 1px #333333; } article .tag { font-size: 60%; - font-family: sans-serif; + font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; color: white; text-decoration: none; text-align: center; diff --git a/out/tags/HB.html b/out/tags/HB.html index 04c3971..f90f788 100644 --- a/out/tags/HB.html +++ b/out/tags/HB.html @@ -28,6 +28,7 @@ <ul> <li><span><a class="" href="../dnd/psionist-class.html" title="Published on 2016-07-16">Psionist Class [5e]</a></span><span><a class="tag ES" href="/tags/ES.html">Essay</a><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> <li><span><a class="" href="../dnd/psionic-schools.html" title="Published on 2017-01-09">Schools of Psionics</a></span><span><a class="tag ES" href="/tags/ES.html">Essay</a><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> +<li><span><a class="" href="../dnd/psionist2.html" title="Published on 2017-01-14 (updated on 2017-01-13)">[5e] Psionist Class - Rewrite [ALPHA]</a></span><span><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> </ul> </article> diff --git a/out/tags/index.html b/out/tags/index.html index 643ad5b..de5222b 100644 --- a/out/tags/index.html +++ b/out/tags/index.html @@ -51,6 +51,7 @@ <ul> <li><span><a class="" href="../dnd/psionist-class.html" title="Published on 2016-07-16">Psionist Class [5e]</a></span><span><a class="tag ES" href="/tags/ES.html">Essay</a><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> <li><span><a class="" href="../dnd/psionic-schools.html" title="Published on 2017-01-09">Schools of Psionics</a></span><span><a class="tag ES" href="/tags/ES.html">Essay</a><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> +<li><span><a class="" href="../dnd/psionist2.html" title="Published on 2017-01-14 (updated on 2017-01-13)">[5e] Psionist Class - Rewrite [ALPHA]</a></span><span><a class="tag HB" href="/tags/HB.html">Homebrew</a></span></li> </ul> <h2> <a href="SS.html">Tag: Short Story</a> diff --git a/src/changelog.md b/src/changelog.md index 21af91a..9a05ee0 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -3,6 +3,14 @@ ChangeLog ## 2017-01-14 Andrew Murrell <merl@neo.andrewdm.me> +updated Psionist Title page + + bin/pre-generate | 2 ++ + src/dnd/{Psionist2.org => psionist2.org} | 4 ++++ + 2 files changed, 6 insertions(+) + +## 2017-01-14 Andrew Murrell <merl@neo.andrewdm.me> + Added an updated Psionist class with more complete domains, but no mind powers yet. src/dnd/Psionist2.org | 566 ++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/src/dnd/Psionist2.org b/src/dnd/psionist2.org index 0cc0a84..accd563 100644 --- a/src/dnd/Psionist2.org +++ b/src/dnd/psionist2.org @@ -1,3 +1,7 @@ +#+TITLE: [5e] Psionist Class - Rewrite [ALPHA] +#+CLASS: dnd +#+CATEGORIES: HB + #+HTML_HEAD_EXTRA: <style type="text/css">#content { padding: 0px 16%; width: 68%; } body { background: url(Background3.png) repeat-y; background-size: 100%;} </style> * Introduction to the Psionist Class [5e] @@ -16,8 +20,8 @@ * *Weapons*: Simple Weapons * *Tools*: None * *Saving Throws*: Intelligence, Wisdom - * *Skills*: Choose two skills from Arcana, History, Insight, - Investigation, Medicine, Perception, or Religion + * *Skills*: Choose two skills from History, Insight, Investigation, + Medicine, Perception, or Religion ** Equipment You start with the following equipment, in addition to the equipment diff --git a/src/main.scss b/src/main.scss index 9fc3ef2..2fecdec 100644 --- a/src/main.scss +++ b/src/main.scss @@ -100,7 +100,7 @@ article { .tag { font-size: 60%; - font-family: sans-serif; + font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; color: white; text-decoration: none; text-align: center; |