aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Paquette <pcpaquette@gmail.com>2019-06-10 10:07:10 -0400
committerPhilip Paquette <pcpaquette@gmail.com>2019-06-14 15:08:29 -0400
commit5df0da9668804906cda2b695ca88acf218c86014 (patch)
tree53eb63ea2b9ff1980213b4c264a3d93a706c1e3c
parent1ac93a9d2f7911964b3755af3ebc66eec427af8a (diff)
Deprecated usage of NMR in game.py
-rw-r--r--diplomacy/engine/game.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/diplomacy/engine/game.py b/diplomacy/engine/game.py
index dd5b7a4..be892f9 100644
--- a/diplomacy/engine/game.py
+++ b/diplomacy/engine/game.py
@@ -2931,7 +2931,7 @@ class Game(Jsonable):
A LON H, F IRI - MAO, A IRI - MAO VIA, A WAL S F LON, A WAL S F MAO - IRI, F NWG C A NWY - EDI
A IRO R MAO, A IRO D, A LON B, F LIV B
"""
- cur_power, had_orders, has_orders, powers = power, [], [], []
+ cur_power, has_orders, powers = power, [], []
# For each order
for line in orders:
@@ -2942,26 +2942,8 @@ class Game(Jsonable):
if not word:
continue
- # Checking if the power can order
- if not hasattr(who, 'orders'):
- return self.error.append('%s HAS NO UNITS OF ITS OWN TO ORDER' % who.name)
-
- # NMR = No Moves Received (NMR or CLEAR command)
- nmr = (len(word) == 1
- and word[0][word[0][:1] in '([':len(word[0]) - (word[0][-1:] in '])')].upper() in ('NMR', 'CLEAR'))
if who not in powers:
-
- # Empty orders before sticking any new orders in it.
- had_orders += [who.orders]
powers += [who]
- if nmr:
- continue
-
- # If CLEAR or NMR, clear orders
- elif nmr:
- who.orders = {}
- has_orders = [x for x in has_orders if x is not who]
- continue
# Adds orders
if 'NO_CHECK' in self.rules: