From ec4d6500a1fa81ec74785b7794a7d939861f1576 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Sat, 28 Jun 2014 21:02:14 +0200
Subject: [PATCH] =?UTF-8?q?/=20=E2=80=98grepolis.user.js=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 grepolis.user.js | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/grepolis.user.js b/grepolis.user.js
index 267a620..ac9d0be 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -21,8 +21,10 @@
 	console.log("Initializing...");
 	windows = {};
 	durations = {};
-	//farm_ids = [1225, 1226, 1228, 1229, 1230, 1231];
-	farm_ids = [20466, 20467, 20468, 20470, 20471, 20472];
+	farm_ids = {
+		83792: [20466, 20467, 20468, 20470, 20471, 20472],
+		85523: []
+	}
 
 	setTimeout(function() {
 		var logGPWindow = new GPWindow(-1, null);
@@ -58,12 +60,16 @@
 	    	+'document.getElementById(id).innerHTML = strZeit;}';
 	    document.getElementsByTagName("head")[0].appendChild(s);
 
-		farm_ids.forEach(function(xFarmId) {
-			var tmout =  5000 + rand(5);
-			setTimeout(getWaresTick(xFarmId), tmout);
-			var tmoutId = 'farm-' + xFarmId 
-			timerWindow.append('Farm ID ' + xFarmId + ': <span id="' + tmoutId + '"><script>j_countdown(' + Math.floor(tmout/1000) + ', "' + tmoutId + '");</script></span><br />');
-		});
+
+		for(var town_id in farm_ids) { 
+			farm_ids[town_id].forEach(function(xFarmId) {
+				var tmout =  5000 + rand(5);
+				setTimeout(getWaresTick(town_id, xFarmId), tmout);
+				var tmoutId = 'farm-' + xFarmId 
+				timerWindow.append('Farm ID ' + xFarmId + ': <span id="' + tmoutId + '"><script>j_countdown(' + Math.floor(tmout/1000) + ', "' + tmoutId + '");</script></span><br />');
+			});
+		}
+		
 
 		$("#ui-id" + logGPWindow.getID()).empty().append("<select id=choosefarmduration><option value=300>5min</option><option value=1200>20min</option><option value=5400>90min</option><option value=14400>4h</option></select>" + GM_info.script.version);
 		var choose = $("#choosefarmduration")[0];
@@ -88,7 +94,7 @@
         return Math.floor((Math.random() * max * 1000));
     }
     
-	function getWaresTick(xFarmId) { 
+	function getWaresTick(xTownId, xFarmId) { 
 		return function() {
 			var timeout = 60000;
 			try {
@@ -153,7 +159,7 @@
 					return;
 				}
 
-				timeout = getWaresFromFarm(wnd, mood, xFarmId) * 1000 + rand(5);
+				timeout = getWaresFromFarm(wnd, mood, xTownId, xFarmId) * 1000 + rand(5);
 			} finally {
 				durations["farm-" + xFarmId] = timeout / 1000;
 				setTimeout(getWaresTick(xFarmId), timeout);
@@ -161,7 +167,10 @@
 		}
 	}
 
-	function getWaresFromFarm(xWindow, xMood, xFarmId) {
+	function getWaresFromFarm(xWindow, xMood, xTownId, xFarmId) {
+		if(Game.town_id != xTownId) {
+			Game.town_id = xTownId;
+		}
 		if(xMood - 6 > 80) {
 			log("Plündere " + xFarmId + " @ Mood: " + xMood);
 			xWindow.call('claimLoad', xFarmId.toString(), 'double', 300);