From b717c0cdf4b2ed919e4d0c93f40b9b0b1da0ab86 Mon Sep 17 00:00:00 2001 From: iopietro Date: Fri, 1 Jun 2018 16:24:36 +0200 Subject: [PATCH] General fixes +Fixed a bug that didn't permit to show to the defender "None of your soldiers returned." under certain circumnstances +Fixed a bug that showed a wrong report icon if the defender had 0 defences and all attacker's units were trapped/killed during the battle +Fixed a bug that counted a wrong percentage bonus for the horse drinking trough --- GameEngine/Automation.php | 13 ++++++++----- GameEngine/Data/buidata.php | 2 +- GameEngine/Message.php | 27 +++++++++++---------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 6c4f7de3..23189b7e 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -2234,9 +2234,13 @@ class Automation { } $data2 = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.','.$steal[0].','.$steal[1].','.$steal[2].','.$steal[3].','.$battlepart['bounty'].','.$to['owner'].','.$to['wref'].','.addslashes($to['name']).',,,,'.$targettribe.','.$unitssend_def[0].','.$unitsdead_def[0].','.$rom.','.$unitssend_def[1].','.$unitsdead_def[1].','.$ger.','.$unitssend_def[2].','.$unitsdead_def[2].','.$gal.','.$unitssend_def[3].','.$unitsdead_def[3].','.$nat.','.$unitssend_def[4].','.$unitsdead_def[4].','.$natar.','.$unitssend_def[5].','.$unitsdead_def[5].','.$DefenderHeroesTot.','.$DefenderHeroesDead.','.$info_ram.','.$info_cat.','.$info_chief.','.(isset($info_spy) ? $info_spy : '').',,'.$data['t11'].','.$dead11.','.$herosend_def.','.$deadhero.','.$unitstraped_att; } - - // When all troops die, sends no info...send info - $info_troop = "None of your soldiers have returned"; + + if($totalsend_att - ($totaldead_att + (isset($totaltraped_att) ? $totaltraped_att : 0)) <= 0){ + $info_troop = "None of your soldiers returned."; + } + else $info_troop = ""; + + //When all of the attacker's troops die, send no informations $data_fail = ''.$from['owner'].','.$from['wref'].','.$owntribe.','.$unitssend_att.','.$unitsdead_att.','.$steal[0].','.$steal[1].','.$steal[2].','.$steal[3].','.$battlepart['bounty'].','.$to['owner'].','.$to['wref'].','.addslashes($to['name']).',,,,'.$targettribe.','.$unitssend_deff[0].','.$unitsdead_deff[0].','.$rom.','.$unitssend_deff[1].','.$unitsdead_deff[1].','.$ger.','.$unitssend_deff[2].','.$unitsdead_deff[2].','.$gal.','.$unitssend_deff[3].','.$unitsdead_deff[3].','.$nat.','.$unitssend_deff[4].','.$unitsdead_deff[4].','.$natar.','.$unitssend_deff[5].','.$unitsdead_deff[5].','.$DefenderHeroesTot.','.$DefenderHeroesDead.',,,'.$data['t11'].','.$dead11.','.$unitstraped_att.',,'.$info_ram.','.$info_cat.','.$info_chief.','.$info_troop.','.$info_hero; //Undetected and detected in here. @@ -2361,10 +2365,9 @@ class Automation { } } - $info_troop = ""; $data2 = $data2.','.(isset($info_trap) ? addslashes($info_trap) : '').',,'.$info_troop.','.$info_hero; - if($totalsend_alldef == 0){ + if($totalsend_alldef == 0 && $totalsend_att - ($totaldead_att + (isset($totaltraped_att) ? $totaltraped_att : 0)) > 0){ $database->addNotice($to['owner'],$to['wref'],$targetally,7,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime); }else if($totaldead_alldef == 0){ $database->addNotice($to['owner'],$to['wref'],$targetally,4,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime); diff --git a/GameEngine/Data/buidata.php b/GameEngine/Data/buidata.php index 443afcbe..dd4e5db5 100755 --- a/GameEngine/Data/buidata.php +++ b/GameEngine/Data/buidata.php @@ -50,6 +50,6 @@ $bid37=array(1=>array('wood'=>700,'clay'=>670,'iron'=>700,'crop'=>240,'pop'=>2,' $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)); $bid39=array(1=>array('wood'=>400,'clay'=>500,'iron'=>350,'crop'=>100,'pop'=>1,'cp'=>1,'attri'=>3600,'time'=>7000),array('wood'=>510,'clay'=>640,'iron'=>450,'crop'=>130,'pop'=>1,'cp'=>1,'attri'=>5100,'time'=>8420),array('wood'=>655,'clay'=>820,'iron'=>575,'crop'=>165,'pop'=>1,'cp'=>2,'attri'=>6900,'time'=>10070),array('wood'=>840,'clay'=>1050,'iron'=>735,'crop'=>210,'pop'=>1,'cp'=>2,'attri'=>9300,'time'=>11980),array('wood'=>1075,'clay'=>1340,'iron'=>940,'crop'=>270,'pop'=>1,'cp'=>2,'attri'=>12000,'time'=>14190),array('wood'=>1375,'clay'=>1720,'iron'=>1205,'crop'=>345,'pop'=>1,'cp'=>3,'attri'=>15000,'time'=>16770),array('wood'=>1760,'clay'=>2200,'iron'=>1540,'crop'=>440,'pop'=>1,'cp'=>4,'attri'=>18900,'time'=>19750),array('wood'=>2250,'clay'=>2815,'iron'=>1970,'crop'=>565,'pop'=>1,'cp'=>4,'attri'=>23400,'time'=>23210),array('wood'=>2880,'clay'=>3605,'iron'=>2520,'crop'=>720,'pop'=>1,'cp'=>5,'attri'=>28800,'time'=>27220),array('wood'=>3690,'clay'=>4610,'iron'=>3230,'crop'=>920,'pop'=>1,'cp'=>6,'attri'=>35400,'time'=>31880),array('wood'=>4720,'clay'=>5905,'iron'=>4130,'crop'=>1180,'pop'=>2,'cp'=>7,'attri'=>43200,'time'=>37280),array('wood'=>6045,'clay'=>7555,'iron'=>5290,'crop'=>1510,'pop'=>2,'cp'=>9,'attri'=>52800,'time'=>43540),array('wood'=>7735,'clay'=>9670,'iron'=>6770,'crop'=>1935,'pop'=>2,'cp'=>11,'attri'=>64200,'time'=>50810),array('wood'=>9905,'clay'=>12380,'iron'=>8665,'crop'=>2475,'pop'=>2,'cp'=>13,'attri'=>77700,'time'=>59240),array('wood'=>12675,'clay'=>15845,'iron'=>11090,'crop'=>3170,'pop'=>2,'cp'=>15,'attri'=>93900,'time'=>69010),array('wood'=>16225,'clay'=>20280,'iron'=>14200,'crop'=>4055,'pop'=>2,'cp'=>18,'attri'=>113700,'time'=>80360),array('wood'=>20770,'clay'=>25960,'iron'=>18175,'crop'=>5190,'pop'=>2,'cp'=>22,'attri'=>137100,'time'=>93510),array('wood'=>26585,'clay'=>33230,'iron'=>23260,'crop'=>6645,'pop'=>2,'cp'=>27,'attri'=>165300,'time'=>108780),array('wood'=>34030,'clay'=>42535,'iron'=>29775,'crop'=>8505,'pop'=>2,'cp'=>32,'attri'=>199200,'time'=>126480),array('wood'=>43555,'clay'=>54445,'iron'=>38110,'crop'=>10890,'pop'=>2,'cp'=>38,'attri'=>240000,'time'=>147020)); $bid40=array(1=>array('wood'=>66700,'clay'=>69050,'iron'=>72200,'crop'=>13200,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>18000),array('wood'=>68535,'clay'=>70950,'iron'=>74185,'crop'=>13565,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>18850),array('wood'=>70420,'clay'=>72900,'iron'=>76225,'crop'=>13935,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>19720),array('wood'=>72355,'clay'=>74905,'iron'=>78320,'crop'=>14320,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>20590),array('wood'=>74345,'clay'=>76965,'iron'=>80475,'crop'=>14715,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>21480),array('wood'=>76390,'clay'=>79080,'iron'=>82690,'crop'=>15120,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>22380),array('wood'=>78490,'clay'=>81255,'iron'=>84965,'crop'=>15535,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>23290),array('wood'=>80650,'clay'=>83490,'iron'=>87300,'crop'=>15960,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>24220),array('wood'=>82865,'clay'=>85785,'iron'=>89700,'crop'=>16400,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>25160),array('wood'=>85145,'clay'=>88145,'iron'=>92165,'crop'=>16850,'pop'=>1,'cp'=>0,'attri'=>0,'time'=>26110),array('wood'=>87485,'clay'=>90570,'iron'=>94700,'crop'=>17315,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>27080),array('wood'=>89895,'clay'=>93060,'iron'=>97305,'crop'=>17790,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>28060),array('wood'=>92365,'clay'=>95620,'iron'=>99980,'crop'=>18280,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>29050),array('wood'=>94905,'clay'=>98250,'iron'=>102730,'crop'=>18780,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>30060),array('wood'=>97515,'clay'=>100950,'iron'=>105555,'crop'=>19300,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>31080),array('wood'=>100195,'clay'=>103725,'iron'=>108460,'crop'=>19830,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>32110),array('wood'=>102950,'clay'=>106580,'iron'=>111440,'crop'=>20375,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>33160),array('wood'=>105785,'clay'=>109510,'iron'=>114505,'crop'=>20935,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>34230),array('wood'=>108690,'clay'=>112520,'iron'=>117655,'crop'=>21510,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>35300),array('wood'=>111680,'clay'=>115615,'iron'=>120890,'crop'=>22100,'pop'=>2,'cp'=>0,'attri'=>0,'time'=>36400),array('wood'=>114755,'clay'=>118795,'iron'=>124215,'crop'=>22710,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>37510),array('wood'=>117910,'clay'=>122060,'iron'=>127630,'crop'=>23335,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>38630),array('wood'=>121150,'clay'=>125420,'iron'=>131140,'crop'=>23975,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>39770),array('wood'=>124480,'clay'=>128870,'iron'=>134745,'crop'=>24635,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>40930),array('wood'=>127905,'clay'=>132410,'iron'=>138455,'crop'=>25315,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>42100),array('wood'=>131425,'clay'=>136055,'iron'=>142260,'crop'=>26010,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>43290),array('wood'=>135035,'clay'=>139795,'iron'=>146170,'crop'=>26725,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>44500),array('wood'=>138750,'clay'=>143640,'iron'=>150190,'crop'=>27460,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>45720),array('wood'=>142565,'clay'=>147590,'iron'=>154320,'crop'=>28215,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>46960),array('wood'=>146485,'clay'=>151650,'iron'=>158565,'crop'=>28990,'pop'=>3,'cp'=>0,'attri'=>0,'time'=>48220),array('wood'=>150515,'clay'=>155820,'iron'=>162925,'crop'=>29785,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>49500),array('wood'=>154655,'clay'=>160105,'iron'=>167405,'crop'=>30605,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>50790),array('wood'=>158910,'clay'=>164505,'iron'=>172010,'crop'=>31450,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>52100),array('wood'=>163275,'clay'=>169030,'iron'=>176740,'crop'=>32315,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>53430),array('wood'=>167770,'clay'=>173680,'iron'=>181600,'crop'=>33200,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>54780),array('wood'=>172380,'clay'=>178455,'iron'=>186595,'crop'=>34115,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>56140),array('wood'=>177120,'clay'=>183360,'iron'=>191725,'crop'=>35055,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>57530),array('wood'=>181995,'clay'=>188405,'iron'=>197000,'crop'=>36015,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>58940),array('wood'=>186995,'clay'=>193585,'iron'=>202415,'crop'=>37005,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>60360),array('wood'=>192140,'clay'=>198910,'iron'=>207985,'crop'=>38025,'pop'=>4,'cp'=>0,'attri'=>0,'time'=>61810),array('wood'=>197425,'clay'=>204380,'iron'=>213705,'crop'=>39070,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>63270),array('wood'=>202855,'clay'=>210000,'iron'=>219580,'crop'=>40145,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>64760),array('wood'=>208430,'clay'=>215775,'iron'=>225620,'crop'=>41250,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>66260),array('wood'=>214165,'clay'=>221710,'iron'=>231825,'crop'=>42385,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>67790),array('wood'=>220055,'clay'=>227805,'iron'=>238200,'crop'=>43550,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>69340),array('wood'=>226105,'clay'=>234070,'iron'=>244750,'crop'=>44745,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>70910),array('wood'=>232320,'clay'=>240505,'iron'=>251480,'crop'=>45975,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>72500),array('wood'=>238710,'clay'=>247120,'iron'=>258395,'crop'=>47240,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>74120),array('wood'=>245275,'clay'=>253915,'iron'=>265500,'crop'=>48540,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>75760),array('wood'=>252020,'clay'=>260900,'iron'=>272800,'crop'=>49875,'pop'=>5,'cp'=>0,'attri'=>0,'time'=>77420),array('wood'=>258950,'clay'=>268075,'iron'=>280305,'crop'=>51245,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>79100),array('wood'=>266070,'clay'=>275445,'iron'=>288010,'crop'=>52655,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>80810),array('wood'=>273390,'clay'=>283020,'iron'=>295930,'crop'=>54105,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>82540),array('wood'=>280905,'clay'=>290805,'iron'=>304070,'crop'=>55590,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>84290),array('wood'=>288630,'clay'=>298800,'iron'=>312430,'crop'=>57120,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>86070),array('wood'=>296570,'clay'=>307020,'iron'=>321025,'crop'=>58690,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>87880),array('wood'=>304725,'clay'=>315460,'iron'=>329850,'crop'=>60305,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>89710),array('wood'=>313105,'clay'=>324135,'iron'=>338925,'crop'=>61965,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>91570),array('wood'=>321715,'clay'=>333050,'iron'=>348245,'crop'=>63670,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>93450),array('wood'=>330565,'clay'=>342210,'iron'=>357820,'crop'=>65420,'pop'=>6,'cp'=>0,'attri'=>0,'time'=>95360),array('wood'=>339655,'clay'=>351620,'iron'=>367660,'crop'=>67220,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>97290),array('wood'=>348995,'clay'=>361290,'iron'=>377770,'crop'=>69065,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>99250),array('wood'=>358590,'clay'=>371225,'iron'=>388160,'crop'=>70965,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>101240),array('wood'=>368450,'clay'=>381435,'iron'=>398835,'crop'=>72915,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>103260),array('wood'=>378585,'clay'=>391925,'iron'=>409800,'crop'=>74920,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>105310),array('wood'=>388995,'clay'=>402700,'iron'=>421070,'crop'=>76985,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>107380),array('wood'=>399695,'clay'=>413775,'iron'=>432650,'crop'=>79100,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>109480),array('wood'=>410685,'clay'=>425155,'iron'=>444550,'crop'=>81275,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>111620),array('wood'=>421980,'clay'=>436845,'iron'=>456775,'crop'=>83510,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>113780),array('wood'=>433585,'clay'=>448860,'iron'=>469335,'crop'=>85805,'pop'=>7,'cp'=>0,'attri'=>0,'time'=>115970),array('wood'=>445505,'clay'=>461205,'iron'=>482240,'crop'=>88165,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>118200),array('wood'=>457760,'clay'=>473885,'iron'=>495505,'crop'=>90590,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>120450),array('wood'=>470345,'clay'=>486920,'iron'=>509130,'crop'=>93080,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>122740),array('wood'=>483280,'clay'=>500310,'iron'=>523130,'crop'=>95640,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>125060),array('wood'=>496570,'clay'=>514065,'iron'=>537520,'crop'=>98270,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>127410),array('wood'=>510225,'clay'=>528205,'iron'=>552300,'crop'=>100975,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>129790),array('wood'=>524260,'clay'=>542730,'iron'=>567490,'crop'=>103750,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>132210),array('wood'=>538675,'clay'=>557655,'iron'=>583095,'crop'=>106605,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>134660),array('wood'=>553490,'clay'=>572990,'iron'=>599130,'crop'=>109535,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>137140),array('wood'=>568710,'clay'=>588745,'iron'=>615605,'crop'=>112550,'pop'=>8,'cp'=>0,'attri'=>0,'time'=>139660),array('wood'=>584350,'clay'=>604935,'iron'=>632535,'crop'=>115645,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>142220),array('wood'=>600420,'clay'=>621575,'iron'=>649930,'crop'=>118825,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>144810),array('wood'=>616930,'clay'=>638665,'iron'=>667800,'crop'=>122090,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>147440),array('wood'=>633895,'clay'=>656230,'iron'=>686165,'crop'=>125450,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>150100),array('wood'=>651330,'clay'=>674275,'iron'=>705035,'crop'=>128900,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>152800),array('wood'=>669240,'clay'=>692820,'iron'=>724425,'crop'=>132445,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>155540),array('wood'=>687645,'clay'=>711870,'iron'=>744345,'crop'=>136085,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>158320),array('wood'=>706555,'clay'=>731445,'iron'=>764815,'crop'=>139830,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>161140),array('wood'=>725985,'clay'=>751560,'iron'=>785850,'crop'=>143675,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>163990),array('wood'=>745950,'clay'=>772230,'iron'=>807460,'crop'=>147625,'pop'=>9,'cp'=>0,'attri'=>0,'time'=>166890),array('wood'=>766460,'clay'=>793465,'iron'=>829665,'crop'=>151685,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>169820),array('wood'=>787540,'clay'=>815285,'iron'=>852480,'crop'=>155855,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>172800),array('wood'=>809195,'clay'=>837705,'iron'=>875920,'crop'=>160140,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>175820),array('wood'=>831450,'clay'=>860745,'iron'=>900010,'crop'=>164545,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>178880),array('wood'=>854315,'clay'=>884415,'iron'=>924760,'crop'=>169070,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>181990),array('wood'=>877810,'clay'=>908735,'iron'=>950190,'crop'=>173720,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>185130),array('wood'=>901950,'clay'=>933725,'iron'=>976320,'crop'=>178495,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>188330),array('wood'=>926750,'clay'=>959405,'iron'=>1000000,'crop'=>183405,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>191560),array('wood'=>952235,'clay'=>985785,'iron'=>1000000,'crop'=>188450,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>194840),array('wood'=>1000000,'clay'=>1000000,'iron'=>1000000,'crop'=>193630,'pop'=>10,'cp'=>0,'attri'=>0,'time'=>198170)); -$bid41=array(1=>array('wood'=>780,'clay'=>420,'iron'=>660,'crop'=>540,'pop'=>5,'cp'=>2,'attri'=>1.01,'time'=>2200),array('wood'=>1000,'clay'=>540,'iron'=>845,'crop'=>690,'pop'=>3,'cp'=>3,'attri'=>1.02,'time'=>3152),array('wood'=>1280,'clay'=>690,'iron'=>1080,'crop'=>885,'pop'=>3,'cp'=>3,'attri'=>1.03,'time'=>4256),array('wood'=>1635,'clay'=>880,'iron'=>1385,'crop'=>1130,'pop'=>3,'cp'=>4,'attri'=>1.04,'time'=>5537),array('wood'=>2095,'clay'=>1125,'iron'=>1770,'crop'=>1450,'pop'=>3,'cp'=>5,'attri'=>1.05,'time'=>7023),array('wood'=>2680,'clay'=>1445,'iron'=>2270,'crop'=>1855,'pop'=>3,'cp'=>6,'attri'=>1.06,'time'=>8747),array('wood'=>3430,'clay'=>1845,'iron'=>2905,'crop'=>2375,'pop'=>3,'cp'=>7,'attri'=>1.08,'time'=>10747),array('wood'=>4390,'clay'=>2365,'iron'=>3715,'crop'=>3040,'pop'=>3,'cp'=>9,'attri'=>1.09,'time'=>13066),array('wood'=>5620,'clay'=>3025,'iron'=>4755,'crop'=>3890,'pop'=>3,'cp'=>10,'attri'=>1.10,'time'=>15757),array('wood'=>7195,'clay'=>3875,'iron'=>6085,'crop'=>4980,'pop'=>3,'cp'=>12,'attri'=>1.11,'time'=>18878),array('wood'=>9210,'clay'=>4960,'iron'=>7790,'crop'=>6375,'pop'=>4,'cp'=>15,'attri'=>1.12,'time'=>22498),array('wood'=>11785,'clay'=>6345,'iron'=>9975,'crop'=>8160,'pop'=>4,'cp'=>18,'attri'=>1.14,'time'=>26698),array('wood'=>15085,'clay'=>8125,'iron'=>12765,'crop'=>10445,'pop'=>4,'cp'=>21,'attri'=>1.15,'time'=>31569),array('wood'=>19310,'clay'=>10400,'iron'=>16340,'crop'=>13370,'pop'=>4,'cp'=>26,'attri'=>1.16,'time'=>37220),array('wood'=>24720,'clay'=>13310,'iron'=>20915,'crop'=>17115,'pop'=>4,'cp'=>31,'attri'=>1.18,'time'=>43776),array('wood'=>31640,'clay'=>17035,'iron'=>26775,'crop'=>21905,'pop'=>4,'cp'=>37,'attri'=>1.19,'time'=>51380),array('wood'=>40500,'clay'=>21810,'iron'=>34270,'crop'=>28040,'pop'=>4,'cp'=>44,'attri'=>1.2,'time'=>60201),array('wood'=>51840,'clay'=>27915,'iron'=>43865,'crop'=>35890,'pop'=>4,'cp'=>53,'attri'=>1.22,'time'=>70433),array('wood'=>66355,'clay'=>35730,'iron'=>56145,'crop'=>45940,'pop'=>4,'cp'=>64,'attri'=>1.23,'time'=>82302),array('wood'=>84935,'clay'=>45735,'iron'=>71870,'crop'=>58800,'pop'=>4,'cp'=>77,'attri'=>1.25,'time'=>96070)); +$bid41=array(1=>array('wood'=>780,'clay'=>420,'iron'=>660,'crop'=>540,'pop'=>5,'cp'=>2,'attri'=>1.01,'time'=>2200),array('wood'=>1000,'clay'=>540,'iron'=>845,'crop'=>690,'pop'=>3,'cp'=>3,'attri'=>1.02,'time'=>3152),array('wood'=>1280,'clay'=>690,'iron'=>1080,'crop'=>885,'pop'=>3,'cp'=>3,'attri'=>1.03,'time'=>4256),array('wood'=>1635,'clay'=>880,'iron'=>1385,'crop'=>1130,'pop'=>3,'cp'=>4,'attri'=>1.04,'time'=>5537),array('wood'=>2095,'clay'=>1125,'iron'=>1770,'crop'=>1450,'pop'=>3,'cp'=>5,'attri'=>1.05,'time'=>7023),array('wood'=>2680,'clay'=>1445,'iron'=>2270,'crop'=>1855,'pop'=>3,'cp'=>6,'attri'=>1.06,'time'=>8747),array('wood'=>3430,'clay'=>1845,'iron'=>2905,'crop'=>2375,'pop'=>3,'cp'=>7,'attri'=>1.07,'time'=>10747),array('wood'=>4390,'clay'=>2365,'iron'=>3715,'crop'=>3040,'pop'=>3,'cp'=>9,'attri'=>1.08,'time'=>13066),array('wood'=>5620,'clay'=>3025,'iron'=>4755,'crop'=>3890,'pop'=>3,'cp'=>10,'attri'=>1.09,'time'=>15757),array('wood'=>7195,'clay'=>3875,'iron'=>6085,'crop'=>4980,'pop'=>3,'cp'=>12,'attri'=>1.10,'time'=>18878),array('wood'=>9210,'clay'=>4960,'iron'=>7790,'crop'=>6375,'pop'=>4,'cp'=>15,'attri'=>1.11,'time'=>22498),array('wood'=>11785,'clay'=>6345,'iron'=>9975,'crop'=>8160,'pop'=>4,'cp'=>18,'attri'=>1.12,'time'=>26698),array('wood'=>15085,'clay'=>8125,'iron'=>12765,'crop'=>10445,'pop'=>4,'cp'=>21,'attri'=>1.13,'time'=>31569),array('wood'=>19310,'clay'=>10400,'iron'=>16340,'crop'=>13370,'pop'=>4,'cp'=>26,'attri'=>1.14,'time'=>37220),array('wood'=>24720,'clay'=>13310,'iron'=>20915,'crop'=>17115,'pop'=>4,'cp'=>31,'attri'=>1.15,'time'=>43776),array('wood'=>31640,'clay'=>17035,'iron'=>26775,'crop'=>21905,'pop'=>4,'cp'=>37,'attri'=>1.16,'time'=>51380),array('wood'=>40500,'clay'=>21810,'iron'=>34270,'crop'=>28040,'pop'=>4,'cp'=>44,'attri'=>1.17,'time'=>60201),array('wood'=>51840,'clay'=>27915,'iron'=>43865,'crop'=>35890,'pop'=>4,'cp'=>53,'attri'=>1.18,'time'=>70433),array('wood'=>66355,'clay'=>35730,'iron'=>56145,'crop'=>45940,'pop'=>4,'cp'=>64,'attri'=>1.19,'time'=>82302),array('wood'=>84935,'clay'=>45735,'iron'=>71870,'crop'=>58800,'pop'=>4,'cp'=>77,'attri'=>1.20,'time'=>96070)); $bid42=array(1=>array('wood'=>1380,'clay'=>1530,'iron'=>1800,'crop'=>960,'pop'=>3,'cp'=>4,'attri'=>100,'time'=>3000),array('wood'=>1770,'clay'=>1915,'iron'=>2310,'crop'=>1230,'pop'=>2,'cp'=>4,'attri'=>90,'time'=>3780),array('wood'=>2215,'clay'=>2505,'iron'=>2955,'crop'=>1575,'pop'=>2,'cp'=>5,'attri'=>81,'time'=>4680),array('wood'=>2895,'clay'=>3210,'iron'=>3780,'crop'=>2010,'pop'=>2,'cp'=>6,'attri'=>72.9,'time'=>5730),array('wood'=>3705,'clay'=>4110,'iron'=>4830,'crop'=>2580,'pop'=>2,'cp'=>7,'attri'=>65.61,'time'=>6950),array('wood'=>4740,'clay'=>5250,'iron'=>6180,'crop'=>3300,'pop'=>2,'cp'=>9,'attri'=>59.05,'time'=>8360),array('wood'=>6075,'clay'=>6735,'iron'=>7920,'crop'=>4215,'pop'=>2,'cp'=>11,'attri'=>53.14,'time'=>10000),array('wood'=>7730,'clay'=>8610,'iron'=>10140,'crop'=>5600,'pop'=>2,'cp'=>13,'attri'=>47.83,'time'=>11900),array('wood'=>9945,'clay'=>11025,'iron'=>12975,'crop'=>4615,'pop'=>2,'cp'=>15,'attri'=>43.05,'time'=>14110),array('wood'=>12735,'clay'=>14115,'iron'=>16605,'crop'=>8850,'pop'=>2,'cp'=>19,'attri'=>38.74,'time'=>16660),array('wood'=>16290,'clay'=>18060,'iron'=>23415,'crop'=>11340,'pop'=>3,'cp'=>22,'attri'=>34.87,'time'=>19630),array('wood'=>20850,'clay'=>23115,'iron'=>27195,'crop'=>14505,'pop'=>3,'cp'=>27,'attri'=>31.38,'time'=>23070),array('wood'=>26700,'clay'=>29595,'iron'=>34815,'crop'=>18570,'pop'=>3,'cp'=>32,'attri'=>28.24,'time'=>27060),array('wood'=>34170,'clay'=>37875,'iron'=>44565,'crop'=>23775,'pop'=>3,'cp'=>39,'attri'=>25.42,'time'=>31690),array('wood'=>43740,'clay'=>48495,'iron'=>57045,'crop'=>30420,'pop'=>3,'cp'=>46,'attri'=>22.88,'time'=>37060),array('wood'=>55980,'clay'=>62070,'iron'=>73020,'crop'=>38940,'pop'=>3,'cp'=>55,'attri'=>20.59,'time'=>43290),array('wood'=>71655,'clay'=>79440,'iron'=>93465,'crop'=>49485,'pop'=>3,'cp'=>67,'attri'=>18.53,'time'=>50520),array('wood'=>91710,'clay'=>101685,'iron'=>119625,'crop'=>63810,'pop'=>3,'cp'=>80,'attri'=>16.68,'time'=>58900),array('wood'=>105650,'clay'=>117140,'iron'=>137810,'crop'=>73510,'pop'=>3,'cp'=>96,'attri'=>15.01,'time'=>68630),array('wood'=>125225,'clay'=>138840,'iron'=>159995,'crop'=>87090,'pop'=>3,'cp'=>115,'attri'=>13.51,'time'=>79910)); ?> diff --git a/GameEngine/Message.php b/GameEngine/Message.php index 39eca94a..5e4c45dd 100755 --- a/GameEngine/Message.php +++ b/GameEngine/Message.php @@ -316,7 +316,7 @@ class Message { } /** - * Not all notices have a corresponding .tpl file but with this function it's like they had it + * Not all notices have a corresponding .tpl file but with this method it's like they have it * * @param int $type The type of the report (notice) * @return int Returns the new report type @@ -333,19 +333,19 @@ class Message { case 7: case 18: case 20: - case 21: return 1; + case 21: return 1; //General attacking reports case 11: case 12: case 13: - case 14: return 10; + case 14: return 10; //Merchants reports case 16: - case 17: return 15; + case 17: return 15; //Reinforcements attacked - case 19: return 3; + case 19: return 3; //No troops have returned - case 23: return 22; + case 23: return 22; //Festive reports } return $type; @@ -397,10 +397,9 @@ class Message { // Vulnerability closed by Shadow $q = "SELECT Count(*) as Total FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".(time() - 60); - $res = mysqli_fetch_array(mysqli_query($database->dblink,$q) or die(mysqli_error($database->dblink). " query ".$q), MYSQLI_ASSOC); - $flood = $res['Total']; - if($flood > 5) - return; //flood + $res = mysqli_fetch_array(mysqli_query($database->dblink,$q), MYSQLI_ASSOC); + if($res['Total'] > 5) return; //flooding prevention + // Vulnerability closed by Shadow @@ -413,9 +412,7 @@ class Message { $text = $this->wordCensor($text); } - if($topic == "") { - $topic = "No subject"; - } + if($topic == "") $topic = "No subject"; if(!preg_match('/\[message\]/',$text) && !preg_match('/\[\/message\]/',$text)){ $text = "[message]".$text."[/message]"; @@ -495,9 +492,7 @@ class Message { if ($security_check) { $q = "SELECT Count(*) as Total FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".(time() - 60); $res = mysqli_fetch_array(mysqli_query($database->dblink,$q), MYSQLI_ASSOC); - $flood = $res['Total']; - - if($flood > 5) return; //flood + if($res['Total'] > 5) return; //flooding prevention } // Vulnerability closed by Shadow