From 29a4f73775651efef58b3bc28b7e48ec61a6ebf8 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Mon, 16 Jun 2014 18:50:01 +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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/grepolis.user.js b/grepolis.user.js
index e6ae7f1..be45fe4 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.0.82
+// @version         1.0.83
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -153,7 +153,7 @@
 					return;
 				}
 
-				getWaresFromFarm(wnd, mood, xFarmId);
+				timeout = getWaresFromFarm(wnd, mood, xFarmId) * 1000 + rand(5);
 			} finally {
 				durations["farm-" + xFarmId] = timeout / 1000;
 				setTimeout(getWaresTick(xFarmId), timeout);
@@ -165,9 +165,11 @@
 		if(xMood - 6 > 80) {
 			log("Plündere " + xFarmId + " @ Mood: " + xMood);
 			xWindow.call('claimLoad', xFarmId.toString(), 'double', 300);
+			return 300;
 		} else {			
 			log("Fordere " + xFarmId + " @ Mood: " + xMood);
 			xWindow.call('claimLoad', xFarmId.toString(), 'normal', farmDuration);
+			return farmDuration;
 		}
 	}