From 129d2ec0374c1067653aeb398e4d7ea28a65d496 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Fri, 19 Feb 2021 13:50:41 +0100
Subject: [PATCH] remove unnecessary ternaries in multiclient

---
 MultiClient.py |  8 ++++----
 WebUI.py       | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MultiClient.py b/MultiClient.py
index ea0dfcbb..0e3fac44 100644
--- a/MultiClient.py
+++ b/MultiClient.py
@@ -940,7 +940,7 @@ async def process_server_cmd(ctx: Context, cmd, args):
         ctx.ui_node.notify_item_sent(ctx.player_names[player_sent], ctx.player_names[player_recvd],
                                      get_item_name_from_id(item), get_location_name_from_address(location),
                                      player_sent == ctx.slot, player_recvd == ctx.slot,
-                                     True if get_item_name_from_id(item) in Items.progression_items else False)
+                                     get_item_name_from_id(item) in Items.progression_items)
         item = color_item(item, player_sent == ctx.slot)
         player_sent = color(ctx.player_names[player_sent], 'yellow' if player_sent != ctx.slot else 'magenta')
         player_recvd = color(ctx.player_names[player_recvd], 'yellow' if player_recvd != ctx.slot else 'magenta')
@@ -952,7 +952,7 @@ async def process_server_cmd(ctx: Context, cmd, args):
         found = ReceivedItem(*args)
         ctx.ui_node.notify_item_found(ctx.player_names[found.player], get_item_name_from_id(found.item),
                                       get_location_name_from_address(found.location), found.player == ctx.slot,
-                                      True if get_item_name_from_id(found.item) in Items.progression_items else False)
+                                      get_item_name_from_id(found.item) in Items.progression_items)
         item = color_item(found.item, found.player == ctx.slot)
         player_sent = color(ctx.player_names[found.player], 'yellow' if found.player != ctx.slot else 'magenta')
         logging.info('%s found %s (%s)' % (player_sent, item, color(get_location_name_from_address(found.location),
@@ -1089,7 +1089,7 @@ class ClientCommandProcessor(CommandProcessor):
             self.ctx.ui_node.notify_item_received(self.ctx.player_names[item.player], get_item_name_from_id(item.item),
                                                   get_location_name_from_address(item.location), index,
                                                   len(self.ctx.items_received),
-                                                  True if get_item_name_from_id(item.item) in Items.progression_items else False)
+                                                  get_item_name_from_id(item.item) in Items.progression_items)
             logging.info('%s from %s (%s) (%d/%d in list)' % (
                 color(get_item_name_from_id(item.item), 'red', 'bold'),
                 color(self.ctx.player_names[item.player], 'yellow'),
@@ -1348,7 +1348,7 @@ async def game_watcher(ctx : Context):
             ctx.ui_node.notify_item_received(ctx.player_names[item.player], get_item_name_from_id(item.item),
                                              get_location_name_from_address(item.location), recv_index + 1,
                                              len(ctx.items_received),
-                                             True if get_item_name_from_id(item.item) in Items.progression_items else False)
+                                             get_item_name_from_id(item.item) in Items.progression_items)
             logging.info('Received %s from %s (%s) (%d/%d in list)' % (
                 color(get_item_name_from_id(item.item), 'red', 'bold'), color(ctx.player_names[item.player], 'yellow'),
                 get_location_name_from_address(item.location), recv_index + 1, len(ctx.items_received)))
diff --git a/WebUI.py b/WebUI.py
index 59f5a3d5..157fa0d6 100644
--- a/WebUI.py
+++ b/WebUI.py
@@ -58,9 +58,9 @@ class WebUiClient(Node, logging.Handler):
             'recipient': recipient,
             'item': item,
             'location': location,
-            'iAmFinder': 1 if i_am_finder else 0,
-            'iAmRecipient': 1 if i_am_recipient else 0,
-            'itemIsUnique': 1 if item_is_unique else 0,
+            'iAmFinder': int(i_am_finder),
+            'iAmRecipient': int(i_am_recipient),
+            'itemIsUnique': int(item_is_unique),
         }))
 
     def notify_item_found(self, finder: str, item: str, location: str, i_am_finder: bool, item_is_unique: bool = False):
@@ -68,8 +68,8 @@ class WebUiClient(Node, logging.Handler):
             'finder': finder,
             'item': item,
             'location': location,
-            'iAmFinder': 1 if i_am_finder else 0,
-            'itemIsUnique': 1 if item_is_unique else 0,
+            'iAmFinder': int(i_am_finder),
+            'itemIsUnique': int(item_is_unique),
         }))
 
     def notify_item_received(self, finder: str, item: str, location: str, item_index: int, queue_length: int,
@@ -80,7 +80,7 @@ class WebUiClient(Node, logging.Handler):
             'location': location,
             'itemIndex': item_index,
             'queueLength': queue_length,
-            'itemIsUnique': 1 if item_is_unique else 0,
+            'itemIsUnique': int(item_is_unique),
         }))
 
     def send_hint(self, finder, recipient, item, location, found, i_am_finder: bool, i_am_recipient: bool,