Putting "pass" in message when battle order is None in DoubleBattleOrder

src/poke_env/player/baselines.py

@@ -1,5 +1,5 @@
 import random
-from typing import List
+from typing import List, Optional
 
 from poke_env.environment.abstract_battle import AbstractBattle
 from poke_env.environment.double_battle import DoubleBattle
@@ -29,7 +29,7 @@ def choose_singles_move(self, battle: AbstractBattle):
         return self.choose_random_move(battle)
 
     def choose_doubles_move(self, battle: DoubleBattle):
-        orders: List[BattleOrder] = []
+        orders: List[Optional[BattleOrder]] = []
         switched_in = None
 
         if any(battle.force_switch):
@@ -51,7 +51,7 @@ def choose_doubles_move(self, battle: DoubleBattle):
             switches = [s for s in switches if s != switched_in]
 
             if not mon or mon.fainted:
-                orders.append(DefaultBattleOrder())
+                orders.append(None)
                 continue
             elif not moves and switches:
                 mon_to_switch_in = random.choice(switches)

src/poke_env/player/battle_order.py

@@ -73,11 +73,11 @@ def message(self) -> str:
                 + self.second_order.message.replace("/choose ", "")
             )
         elif self.first_order:
-            return self.first_order.message + ", default"
+            return self.first_order.message + ", pass"
         elif self.second_order:
-            return self.second_order.message + ", default"
+            return "/choose pass, " + self.second_order.message.replace("/choose ", "")
         else:
-            return self.DEFAULT_ORDER
+            return "/choose pass, pass"
 
     @staticmethod
     def join_orders(first_orders: List[BattleOrder], second_orders: List[BattleOrder]):
@@ -95,9 +95,9 @@ def join_orders(first_orders: List[BattleOrder], second_orders: List[BattleOrder
             if orders:
                 return orders
         elif first_orders:
-            return [DoubleBattleOrder(first_order=order) for order in first_orders]
+            return [DoubleBattleOrder(order, None) for order in first_orders]
         elif second_orders:
-            return [DoubleBattleOrder(first_order=order) for order in second_orders]
+            return [DoubleBattleOrder(None, order) for order in second_orders]
         return [DefaultBattleOrder()]
 
 

src/poke_env/player/player.py

@@ -523,9 +523,7 @@ def choose_random_doubles_move(self, battle: DoubleBattle) -> BattleOrder:
                     second_switch_in = random.choice(available_switches)
                     second_order = BattleOrder(second_switch_in)
 
-            if first_order and second_order:
-                return DoubleBattleOrder(first_order, second_order)
-            return DoubleBattleOrder(first_order or second_order, None)
+            return DoubleBattleOrder(first_order, second_order)
 
         for (
             orders,