Merge branch 'master' into feat/rec6

Pipfile

@@ -15,7 +15,7 @@ lxml = "==4.9.4"
 more-itertools = "==7.2.0"
 pluggy = "==0.13.1"
 py = "==1.10.0"
-pytest = "==6.2.5"
+pytest = "==8.0.0"
 requests = "==2.31.0"
 six = "==1.16.0"
 urllib3 = "*"

deploy/requirements.txt

@@ -10,7 +10,7 @@ more-itertools==8.8.0
 pluggy==0.13.1
 py==1.10.0
 testresources==2.0.1
-pytest==6.2.5
+pytest==8.0.0
 requests==2.31.0
 six==1.16.0
 urllib3==2.1.0

deploy/templates/intro.tpl

@@ -88,6 +88,14 @@ a.dull-link#join-link, a.dull-link#continue-link{
     <h2>Live by the Shuriken!</h2>
   </div>
 
+  <!-- Intro paragraphs -->
+  <div style="max-width: 50%;margin: 0 auto;text-align: start;">
+    <h3>Arising from the unrest of a lawless period...</h3>
+    <p style="margin-bottom: 7rem;font-size: 1.75rem;">
+      ...families of elite peasant warriors banded together to form clans in the more remote mountainous regions. Initially formed as self-defense against roving bands of thieves, now they strike back in revolt against the growing threat of control by the rule of the new shogunate that is growing in power and soon will control all the nearby lands...
+    </p>
+  </div>
+  
   <div id='progression'>
     <div id='later-progression'>
       <p>Explore the <a class='fade-in' target='main' href='/map'><i class="fa fa-map" aria-hidden="true"></i> map</a> and <a class='fade-in' target='main' href='/enemies#npcs'><i class="fa fa-bolt" aria-hidden="true"></i> attack monsters</a>, gather loot</p>

deploy/templates/logout.tpl

@@ -30,12 +30,15 @@
 </h1>
 <section class='glassbox centered thick'>
 	<p class='lead'>
-		Sorry to see you go!  Come back soon!
-		You can return to <a href='/'><i class="fa-solid fa-house"></i> the homepage</a> or <a class='btn btn-primary' href='/login'><i class="fa-solid fa-lock"></i> log in again.</a>
+		Sorry to see you go!  Come back soon!<br />
+		<br />
+		You can:<br />
+		<a href='/'>return to <i class="fa-solid fa-house"></i> the homepage</a> <i class="fa-solid fa-arrow-left"></i> OR <i class="fa-solid fa-arrow-right"></i> <a class='btn btn-primary' href='/login'><i class="fa-solid fa-lock"></i> log in again.</a>
 	</p>
 </section>
-<section id='logout-ads' class='ad-sectionglassbox'>
+<section id='logout-ads' class='ad-section glassbox'>
 <div class='glassbox clearfix well'>
+	{*
 	<h2>Can't get enough ninjas? Try these</h2>
 	<div class='group'>
 		<a href="http://amzn.to/1Ro2VLC" rel='nofollow'>Ninja AD 1460-1650 (Warrior)</a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=bit0d3-20&l=as2&o=1&a=1841765252" width="1" height="1" alt="" style="border:none !important; margin:0px !important;" />
@@ -63,11 +66,12 @@
 		<p>The Ninja Wars movie, amusing, disgusting & weird all at once</p>
 		<a rel="nofollow" href="http://www.amazon.com/gp/product/B0006IINIW/ref=as_li_tl?ie=UTF8&camp=1789&creative=390957&creativeASIN=B0006IINIW&linkCode=as2&tag=bit0d3-20&linkId=A2Z4NQEKGHB7BKBQ"><img src="http://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=B0006IINIW&Format=_SL110_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bit0d3-20" ></a><img src="http://ir-na.amazon-adsystem.com/e/ir?t=bit0d3-20&l=as2&o=1&a=B0006IINIW" width="1" height="1" alt="" style="border:none !important; margin:0px !important;" />
 	</div>
+	*}
 	<div class='horizontal'>
 		<div class='google-ad group'>
 			<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-9488510237149880"
 			crossorigin="anonymous"></script>
-	<!-- NWShopAd -->
+	<!-- NWLogoutAd -->
 	<ins class="adsbygoogle"
 			style="display:block"
 			data-ad-client="ca-pub-9488510237149880"