Merge pull request #227 from mbridak/Fix_CQWW_Scoring

@mbridak Fix CQWW CW and SSB Scoring.

not1mm/plugins/cq_ww_cw.py

@@ -154,17 +154,26 @@ def points(self):
             mycountry = item[1].get("entity", "")
             mycontinent = item[1].get("continent", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
+
     if result:
         for item in result.items():
             entity = item[1].get("entity", "")
             continent = item[1].get("continent", "")
-            if mycountry.upper() == entity.upper():
-                return 0
-            if mycontinent and continent == "NA":
+
+            # Contacts between stations on different continents count three (3) points.
+            if mycontinent != continent:
+                return 3
+
+            # Exception: Contacts between stations in different countries within the North American boundaries count two (2) points.
+            if (mycontinent == "NA" and continent == "NA") and mycountry != entity:
                 return 2
-            if mycontinent == continent:
+
+            # Contacts between stations on the same continent but in different countries count one (1) point.
+            if mycountry.upper() != entity.upper():
                 return 1
-            return 3
+
+            # Contacts between stations in the same country have zero (0) QSO point value, but count for zone and country multiplier credit.
+
     return 0
 
 

not1mm/plugins/cq_ww_ssb.py

@@ -149,13 +149,21 @@ def points(self):
         for item in result.items():
             entity = item[1].get("entity", "")
             continent = item[1].get("continent", "")
-            if mycountry.upper() == entity.upper():
-                return 0
-            if mycontinent and continent == "NA":
+
+            # Contacts between stations on different continents count three (3) points.
+            if mycontinent != continent:
+                return 3
+
+            # Exception: Contacts between stations in different countries within the North American boundaries count two (2) points.
+            if (mycontinent == "NA" and continent == "NA") and mycountry != entity:
                 return 2
-            if mycontinent == continent:
+
+            # Contacts between stations on the same continent but in different countries count one (1) point.
+            if mycountry.upper() != entity.upper():
                 return 1
-            return 3
+
+            # Contacts between stations in the same country have zero (0) QSO point value, but count for zone and country multiplier credit.
+
     return 0