Updated covop page

[ndwebbie.git] / database / covopalert.sql

diff --git a/database/covopalert.sql b/database/covopalert.sql
index 18ccc68258a6bb631e8cb193f7fdc23fe55ffd1e..1d3d2a6b7a4e85f3776b9b362934b0f3c0f93f67 100644 (file)
--- a/database/covopalert.sql
+++ b/database/covopalert.sql
@@ -3,7 +3,8 @@ CREATE OR REPLACE FUNCTION covop_alert(secs integer, strucs integer, roids integ
        , guards integer, gov governments, population integer) RETURNS integer
        AS $_$
        SELECT ((50 + COALESCE($4*5.0/($3+1.0),$6))
-               * (1.0+LEAST(COALESCE($1::float/$2,$6),0.30)*2
+               * (1.0+2*LEAST(COALESCE($1::float/CASE $2
+                       WHEN 0 THEN 1 ELSE $2 END,$6),0.30)
                        + (CASE $5
                                WHEN 'Dic' THEN 0.20
                                WHEN 'Feu' THEN -0.20