fixed land map for gulf; ability to get logs from settings; minor trigger updates

theater/conflicttheater.py

@@ -76,9 +76,13 @@ class ConflictTheater:
         if not self.landmap:
             return True
 
-        for inclusion_zone in self.landmap[0]:
-            if not poly_contains(point.x, point.y, inclusion_zone):
-                return False
+        is_point_included = False
+        for i, inclusion_zone in enumerate(self.landmap[0]):
+            if poly_contains(point.x, point.y, inclusion_zone):
+                is_point_included = True
+
+        if not is_point_included:
+            return False
 
         for exclusion_zone in self.landmap[1]:
             if poly_contains(point.x, point.y, exclusion_zone):

theater/persiangulf.py

@@ -45,7 +45,7 @@ class PersianGulfTheater(ConflictTheater):
 
     west_carrier = ControlPoint.carrier("East carrier", Point(-100531.972946, 60939.275818))
 
-    def __init__(self, load_ground_objects=True):
+    def __init__(self):
         super(PersianGulfTheater, self).__init__()
 
         self.add_controlpoint(self.shiraz, connected_to=[self.lar, self.kerman])
@@ -75,14 +75,3 @@ class PersianGulfTheater(ConflictTheater):
 
         self.west_carrier.captured = True
         self.kerman.captured = True
-
-        """
-        Mid game: 
-        self.al_maktoum.captured = True
-        self.al_minhad.captured = True
-        self.dubai.captured = True
-        self.sharjah.captured = True
-        self.fujairah.captured = True
-        self.khasab.captured = True
-        self.sir_abu_nuayr.captured = True
-        """

theater/theatergroundobject.py

@@ -34,7 +34,7 @@ CATEGORY_MAP = {
     "aa": ["AA"],
     "power": ["Workshop A", "Electric power box", "Garage A"],
     "warehouse": ["Warehouse", "Hangar A"],
-    "fuel": ["Tank", "Tank 2", "Fuel tank"],
+    "fuel": ["Tank", "Tank 2", "Tank 3", "Fuel tank"],
     "ammo": [".Ammunition depot", "Hangar B"],
     "farp": ["FARP Tent", "FARP Ammo Dump Coating", "FARP Fuel Depot", "FARP Command Post", "FARP CP Blindage"],
     "fob": ["Bunker 2", "Bunker 1", "Garage small B", ".Command Center", "Barracks 2"],