From e2aa2d0d9e749dbab8f50f25716b7e9e1d5cb266 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan@javil.eu>
Date: Wed, 4 Jun 2014 19:03:34 +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 | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/grepolis.user.js b/grepolis.user.js
index 1092daa..5db3432 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.0.47
+// @version         1.0.48
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -107,38 +107,34 @@
 					timeout = 50;
 					return;
 				}
-				var btn = $(wndElement).find(".farm_claim_box .farm_claim_res0 + div + a");
+
 				var mood = parseFloat($(wndElement).find('#mood1').siblings().last().text());
+				var ts = $(wndElement).find(".farm_next_claim_time").text();
+				if(ts != "bereit") {
+					var minutes = ts.substring(2,4);
+					var seconds = minutes * 60 + ts.substring(5,7) * 1;
 
-				if(btn.hasClass("farm_claim_button_inactive")) {
-					var ts = $(wndElement).find(".farm_next_claim_time").text();
-					
-					if(ts != "bereit") {
-						var minutes = ts.substring(2,4);
-						var seconds = minutes * 60 + ts.substring(5,7) * 1;
+					log("Farm " + xFarmId + " not ready, trying again in " + ts);
+					wnd.close();
 
-						log("Farm " + xFarmId + " not ready, trying again in " + ts);
-						wnd.close();
-
-						timeout = seconds * 1000 + 1000;
-						return;
-					}
+					timeout = seconds * 1000 + 1000;
+					return;
 				}
 
-				getWaresFromFarm(btn[0], mood, xFarmId);
+				getWaresFromFarm(wnd, mood, xFarmId);
 			} finally {
 				setTimeout(getWaresTick(xFarmId), timeout);
 			}
 		}
 	}
 
-	function getWaresFromFarm(xButton, xMood, xFarmId) {
+	function getWaresFromFarm(xWindow, xMood, xFarmId) {
 		if(xMood - 6 > 80) {
 			log("Plündere " + xFarmId + " @ Mood: " + xMood);
-			w(xButton).call('claimLoad', xFarmId.toString(), 'double', 300);
+			xWindow.call('claimLoad', xFarmId.toString(), 'double', 300);
 		} else {			
 			log("Fordere " + xFarmId + " @ Mood: " + xMood);
-			w(xButton).call('claimLoad', xFarmId.toString(), 'normal', 300);
+			xWindow.call('claimLoad', xFarmId.toString(), 'normal', 300);
 		}
 	}