fix brewery and crop finder

2026-07-02 18:44:21 +00:00 · 2012-05-23 23:18:12 +03:00
parent ba723dce9d
commit 42da7517d3
5 changed files with 18 additions and 9 deletions
@@ -547,6 +547,7 @@ class Automation {
            $fromcoor = $database->getCoor($data['to']);
            $isoasis = $database->isVillageOases($data['to']);
            $AttackArrivalTime = $data['endtime'];
+			$AttackerWref = $data['from'];
            if ($isoasis == 0){
            $Attacker['id'] = $database->getUserField($database->getVillageField($data['from'],"owner"),"id",0);
            $Defender['id'] = $database->getUserField($database->getVillageField($data['to'],"owner"),"id",0);
@@ -895,7 +896,7 @@ class Automation {
                                        $stonemason = "1";

        }
-            $battlepart = $battle->calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab,$tblevel,$stonemason,$walllevel,$AttackerID,$DefenderID);
+            $battlepart = $battle->calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab,$tblevel,$stonemason,$walllevel,$AttackerID,$DefenderID,$AttackerWref);

            //units attack string for battleraport
            $unitssend_att = ''.$data['t1'].','.$data['t2'].','.$data['t3'].','.$data['t4'].','.$data['t5'].','.$data['t6'].','.$data['t7'].','.$data['t8'].','.$data['t9'].','.$data['t10'].'';
@@ -1775,9 +1776,15 @@ class Automation {
                }
                if(!isset($nochiefing)){
                    //$info_chief = "".$chief_pic.",You don't have enought CP to chief a village.";
+					if($this->getTypeLevel(37,$data['to']) > 0){
                    for ($i=0; $i<($data['t9']-$dead9); $i++){
                    $rand+=rand(15,25);
                    }
+					}else{
+                    for ($i=0; $i<($data['t9']-$dead9); $i++){
+                    $rand+=rand(5,15);
+					}
+					}
                    //loyalty is more than 0
                    if(($toF['loyalty']-$rand)>0){
                        $info_chief = "".$chief_pic.",The loyalty was lowered from <b>".floor($toF['loyalty'])."</b> to <b>".floor($toF['loyalty']-$rand)."</b>.";
@@ -2085,6 +2092,7 @@ $crannyimg = "<img src=\"".GP_LOCATE."img/g/g23.gif\" height=\"20\" width=\"15\"
 			unset($enforceowner);
 			unset($defheroxp);
            unset($reinfheroxp);
+            unset($AttackerWref);
           }
            if(file_exists("GameEngine/Prevention/sendunits.txt")) {
                @unlink("GameEngine/Prevention/sendunits.txt");
@@ -154,14 +154,14 @@ class Battle {
                }

                if(!$scout)
-                        return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],$post['ktyp']+3,$def_ab,$att_ab,$post['kata'],1);
+                        return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],$post['ktyp']+3,$def_ab,$att_ab,$post['kata'],1,0,0,0);
                else
-                        return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],1,$def_ab,$att_ab,$post['kata'],1);
+                        return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$post['palast'],$post['ew1'],$post['ew2'],1,$def_ab,$att_ab,$post['kata'],1,0,0,0);
        }


        //1 raid 0 normal
