Latest updates for 19JulyRelease

LittoSim · Jul 19, 2019 · 62519eb · 62519eb
1 parent a2faad3
commit 62519eb
Show file tree

Hide file tree

Showing 7 changed files with 146 additions and 67 deletions.
diff --git a/includes/config/langs.conf b/includes/config/langs.conf
@@ -193,6 +193,7 @@ LEV_DENSIFICATION_LA_FA;du coût d'une densification préalablement réalisée h
 LEV_CHANGE_TRESHOLD;Changer le seuil;Change treshold;XXXXX
 LEV_CHANGE_PLAYER_MSG;Changer le message joueur;Change player message;XXXXX
 LEV_CANCEL_NEXT_APP;Annuler la prochaine application;Cancel next application;XXXXX
+LEV_CANCEL_ALL_APPS;Annuler toutes les applications;Cancel all applications;XXX xxxxx
 LEV_VALIDATE_NEXT_APP;Valider la prochaine application;Validate next application;XXXXX
 LEV_VALIDATE_ALL_APPS;Valider toutes les applications;Validate all applications;XXXXX
 LEV_ACTIVE_DEACTIVE;Activer/Désactiver;Activate/Deactivate;XXXXX
@@ -228,7 +229,7 @@ MSG_SOFT_DEF;def douce;soft def;xxx XXXX
 MSG_WITHDRAWAL;retrait;withdraw;xxx
 MSG_NEUTRAL;neutre;neuter;xxxxx
 MSG_PAUSE_GAME;Pauser le jeu;Pause game;xxxx XXXXX
-MSG_RESUME_GAME;Résumer le jeu;Resume game;XXXX xxxxx
+MSG_RESUME_GAME;Reprendre le jeu;Resume game;XXXX xxxxx
 MSG_HIGH_FLOODING;Forte submersion;High flooding;XXX xxxxx
 MSG_LOW_FLOODING;Faible submersion;Low flooding;XXX xxxxx
 MSG_REPLY_SUBMERSION;Rejouer la submersion;Replay Submersion;XXXXX xxxxx
@@ -238,12 +239,14 @@ LDR_EXCHANGE_MONEY;Transfert d'argent;Money transfer;XXXX xxxx
 LEV_DUNES;dunes;dunes;XXXXX
 LEV_DIKES;digues;dikes;xxxx
 LDR_TRANSFERT1;Choisissez le montant du transfert et la commune qui va recevoir l'argent;Select the transfer amount and the target district;xxxxxxx XXXX xxxxx
-LDR_TRANSFERT2;Votre budget n'est pas suffisant pour effectuer le transfert;Your budget is not sufficient to make the transfer;xxxxxx XXXXXXXXX xxxxxxxx
+LDR_TRANSFERT2;Le budget de la commune n'est pas suffisant pour effectuer le transfert;District's budget is not sufficient to make the transfer;xxxxxx XXXXXXXXX xxxxxxxx
 LDR_TRANSFERT3;L'argent a été transféré à votre destinaire;The money has been sent to your recipient;XXXX xxxxx XXXX
 LDR_TRANSFERT4;Vous avez reçu un transfert de la part de;You have received a transfer from;XXXXxxxx xxxxxXXXXX
 PLY_MSG_PREVIOUS;Précédent;Previous;XXXX
 PLY_MSG_NEXT;Suivant;Next;xxxxx
 MSG_MIN_ALT;Altitude minimale;Minimal altitude;XXX xxxx
 MSG_MEAN_ALT;Altitude moyenne;Mean altitude;xxxx XXXX
 PLY_MSG_DOSSIER;pour le dossier;for the dossier;XXX xxx XXX
-PLY_MSG_BEEN;Vous avez été;You have been;xxx XXXXX
+PLY_MSG_BEEN;Vous avez été;You have been;xxx XXXXX
+PLY_SUBMERSION_RESULTS;Réception du résultat de la submersion, veuillez patientez;Receiving submersion result, please wait;XXXXX xxxxx
+PLY_SUBMERSION_RES_OK;Le résultat de la dernière submersion est disponible, vous pouvez l'afficher;Last submersion result is available, you can display it;xxxx XXXXXX xxxx XXX
diff --git a/includes/oleron/floodfiles/oleron2016_Xynthia-50.bdy b/includes/oleron/floodfiles/oleron2016_Xynthia-50.bdy
@@ -1,4 +1,4 @@
-Hauteurs simul�es Est Ol�ron
+Hauteurs Xynthia - 50cm
 Est_Oleron1	
 30 second	
 0	0

diff --git a/includes/oleron/floodfiles/oleron2016_Xynthia.bdy b/includes/oleron/floodfiles/oleron2016_Xynthia.bdy
@@ -1,4 +1,4 @@
-Hauteurs simul�es Est Ol�ron
+Hauteurs Xynthia
 Est_Oleron1	
 30 second	
 0	0

