From 0b24100ee959df80acac8e3b3938941a25d381a9 Mon Sep 17 00:00:00 2001
From: rsiddharth <s@ricketyspace.net>
Date: Mon, 30 Sep 2019 18:55:20 -0400
Subject: nfsw/scenes.py: Update sexshop.

* nfsw/scenes.py (sexshop): Use RedisC for Redis calls.
---
 nfsw/scenes.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/nfsw/scenes.py b/nfsw/scenes.py
index dbf92c6..146f9b6 100644
--- a/nfsw/scenes.py
+++ b/nfsw/scenes.py
@@ -20,6 +20,8 @@ def current_scene():
 
 
 def sexshop(o):
+    r = redisc()
+
     gobbledygook = [
         'I just got raped in the'
         '\narse by 9238 sentinels.'
@@ -36,10 +38,10 @@ def sexshop(o):
         l = len(gobbledygook)
 
         for i in range(0, l):
-            if r().sismember(k('scene:sexshop:gg'), i):
+            if r.sismember('scene:sexshop:gg', i):
                 continue
 
-            r().sadd(k('scene:sexshop:gg'), i)
+            r.sadd('scene:sexshop:gg', i)
             return gobbledygook[i]
 
         return 'I\'m outta words.'
@@ -50,26 +52,26 @@ def sexshop(o):
 
 
     def p_done(q):
-        if r().sismember(k('scenes:done'), 'sexshop'):
+        if r.sismember('scenes:done', 'sexshop'):
             return rj('done')
 
         # Set player type.
-        type = '{}{}'.format(r().get(k('player:type:body')).decode(),
-                             r().get(k('player:type:mind')).decode())
-        r().set(k('player:type'), type)
+        type = '{}{}'.format(r.get('player:type:body').decode(),
+                             r.get('player:type:mind').decode())
+        r.set('player:type', type)
 
         # Mark scene done
-        r().sadd(k('scenes:done'), 'sexshop')
+        r.sadd('scenes:done', 'sexshop')
 
         # Move to next scene
-        r().set(k('scene'), 'garden')
+        r.set('scene', 'garden')
 
         return garden({'intro': 1})
 
 
     def p_body(q):
         if 'female' in q:
-            r().set(k('player:type:body'), 'f')
+            r.set('player:type:body', 'f')
 
             return '\n\n'.join([
                 rj('body-f-done'),
@@ -77,7 +79,7 @@ def sexshop(o):
             ])
 
         if 'male' in q:
-            r().set(k('player:type:body'), 'm')
+            r.set('player:type:body', 'm')
 
             return '\n\n'.join([
                 rj('body-m-done'),
@@ -89,7 +91,7 @@ def sexshop(o):
 
     def p_mind(q):
         if 'women' in q:
-            r().set(k('player:type:mind'), 'w')
+            r.set('player:type:mind', 'w')
 
             return '\n\n'.join([
                 rj('mind-f-done'),
@@ -97,7 +99,7 @@ def sexshop(o):
             ])
 
         if 'men' in q:
-            r().set(k('player:type:mind'), 'm')
+            r.set('player:type:mind', 'm')
 
             return '\n\n'.join([
                 rj('mind-m-done'),
@@ -108,13 +110,13 @@ def sexshop(o):
 
 
     def p(q):
-        if r().exists(k('player:type')):
+        if r.exists('player:type'):
             return p_done(q)
 
-        if not r().exists(k('player:type:body')):
+        if not r.exists('player:type:body'):
             return p_body(q)
 
-        if not r().exists(k('player:type:mind')):
+        if not r.exists('player:type:mind'):
             return p_mind(q)
 
         return p_done(q)
-- 
cgit v1.2.3