-        function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab,$tblevel,$stonemason,$walllevel,$AttackerID,$DefenderID) {
+        function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab,$tblevel,$stonemason,$walllevel,$AttackerID,$DefenderID,$AttackerWref) {
                global $database,$bid34;
                // Definieer de array met de eenheden
                $calvary = array(4,5,6,15,16,23,24,25,26,35,36,45,46);
@@ -349,7 +349,7 @@ class Battle {
                //
                // Formule voor het berekenen van punten aanvallers (Infanterie & Cavalry)
                //
-                        $rap = $ap+$cap;
+                        $rap = ($ap+$cap)+(($ap+$cap)/100*$bid35[$automation->getTypeLevel(35,$AttackerWref)]['attri']);
                //
                // Formule voor de berekening van Defensive Punten
                //
@@ -44,7 +44,7 @@ $bid31=array(1=>array('wood'=>70,'clay'=>90,'iron'=>170,'crop'=>70,'pop'=>0,'cp'
 $bid32=array(1=>array('wood'=>120,'clay'=>200,'iron'=>0,'crop'=>80,'pop'=>0,'cp'=>1,'attri'=>2,'time'=>2000),array('wood'=>155,'clay'=>255,'iron'=>0,'crop'=>100,'pop'=>0,'cp'=>1,'attri'=>4,'time'=>2620),array('wood'=>195,'clay'=>330,'iron'=>0,'crop'=>130,'pop'=>0,'cp'=>2,'attri'=>6,'time'=>3340),array('wood'=>250,'clay'=>420,'iron'=>0,'crop'=>170,'pop'=>0,'cp'=>2,'attri'=>8,'time'=>4170),array('wood'=>320,'clay'=>535,'iron'=>0,'crop'=>215,'pop'=>0,'cp'=>2,'attri'=>10,'time'=>5140),array('wood'=>410,'clay'=>685,'iron'=>0,'crop'=>275,'pop'=>1,'cp'=>3,'attri'=>13,'time'=>6260),array('wood'=>530,'clay'=>880,'iron'=>0,'crop'=>350,'pop'=>1,'cp'=>4,'attri'=>15,'time'=>7570),array('wood'=>675,'clay'=>1125,'iron'=>0,'crop'=>450,'pop'=>1,'cp'=>4,'attri'=>17,'time'=>9080),array('wood'=>865,'clay'=>1440,'iron'=>0,'crop'=>575,'pop'=>1,'cp'=>5,'attri'=>20,'time'=>10830),array('wood'=>1105,'clay'=>1845,'iron'=>0,'crop'=>740,'pop'=>1,'cp'=>6,'attri'=>22,'time'=>12860),array('wood'=>1415,'clay'=>2360,'iron'=>0,'crop'=>945,'pop'=>1,'cp'=>7,'attri'=>24,'time'=>15220),array('wood'=>1815,'clay'=>3020,'iron'=>0,'crop'=>1210,'pop'=>1,'cp'=>9,'attri'=>27,'time'=>17950),array('wood'=>2320,'clay'=>3870,'iron'=>0,'crop'=>1545,'pop'=>1,'cp'=>11,'attri'=>29,'time'=>21130),array('wood'=>2970,'clay'=>4950,'iron'=>0,'crop'=>1980,'pop'=>1,'cp'=>13,'attri'=>32,'time'=>24810),array('wood'=>3805,'clay'=>6340,'iron'=>0,'crop'=>2535,'pop'=>1,'cp'=>15,'attri'=>35,'time'=>29080),array('wood'=>4870,'clay'=>8115,'iron'=>0,'crop'=>3245,'pop'=>2,'cp'=>18,'attri'=>37,'time'=>34030),array('wood'=>6230,'clay'=>10385,'iron'=>0,'crop'=>4155,'pop'=>2,'cp'=>22,'attri'=>40,'time'=>39770),array('wood'=>7975,'clay'=>13290,'iron'=>0,'crop'=>5315,'pop'=>2,'cp'=>27,'attri'=>43,'time'=>46440),array('wood'=>10210,'clay'=>17015,'iron'=>0,'crop'=>6805,'pop'=>2,'cp'=>32,'attri'=>46,'time'=>54170),array('wood'=>13065,'clay'=>21780,'iron'=>0,'crop'=>8710,'pop'=>2,'cp'=>38,'attri'=>49,'time'=>63130));
 $bid33=array(1=>array('wood'=>160,'clay'=>100,'iron'=>80,'crop'=>60,'pop'=>0,'cp'=>1,'attri'=>2,'time'=>2000),array('wood'=>205,'clay'=>130,'iron'=>100,'crop'=>75,'pop'=>0,'cp'=>1,'attri'=>5,'time'=>2620),array('wood'=>260,'clay'=>165,'iron'=>130,'crop'=>100,'pop'=>0,'cp'=>2,'attri'=>8,'time'=>3340),array('wood'=>335,'clay'=>210,'iron'=>170,'crop'=>125,'pop'=>0,'cp'=>2,'attri'=>10,'time'=>4170),array('wood'=>430,'clay'=>270,'iron'=>215,'crop'=>160,'pop'=>0,'cp'=>2,'attri'=>13,'time'=>5140),array('wood'=>550,'clay'=>345,'iron'=>275,'crop'=>205,'pop'=>1,'cp'=>3,'attri'=>16,'time'=>6260),array('wood'=>705,'clay'=>440,'iron'=>350,'crop'=>265,'pop'=>1,'cp'=>4,'attri'=>19,'time'=>7570),array('wood'=>900,'clay'=>565,'iron'=>450,'crop'=>340,'pop'=>1,'cp'=>4,'attri'=>22,'time'=>9080),array('wood'=>1155,'clay'=>720,'iron'=>575,'crop'=>430,'pop'=>1,'cp'=>5,'attri'=>25,'time'=>10830),array('wood'=>1475,'clay'=>920,'iron'=>740,'crop'=>555,'pop'=>1,'cp'=>6,'attri'=>28,'time'=>12860),array('wood'=>1890,'clay'=>1180,'iron'=>945,'crop'=>710,'pop'=>1,'cp'=>7,'attri'=>31,'time'=>15220),array('wood'=>2420,'clay'=>1510,'iron'=>1210,'crop'=>905,'pop'=>1,'cp'=>9,'attri'=>34,'time'=>17950),array('wood'=>3095,'clay'=>1935,'iron'=>1545,'crop'=>1160,'pop'=>1,'cp'=>11,'attri'=>38,'time'=>21130),array('wood'=>3960,'clay'=>2475,'iron'=>1980,'crop'=>1485,'pop'=>1,'cp'=>13,'attri'=>41,'time'=>24810),array('wood'=>5070,'clay'=>3170,'iron'=>2535,'crop'=>1900,'pop'=>1,'cp'=>15,'attri'=>45,'time'=>29080),array('wood'=>6490,'clay'=>4055,'iron'=>3245,'crop'=>2435,'pop'=>2,'cp'=>18,'attri'=>48,'time'=>34030),array('wood'=>8310,'clay'=>5190,'iron'=>4155,'crop'=>3115,'pop'=>2,'cp'=>22,'attri'=>52,'time'=>39770),array('wood'=>10635,'clay'=>6645,'iron'=>5315,'crop'=>3990,'pop'=>2,'cp'=>27,'attri'=>56,'time'=>46440),array('wood'=>13610,'clay'=>8505,'iron'=>6805,'crop'=>5105,'pop'=>2,'cp'=>32,'attri'=>60,'time'=>54170),array('wood'=>17420,'clay'=>10890,'iron'=>8710,'crop'=>6535,'pop'=>2,'cp'=>38,'attri'=>64,'time'=>63130));
 $bid34=array(1=>array('wood'=>155,'clay'=>130,'iron'=>125,'crop'=>70,'pop'=>2,'cp'=>1,'attri'=>110,'time'=>2200),array('wood'=>200,'clay'=>165,'iron'=>160,'crop'=>90,'pop'=>1,'cp'=>1,'attri'=>120,'time'=>3150),array('wood'=>255,'clay'=>215,'iron'=>205,'crop'=>115,'pop'=>1,'cp'=>2,'attri'=>130,'time'=>4260),array('wood'=>325,'clay'=>275,'iron'=>260,'crop'=>145,'pop'=>1,'cp'=>2,'attri'=>140,'time'=>5540),array('wood'=>415,'clay'=>350,'iron'=>335,'crop'=>190,'pop'=>1,'cp'=>2,'attri'=>150,'time'=>7020),array('wood'=>535,'clay'=>445,'iron'=>430,'crop'=>240,'pop'=>2,'cp'=>3,'attri'=>160,'time'=>8750),array('wood'=>680,'clay'=>570,'iron'=>550,'crop'=>310,'pop'=>2,'cp'=>4,'attri'=>170,'time'=>10750),array('wood'=>875,'clay'=>730,'iron'=>705,'crop'=>395,'pop'=>2,'cp'=>4,'attri'=>180,'time'=>13070),array('wood'=>1115,'clay'=>935,'iron'=>900,'crop'=>505,'pop'=>2,'cp'=>5,'attri'=>190,'time'=>15760),array('wood'=>1430,'clay'=>1200,'iron'=>1155,'crop'=>645,'pop'=>2,'cp'=>6,'attri'=>200,'time'=>18880),array('wood'=>1830,'clay'=>1535,'iron'=>1475,'crop'=>825,'pop'=>2,'cp'=>7,'attri'=>210,'time'=>22500),array('wood'=>2340,'clay'=>1965,'iron'=>1890,'crop'=>1060,'pop'=>2,'cp'=>9,'attri'=>220,'time'=>26700),array('wood'=>3000,'clay'=>2515,'iron'=>2420,'crop'=>1355,'pop'=>2,'cp'=>11,'attri'=>230,'time'=>31570),array('wood'=>3840,'clay'=>3220,'iron'=>3095,'crop'=>1735,'pop'=>2,'cp'=>13,'attri'=>240,'time'=>37220),array('wood'=>4910,'clay'=>4120,'iron'=>3960,'crop'=>2220,'pop'=>2,'cp'=>15,'attri'=>250,'time'=>43780),array('wood'=>6290,'clay'=>5275,'iron'=>5070,'crop'=>2840,'pop'=>3,'cp'=>18,'attri'=>260,'time'=>51380),array('wood'=>8050,'clay'=>6750,'iron'=>6490,'crop'=>3635,'pop'=>3,'cp'=>22,'attri'=>270,'time'=>60200),array('wood'=>10300,'clay'=>8640,'iron'=>8310,'crop'=>4650,'pop'=>3,'cp'=>27,'attri'=>280,'time'=>70430),array('wood'=>13185,'clay'=>11060,'iron'=>10635,'crop'=>5955,'pop'=>3,'cp'=>32,'attri'=>290,'time'=>82300),array('wood'=>16880,'clay'=>14155,'iron'=>13610,'crop'=>7620,'pop'=>3,'cp'=>38,'attri'=>300,'time'=>96070));
-$bid35=array(1=>array('wood'=>1460,'clay'=>930,'iron'=>1250,'crop'=>1740,'pop'=>6,'cp'=>5,'attri'=>0,'time'=>8000),array('wood'=>2045,'clay'=>1300,'iron'=>1750,'crop'=>2435,'pop'=>3,'cp'=>6,'attri'=>0,'time'=>9880),array('wood'=>2860,'clay'=>1825,'iron'=>2450,'crop'=>3410,'pop'=>3,'cp'=>7,'attri'=>0,'time'=>12060),array('wood'=>4005,'clay'=>2550,'iron'=>3430,'crop'=>4775,'pop'=>3,'cp'=>8,'attri'=>0,'time'=>14590),array('wood'=>5610,'clay'=>3575,'iron'=>4800,'crop'=>6685,'pop'=>3,'cp'=>10,'attri'=>0,'time'=>17530),array('wood'=>7850,'clay'=>5000,'iron'=>6725,'crop'=>9360,'pop'=>4,'cp'=>12,'attri'=>0,'time'=>20930),array('wood'=>10995,'clay'=>7000,'iron'=>9410,'crop'=>13100,'pop'=>4,'cp'=>14,'attri'=>0,'time'=>24880),array('wood'=>15390,'clay'=>9805,'iron'=>13175,'crop'=>18340,'pop'=>4,'cp'=>17,'attri'=>0,'time'=>29460),array('wood'=>21545,'clay'=>13725,'iron'=>18445,'crop'=>25680,'pop'=>4,'cp'=>21,'attri'=>0,'time'=>34770),array('wood'=>30165,'clay'=>19215,'iron'=>25825,'crop'=>35950,'pop'=>4,'cp'=>25,'attri'=>0,'time'=>40930));
+$bid35=array(1=>array('wood'=>1460,'clay'=>930,'iron'=>1250,'crop'=>1740,'pop'=>6,'cp'=>5,'attri'=>1,'time'=>8000),array('wood'=>2045,'clay'=>1300,'iron'=>1750,'crop'=>2435,'pop'=>3,'cp'=>6,'attri'=>2,'time'=>9880),array('wood'=>2860,'clay'=>1825,'iron'=>2450,'crop'=>3410,'pop'=>3,'cp'=>7,'attri'=>3,'time'=>12060),array('wood'=>4005,'clay'=>2550,'iron'=>3430,'crop'=>4775,'pop'=>3,'cp'=>8,'attri'=>4,'time'=>14590),array('wood'=>5610,'clay'=>3575,'iron'=>4800,'crop'=>6685,'pop'=>3,'cp'=>10,'attri'=>5,'time'=>17530),array('wood'=>7850,'clay'=>5000,'iron'=>6725,'crop'=>9360,'pop'=>4,'cp'=>12,'attri'=>6,'time'=>20930),array('wood'=>10995,'clay'=>7000,'iron'=>9410,'crop'=>13100,'pop'=>4,'cp'=>14,'attri'=>7,'time'=>24880),array('wood'=>15390,'clay'=>9805,'iron'=>13175,'crop'=>18340,'pop'=>4,'cp'=>17,'attri'=>8,'time'=>29460),array('wood'=>21545,'clay'=>13725,'iron'=>18445,'crop'=>25680,'pop'=>4,'cp'=>21,'attri'=>9,'time'=>34770),array('wood'=>30165,'clay'=>19215,'iron'=>25825,'crop'=>35950,'pop'=>4,'cp'=>25,'attri'=>10,'time'=>40930));
 $bid36=array(1=>array('wood'=>100,'clay'=>100,'iron'=>100,'crop'=>100,'pop'=>4,'cp'=>1,'attri'=>10,'time'=>2000),array('wood'=>130,'clay'=>130,'iron'=>130,'crop'=>130,'pop'=>2,'cp'=>1,'attri'=>22,'time'=>2320),array('wood'=>165,'clay'=>165,'iron'=>165,'crop'=>165,'pop'=>2,'cp'=>2,'attri'=>35,'time'=>2690),array('wood'=>210,'clay'=>210,'iron'=>210,'crop'=>210,'pop'=>2,'cp'=>2,'attri'=>49,'time'=>3120),array('wood'=>270,'clay'=>270,'iron'=>270,'crop'=>270,'pop'=>2,'cp'=>2,'attri'=>64,'time'=>3620),array('wood'=>345,'clay'=>345,'iron'=>345,'crop'=>345,'pop'=>3,'cp'=>3,'attri'=>80,'time'=>4200),array('wood'=>440,'clay'=>440,'iron'=>440,'crop'=>440,'pop'=>3,'cp'=>4,'attri'=>97,'time'=>4870),array('wood'=>565,'clay'=>565,'iron'=>565,'crop'=>565,'pop'=>3,'cp'=>4,'attri'=>115,'time'=>5650),array('wood'=>720,'clay'=>720,'iron'=>720,'crop'=>720,'pop'=>3,'cp'=>5,'attri'=>134,'time'=>6560),array('wood'=>920,'clay'=>920,'iron'=>920,'crop'=>920,'pop'=>3,'cp'=>6,'attri'=>154,'time'=>7610),array('wood'=>1180,'clay'=>1180,'iron'=>1180,'crop'=>1180,'pop'=>3,'cp'=>7,'attri'=>175,'time'=>8820),array('wood'=>1510,'clay'=>1510,'iron'=>1510,'crop'=>1510,'pop'=>3,'cp'=>9,'attri'=>196,'time'=>10230),array('wood'=>1935,'clay'=>1935,'iron'=>1935,'crop'=>1935,'pop'=>3,'cp'=>11,'attri'=>218,'time'=>11870),array('wood'=>2475,'clay'=>2475,'iron'=>2475,'crop'=>2475,'pop'=>3,'cp'=>13,'attri'=>241,'time'=>13770),array('wood'=>3170,'clay'=>3170,'iron'=>3170,'crop'=>3170,'pop'=>3,'cp'=>15,'attri'=>265,'time'=>15980),array('wood'=>4055,'clay'=>4055,'iron'=>4055,'crop'=>4055,'pop'=>4,'cp'=>18,'attri'=>290,'time'=>18530),array('wood'=>5190,'clay'=>5190,'iron'=>5190,'crop'=>5190,'pop'=>4,'cp'=>22,'attri'=>316,'time'=>21500),array('wood'=>6645,'clay'=>6645,'iron'=>6645,'crop'=>6645,'pop'=>4,'cp'=>27,'attri'=>343,'time'=>24940),array('wood'=>8505,'clay'=>8505,'iron'=>8505,'crop'=>8505,'pop'=>4,'cp'=>32,'attri'=>371,'time'=>28930),array('wood'=>10890,'clay'=>10890,'iron'=>10890,'crop'=>10890,'pop'=>4,'cp'=>38,'attri'=>400,'time'=>33550));
 $bid37=array(1=>array('wood'=>700,'clay'=>670,'iron'=>700,'crop'=>240,'pop'=>2,'cp'=>1,'attri'=>0,'time'=>2300),array('wood'=>930,'clay'=>890,'iron'=>930,'crop'=>320,'pop'=>1,'cp'=>1,'attri'=>0,'time'=>2670),array('wood'=>1240,'clay'=>1185,'iron'=>1240,'crop'=>425,'pop'=>1,'cp'=>2,'attri'=>0,'time'=>3090),array('wood'=>1645,'clay'=>1575,'iron'=>1645,'crop'=>565,'pop'=>1,'cp'=>2,'attri'=>0,'time'=>3590),array('wood'=>2190,'clay'=>2095,'iron'=>2190,'crop'=>750,'pop'=>1,'cp'=>2,'attri'=>0,'time'=>4160),array('wood'=>2915,'clay'=>2790,'iron'=>2915,'crop'=>1000,'pop'=>2,'cp'=>3,'attri'=>0,'time'=>4830),array('wood'=>3875,'clay'=>3710,'iron'=>3875,'crop'=>1330,'pop'=>2,'cp'=>4,'attri'=>0,'time'=>5600),array('wood'=>5155,'clay'=>4930,'iron'=>5155,'crop'=>1765,'pop'=>2,'cp'=>4,'attri'=>0,'time'=>6500),array('wood'=>6855,'clay'=>6560,'iron'=>6855,'crop'=>2350,'pop'=>2,'cp'=>5,'attri'=>0,'time'=>7540),array('wood'=>9115,'clay'=>8725,'iron'=>9115,'crop'=>3125,'pop'=>2,'cp'=>6,'attri'=>1,'time'=>8750),array('wood'=>12125,'clay'=>11605,'iron'=>12125,'crop'=>4155,'pop'=>2,'cp'=>7,'attri'=>1,'time'=>10150),array('wood'=>16125,'clay'=>15435,'iron'=>16125,'crop'=>5530,'pop'=>2,'cp'=>9,'attri'=>1,'time'=>11770),array('wood'=>21445,'clay'=>20525,'iron'=>21445,'crop'=>7350,'pop'=>2,'cp'=>11,'attri'=>1,'time'=>13650),array('wood'=>28520,'clay'=>27300,'iron'=>28520,'crop'=>9780,'pop'=>2,'cp'=>13,'attri'=>1,'time'=>15840),array('wood'=>37935,'clay'=>36310,'iron'=>37935,'crop'=>13005,'pop'=>2,'cp'=>15,'attri'=>2,'time'=>18370),array('wood'=>50450,'clay'=>48290,'iron'=>50450,'crop'=>17300,'pop'=>3,'cp'=>18,'attri'=>2,'time'=>21310),array('wood'=>67100,'clay'=>64225,'iron'=>67100,'crop'=>23005,'pop'=>3,'cp'=>22,'attri'=>2,'time'=>24720),array('wood'=>89245,'clay'=>85420,'iron'=>89245,'crop'=>30600,'pop'=>3,'cp'=>27,'attri'=>2,'time'=>28680),array('wood'=>118695,'clay'=>113605,'iron'=>118695,'crop'=>40695,'pop'=>3,'cp'=>32,'attri'=>2,'time'=>33260),array('wood'=>157865,'clay'=>151095,'iron'=>157865,'crop'=>54125,'pop'=>3,'cp'=>38,'attri'=>3,'time'=>38590));
 $bid38=array(1=>array('wood'=>650,'clay'=>800,'iron'=>450,'crop'=>200,'pop'=>1,'cp'=>1,'attri'=>3600,'time'=>9000),array('wood'=>830,'clay'=>1025,'iron'=>575,'crop'=>255,'pop'=>1,'cp'=>1,'attri'=>5100,'time'=>10740),array('wood'=>1065,'clay'=>1310,'iron'=>735,'crop'=>330,'pop'=>1,'cp'=>2,'attri'=>6900,'time'=>12760),array('wood'=>1365,'clay'=>1680,'iron'=>945,'crop'=>420,'pop'=>1,'cp'=>2,'attri'=>9300,'time'=>15100),array('wood'=>1745,'clay'=>2145,'iron'=>1210,'crop'=>535,'pop'=>1,'cp'=>2,'attri'=>12000,'time'=>17820),array('wood'=>2235,'clay'=>2750,'iron'=>1545,'crop'=>685,'pop'=>1,'cp'=>3,'attri'=>15000,'time'=>20970),array('wood'=>2860,'clay'=>3520,'iron'=>1980,'crop'=>880,'pop'=>1,'cp'=>4,'attri'=>18900,'time'=>24620),array('wood'=>3660,'clay'=>4505,'iron'=>2535,'crop'=>1125,'pop'=>1,'cp'=>4,'attri'=>23400,'time'=>28860),array('wood'=>4685,'clay'=>5765,'iron'=>3245,'crop'=>1440,'pop'=>1,'cp'=>5,'attri'=>28800,'time'=>33780),array('wood'=>5995,'clay'=>7380,'iron'=>4150,'crop'=>1845,'pop'=>1,'cp'=>6,'attri'=>35400,'time'=>39480),array('wood'=>7675,'clay'=>9445,'iron'=>5315,'crop'=>2360,'pop'=>2,'cp'=>7,'attri'=>43200,'time'=>46100),array('wood'=>9825,'clay'=>12090,'iron'=>6800,'crop'=>3020,'pop'=>2,'cp'=>9,'attri'=>52800,'time'=>53780),array('wood'=>12575,'clay'=>15475,'iron'=>8705,'crop'=>3870,'pop'=>2,'cp'=>11,'attri'=>64200,'time'=>62680),array('wood'=>16095,'clay'=>19805,'iron'=>11140,'crop'=>4950,'pop'=>2,'cp'=>13,'attri'=>77700,'time'=>73010),array('wood'=>20600,'clay'=>25355,'iron'=>14260,'crop'=>6340,'pop'=>2,'cp'=>15,'attri'=>93900,'time'=>84990),array('wood'=>26365,'clay'=>32450,'iron'=>18255,'crop'=>8115,'pop'=>2,'cp'=>18,'attri'=>113700,'time'=>98890),array('wood'=>33750,'clay'=>41540,'iron'=>23365,'crop'=>10385,'pop'=>2,'cp'=>22,'attri'=>137100,'time'=>115010),array('wood'=>43200,'clay'=>53170,'iron'=>29910,'crop'=>13290,'pop'=>2,'cp'=>27,'attri'=>165300,'time'=>133710),array('wood'=>55295,'clay'=>68055,'iron'=>38280,'crop'=>17015,'pop'=>2,'cp'=>32,'attri'=>199200,'time'=>155400),array('wood'=>70780,'clay'=>87110,'iron'=>49000,'crop'=>21780,'pop'=>2,'cp'=>38,'attri'=>240000,'time'=>180570));
@@ -233,7 +233,7 @@ $neutral = (($neutralarray[0]['alli1']>0 and $neutralarray[0]['alli2']>0 and $do
 				<span>x </span><input id="mcx" class="text" name="xp" value="<?php echo $x ?>" maxlength="4"/>
 				<span>y </span><input id="mcy" class="text" name="yp" value="<?php echo $y ?>" maxlength="4"/>
 				<input type="image" id="btn_ok" class="dynamic_img" value="ok" name="s1" src="img/x.gif" alt="OK" /><br />
-				<?php if($session->plus != 0){echo "<a href=\"crop_finder.php\"><img src=\"".GP_LOCATE."img/misc/cropfinder.gif\" /> Crop Finder</a>";}?>
+				<?php if($session->goldclub != 0){echo "<a href=\"crop_finder.php\"><img src=\"".GP_LOCATE."img/misc/cropfinder.gif\" /> Crop Finder</a>";}?>
 			</form>
 		</div>
 		<table cellpadding="1" cellspacing="1" id="map_infobox" class="default"><thead><tr><th colspan="2">Details</th></tr></thead><tbody><tr><th>Player</th><td>-</td></tr><tr><th>Population</th><td>-</td></tr><tr><th>Alliance</th><td></td></tr></tbody></table>
@@ -175,7 +175,8 @@ $end = ($tribe*10);
                    
                        <select name="ctar1" class="dropdown">
                            <option value="0">Random</option>
-                            <?php if($building->getTypeLevel(16) >= 5) { ?>
+                            <?php if($building->getTypeLevel(35) == 0){
+							if($building->getTypeLevel(16) >= 5) { ?>
                <optgroup label="Resources">
                <option value="1">Woodcutter</option>
                                <option value="2">Clay Pit</option>
@@ -287,7 +288,7 @@ $end = ($tribe*10);
                     </td>
                </tr>
            </tbody><?PHP  
-            }
+            }}
            else if($process['c']=='4')
            {
                ?><tbody class="infos">