diff --git a/modules/standard/tower/land_controller.py b/modules/standard/tower/land_controller.py index 3516d38..ac1cb2d 100644 --- a/modules/standard/tower/land_controller.py +++ b/modules/standard/tower/land_controller.py @@ -122,8 +122,7 @@ class LandController: blob = "" ql = 0 for x in data: - blob += f"{self.format_site_info(x, time.time(), len(data))}" - blob += f"Dist: {x.guard} Conductors and {x.turrets} Turrets planted\n\n" + blob += f"{self.format_site_info(x, time.time(), len(data))}\n" ql += x.ql blob += f"Stats: QL{ql}, contracts up to QL{ql * 2}" return ChatBlob(f"Sites owned by {result}", blob) @@ -218,7 +217,7 @@ class LandController: blob += "\n Towers:\n" blob += towers else: - blob += f"Dist: {data.guards} Conductors and {data.turrets} Turrets\n" + blob += f"Dist: {row.guards} Conductors and {row.turrets} Turrets\n" else: if not row.enabled: @@ -285,7 +284,7 @@ class LandController: def get_towers_by_org(self, org_id): return self.db.query("""SELECT * FROM (SELECT COUNT(CASE WHEN name LIKE '%Turret%' THEN 1 WHEN name LIKE '%SAM Battery%' THEN 1 END) turrets, - COUNT(CASE WHEN name LIKE '%Guard%' THEN 1 END) guard, a.pf_id, a.org_id, e.org_name, c.*, d.* FROM towers a + COUNT(CASE WHEN name LIKE '%Guard%' THEN 1 END) guards, a.pf_id, a.org_id, e.org_name, c.*, d.* FROM towers a LEFT JOIN aodb b ON a.high_id = b.highid LEFT JOIN playfields c on a.pf_id = c.id LEFT JOIN tower_sites d on a.pf_id = d.playfield_id and a.site_number = d.site_number