nfsw.scenes: Update coitus.

After fucking, the player has to explicitly touch the mirror to move
to the "strayed" scene.

7 files changed, 41 insertions, 47 deletions

diff --git a/nfsw/io.py b/nfsw/io.py
index 52de354..0092451 100644
--- a/nfsw/io.py
+++ b/nfsw/io.py
@@ -48,6 +48,7 @@ def reset():
     r.delete('scene:nymphomaniac:gg')
     r.delete('scene:nymphomaniac:gg-hunk')
     r.delete('scene:coitus:gg')
+    r.delete('scene:coitus:fucked')
     r.delete('scene:strayed:gg')
     r.delete('scene:xkcd:gg')
     r.delete('scenes:done')
diff --git a/nfsw/junk/coitus/fuck-fm b/nfsw/junk/coitus/fuck-fm
index 274f143..f1aff4d 100644
--- a/nfsw/junk/coitus/fuck-fm
+++ b/nfsw/junk/coitus/fuck-fm
@@ -47,14 +47,3 @@ You suddenly spot a mirror
 beside the bed.
 It looks weird.
 It reflects you but is squishy.
-You touch it.
-
-Abruptly, the mirror strikes
-you with a silver glow
-and sucks you into it.
-Into nothingness.
-
-Next thing.
-You get spurted into
-a small square room
-full of TVs from the 1990s.
diff --git a/nfsw/junk/coitus/fuck-fw b/nfsw/junk/coitus/fuck-fw
index 227bc45..e216fe0 100644
--- a/nfsw/junk/coitus/fuck-fw
+++ b/nfsw/junk/coitus/fuck-fw
@@ -50,14 +50,3 @@ You suddenly spot a mirror
 beside the bed.
 It looks weird.
 It reflects you but is squishy.
-You touch it.
-
-Abruptly, the mirror strikes
-you with a silver glow
-and sucks you into it.
-Into nothingness.
-
-Next thing.
-You get spurted into
-a small square room
-full of TVs from the 1990s.
diff --git a/nfsw/junk/coitus/fuck-mm b/nfsw/junk/coitus/fuck-mm
index 6198983..61ee5dd 100644
--- a/nfsw/junk/coitus/fuck-mm
+++ b/nfsw/junk/coitus/fuck-mm
@@ -49,13 +49,3 @@ You suddenly spot a mirror
 beside the bed.
 It looks weird.
 It reflects you but is squishy.
-You touch it.
-
-Abruptly, the mirror strikes
-you with a silver glow
-and sucks you into nothingness.
-
-Next thing.
-You get spurted into
-a small square room
-full of TVs from the 1990s.
diff --git a/nfsw/junk/coitus/fuck-mw b/nfsw/junk/coitus/fuck-mw
index a89aa5d..b5af856 100644
--- a/nfsw/junk/coitus/fuck-mw
+++ b/nfsw/junk/coitus/fuck-mw
@@ -47,14 +47,3 @@ You suddenly spot a mirror
 beside the bed.
 It looks weird.
 It reflects you but is squishy.
-You touch it.
-
-Abruptly, the mirror strikes
-you with a silver glow
-and sucks you into it.
-Into nothingness.
-
-Next thing.
-You get spurted into
-a small square room
-full of TVs from the 1990s.
diff --git a/nfsw/junk/coitus/mirror b/nfsw/junk/coitus/mirror
new file mode 100644
index 0000000..e208807
--- /dev/null
+++ b/nfsw/junk/coitus/mirror
@@ -0,0 +1,11 @@
+You touch the mirror.
+
+Abruptly, the mirror strikes
+you with a silver glow
+and sucks you into it.
+Into nothingness.
+
+Next thing.
+You get spurted into
+a small square room
+full of TVs from the 1990s.
diff --git a/nfsw/scenes.py b/nfsw/scenes.py
index cf87228..0f9fe5d 100644
--- a/nfsw/scenes.py
+++ b/nfsw/scenes.py
@@ -390,6 +390,29 @@ def coitus(o):
         ])
 
 
+    def fucked():
+        if r.get('scene:coitus:fucked'):
+            return True
+
+        return False
+
+
+    def fuck(q):
+        r.set('scene:coitus:fucked', 1)
+
+        return rj('fuck-{}'.format(type))
+
+
+    def mirror(q):
+        if not r.get('scene:coitus:fucked'):
+            return False
+
+        if 'touch' in q and 'mirror' in q:
+            return True
+
+        return False
+
+
     def p_done(q):
         # Mark scene done
         r.sadd('scenes:done', 'coitus')
@@ -398,17 +421,19 @@ def coitus(o):
         r.set('scene', 'strayed')
 
         return '\n\n'.join([
-            rj('fuck-{}'.format(type)),
+            rj('mirror'),
             strayed({'intro': 1})
         ])
 
 
     def p(q):
-
-        if 'fuck' in q:
+        if mirror(q):
             return p_done(q)
 
-        if 'sex' in q or 'coitus' in q:
+        if not fucked() and 'fuck' in q:
+            return fuck(q)
+
+        if not fucked() and ('sex' in q or 'coitus' in q):
             return colloquial()
 
         return gg()