Bug fix in win/loss agregation

[fourmizzz.git] / members.py

diff --git a/members.py b/members.py
index 2fc4ab21351f92f738322e88fed618e35bf73763..87b3876cb61735610a0680acec41c811ead247f0 100755 (executable)
--- a/members.py
+++ b/members.py
@@ -33,8 +33,8 @@ FLOOD,Nick1,Grade1,100,102,Nick2,Grade2,100,99,1,Nick1 a pris 1 cm² à Nick2 (1
 FLOOD,Nick1,Grade1,100,102,Nick3,Grade3,100,99,1,Nick1 a pris 1 cm² à Nick3 (1.00%)
 
 ACT,Nick1,Grade1,Actif,En vacances,,,,,,Nick1 est maintenant en vacances
 FLOOD,Nick1,Grade1,100,102,Nick3,Grade3,100,99,1,Nick1 a pris 1 cm² à Nick3 (1.00%)
 
 ACT,Nick1,Grade1,Actif,En vacances,,,,,,Nick1 est maintenant en vacances

-COLON,Nick1,Grade1,False,True,,,,,,Nick1 s'est fait coloniser
-COLON,Nick1,Grade1,True,False,,,,,,Nick1 n'est plus colonisé
+COLON,Nick1,Grade1,False,Nick2,,,,,,Nick1 s'est fait coloniser par Nick2
+COLON,Nick1,Grade1,Nick2,False,,,,,,Nick1 n'est plus colonisé par Nick2

 
 ANTHILL,Nick1,Grade1,199,200,,,,,,La fourmilière de Nick1 a atteint le niveau 200
 TECHNO,Nick1,Grade1,199,200,,,,,,La technologie Nick1 a atteint le niveau 200
 
 ANTHILL,Nick1,Grade1,199,200,,,,,,La fourmilière de Nick1 a atteint le niveau 200
 TECHNO,Nick1,Grade1,199,200,,,,,,La technologie Nick1 a atteint le niveau 200


@@ -237,7 +237,9 @@ def members_fill_positions(newmembers):
 
         logging.debug('%s has position %s %s and ID %s. Colonized:%s', nick, x, y, _id, newmembers[nick]['colonized'])
 
 
         logging.debug('%s has position %s %s and ID %s. Colonized:%s', nick, x, y, _id, newmembers[nick]['colonized'])
 

-        break # only one at a time (debug)
+        delay = random.randint(0,2)
+        sleep(delay)
+        #break # only one at a time (debug)

 
 def copy_existing_data(oldmembers, newmembers):
     '''
 
 def copy_existing_data(oldmembers, newmembers):
     '''


@@ -301,10 +303,10 @@ def field_compare(oldmembers, newmembers, csvfile):
         publish_line(csvfile, 'NOOP,,,,,,,,,,No changes')
  
     for nick in changes.keys():
         publish_line(csvfile, 'NOOP,,,,,,,,,,No changes')
  
     for nick in changes.keys():

-        delta = changes[nick]['delta']
-        if delta <= 0:
-            continue # 0 is already process, <0 will be processed when nick swaps with nick2

         for nick2 in changes.keys():
         for nick2 in changes.keys():

+            delta = changes[nick]['delta']
+            if delta <= 0:
+                continue # 0 is already process, <0 will be processed when nick swaps with nick2

             if changes[nick2]['delta'] == 0:
                 continue # already done
             if changes[nick2]['delta'] != -delta:
             if changes[nick2]['delta'] == 0:
                 continue # already done
             if changes[nick2]['delta'] != -delta: