Extra cards

cards.py

@@ -268,7 +268,7 @@ def dealCardsToPlayer(players: {}, dealerId, name: str, noOfCards: int, deck,
         else:
             mud.sendMessage(dealerId,
                             '\nYou deal ' + str(ctr) +
-                            ' cards to '+cardPlayerName+'.\n')
+                            ' cards to ' + cardPlayerName + '.\n')
             mud.sendMessage(cardPlayerId,
                             '\n' + players[dealerId]['name'] + ' deals ' +
                             str(ctr) + ' cards to you.\n')
@@ -401,6 +401,24 @@ def getCardDescription(pack: str, rank: str, suit: str) -> str:
         rankStr = 'Ace'
     elif rankStr.startswith('J'):
         rankStr = 'Jack'
+    elif rankStr.startswith('2'):
+        rankStr = 'Two'
+    elif rankStr.startswith('3'):
+        rankStr = 'Three'
+    elif rankStr.startswith('4'):
+        rankStr = 'Four'
+    elif rankStr.startswith('5'):
+        rankStr = 'Five'
+    elif rankStr.startswith('6'):
+        rankStr = 'Six'
+    elif rankStr.startswith('7'):
+        rankStr = 'Seven'
+    elif rankStr.startswith('8'):
+        rankStr = 'Eight'
+    elif rankStr.startswith('9'):
+        rankStr = 'Nine'
+    elif rankStr.startswith('10'):
+        rankStr = 'Ten'
 
     if suit == '♥':
         if pack == 'cloisters':
@@ -462,6 +480,7 @@ def showHandOfCards(players: {}, id, mud, rooms: {},
     lines = [[] for i in range(9)]
     cardColor = "\u001b[38;5;240m"
     cardDescriptions = ''
+    htmlStr = '<table id="cards"><tr>'
 
     for cardStr in hand:
         if len(cardStr) < 2:
@@ -475,7 +494,15 @@ def showHandOfCards(players: {}, id, mud, rooms: {},
             suit = cardStr[2]
         suitColor = "\u001b[38;5;245m"
 
-        cardDescriptions += getCardDescription(pack, rank, suit)
+        desc = getCardDescription(pack, rank, suit)
+        cardDescriptions += desc.strip()
+
+        # create html for the web interface
+        htmlStr += '<td>'
+        htmlStr += '<img class="playingcard" ' + \
+            'src="cardpacks/' + pack.lower() + '/' + \
+            desc.replace(' ', '_').lower() + '.jpg" />'
+        htmlStr += '</td>'
 
         if suit == '♥' or suit == '♦':
             suitColor = "\u001b[31m"
@@ -496,6 +523,7 @@ def showHandOfCards(players: {}, id, mud, rooms: {},
                                                    rank, cardColor))
         lines[8].append('└─────────┘')
 
+    htmlStr += '</tr></table>'
     boardStr = cardColor + '\n'
 
     graphicalCards = True
@@ -504,8 +532,7 @@ def showHandOfCards(players: {}, id, mud, rooms: {},
             graphicalCards = False
     if graphicalCards:
         if mud.playerUsingWebInterface(id):
-            # TODO show cards as html
-            boardStr += '<i>Show cards as html</i>'
+            boardStr = htmlStr
         else:
             for lineRowStr in lines:
                 lineStr = ''

def/items.json

@@ -31851,7 +31851,7 @@
         "heave": "",
         "jumpTo": "",
         "game": "cards morris",
-	"cardPack": "cloisters",
+	"cardPack": "set1",
         "gameState": {},
         "state": "container open always",
         "visibleWhenWearing": [],

index.html

@@ -68,6 +68,12 @@
       width: 100%;
       background-color: var(--main-background-color);
   }
+  #cards {
+      height: 20%;
+  }
+  #playingcard {
+      height: 20%;
+  }
 </style>
 
 <title>AberMUSH</title>
@@ -198,15 +204,21 @@
       }
 
       if (destination != "roomtitle") {
-	  // split the message into lines
-	  var lines = message.split('\n');
-	  msgStr = "";
-	  var maxLines = lines.length;
-	  if (destination == "roomimage") {
-	      if (maxLines > 40) maxLines = 40;
+	  if (message.includes('<img class=')) {
+	      // playing card images
+	      msgStr = message;
 	  }
-	  for (var i = 0; i < maxLines; i++) {
-              msgStr += ansi_up.ansi_to_html(lines[i]) + "<br>";
+	  else {	      
+	      // split the message into lines
+	      var lines = message.split('\n');
+	      msgStr = "";
+	      var maxLines = lines.length;
+	      if (destination == "roomimage") {
+		  if (maxLines > 40) maxLines = 40;
+	      }
+	      for (var i = 0; i < maxLines; i++) {
+		  msgStr += ansi_up.ansi_to_html(lines[i]) + "<br>";
+	      }
 	  }
       }
       else {

mudserver.py

@@ -399,7 +399,10 @@ def send_game_board(self, to, message) -> None:
                         cl.socket.sendMessage(msgStr)
                     time.sleep(0.03)
             elif cl.client_type == self._CLIENT_WEBSOCKET:
-                cl.socket.sendMessage('****IMAGE****' + message)
+                if '<img class="playingcard" ' not in message:
+                    cl.socket.sendMessage('****IMAGE****' + message)
+                else:
+                    cl.socket.sendMessage('****CLEAR****' + message)
             if cl.client_type == self._CLIENT_TELNET:
                 cl.socket.sendall(bytearray(cmsg('<b0>'), 'utf-8'))
             elif cl.client_type == self._CLIENT_WEBSOCKET: