From da8bb3f7cb66f3c08309f9bff9b46093d8194220 Mon Sep 17 00:00:00 2001
From: Philip Paquette <pcpaquette@gmail.com>
Date: Thu, 6 Jun 2019 12:10:39 -0400
Subject: Map - Adjacency for invalid unit is always false
---
diplomacy/engine/map.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/diplomacy/engine/map.py b/diplomacy/engine/map.py
index 2730168..db2ab5c 100644
--- a/diplomacy/engine/map.py
+++ b/diplomacy/engine/map.py
@@ -208,11 +208,13 @@ class Map():
self.error += [err.MAP_NO_FULL_NAME % place]
# Checking one-way adjacency
+ # Adjacencies between lower-case coast and water are supposed to be one-way
for loc in abuts:
if self.area_type(place) != 'SHUT' \
and self.area_type(loc) != 'SHUT' \
and not self.abuts('A', loc, '-', place) \
- and not self.abuts('F', loc, '-', place):
+ and not self.abuts('F', loc, '-', place) \
+ and not (place.islower() and self.area_type(loc) == 'WATER'):
self.error.append(err.MAP_ONE_WAY_ADJ % (place, loc))
# Validating home centers
@@ -1109,6 +1111,10 @@ class Map():
# pylint: disable=too-many-return-statements
unit_loc, other_loc = unit_loc.upper(), other_loc.upper()
+ # If the unit is not valid on the current location, returning 0
+ if not self.is_valid_unit(unit_type + ' ' + unit_loc):
+ return 0
+
# Removing coasts for support
# Otherwise, if army, not adjacent since army can't move, hold, or convoy on coasts
if '/' in other_loc:
--
cgit v1.2.3