diff --git a/includes/oleron/shapefiles/dem.asc.aux.xml b/includes/oleron/shapefiles/dem.asc.aux.xml
@@ -0,0 +1,12 @@
+<PAMDataset>
+  <PAMRasterBand band="1">
+    <Metadata>
+      <MDI key="STATISTICS_APPROXIMATE">YES</MDI>
+      <MDI key="STATISTICS_MAXIMUM">34</MDI>
+      <MDI key="STATISTICS_MEAN">-1.1636464217116</MDI>
+      <MDI key="STATISTICS_MINIMUM">-16.233</MDI>
+      <MDI key="STATISTICS_STDDEV">6.8143031485717</MDI>
+      <MDI key="STATISTICS_VALID_PERCENT">100</MDI>
+    </Metadata>
+  </PAMRasterBand>
+</PAMDataset>
diff --git a/models/LittoSIM-GEN_Leader.gaml b/models/LittoSIM-GEN_Leader.gaml
@@ -168,26 +168,32 @@ global{
 						}
 					}
 					match 4 {
+						if selected_lever.status_on and selected_lever.timer_activated {
+							ask selected_lever { do cancel_all_activated_actions; }
+							selected_lever <- nil;
+						}
+					}
+					match 5 {
 						if selected_lever.status_on and selected_lever.timer_activated{
 							ask selected_lever { do accept_next_activated_action; }
 							selected_lever <- nil;
 						}
 					}
-					match 5 {
+					match 6 {
 						if selected_lever.status_on and selected_lever.timer_activated {
 							ask selected_lever { do accept_all_activated_actions; }
 							selected_lever <- nil;
 						}
 					}
-					match 6 {
+					match 7 {
 						ask selected_lever { do toggle_status; }
 						selected_lever <- nil;
 					}
-					match 7 {
+					match 8 {
 						ask selected_lever { do write_help_lever_msg; }
 						selected_lever <- nil;
 					}
-					match 8 {
+					match 9 {
 						selected_lever <- nil;
 					}
 				}
@@ -567,29 +573,29 @@ species Lever_Window_Info {
 
 species Lever_Window_Actions {
 	point loca <- world.location;
-	geometry shape <- rectangle(30#m, 55#m);
+	geometry shape <- rectangle(30#m, 60#m);
 
-	list<string> text_buttons <- ['','LEV_CHANGE_TRESHOLD','LEV_CHANGE_PLAYER_MSG','LEV_CANCEL_NEXT_APP',
+	list<string> text_buttons <- ['','LEV_CHANGE_TRESHOLD','LEV_CHANGE_PLAYER_MSG','LEV_CANCEL_NEXT_APP','LEV_CANCEL_ALL_APPS',
 				'LEV_VALIDATE_NEXT_APP','LEV_VALIDATE_ALL_APPS','LEV_ACTIVE_DEACTIVE','LEV_HOW_WORKS','LEV_CLOSE_WINDOW'];
 
 	init {
-		point lo <- loca - {15, 27.5};
-		loop i from: 0 to: 8 {
+		point lo <- loca - {15, 30};
+		loop i from: 0 to: 9 {
 			create Lever_Window_Button {
 				command <- i ;
 				if myself.text_buttons [i] != "" {
 					text <- world.get_message(myself.text_buttons [i]);	
 				}
 				loca <- lo + {15, 7 + (i * 5.5)};
-				if i = 8 {	col <- #red; }
+				if i = 9 {	col <- #red; }
 			}
 		}
 	}
 
 	aspect {
 		if selected_lever != nil {
 			draw shape color: #white border: #black at: loca;
-			draw selected_lever.box_title at: loca - {0,25.5} anchor: #center font: font("Arial", 13 , #bold) color: #darkblue;
+			draw selected_lever.box_title at: loca - {0,27.5} anchor: #center font: font("Arial", 13 , #bold) color: #darkblue;
 		}
 	}
 }
@@ -605,7 +611,7 @@ species Lever_Window_Button {
 		if selected_lever != nil {
 			draw shape color: col border: #black at: loca;
 			draw text font: font("Arial", 12 , #bold) color: #darkblue at: loca anchor: #center;
-			if command in [3,4,5] and (!selected_lever.status_on or !selected_lever.timer_activated){
+			if command in [3,4,5,6] and (!selected_lever.status_on or !selected_lever.timer_activated){
 				draw shape+0.1#m color: rgb(200,200,200,160);
 			}
 		}
@@ -745,16 +751,23 @@ species Lever {
 	action cancel_next_activated_action {		
 		if !empty(activation_queue){
 			do cancel_lever(activation_queue[0]);
-			ask world {
-				do record_leader_activity("Lever " + myself.lever_name + " canceled at", myself.my_district.district_name, "Cancel of " + myself.activation_queue[0].p_action);
-			}
-			remove index: 0 from: activation_queue ;	
+			remove index: 0 from: activation_queue;	
+		}
+	}
+
+	action cancel_all_activated_actions {
+		loop aa over: activation_queue {
+			do cancel_lever(aa);
 		}
+		activation_queue <- [];
 	}
 
 	action cancel_lever(Activated_Lever lev){
 		lev.p_action.should_wait_lever_to_activate <- false;
 		do inform_network_should_wait_lever_to_activate(lev.p_action);
+		ask world {
+			do record_leader_activity("Lever " + myself.lever_name + " canceled at", myself.my_district.district_name, "Cancel of " + myself.activation_queue[0].p_action);
+		}
 	}
 
 	action accept_next_activated_action{