From fe7de9751a2954b19fcbd4d599b8e43747b2b553 Mon Sep 17 00:00:00 2001 From: Lorex Date: Fri, 5 Dec 2014 15:44:16 +0800 Subject: [PATCH 01/33] Update zh_tw.php --- GameEngine/Lang/zh_tw.php | 236 +++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php index cd6d3f5f..8f10cd57 100644 --- a/GameEngine/Lang/zh_tw.php +++ b/GameEngine/Lang/zh_tw.php @@ -20,7 +20,7 @@ define("TRIBE3","高盧人"); define("TRIBE4","自然界"); define("TRIBE5","達賴族"); -define("TRIBE6","Monsters"); +define("TRIBE6","野獸"); define("HOME","首頁"); define("INSTRUCT","說明"); @@ -39,9 +39,9 @@ define("REG","註冊"); define("FORUM","論壇"); define("CHAT","聊天室"); -define("IMPRINT","Imprint"); +define("IMPRINT","版本說明"); define("MORE_LINKS","更多連結"); -define("TOUR","Game Tour"); +define("TOUR","遊戲瀏覽"); //ERRORS @@ -102,11 +102,11 @@ define("IRON","鋼鐵"); define("CROP","穀物"); define("LEVEL","等級"); -define("CROP_COM",CROP." consumption"); +define("CROP_COM",CROP." 消耗"); define("PER_HR","每小時"); define("PROD_HEADER","生產"); define("MULTI_V_HEADER","村莊"); -define("ANNOUNCEMENT","Announcement"); +define("ANNOUNCEMENT","公告"); define("GO2MY_VILLAGE","回到我的村莊"); define("VILLAGE_CENTER","地圖中心"); define("FINISH_GOLD","花費2金,結束這個村莊當前建築任務或者兵種研發, 升級的任務. (除了皇宮和行宮)"); @@ -114,15 +114,15 @@ define("HRS","(hrs.)"); define("DONE_AT","結束在"); define("CANCEL","取消"); -define("LOYALTY","Loyalty:"); +define("LOYALTY","忠誠度:"); define("CALCULATED_IN","產生在"); define("SEVER_TIME","伺服器時間:"); //QUEST -define("Q_CONTINUE","Continue with the next task."); -define("Q_REWARD","Your reward:"); -define("Q_BUTN","complete task"); -define("Q0","Welcome to "); +define("Q_CONTINUE","繼續下個任務"); +define("Q_REWARD","你的任務獎勵:"); +define("Q_BUTN","完成任務"); +define("Q0","歡迎來到"); define("Q0_DESC","As I see you have been made chieftain of this little village. I will be your counselor for the first few days and never leave your (right hand) side."); define("Q0_OPT1","To the first task."); define("Q0_OPT2","Look around on your own."); @@ -334,65 +334,65 @@ define("U0","英雄"); //ROMAN UNITS -define("U1","Legionnaire"); -define("U2","Praetorian"); -define("U3","Imperian"); -define("U4","Equites Legati"); -define("U5","Equites Imperatoris"); -define("U6","Equites Caesaris"); -define("U7","Battering Ram"); -define("U8","Fire Catapult"); -define("U9","Senator"); -define("U10","Settler"); +define("U1","古羅馬步兵"); +define("U2","禁衛兵"); +define("U3","帝國兵"); +define("U4","使者騎士"); +define("U5","帝國騎士"); +define("U6","將軍騎士"); +define("U7","衝撞車"); +define("U8","火焰投石機"); +define("U9","參議員"); +define("U10","拓荒者"); //TEUTON UNITS -define("U11","Clubswinger"); -define("U12","Spearman"); -define("U13","Axeman"); -define("U14","Scout"); -define("U15","Paladin"); -define("U16","Teutonic Knight"); -define("U17","Ram"); -define("U18","Catapult"); -define("U19","Chief"); -define("U20","Settler"); +define("U11","棍棒兵"); +define("U12","矛兵"); +define("U13","斧頭兵"); +define("U14","偵查兵"); +define("U15","聖騎士"); +define("U16","條頓騎士"); +define("U17","衝撞車"); +define("U18","投石機"); +define("U19","首領"); +define("U20","拓荒者"); //GAUL UNITS -define("U21","Phalanx"); -define("U22","Swordsman"); -define("U23","Pathfinder"); -define("U24","Theutates Thunder"); -define("U25","Druidrider"); -define("U26","Haeduan"); -define("U27","Ram"); -define("U28","Trebuchet"); -define("U29","Chieftain"); -define("U30","Settler"); -define("U99","Trap"); +define("U21","方陣兵"); +define("U22","劍士"); +define("U23","探路者"); +define("U24","雷法師"); +define("U25","德魯依騎兵"); +define("U26","海頓聖騎士"); +define("U27","衝撞車"); +define("U28","投石器"); +define("U29","首領"); +define("U30","拓荒者"); +define("U99","陷阱"); //NATURE UNITS -define("U31","Rat"); -define("U32","Spider"); -define("U33","Snake"); -define("U34","Bat"); -define("U35","Wild Boar"); -define("U36","Wolf"); -define("U37","Bear"); -define("U38","Crocodile"); -define("U39","Tiger"); -define("U40","Elephant"); +define("U31","老鼠"); +define("U32","蜘蛛"); +define("U33","蛇"); +define("U34","蝙蝠"); +define("U35","野豬"); +define("U36","狼"); +define("U37","熊"); +define("U38","鱷魚"); +define("U39","老虎"); +define("U40","大象"); //NATARS UNITS -define("U41","Pikeman"); -define("U42","Thorned Warrior"); -define("U43","Guardsman"); -define("U44","Birds Of Prey"); -define("U45","Axerider"); -define("U46","Natarian Knight"); -define("U47","War Elephant"); -define("U48","Ballista"); -define("U49","Natarian Emperor"); -define("U50","Natarian Settler"); +define("U41","長槍兵"); +define("U42","刺錘武士"); +define("U43","近衛兵"); +define("U44","狩獵鳥"); +define("U45","斧騎兵"); +define("U46","達賴騎士"); +define("U47","戰象"); +define("U48","投石車"); +define("U49","達賴國王"); +define("U50","拓荒者"); //MONSTER UNITS define("U51","Monster Peon"); @@ -407,17 +407,17 @@ define("U60","Monster Settler"); // RESOURCES -define("R1","Lumber"); -define("R2","Clay"); -define("R3","Iron"); -define("R4","Crop"); +define("R1","木材"); +define("R2","磚塊"); +define("R3","鋼鐵"); +define("R4","穀物"); //INDEX.php -define("LOGIN","Login"); -define("PLAYERS","Players"); -define("ACTIVE","Active"); -define("ONLINE","Online"); -define("TUTORIAL","Tutorial"); +define("LOGIN","登入"); +define("PLAYERS","總玩家數量"); +define("ACTIVE","活躍玩家"); +define("ONLINE","線上玩家"); +define("TUTORIAL","教學"); define("PLAYER_STATISTICS","Player statistics"); define("TOTAL_PLAYERS","".PLAYERS." in total"); define("ACTIVE_PLAYERS","Active players"); @@ -544,50 +544,50 @@ define("MASS_SENT","Mass IGM was sent"); //BUILDINGS -define("WOODCUTTER","Woodcutter"); -define("CLAYPIT","Clay Pit"); -define("IRONMINE","Iron Mine"); -define("CROPLAND","Cropland"); -define("SAWMILL","Sawmill"); -define("BRICKYARD","Brickyard"); -define("IRONFOUNDRY","Iron Foundry"); -define("GRAINMILL","Grain Mill"); -define("BAKERY","Bakery"); -define("WAREHOUSE","Warehouse"); -define("GRANARY","Granary"); -define("BLACKSMITH","Blacksmith"); -define("ARMOURY","Armoury"); -define("TOURNAMENTSQUARE","Tournament Square"); +define("WOODCUTTER","伐木場"); +define("CLAYPIT","泥坑"); +define("IRONMINE","鐵礦場"); +define("CROPLAND","農場"); +define("SAWMILL","鋸木廠"); +define("BRICKYARD","磚塊廠"); +define("IRONFOUNDRY","鋼鐵鑄造廠"); +define("GRAINMILL","大糧倉"); +define("BAKERY","麵包房"); +define("WAREHOUSE","倉庫"); +define("GRANARY","糧倉"); +define("BLACKSMITH","鐵匠鋪"); +define("ARMOURY","軍械庫"); +define("TOURNAMENTSQUARE","競技場"); define("MAINBUILDING","Main Building"); -define("RALLYPOINT","Rally Point"); +define("RALLYPOINT","集結點"); define("OVERVIEW","Resumen"); define("RALLYPOINT_DESC","Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages."); -define("MARKETPLACE","Marketplace"); -define("EMBASSY","Embassy"); -define("BARRACKS","Barracks"); -define("STABLE","Stable"); -define("WORKSHOP","Workshop"); -define("ACADEMY","Academy"); -define("CRANNY","Cranny"); -define("TOWNHALL","Town Hall"); -define("RESIDENCE","Residence"); -define("PALACE","Palace"); -define("TREASURY","Treasury"); -define("TRADEOFFICE","Trade Office"); -define("GREATBARRACKS","Great Barracks"); -define("GREATSTABLE","Great Stable"); -define("CITYWALL","City Wall"); -define("EARTHWALL","Earth Wall"); -define("PALISADE","Palisade"); -define("STONEMASON","Stonemason's Lodge"); -define("BREWERY","Brewery"); -define("TRAPPER","Trapper"); -define("HEROSMANSION","Hero's Mansion"); -define("GREATWAREHOUSE","Great Warehouse"); -define("GREATGRANARY","Great Granary"); -define("WONDER","Wonder of the World"); -define("HORSEDRINKING","Horse Drinking Trough"); -define("GREATWORKSHOP","Great Workshop"); +define("MARKETPLACE","市場"); +define("EMBASSY","大使館"); +define("BARRACKS","兵營"); +define("STABLE","馬廄"); +define("WORKSHOP","工場"); +define("ACADEMY","研發所"); +define("CRANNY","山洞"); +define("TOWNHALL","中心大樓"); +define("RESIDENCE","行宮"); +define("PALACE","皇宮"); +define("TREASURY","寶庫"); +define("TRADEOFFICE","交易所"); +define("GREATBARRACKS","大兵營"); +define("GREATSTABLE","大馬廄"); +define("CITYWALL","城牆"); +define("EARTHWALL","土牆"); +define("PALISADE","圍欄"); +define("STONEMASON","石匠鋪"); +define("BREWERY","釀酒廠"); +define("TRAPPER","陷阱"); +define("HEROSMANSION","英雄館"); +define("GREATWAREHOUSE","大倉庫"); +define("GREATGRANARY","大糧倉"); +define("WONDER","世界奇觀"); +define("HORSEDRINKING","飲馬槽"); +define("GREATWORKSHOP","大工場"); //artefact define("ARCHITECTS_DESC","All buildings in the area of effect are stronger. This means that you will need more catapults to damage buildings protected by this artifacts powers."); @@ -713,19 +713,19 @@ |-------------------------------------------------------------------------- */ - $lang['index'][0][1] = "Welcome to " . SERVER_NAME . ""; - $lang['index'][0][2] = "Manual"; + $lang['index'][0][1] = "歡迎來到 " . SERVER_NAME . ""; + $lang['index'][0][2] = "資料"; $lang['index'][0][3] = "這是免費的, 現在就加入!"; - $lang['index'][0][4] = "What is " . SERVER_NAME . ""; + $lang['index'][0][4] = "" . SERVER_NAME . "是什麼"; $lang['index'][0][5] = "" . SERVER_NAME . " 是 網頁遊戲 是架構於瀏覽器的遊戲
TRAVIAN世界內有數千至數萬名玩家，一名玩家就是一個村莊的領主，以外交、權謀、諜戰、結盟、分工等等謀略，成為中世紀霸主

這是 免費的 而且 不用下載."; $lang['index'][0][6] = "點擊這裡玩 " . SERVER_NAME . ""; $lang['index'][0][7] = "總人數"; $lang['index'][0][8] = "活躍的玩家"; $lang['index'][0][9] = "在線的玩家"; - $lang['index'][0][10] = "About the game"; - $lang['index'][0][11] = "You will begin as the chief of a tiny village and will embark on an exciting quest."; - $lang['index'][0][12] = "Build up villages, wage wars or establish trade routes with your neighbours."; - $lang['index'][0][13] = "Play with and against thousands of other real players and conquer the the world of Travian."; + $lang['index'][0][10] = "關於遊戲"; + $lang['index'][0][11] = "一開始你的村莊只有一個建築物。 "; + $lang['index'][0][12] = "在發展成大帝國之前，你須要開發你的資源以增加生產力。"; + $lang['index'][0][13] = "在 OC TRAVIAN 的世界您並不孤單，您將和成千上萬的玩家在虛擬的世界裡一起互動。"; $lang['index'][0][14] = "新聞"; $lang['index'][0][15] = "說明"; $lang['index'][0][16] = "遊戲截圖"; From 7584ccb5088b998162e81d56f7592aab18039975 Mon Sep 17 00:00:00 2001 From: Lorex Date: Fri, 5 Dec 2014 15:54:10 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=8C=96=E7=94=A8?= =?UTF-8?q?=E8=AA=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 將升級顯示區塊中文化 --- Templates/Build/upgrade.tpl | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Templates/Build/upgrade.tpl b/Templates/Build/upgrade.tpl index 2ee9d5bc..2d394664 100644 --- a/Templates/Build/upgrade.tpl +++ b/Templates/Build/upgrade.tpl @@ -3,11 +3,11 @@ $bid = $village->resarray['f'.$id.'t']; $bindicate = $building->canBuild($id,$bid); if($bindicate == 1) { - echo "

Building already at max level

"; + echo "

建築物已達最高等級。

"; } else if($bindicate == 10) { - echo "

Building max level under construction

"; + echo "

建築物即將升至最高等級。

"; } else if($bindicate == 11) { - echo "

Building presently being demolished

"; + echo "

建築物即將摧毀。

"; } else { $loopsame = ($building->isCurrent($id) || $building->isLoop($id))?1:0; $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; @@ -16,14 +16,14 @@ if($bindicate == 1) { $mastertime = $uprequire['time']; $_SESSION['mas'][$bid]=$bid.",".$id.",".$mastertime; ?> -

Costs for upgrading to level resarray['f'.$id]+1+$loopsame+$doublebuild+$master; ?>:
+

升級到等級 resarray['f'.$id]+1+$loopsame+$doublebuild+$master; ?> 所需資源:
Lumber | Clay | Iron | Crop | Crop consumption | durationgetTimeFormat($uprequire['time']); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { echo "|\"NPC"; } ?>
The workers are already at work."; + echo "所有的工人皆已有工作。"; if($session->goldclub == 1){ ?>
userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { } } else if($bindicate == 3) { - echo "The workers are already at work. (waiting loop)"; + echo "所有的工人皆已有工作。 (排入建築貯列)"; if($session->goldclub == 1){ ?>
userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { } } else if($bindicate == 4) { - echo "Not enough food. Expand cropland."; + echo "食物不足，請升級農田。"; } else if($bindicate == 5) { - echo "Upgrade Warehouse."; + echo "請先升級倉庫。"; } else if($bindicate == 6) { - echo "Upgrade Granary."; + echo "請先升級糧倉。"; } else if($bindicate == 7) { if($village->allcrop - $village->pop - $automation->getUpkeep($village->unitall, 0) > 0){ $neededtime = $building->calculateAvaliable($id,$village->resarray['f'.$id.'t'],1+$loopsame+$doublebuild+$master); - echo "Enough resources ".$neededtime[0]." at ".$neededtime[1].""; + echo "於 ".$neededtime[0]." 的 ".$neededtime[1]." 足夠資源".""; }else{ - echo "Your crop production is negative, you will never get the required resources."; + echo "你的糧食生產量為負，您將無法建造任何東西。"; } if($session->goldclub == 1){ ?>
gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; + echo "checker\">雇用大師建造 "; echo '(costs: Gold1)'; }else{ - echo "Constructing with master builder"; + echo "雇用大師建造 "; echo '(costs: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; + echo "checker\">雇用大師建造 "; echo '(costs: Gold1)'; }else{ - echo "Constructing with master builder"; - echo '(costs: Gold1)'; + echo "雇用大師建造"; + echo '(需要花費: Gold1)'; } } } } else if($bindicate == 8) { if($session->access==BANNED){ - echo "Upgrade to level "; + echo "升級到等級 "; } else if($id <= 18) { - echo "checker\">Upgrade to level "; + echo "checker\">升級到等級 "; } else { - echo "checker\">Upgrade to level "; + echo "checker\">升級到等級 "; } echo $village->resarray['f'.$id]+1; echo "."; } else if($bindicate == 9) { if($session->access==BANNED){ - echo "Upgrade to level "; + echo "升級到等級 "; } else if($id <= 18) { - echo "checker\">Upgrade to level "; + echo "checker\">升級到等級 "; } else { - echo "checker\">Upgrade to level "; + echo "checker\">升級到等級 "; } echo $village->resarray['f'.$id]+($loopsame > 0 ? 2:1); echo ". (waiting loop) "; From 7c3fd5449ffd2e1be03db1d75c7350aa017c4444 Mon Sep 17 00:00:00 2001 From: Lorex Date: Fri, 5 Dec 2014 16:08:06 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20Constructing=20with?= =?UTF-8?q?=20master=20builder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 中文化 Constructing with master builder => 雇用大師進行建造 --- Templates/Build/upgrade.tpl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Templates/Build/upgrade.tpl b/Templates/Build/upgrade.tpl index 2d394664..cdee7515 100644 --- a/Templates/Build/upgrade.tpl +++ b/Templates/Build/upgrade.tpl @@ -29,18 +29,18 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; + echo "checker\">雇用大師進行建造 "; echo '(costs: Gold1)'; }else{ - echo "Constructing with master builder"; + echo "雇用大師進行建造"; echo '(costs: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; + echo "checker\">雇用大師進行建造 "; echo '(costs: Gold1)'; }else{ - echo "Constructing with master builder"; + echo "雇用大師進行建造"; echo '(costs: Gold1)'; } } @@ -53,18 +53,18 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; + echo "checker\">雇用大師進行建造 "; echo '(costs: Gold1)'; }else{ - echo "Constructing with master builder"; + echo "雇用大師進行建造"; echo '(costs: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; + echo "checker\">雇用大師進行建造 "; echo '(costs: Gold1)'; }else{ - echo "Constructing with master builder"; + echo "雇用大師進行建造"; echo '(costs: Gold1)'; } } @@ -91,18 +91,18 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { gold >= 1 && $village->master == 0){ - echo "checker\">雇用大師建造 "; + echo "checker\">雇用大師進行建造 "; echo '(costs: Gold1)'; }else{ - echo "雇用大師建造 "; + echo "雇用大師進行建造 "; echo '(costs: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ - echo "checker\">雇用大師建造 "; + echo "checker\">雇用大師進行建造 "; echo '(costs: Gold1)'; }else{ - echo "雇用大師建造"; + echo "雇用大師進行建造"; echo '(需要花費: Gold1)'; } } From 7660a30be7790688f5603e870d85bd4714f38655 Mon Sep 17 00:00:00 2001 From: Lorex Date: Fri, 5 Dec 2014 16:11:02 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20costs=20/=20waiting?= =?UTF-8?q?=20loop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit costs => 需要花費 waiting loop => 等待貯列 --- Templates/Build/upgrade.tpl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Templates/Build/upgrade.tpl b/Templates/Build/upgrade.tpl index cdee7515..639d7ee0 100644 --- a/Templates/Build/upgrade.tpl +++ b/Templates/Build/upgrade.tpl @@ -30,18 +30,18 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { if($id <= 18) { if($session->gold >= 1 && $village->master == 0){ echo "checker\">雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; }else{ echo "雇用大師進行建造"; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ echo "checker\">雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; }else{ echo "雇用大師進行建造"; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; } } } @@ -54,18 +54,18 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { if($id <= 18) { if($session->gold >= 1 && $village->master == 0){ echo "checker\">雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; }else{ echo "雇用大師進行建造"; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ echo "checker\">雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; }else{ echo "雇用大師進行建造"; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; } } } @@ -92,15 +92,15 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { if($id <= 18) { if($session->gold >= 1 && $village->master == 0){ echo "checker\">雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; }else{ echo "雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; } }else{ if($session->gold >= 1 && $village->master == 0){ echo "checker\">雇用大師進行建造 "; - echo '(costs: Gold1)'; + echo '(需要花費: Gold1)'; }else{ echo "雇用大師進行建造"; echo '(需要花費: Gold1)'; @@ -132,7 +132,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { echo "checker\">升級到等級 "; } echo $village->resarray['f'.$id]+($loopsame > 0 ? 2:1); - echo ". (waiting loop) "; + echo ". (等待貯列) "; } } From e4cd784d08c8edd112d7a22799ca4a4b77cc45dc Mon Sep 17 00:00:00 2001 From: Lorex Date: Fri, 5 Dec 2014 16:19:51 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E5=8F=AF=E5=BB=BA=E7=AF=89=E6=B8=85?= =?UTF-8?q?=E5=96=AE=E4=BB=8B=E9=9D=A2=E4=B8=AD=E6=96=87=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 可建築清單介面中文化 --- Templates/Build/avaliable.tpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Templates/Build/avaliable.tpl b/Templates/Build/avaliable.tpl index 8bee00bd..6b2fc1d6 100644 --- a/Templates/Build/avaliable.tpl +++ b/Templates/Build/avaliable.tpl @@ -85,7 +85,7 @@ $greatgranary1 = $database->getBuildingByType2($village->wid,39); $greatworkshop1 = $database->getBuildingByType2($village->wid,42); ?> -

Construct new building

+

建造新建築物

c } if($id != 39 && $id != 40) { ?> -

show soon available buildings

+

顯示即將可以建造的建築物

Date: Fri, 5 Dec 2014 17:04:48 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E5=9C=B0=E5=9C=96=E4=BB=8B=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Templates/Map/mapview.tpl | 4 ++-- Templates/Map/mapviewlarge.tpl | 2 +- Templates/Map/vilview.tpl | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl index a8aed256..647eaa77 100644 --- a/Templates/Map/mapview.tpl +++ b/Templates/Map/mapview.tpl @@ -219,7 +219,7 @@ if (isset($neutralarray[0])) { } ?>
-

Map(|)

+

地圖(|)

diff --git a/Admin/database.php b/Admin/database.php index 12012599..712794f0 100644 --- a/Admin/database.php +++ b/Admin/database.php @@ -84,7 +84,7 @@ function buildingPOP($f,$lvl){ } return $popT; } - + function buildingCP($f,$lvl){ $name = "bid".$f; global $$name; @@ -96,7 +96,7 @@ function buildingCP($f,$lvl){ } return $popT; } - + function recountCP($vid){ global $database; $fdata = $database->getResourceLevel($vid); @@ -206,7 +206,7 @@ function DelPlayer($uid,$pass){ } $q = "DELETE FROM ".TB_PREFIX."hero where uid = $uid"; mysql_query($q, $this->connection); - + $name = $database->getUserField($uid,"username",0); mysql_query("Insert into ".TB_PREFIX."admin_log values (0,$ID,'Deleted user $name',".time().")"); $q = "DELETE FROM ".TB_PREFIX."users WHERE `id` = $uid;"; @@ -244,7 +244,7 @@ function DelVillage($wref, $mode=0){ mysql_query("Insert into ".TB_PREFIX."admin_log values (0,".$_SESSION['id'].",'Deleted village $wref',".time().")"); $database->clearExpansionSlot($wref); - + $q = "DELETE FROM ".TB_PREFIX."abdata where vref = $wref"; mysql_query($q, $this->connection); $q = "DELETE FROM ".TB_PREFIX."bdata where wid = $wref"; @@ -267,29 +267,29 @@ function DelVillage($wref, $mode=0){ mysql_query($q, $this->connection); $q = "DELETE FROM ".TB_PREFIX."raidlist where towref = $wref"; mysql_query($q, $this->connection); - + $q = "DELETE FROM ".TB_PREFIX."movement where `from` = $wref and proc=0"; mysql_query($q, $this->connection); - + $getmovement = $database->getMovement(3,$wref,1); foreach($getmovement as $movedata) { $time = microtime(true); $time2 = $time - $movedata['starttime']; $database->setMovementProc($movedata['moveid']); $database->addMovement(4,$movedata['to'],$movedata['from'],$movedata['ref'],$time,$time+$time2); - + } //check return enforcement from del village $this->returnTroops($wref); - + $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref"; mysql_query($q, $this->connection); - + if (mysql_affected_rows()>0) { $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref"; mysql_query($q, $this->connection); - + $getprisoners = $database->getPrisoners($wref); foreach($getprisoners as $pris) { $troops = 0; @@ -311,21 +311,21 @@ function DelVillage($wref, $mode=0){ } } } - + public function returnTroops($wref) { global $database; $getenforce=$database->getEnforceVillage($wref,0); - + foreach($getenforce as $enforce) { - + $to = $database->getVillage($enforce['from']); $Gtribe = ""; if ($database->getUserField($to['owner'],'tribe',0) == '2'){ $Gtribe = "1"; } else if ($database->getUserField($to['owner'],'tribe',0) == '3'){ $Gtribe = "2"; } else if ($database->getUserField($to['owner'],'tribe',0) == '4'){ $Gtribe = "3"; } else if ($database->getUserField($to['owner'],'tribe',0) == '5'){ $Gtribe = "4"; } - + $start = ($database->getUserField($to['owner'],'tribe',0)-1)*10+1; $end = ($database->getUserField($to['owner'],'tribe',0)*10); @@ -339,20 +339,20 @@ public function returnTroops($wref) { //find slowest unit. for($i=$start;$i<=$end;$i++){ - + if(intval($enforce['u'.$i]) > 0){ if($unitarray) { reset($unitarray); } $unitarray = $GLOBALS["u".$i]; $speeds[] = $unitarray['speed']; //echo print_r(array_keys($speeds))."unitspd\n".$i."trib\n"; - + } else { $enforce['u'.$i]='0'; } - + } - + if( intval($enforce['hero']) > 0){ $q = "SELECT * FROM ".TB_PREFIX."hero WHERE uid = ".$from['owner'].""; $result = mysql_query($q); @@ -362,7 +362,7 @@ public function returnTroops($wref) { } else { $enforce['hero']='0'; } - + $artefact = count($database->getOwnUniqueArtefactInfo2($from['owner'],2,3,0)); $artefact1 = count($database->getOwnUniqueArtefactInfo2($enforce['from'],2,1,1)); $artefact2 = count($database->getOwnUniqueArtefactInfo2($from['owner'],2,2,0)); @@ -376,7 +376,7 @@ public function returnTroops($wref) { $fastertroops = 1; } $time = round($this->procDistanceTime($fromCor,$toCor,min($speeds),$enforce['from'])/$fastertroops); - + $foolartefact2 = $database->getFoolArtefactInfo(2,$enforce['from'],$from['owner']); if(count($foolartefact2) > 0){ foreach($foolartefact2 as $arte){ @@ -397,7 +397,7 @@ public function returnTroops($wref) { public function getTypeLevel($tid,$vid) { global $village,$database; $keyholder = array(); - + if($vid == 0) { $resourcearray = $village->resarray; } else { @@ -446,7 +446,7 @@ public function getTypeLevel($tid,$vid) { public function procDistanceTime($coor,$thiscoor,$ref,$vid) { global $bid28,$bid14; - + $xdistance = ABS($thiscoor['x'] - $coor['x']); if($xdistance > WORLD_MAX) { $xdistance = (2 * WORLD_MAX + 1) - $xdistance; diff --git a/Admin/function.php b/Admin/function.php index 205cee0d..2f39dd98 100644 --- a/Admin/function.php +++ b/Admin/function.php @@ -84,11 +84,11 @@ function Act($get){ } if (!$killhero){ $killhero=$database->FindHeroInOasis($get['uid']); - } + } if ($killhero) { $database->KillMyHero($get['uid']); $error="&kc=1"; - }else $error="&e=1"; + }else $error="&e=1"; header("Location: admin.php?p=player&uid=".$get['uid'].$error); exit; case "reviveHero": @@ -101,14 +101,14 @@ function Act($get){ case "addHero": $user = $database->getUserArray($get['uid'],1); $vilarray=$database->getVrefCapital($get['uid']); - + $database->query("INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$get['uid']."', '" . $vilarray['wref'] . "', '0', '".$get['u']."', '".addslashes($user['username'])."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".time()."', '50', '0')"); - + $database->query("UPDATE ".TB_PREFIX."units SET hero = 1 WHERE vref = ".$vilarray['wref']); - + header("Location: admin.php?p=player&uid=".$get['uid']."&ac=1"); exit; } diff --git a/GameEngine/Account.php b/GameEngine/Account.php index 08a05d29..99e2f723 100644 --- a/GameEngine/Account.php +++ b/GameEngine/Account.php @@ -99,7 +99,7 @@ private function Signup() { $form->addError("invt",$_POST['invited']); $_SESSION['errorarray'] = $form->getErrors(); $_SESSION['valuearray'] = $_POST; - + header("Location: anmelden.php"); } diff --git a/GameEngine/Admin/Mods/addABTroops.php b/GameEngine/Admin/Mods/addABTroops.php index ba592bf5..f288c01f 100644 --- a/GameEngine/Admin/Mods/addABTroops.php +++ b/GameEngine/Admin/Mods/addABTroops.php @@ -14,8 +14,8 @@ include_once("../../Database.php"); $id = $_POST['id']; -$village = $database->getVillage($id); -$user = $database->getUserArray($village['owner'],1); +$village = $database->getVillage($id); +$user = $database->getUserArray($village['owner'],1); $atech=""; $btech=""; for($i=1; $i<9; $i++) { diff --git a/GameEngine/Admin/Mods/addTroops.php b/GameEngine/Admin/Mods/addTroops.php index a04a19fc..394dad42 100644 --- a/GameEngine/Admin/Mods/addTroops.php +++ b/GameEngine/Admin/Mods/addTroops.php @@ -15,8 +15,8 @@ include_once("../../Database.php"); $id = $_POST['id']; -$village = $database->getVillage($id); -$user = $database->getUserArray($village['owner'],1); +$village = $database->getVillage($id); +$user = $database->getUserArray($village['owner'],1); $units=""; $tribe = $user['tribe']; if($tribe ==1){ $u = 0;} diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php index 53e2f634..85496211 100644 --- a/GameEngine/Admin/Mods/addUsers.php +++ b/GameEngine/Admin/Mods/addUsers.php @@ -51,12 +51,12 @@ $userName = $baseName . $i; // Random passwords disallow admin logging in to use the accounts $password = $generator->generateRandStr(20); - + // Leaving the line below but commented out - could be used to // allow admin to log in to the generated accounts and play them // Easily guessed by players so should only be used for testing //$password = $baseName . $i . 'PASS'; - + $email = $baseName . $i . '@example.com'; if ($postTribe == 0) { @@ -72,7 +72,7 @@ $kid = rand(1,4); // Dont need to activate, not 100% sure we need to initialise $act $act = ""; - + // Check username not already registered if($database->checkExist($userName,0)) { @@ -96,14 +96,14 @@ * Don't directly access the DB, create a $database function * where required */ - + // Show the dove in User Profile - will show this even if // beginners protection is not checked // Need a $database function for this // (assuming we don't already have one as creating Natars also updates this way) $q = "UPDATE " . TB_PREFIX . "users SET desc2 = '[#0]' WHERE id = $uid"; mysql_query($q) or die(mysql_error()); - + if (!$beginnersProtection) { // No beginners protection so set it to current time @@ -115,17 +115,17 @@ protect = '".$protection."' WHERE id = $uid") or die(mysql_error()); } - + $database->updateUserField($uid,"act","",1); $wid = $database->generateBase($kid,0); $database->setFieldTaken($wid); - + //calculate random generate value and level building $rand_resource=rand(30000, 80000); $level_storage=rand(10, 20); $cap_storage=$wgarray[$level_storage]*(STORAGE_BASE/800); $rand_resource=($rand_resource>$cap_storage)? $cap_storage:$rand_resource; - + //insert village with all resource and building with random level $time = time(); $q = "INSERT INTO ".TB_PREFIX."vdata (`wref`,`owner`,`name`,`capital`,`pop`,`cp`,`celebration`,`type`,`wood`,`clay`,`iron`,`maxstore`,`crop`,`maxcrop`,`lastupdate`,`loyalty`,`exp1`,`exp2`,`exp3`,`created`) values ('$wid','$uid','".$userName."\'s village',1,200,1,0,0,$rand_resource,$rand_resource,$rand_resource,$cap_storage,$rand_resource,$cap_storage,$time,100,0,0,0,$time)"; @@ -138,13 +138,13 @@ $database->addTech($wid); $database->addABTech($wid); $database->updateUserField($uid,"access",USER,1); - + //insert units randomly generate the number of troops $q = "UPDATE " . TB_PREFIX . "units SET u".(($tribe-1)*10+1)." = ".rand(100, 2000).", u".(($tribe-1)*10+2)." = ".rand(100, 2400).", u".(($tribe-1)*10+3)." = ".rand(100, 1600).", u".(($tribe-1)*10+4)." = ".rand(100, 1500).", u".(($tribe-1)*10+5)." = " .rand(48, 1700).", u".(($tribe-1)*10+6)." = ".rand(60, 1800)." WHERE vref = '".$wid."'"; mysql_query($q); $created ++; - + } else { @@ -154,4 +154,4 @@ } header("Location: ../../../Admin/admin.php?p=addUsers&g=OK&bn=$baseName&am=$created&sk=$skipped&bp=$beginnersProtection&tr=$postTribe"); } -?> +?> diff --git a/GameEngine/Admin/Mods/additional.php b/GameEngine/Admin/Mods/additional.php index 914418f8..e3ef2e3b 100644 --- a/GameEngine/Admin/Mods/additional.php +++ b/GameEngine/Admin/Mods/additional.php @@ -30,18 +30,18 @@ $dur = $_POST['protect'] * 86400; $protection = (time() + $dur); -mysql_query("UPDATE ".TB_PREFIX."users SET +mysql_query("UPDATE ".TB_PREFIX."users SET access = ".$access.", - gold = ".$_POST['gold'].", + gold = ".$_POST['gold'].", sit1 = '".$_POST['sitter1']."', sit2 = '".$_POST['sitter2']."', protect = '".$protection."', cp = ".$_POST['cp'].", - ap = '".$_POST['off']."', - dp = '".$_POST['def']."', - RR = '".$_POST['res']."', - apall = '".$_POST['ooff']."', - dpall = '".$_POST['odef']."' + ap = '".$_POST['off']."', + dp = '".$_POST['def']."', + RR = '".$_POST['res']."', + apall = '".$_POST['ooff']."', + dpall = '".$_POST['odef']."' WHERE id = ".$id."") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editAccess.php b/GameEngine/Admin/Mods/editAccess.php index ec834cbf..0fb91490 100644 --- a/GameEngine/Admin/Mods/editAccess.php +++ b/GameEngine/Admin/Mods/editAccess.php @@ -26,8 +26,8 @@ $access = $_POST['access']; -mysql_query("UPDATE ".TB_PREFIX."users SET - access = ".$access." +mysql_query("UPDATE ".TB_PREFIX."users SET + access = ".$access." WHERE id = ".$id."") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editAdminInfo.php b/GameEngine/Admin/Mods/editAdminInfo.php index 3534abdb..0172b6ef 100644 --- a/GameEngine/Admin/Mods/editAdminInfo.php +++ b/GameEngine/Admin/Mods/editAdminInfo.php @@ -16,7 +16,7 @@ $myFile = "../../config.php"; $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\config.php"); - + $ERRORREPORT=ERROR_REPORT; $T4=(T4_COMING==false)? "false":"true"; $GP_ENABLE=(GP_ENABLE==false)? "false":"true"; @@ -39,7 +39,7 @@ $NEWSBOX2=(NEWSBOX2==false)? "false":"true"; $NEWSBOX3=(NEWSBOX3==false)? "false":"true"; $LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true"; - + $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); $text = preg_replace("'%ERROR%'", $ERRORREPORT, $text); @@ -60,7 +60,7 @@ $text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text); $text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text); $text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text); - $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); $text = preg_replace("'%QUEST%'", $QUEST, $text); $text = preg_replace("'%QTYPE%'", QTYPE, $text); $text = preg_replace("'%BEGINNER%'", PROTECTION, $text); @@ -84,7 +84,7 @@ $text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text); $text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text); $text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text); - $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); + $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); $text = preg_replace("'%BOX1%'", $NEWSBOX1, $text); $text = preg_replace("'%BOX2%'", $NEWSBOX2, $text); $text = preg_replace("'%BOX3%'", $NEWSBOX3, $text); @@ -93,18 +93,18 @@ $text = preg_replace("'%SPASS%'", SQL_PASS, $text); $text = preg_replace("'%SDB%'", SQL_DB, $text); $text = preg_replace("'%PREFIX%'", TB_PREFIX, $text); - $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); + $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); $text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text); $text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text); - $text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text); + $text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text); $text = preg_replace("'%AEMAIL%'", $_POST['aemail'], $text); $text = preg_replace("'%ANAME%'", $_POST['aname'], $text); $text = preg_replace("'%UTRACK%'", "", $text); $text = preg_replace("'%UTOUT%'", "", $text); $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); - $text = preg_replace("'%SERVER%'", SERVER, $text); - + $text = preg_replace("'%SERVER%'", SERVER, $text); + fwrite($fh, $text); fclose($fh); diff --git a/GameEngine/Admin/Mods/editBuildings.php b/GameEngine/Admin/Mods/editBuildings.php index 428b8a2b..6d086b89 100644 --- a/GameEngine/Admin/Mods/editBuildings.php +++ b/GameEngine/Admin/Mods/editBuildings.php @@ -20,87 +20,87 @@ $id = $_POST['id']; -mysql_query("UPDATE ".TB_PREFIX."fdata SET - f1 = '".$_POST['id1level']."', - f1t = '".$_POST['id1gid']."', - f2 = '".$_POST['id2level']."', - f2t = '".$_POST['id2gid']."', - f3 = '".$_POST['id3level']."', - f3t = '".$_POST['id3gid']."', - f4 = '".$_POST['id4level']."', - f4t = '".$_POST['id4gid']."', - f5 = '".$_POST['id5level']."', - f5t = '".$_POST['id5gid']."', - f6 = '".$_POST['id6level']."', - f6t = '".$_POST['id6gid']."', - f7 = '".$_POST['id7level']."', - f7t = '".$_POST['id7gid']."', - f8 = '".$_POST['id8level']."', - f8t = '".$_POST['id8gid']."', - f9 = '".$_POST['id9level']."', - f9t = '".$_POST['id9gid']."', - f10 = '".$_POST['id10level']."', - f10t = '".$_POST['id10gid']."', - f11 = '".$_POST['id11level']."', - f11t = '".$_POST['id11gid']."', - f12 = '".$_POST['id12level']."', - f12t = '".$_POST['id12gid']."', - f13 = '".$_POST['id13level']."', - f13t = '".$_POST['id13gid']."', - f14 = '".$_POST['id14level']."', - f14t = '".$_POST['id14gid']."', - f15 = '".$_POST['id15level']."', - f15t = '".$_POST['id15gid']."', - f16 = '".$_POST['id16level']."', - f16t = '".$_POST['id16gid']."', - f17 = '".$_POST['id17level']."', - f17t = '".$_POST['id17gid']."', - f18 = '".$_POST['id18level']."', - f18t = '".$_POST['id18gid']."', - f19 = '".$_POST['id19level']."', - f19t = '".$_POST['id19gid']."', - f20 = '".$_POST['id20level']."', - f20t = '".$_POST['id20gid']."', - f21 = '".$_POST['id21level']."', - f21t = '".$_POST['id21gid']."', - f22 = '".$_POST['id22level']."', - f22t = '".$_POST['id22gid']."', - f23 = '".$_POST['id23level']."', - f23t = '".$_POST['id23gid']."', - f24 = '".$_POST['id24level']."', - f24t = '".$_POST['id24gid']."', - f25 = '".$_POST['id25level']."', - f25t = '".$_POST['id25gid']."', - f26 = '".$_POST['id26level']."', - f26t = '".$_POST['id26gid']."', - f27 = '".$_POST['id27level']."', - f27t = '".$_POST['id27gid']."', - f28 = '".$_POST['id28level']."', - f28t = '".$_POST['id28gid']."', - f29 = '".$_POST['id29level']."', - f29t = '".$_POST['id29gid']."', - f30 = '".$_POST['id30level']."', - f30t = '".$_POST['id30gid']."', - f31 = '".$_POST['id31level']."', - f31t = '".$_POST['id31gid']."', - f32 = '".$_POST['id32level']."', - f32t = '".$_POST['id32gid']."', - f33 = '".$_POST['id33level']."', - f33t = '".$_POST['id33gid']."', - f34 = '".$_POST['id34level']."', - f34t = '".$_POST['id34gid']."', - f35 = '".$_POST['id35level']."', - f35t = '".$_POST['id35gid']."', - f36 = '".$_POST['id36level']."', - f36t = '".$_POST['id36gid']."', - f37 = '".$_POST['id37level']."', - f37t = '".$_POST['id37gid']."', - f38 = '".$_POST['id38level']."', - f38t = '".$_POST['id38gid']."', - f39 = '".$_POST['id39level']."', - f39t = '".$_POST['id39gid']."', - f40 = '".$_POST['id40level']."', - f40t = '".$_POST['id40gid']."' +mysql_query("UPDATE ".TB_PREFIX."fdata SET + f1 = '".$_POST['id1level']."', + f1t = '".$_POST['id1gid']."', + f2 = '".$_POST['id2level']."', + f2t = '".$_POST['id2gid']."', + f3 = '".$_POST['id3level']."', + f3t = '".$_POST['id3gid']."', + f4 = '".$_POST['id4level']."', + f4t = '".$_POST['id4gid']."', + f5 = '".$_POST['id5level']."', + f5t = '".$_POST['id5gid']."', + f6 = '".$_POST['id6level']."', + f6t = '".$_POST['id6gid']."', + f7 = '".$_POST['id7level']."', + f7t = '".$_POST['id7gid']."', + f8 = '".$_POST['id8level']."', + f8t = '".$_POST['id8gid']."', + f9 = '".$_POST['id9level']."', + f9t = '".$_POST['id9gid']."', + f10 = '".$_POST['id10level']."', + f10t = '".$_POST['id10gid']."', + f11 = '".$_POST['id11level']."', + f11t = '".$_POST['id11gid']."', + f12 = '".$_POST['id12level']."', + f12t = '".$_POST['id12gid']."', + f13 = '".$_POST['id13level']."', + f13t = '".$_POST['id13gid']."', + f14 = '".$_POST['id14level']."', + f14t = '".$_POST['id14gid']."', + f15 = '".$_POST['id15level']."', + f15t = '".$_POST['id15gid']."', + f16 = '".$_POST['id16level']."', + f16t = '".$_POST['id16gid']."', + f17 = '".$_POST['id17level']."', + f17t = '".$_POST['id17gid']."', + f18 = '".$_POST['id18level']."', + f18t = '".$_POST['id18gid']."', + f19 = '".$_POST['id19level']."', + f19t = '".$_POST['id19gid']."', + f20 = '".$_POST['id20level']."', + f20t = '".$_POST['id20gid']."', + f21 = '".$_POST['id21level']."', + f21t = '".$_POST['id21gid']."', + f22 = '".$_POST['id22level']."', + f22t = '".$_POST['id22gid']."', + f23 = '".$_POST['id23level']."', + f23t = '".$_POST['id23gid']."', + f24 = '".$_POST['id24level']."', + f24t = '".$_POST['id24gid']."', + f25 = '".$_POST['id25level']."', + f25t = '".$_POST['id25gid']."', + f26 = '".$_POST['id26level']."', + f26t = '".$_POST['id26gid']."', + f27 = '".$_POST['id27level']."', + f27t = '".$_POST['id27gid']."', + f28 = '".$_POST['id28level']."', + f28t = '".$_POST['id28gid']."', + f29 = '".$_POST['id29level']."', + f29t = '".$_POST['id29gid']."', + f30 = '".$_POST['id30level']."', + f30t = '".$_POST['id30gid']."', + f31 = '".$_POST['id31level']."', + f31t = '".$_POST['id31gid']."', + f32 = '".$_POST['id32level']."', + f32t = '".$_POST['id32gid']."', + f33 = '".$_POST['id33level']."', + f33t = '".$_POST['id33gid']."', + f34 = '".$_POST['id34level']."', + f34t = '".$_POST['id34gid']."', + f35 = '".$_POST['id35level']."', + f35t = '".$_POST['id35gid']."', + f36 = '".$_POST['id36level']."', + f36t = '".$_POST['id36gid']."', + f37 = '".$_POST['id37level']."', + f37t = '".$_POST['id37gid']."', + f38 = '".$_POST['id38level']."', + f38t = '".$_POST['id38gid']."', + f39 = '".$_POST['id39level']."', + f39t = '".$_POST['id39gid']."', + f40 = '".$_POST['id40level']."', + f40t = '".$_POST['id40gid']."' WHERE vref = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=village&did=".$id.""); diff --git a/GameEngine/Admin/Mods/editExtraSet.php b/GameEngine/Admin/Mods/editExtraSet.php index 554e7831..837df3d9 100644 --- a/GameEngine/Admin/Mods/editExtraSet.php +++ b/GameEngine/Admin/Mods/editExtraSet.php @@ -16,7 +16,7 @@ $myFile = "../../config.php"; $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\config.php"); - + $ERRORREPORT=ERROR_REPORT; $T4=(T4_COMING==false)? "false":"true"; $GP_ENABLE=(GP_ENABLE==false)? "false":"true"; @@ -39,7 +39,7 @@ $NEWSBOX2=(NEWSBOX2==false)? "false":"true"; $NEWSBOX3=(NEWSBOX3==false)? "false":"true"; $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; - + $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); $text = preg_replace("'%ERROR%'", $ERRORREPORT, $text); @@ -60,7 +60,7 @@ $text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text); $text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text); $text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text); - $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); $text = preg_replace("'%QUEST%'", $QUEST, $text); $text = preg_replace("'%QTYPE%'", QTYPE, $text); $text = preg_replace("'%BEGINNER%'", PROTECTION, $text); @@ -84,7 +84,7 @@ $text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text); $text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text); $text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text); - $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); + $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); $text = preg_replace("'%BOX1%'", $NEWSBOX1, $text); $text = preg_replace("'%BOX2%'", $NEWSBOX2, $text); $text = preg_replace("'%BOX3%'", $NEWSBOX3, $text); @@ -93,18 +93,18 @@ $text = preg_replace("'%SPASS%'", SQL_PASS, $text); $text = preg_replace("'%SDB%'", SQL_DB, $text); $text = preg_replace("'%PREFIX%'", TB_PREFIX, $text); - $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); + $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); $text = preg_replace("'%LIMIT_MAILBOX%'", $_POST['limit_mailbox'], $text); $text = preg_replace("'%MAX_MAILS%'", 30, $text); - $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); + $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); $text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text); $text = preg_replace("'%ANAME%'", ADMIN_NAME, $text); $text = preg_replace("'%UTRACK%'", "", $text); $text = preg_replace("'%UTOUT%'", "", $text); $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); - $text = preg_replace("'%SERVER%'", SERVER, $text); - + $text = preg_replace("'%SERVER%'", SERVER, $text); + fwrite($fh, $text); fclose($fh); diff --git a/GameEngine/Admin/Mods/editHero.php b/GameEngine/Admin/Mods/editHero.php index e0e97520..62a4df3d 100644 --- a/GameEngine/Admin/Mods/editHero.php +++ b/GameEngine/Admin/Mods/editHero.php @@ -19,19 +19,19 @@ if ($_POST['hname']=="") { header("Location: ../../../Admin/admin.php?p=editHero&uid=".$_POST['id']."&e=1"); exit; - } - - include_once("../../Data/hero_full.php"); - + } + + include_once("../../Data/hero_full.php"); + $id = $_POST['id']; - + $q = "UPDATE ".TB_PREFIX."hero SET unit=".$_POST['hunit'].", name='".$_POST['hname']."', level=".$_POST['hlvl'].", points=".$_POST['exp'].", experience=".$hero_levels[$_POST['hlvl']].", health=".$_POST['hhealth'].", attack=".$_POST['hatk'].", defence=".$_POST['hdef'].", attackbonus=".$_POST['hob'].", defencebonus=".$_POST['hdb'].", regeneration=".$_POST['hrege']." WHERE uid = ".$id; $return=$database->query($q); if($return) { $database->query("Insert into ".TB_PREFIX."admin_log values (0,".$_SESSION['id'].",'Changed hero info',".time().")"); $status="&cs=1"; -} +} } header("Location: ../../../Admin/admin.php?p=player&uid=".$id.$status); ?> \ No newline at end of file diff --git a/GameEngine/Admin/Mods/editLogSet.php b/GameEngine/Admin/Mods/editLogSet.php index 87ae8ce5..b7ac01d4 100644 --- a/GameEngine/Admin/Mods/editLogSet.php +++ b/GameEngine/Admin/Mods/editLogSet.php @@ -16,7 +16,7 @@ $myFile = "../../config.php"; $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\config.php"); - + $ERRORREPORT=ERROR_REPORT; $T4=(T4_COMING==false)? "false":"true"; $GP_ENABLE=(GP_ENABLE==false)? "false":"true"; @@ -26,13 +26,13 @@ $AUTH_EMAIL=(AUTH_EMAIL==false)? "false":"true"; $GREAT_WKS=(GREAT_WKS==false)? "false":"true"; $REG_OPEN=(REG_OPEN==false)? "false":"true"; - + $NEWSBOX1=(NEWSBOX1==false)? "false":"true"; $NEWSBOX2=(NEWSBOX2==false)? "false":"true"; $NEWSBOX3=(NEWSBOX3==false)? "false":"true"; $LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true"; $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; - + $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); $text = preg_replace("'%ERROR%'", $ERRORREPORT, $text); @@ -53,7 +53,7 @@ $text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text); $text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text); $text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text); - $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); $text = preg_replace("'%QUEST%'", $QUEST, $text); $text = preg_replace("'%QTYPE%'", QTYPE, $text); $text = preg_replace("'%BEGINNER%'", PROTECTION, $text); @@ -78,7 +78,7 @@ $text = preg_replace("'%LOGADMIN%'", $_POST['log_admin'], $text); $text = preg_replace("'%LOGWAR%'", $_POST['log_war'], $text); $text = preg_replace("'%LOGMARKET%'", $_POST['log_market'], $text); - $text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text); + $text = preg_replace("'%LOGILLEGAL%'", $_POST['log_illegal'], $text); //end update $text = preg_replace("'%BOX1%'", $NEWSBOX1, $text); $text = preg_replace("'%BOX2%'", $NEWSBOX2, $text); @@ -88,18 +88,18 @@ $text = preg_replace("'%SPASS%'", SQL_PASS, $text); $text = preg_replace("'%SDB%'", SQL_DB, $text); $text = preg_replace("'%PREFIX%'", TB_PREFIX, $text); - $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); + $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); $text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text); $text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text); - $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); + $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); $text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text); $text = preg_replace("'%ANAME%'", ADMIN_NAME, $text); $text = preg_replace("'%UTRACK%'", "", $text); $text = preg_replace("'%UTOUT%'", "", $text); $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); - $text = preg_replace("'%SERVER%'", SERVER, $text); - + $text = preg_replace("'%SERVER%'", SERVER, $text); + fwrite($fh, $text); fclose($fh); diff --git a/GameEngine/Admin/Mods/editNewsboxSet.php b/GameEngine/Admin/Mods/editNewsboxSet.php index b7dc9a71..7e1995ab 100644 --- a/GameEngine/Admin/Mods/editNewsboxSet.php +++ b/GameEngine/Admin/Mods/editNewsboxSet.php @@ -16,7 +16,7 @@ $myFile = "../../config.php"; $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\config.php"); - + $ERRORREPORT=ERROR_REPORT; $T4=(T4_COMING==false)? "false":"true"; $GP_ENABLE=(GP_ENABLE==false)? "false":"true"; @@ -35,11 +35,11 @@ $LOG_WAR=(LOG_WAR==false)? "false":"true"; $LOG_MARKET=(LOG_MARKET==false)? "false":"true"; $LOG_ILLEGAL=(LOG_ILLEGAL==false)? "false":"true"; - + $LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true"; $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; - + $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); $text = preg_replace("'%ERROR%'", $ERRORREPORT, $text); @@ -60,7 +60,7 @@ $text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text); $text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text); $text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text); - $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); $text = preg_replace("'%QUEST%'", $QUEST, $text); $text = preg_replace("'%QTYPE%'", QTYPE, $text); $text = preg_replace("'%BEGINNER%'", PROTECTION, $text); @@ -84,7 +84,7 @@ $text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text); $text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text); $text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text); - $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); + $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); //update $text = preg_replace("'%BOX1%'", $_POST['box1'], $text); $text = preg_replace("'%BOX2%'", $_POST['box2'], $text); @@ -95,18 +95,18 @@ $text = preg_replace("'%SPASS%'", SQL_PASS, $text); $text = preg_replace("'%SDB%'", SQL_DB, $text); $text = preg_replace("'%PREFIX%'", TB_PREFIX, $text); - $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); + $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); $text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text); $text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text); - $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); + $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); $text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text); $text = preg_replace("'%ANAME%'", ADMIN_NAME, $text); $text = preg_replace("'%UTRACK%'", "", $text); $text = preg_replace("'%UTOUT%'", "", $text); $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); - $text = preg_replace("'%SERVER%'", SERVER, $text); - + $text = preg_replace("'%SERVER%'", SERVER, $text); + fwrite($fh, $text); fclose($fh); diff --git a/GameEngine/Admin/Mods/editOverall.php b/GameEngine/Admin/Mods/editOverall.php index 4331cc5f..5ac72b12 100644 --- a/GameEngine/Admin/Mods/editOverall.php +++ b/GameEngine/Admin/Mods/editOverall.php @@ -24,9 +24,9 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."users SET - apall = '".$_POST['off']."', - dpall = '".$_POST['def']."' +mysql_query("UPDATE ".TB_PREFIX."users SET + apall = '".$_POST['off']."', + dpall = '".$_POST['def']."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editPassword.php b/GameEngine/Admin/Mods/editPassword.php index 98aec328..baf53643 100644 --- a/GameEngine/Admin/Mods/editPassword.php +++ b/GameEngine/Admin/Mods/editPassword.php @@ -25,8 +25,8 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."users SET - password = '".$pass."' +mysql_query("UPDATE ".TB_PREFIX."users SET + password = '".$pass."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editPlus.php b/GameEngine/Admin/Mods/editPlus.php index 51ca0a09..879942dd 100644 --- a/GameEngine/Admin/Mods/editPlus.php +++ b/GameEngine/Admin/Mods/editPlus.php @@ -59,12 +59,12 @@ if($b4dur > 1){ $crop = ($user['b4'] + $b4dur); } else { $crop = $user['b4']; } } -mysql_query("UPDATE ".TB_PREFIX."users SET +mysql_query("UPDATE ".TB_PREFIX."users SET plus = '".$plus."', - b1 = '".$wood."', + b1 = '".$wood."', b2 = '".$clay."', b3 = '".$iron."', - b4 = '".$crop."' + b4 = '".$crop."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editProtection.php b/GameEngine/Admin/Mods/editProtection.php index 7f2caf11..c644d9de 100644 --- a/GameEngine/Admin/Mods/editProtection.php +++ b/GameEngine/Admin/Mods/editProtection.php @@ -27,8 +27,8 @@ $dur = $_POST['protect'] * 86400; $protection = (time() + $dur); -mysql_query("UPDATE ".TB_PREFIX."users SET - protect = '".$protection."' +mysql_query("UPDATE ".TB_PREFIX."users SET + protect = '".$protection."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editResources.php b/GameEngine/Admin/Mods/editResources.php index 28784775..8f8990d1 100644 --- a/GameEngine/Admin/Mods/editResources.php +++ b/GameEngine/Admin/Mods/editResources.php @@ -24,13 +24,13 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."vdata SET - wood = '".$_POST['wood']."', - clay = '".$_POST['clay']."', - iron = '".$_POST['iron']."', - crop = '".$_POST['crop']."', - maxstore = '".$_POST['maxstore']."', - maxcrop = '".$_POST['maxcrop']."' +mysql_query("UPDATE ".TB_PREFIX."vdata SET + wood = '".$_POST['wood']."', + clay = '".$_POST['clay']."', + iron = '".$_POST['iron']."', + crop = '".$_POST['crop']."', + maxstore = '".$_POST['maxstore']."', + maxcrop = '".$_POST['maxcrop']."' WHERE wref = '".$id."'") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=village&did=".$id.""); diff --git a/GameEngine/Admin/Mods/editServerSet.php b/GameEngine/Admin/Mods/editServerSet.php index 233351de..134cf414 100644 --- a/GameEngine/Admin/Mods/editServerSet.php +++ b/GameEngine/Admin/Mods/editServerSet.php @@ -16,7 +16,7 @@ $myFile = "../../config.php"; $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\config.php"); - + $T4=(T4_COMING==false)? "false":"true"; $LOG_BUILD=(LOG_BUILD==false)? "false":"true"; $LOG_TECH=(LOG_TECH==false)? "false":"true"; @@ -31,8 +31,8 @@ $NEWSBOX3=(NEWSBOX3==false)? "false":"true"; $LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true"; $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; - - + + $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $_POST['error'], $text); $text = preg_replace("'%ERROR%'", $_POST['error'], $text); @@ -53,7 +53,7 @@ $text = preg_replace("'%TRAPPERCAP%'", $_POST['trappercap'], $text); $text = preg_replace("'%VILLAGE_EXPAND%'", $_POST['village_expand'], $text); $text = preg_replace("'%DEMOLISH%'", $_POST['demolish'], $text); - $text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", $_POST['storage_multiplier'], $text); $text = preg_replace("'%QUEST%'", $_POST['quest'], $text); $text = preg_replace("'%QTYPE%'", $_POST['qtype'], $text); $text = preg_replace("'%BEGINNER%'", $_POST['beginner'], $text); @@ -77,7 +77,7 @@ $text = preg_replace("'%LOGADMIN%'", $LOG_ADMIN, $text); $text = preg_replace("'%LOGWAR%'", $LOG_WAR, $text); $text = preg_replace("'%LOGMARKET%'", $LOG_MARKET, $text); - $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); + $text = preg_replace("'%LOGILLEGAL%'", $LOG_ILLEGAL, $text); $text = preg_replace("'%BOX1%'", $NEWSBOX1, $text); $text = preg_replace("'%BOX2%'", $NEWSBOX2, $text); $text = preg_replace("'%BOX3%'", $NEWSBOX3, $text); @@ -86,18 +86,18 @@ $text = preg_replace("'%SPASS%'", SQL_PASS, $text); $text = preg_replace("'%SDB%'", SQL_DB, $text); $text = preg_replace("'%PREFIX%'", TB_PREFIX, $text); - $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); + $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); $text = preg_replace("'%LIMIT_MAILBOX%'", $LIMIT_MAILBOX, $text); $text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text); - $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); + $text = preg_replace("'%ARANK%'", $INCLUDE_ADMIN, $text); $text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text); $text = preg_replace("'%ANAME%'", ADMIN_NAME, $text); $text = preg_replace("'%UTRACK%'", "", $text); $text = preg_replace("'%UTOUT%'", "", $text); $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); - $text = preg_replace("'%SERVER%'", SERVER, $text); - + $text = preg_replace("'%SERVER%'", SERVER, $text); + fwrite($fh, $text); fclose($fh); diff --git a/GameEngine/Admin/Mods/editSitter.php b/GameEngine/Admin/Mods/editSitter.php index d155a2d5..eef41ea9 100644 --- a/GameEngine/Admin/Mods/editSitter.php +++ b/GameEngine/Admin/Mods/editSitter.php @@ -24,9 +24,9 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."users SET +mysql_query("UPDATE ".TB_PREFIX."users SET sit1 = '".$_POST['sitter1']."', - sit2 = '".$_POST['sitter2']."' + sit2 = '".$_POST['sitter2']."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editUser.php b/GameEngine/Admin/Mods/editUser.php index dc37b6f0..5722167c 100644 --- a/GameEngine/Admin/Mods/editUser.php +++ b/GameEngine/Admin/Mods/editUser.php @@ -24,13 +24,13 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."users SET - email = '".$_POST['email']."', - tribe = ".$_POST['tribe'].", - location = '".$_POST['location']."', - desc1 = '".$_POST['desc1']."', - desc2 = '".$_POST['desc2']."', - quest = '".$_POST['quest']."' +mysql_query("UPDATE ".TB_PREFIX."users SET + email = '".$_POST['email']."', + tribe = ".$_POST['tribe'].", + location = '".$_POST['location']."', + desc1 = '".$_POST['desc1']."', + desc2 = '".$_POST['desc2']."', + quest = '".$_POST['quest']."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/editVillageOwner.php b/GameEngine/Admin/Mods/editVillageOwner.php index 12f0901b..3cc0c1a6 100644 --- a/GameEngine/Admin/Mods/editVillageOwner.php +++ b/GameEngine/Admin/Mods/editVillageOwner.php @@ -24,8 +24,8 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."vdata SET - owner = '".$_POST['newowner']."' +mysql_query("UPDATE ".TB_PREFIX."vdata SET + owner = '".$_POST['newowner']."' WHERE wref = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$_POST['newowner'].""); diff --git a/GameEngine/Admin/Mods/editWeek.php b/GameEngine/Admin/Mods/editWeek.php index 2d5e0271..4ac230e1 100644 --- a/GameEngine/Admin/Mods/editWeek.php +++ b/GameEngine/Admin/Mods/editWeek.php @@ -24,10 +24,10 @@ if($sessionaccess != 9) die("

Access Denied: You are not Admin!

"); -mysql_query("UPDATE ".TB_PREFIX."users SET - ap = '".$_POST['off']."', - dp = '".$_POST['def']."', - RR = '".$_POST['res']."' +mysql_query("UPDATE ".TB_PREFIX."users SET + ap = '".$_POST['off']."', + dp = '".$_POST['def']."', + RR = '".$_POST['res']."' WHERE id = $id") or die(mysql_error()); header("Location: ../../../Admin/admin.php?p=player&uid=".$id.""); diff --git a/GameEngine/Admin/Mods/givePlus.php b/GameEngine/Admin/Mods/givePlus.php index c21917f1..3fd1f7a3 100644 --- a/GameEngine/Admin/Mods/givePlus.php +++ b/GameEngine/Admin/Mods/givePlus.php @@ -36,7 +36,7 @@ { if($row['plus'] < time()) { $plusbefore = time(); $addplus = $plusbefore + $plusdur; } elseif($row['plus'] > time()) { $plusbefore = $row['plus']; $addplus = $plusbefore + $plusdur; } mysql_query("UPDATE ".TB_PREFIX."users SET - plus = '".$addplus."' + plus = '".$addplus."' WHERE id = '".$row['id']."'"); } } diff --git a/GameEngine/Admin/Mods/givePlusRes.php b/GameEngine/Admin/Mods/givePlusRes.php index 6afe55f3..8b5598d2 100644 --- a/GameEngine/Admin/Mods/givePlusRes.php +++ b/GameEngine/Admin/Mods/givePlusRes.php @@ -42,10 +42,10 @@ if($row['b3'] < time()) { $b3before = time(); $addb3 = $b1before + $iron; } elseif($row['b3'] > time()) { $b3before = $row['b3']; $addb3 = $b1before + $iron; } if($row['b4'] < time()) { $b4before = time(); $addb4 = $b1before + $crop; } elseif($row['b4'] > time()) { $b4before = $row['b4']; $addb4 = $b1before + $crop; } mysql_query("UPDATE ".TB_PREFIX."users SET - b1 = '".$addb1."', - b2 = '".$addb2."', - b3 = '".$addb3."', - b4 = '".$addb4."' + b1 = '".$addb1."', + b2 = '".$addb2."', + b3 = '".$addb3."', + b4 = '".$addb4."' WHERE id = '".$row['id']."'"); } } diff --git a/GameEngine/Admin/Mods/gold_1.php b/GameEngine/Admin/Mods/gold_1.php index accb1869..e16cb3e3 100644 --- a/GameEngine/Admin/Mods/gold_1.php +++ b/GameEngine/Admin/Mods/gold_1.php @@ -9,7 +9,7 @@ ## ## ################################################################################# if (!isset($_SESSION)) session_start(); -if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); +if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); include_once("../../config.php"); mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS); diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php index f89db0fd..d5774449 100644 --- a/GameEngine/Admin/Mods/natarend.php +++ b/GameEngine/Admin/Mods/natarend.php @@ -35,7 +35,7 @@ $database->addTech($wid); $database->addABTech($wid); $speed = NATARS_UNITS; - + //new with random amount of troops $q = "UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(50, 1200) * $speed) . ", u42 = " . (rand(100, 1400) * $speed) . ", u43 = " . (rand(200, 1600) * $speed) . ", u44 = " . (rand(10, 50) * $speed) . ", u45 = " . (rand(48, 1700) * $speed) . ", u46 = " . (rand(60, 1800) * $speed) . ", u47 = " . (rand(200, 1600) * $speed) . ", u48 = " . (rand(40, 200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(5, 25) * $speed) . " WHERE vref = '".$wid."'"; mysql_query($q); diff --git a/GameEngine/Admin/database.php b/GameEngine/Admin/database.php index 188ac53f..3c7ce29e 100644 --- a/GameEngine/Admin/database.php +++ b/GameEngine/Admin/database.php @@ -72,7 +72,7 @@ function recountPop($vid){ $q = "UPDATE ".TB_PREFIX."vdata set pop = $popTot where wref = $vid"; mysql_query($q, $this->connection); } - + function recountCP($vid){ global $database; $fdata = $database->getResourceLevel($vid); @@ -99,18 +99,18 @@ function buildingPOP($f,$lvl){ } return $popT; } - + function buildingCP($f,$lvl){ $name = "bid".$f; global $$name; $popT = 0; $dataarray = $$name; - + for ($i = 1; $i <= $lvl; $i++) { $popT += $dataarray[$i]['cp']; } return $popT; - } + } function getWref($x,$y) { $q = "SELECT id FROM ".TB_PREFIX."wdata where x = $x and y = $y"; @@ -206,7 +206,7 @@ function DelPlayer($uid,$pass){ } $q = "DELETE FROM ".TB_PREFIX."hero where uid = $uid"; mysql_query($q, $this->connection); - + $name = $database->getUserField($uid,"username",0); mysql_query("Insert into ".TB_PREFIX."admin_log values (0,$ID,'Deleted user $name',".time().")"); $q = "DELETE FROM ".TB_PREFIX."users WHERE `id` = $uid;"; @@ -244,7 +244,7 @@ function DelVillage($wref, $mode=0){ mysql_query("Insert into ".TB_PREFIX."admin_log values (0,".$_SESSION['id'].",'Deleted village $wref',".time().")"); $database->clearExpansionSlot($wref); - + $q = "DELETE FROM ".TB_PREFIX."abdata where vref = $wref"; mysql_query($q, $this->connection); $q = "DELETE FROM ".TB_PREFIX."bdata where wid = $wref"; @@ -267,10 +267,10 @@ function DelVillage($wref, $mode=0){ mysql_query($q, $this->connection); $q = "DELETE FROM ".TB_PREFIX."raidlist where towref = $wref"; mysql_query($q, $this->connection); - + $q = "DELETE FROM ".TB_PREFIX."movement where `from` = $wref and proc=0"; mysql_query($q, $this->connection); - + $getmovement = $database->getMovement(3,$wref,1); foreach($getmovement as $movedata) { $time = microtime(true); @@ -282,14 +282,14 @@ function DelVillage($wref, $mode=0){ //check return enforcement from del village $this->returnTroops($wref); - + $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref"; mysql_query($q, $this->connection); - + if (mysql_affected_rows()>0) { $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref"; mysql_query($q, $this->connection); - + $getprisoners = $database->getPrisoners($wref); foreach($getprisoners as $pris) { $troops = 0; @@ -310,8 +310,8 @@ function DelVillage($wref, $mode=0){ } } } - } - + } + function DelBan($uid,$id){ global $database; $name = addslashes($database->getUserField($uid,"username",0)); @@ -405,7 +405,7 @@ function query($query) { public function getTypeLevel($tid,$vid) { global $village,$database; $keyholder = array(); - + if($vid == 0) { $resourcearray = $village->resarray; } else { @@ -454,7 +454,7 @@ public function getTypeLevel($tid,$vid) { public function procDistanceTime($coor,$thiscoor,$ref,$vid) { global $bid28,$bid14; - + $xdistance = ABS($thiscoor['x'] - $coor['x']); if($xdistance > WORLD_MAX) { $xdistance = (2 * WORLD_MAX + 1) - $xdistance; @@ -479,17 +479,17 @@ public function returnTroops($wref) { global $database; $getenforce=$database->getEnforceVillage($wref,0); - + //if(($enforce['from']==$village->wid) || ($enforce['vref']==$village->wid)){ foreach($getenforce as $enforce) { - + $to = $database->getVillage($enforce['from']); $Gtribe = ""; if ($database->getUserField($to['owner'],'tribe',0) == '2'){ $Gtribe = "1"; } else if ($database->getUserField($to['owner'],'tribe',0) == '3'){ $Gtribe = "2"; } else if ($database->getUserField($to['owner'],'tribe',0) == '4'){ $Gtribe = "3"; } else if ($database->getUserField($to['owner'],'tribe',0) == '5'){ $Gtribe = "4"; } - + $start = ($database->getUserField($to['owner'],'tribe',0)-1)*10+1; $end = ($database->getUserField($to['owner'],'tribe',0)*10); @@ -503,20 +503,20 @@ public function returnTroops($wref) { //find slowest unit. for($i=$start;$i<=$end;$i++){ - + if(intval($enforce['u'.$i]) > 0){ if($unitarray) { reset($unitarray); } $unitarray = $GLOBALS["u".$i]; $speeds[] = $unitarray['speed']; //echo print_r(array_keys($speeds))."unitspd\n".$i."trib\n"; - + } else { $enforce['u'.$i]='0'; } - + } - + if( intval($enforce['hero']) > 0){ $q = "SELECT * FROM ".TB_PREFIX."hero WHERE uid = ".$from['owner'].""; $result = mysql_query($q); @@ -526,7 +526,7 @@ public function returnTroops($wref) { } else { $enforce['hero']='0'; } - + $artefact = count($database->getOwnUniqueArtefactInfo2($from['owner'],2,3,0)); $artefact1 = count($database->getOwnUniqueArtefactInfo2($enforce['from'],2,1,1)); $artefact2 = count($database->getOwnUniqueArtefactInfo2($from['owner'],2,2,0)); @@ -540,7 +540,7 @@ public function returnTroops($wref) { $fastertroops = 1; } $time = round($this->procDistanceTime($fromCor,$toCor,min($speeds),$enforce['from'])/$fastertroops); - + $foolartefact2 = $database->getFoolArtefactInfo(2,$enforce['from'],$from['owner']); if(count($foolartefact2) > 0){ foreach($foolartefact2 as $arte){ @@ -556,7 +556,7 @@ public function returnTroops($wref) { $database->addMovement(4,$wref,$enforce['from'],$reference,time(),($time+time())); $database->deleteReinf($enforce['id']); } - } + } public function calculateProduction($wid,$uid,$b1,$b2,$b3,$b4,$fdata,$ocounter,$pop) { @@ -565,8 +565,8 @@ public function calculateProduction($wid,$uid,$b1,$b2,$b3,$b4,$fdata,$ocounter,$ $largeA = $database->getOwnUniqueArtefactInfo($uid,4,2); $uniqueA = $database->getOwnUniqueArtefactInfo($uid,4,3); $upkeep = $this->getUpkeep($this->getAllUnits($wid),0,$wid,$uid); - - + + $production=array(); $production['wood'] = $this->getWoodProd($fdata, $ocounter,$b1); $production['clay'] = $this->getClayProd($fdata, $ocounter,$b2); @@ -716,9 +716,9 @@ function getAllUnits($base,$InVillageOnly=False,$mode=0) { } $ownunit['hero'] += $enforce['hero']; } - } + } + - $prisoners = $database->getPrisoners($base,1); if(!empty($prisoners)) { foreach($prisoners as $prisoner){ @@ -734,7 +734,7 @@ function getAllUnits($base,$InVillageOnly=False,$mode=0) { } } } - + if(!$InVillageOnly) { $movement = $database->getVillageMovement($base); if(!empty($movement)) { @@ -748,7 +748,7 @@ function getAllUnits($base,$InVillageOnly=False,$mode=0) { } return $ownunit; } - + public function getUpkeep($array,$type,$vid,$uid,$prisoners=0) { global $database; $buildarray = array(); @@ -850,7 +850,7 @@ public function getUpkeep($array,$type,$vid,$uid,$prisoners=0) { } return $upkeep; } - + }; $admin = new adm_DB; diff --git a/GameEngine/Admin/function.php b/GameEngine/Admin/function.php index 205cee0d..2f39dd98 100644 --- a/GameEngine/Admin/function.php +++ b/GameEngine/Admin/function.php @@ -84,11 +84,11 @@ function Act($get){ } if (!$killhero){ $killhero=$database->FindHeroInOasis($get['uid']); - } + } if ($killhero) { $database->KillMyHero($get['uid']); $error="&kc=1"; - }else $error="&e=1"; + }else $error="&e=1"; header("Location: admin.php?p=player&uid=".$get['uid'].$error); exit; case "reviveHero": @@ -101,14 +101,14 @@ function Act($get){ case "addHero": $user = $database->getUserArray($get['uid'],1); $vilarray=$database->getVrefCapital($get['uid']); - + $database->query("INSERT INTO ".TB_PREFIX."hero (`uid`, `wref`, `regeneration`, `unit`, `name`, `level`, `points`, `experience`, `dead`, `health`, `attack`, `defence`, `attackbonus`, `defencebonus`, `trainingtime`, `autoregen`, `intraining`) VALUES ('".$get['uid']."', '" . $vilarray['wref'] . "', '0', '".$get['u']."', '".addslashes($user['username'])."', '0', '5', '0', '0', '100', '0', '0', '0', '0', '".time()."', '50', '0')"); - + $database->query("UPDATE ".TB_PREFIX."units SET hero = 1 WHERE vref = ".$vilarray['wref']); - + header("Location: admin.php?p=player&uid=".$get['uid']."&ac=1"); exit; } diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php index 30fb0d74..a52d3789 100644 --- a/GameEngine/Alliance.php +++ b/GameEngine/Alliance.php @@ -450,7 +450,7 @@ private function changediplomacy($post) { header("Location: banned.php"); } } - + private function updateMax($leader) { global $bid18, $database; $q = mysql_query("SELECT * FROM " . TB_PREFIX . "alidata where leader = $leader"); diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index b61f61fc..cc60a038 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -240,8 +240,8 @@ private function loyaltyRegeneration() { //fix by ronix //create new file to check filetime //not every click regenerate but 1 minute or after - - + + $ourFileHandle = fopen("GameEngine/Prevention/loyalty.txt", 'w'); fclose($ourFileHandle); global $database; @@ -291,7 +291,7 @@ private function getfieldDistance($coorx1, $coory1, $coorx2, $coory2) { $distanceY = min(abs($y2 - $y1), abs($max - abs($y2 - $y1))); $dist = sqrt(pow($distanceX, 2) + pow($distanceY, 2)); return round($dist, 1); - } + } public function getTypeLevel($tid,$vid) { global $village,$database; @@ -613,7 +613,7 @@ private function culturePoints() { $dur_day=86400/$speed; //24 hours/speed if ($dur_day<3600) $dur_day=3600; $time = time()-600; // recount every 10minutes - + $array = array(); $q = "SELECT id, lastupdate FROM ".TB_PREFIX."users WHERE lastupdate < $time"; $array = $database->query_return($q); @@ -630,7 +630,7 @@ private function culturePoints() { if(file_exists("GameEngine/Prevention/culturepoints.txt")) { unlink("GameEngine/Prevention/culturepoints.txt"); } -} +} private function buildComplete() { if(file_exists("GameEngine/Prevention/build.txt")) { @@ -1056,7 +1056,7 @@ private function sendunitsComplete() { $fromF = $database->getVillage($data['from']); $conqureby=0; $NatarCapital=($toF['owner']==3 && $toF['capital']==1)? true:false; - if(!isset($to['name']) || $to['name']=='') $to['name']="??"; + if(!isset($to['name']) || $to['name']=='') $to['name']="??"; $DefenderUnit = array(); $DefenderUnit = $database->getUnit($data['to']); @@ -1068,7 +1068,7 @@ private function sendunitsComplete() { $movements = $database->getMovement("34",$data['to'],1); for($y=0;$y < count($movements);$y++){ $returntime = $unit[$y]['endtime']-time(); - if($unit[$y]['sort_type'] == 4 && $unit[$y]['from'] != 0 && $returntime <= 10){ + if($unit[$y]['sort_type'] == 4 && $unit[$y]['from'] != 0 && $returntime <= 10){ $cannotsend = 1; } } @@ -1100,7 +1100,7 @@ private function sendunitsComplete() { $Defender = $database->getUnit($data['to']); $enforcementarray = $database->getEnforceVillage($data['to'],0); if(count($enforcementarray) > 0) { - + foreach($enforcementarray as $enforce) { for($i=1;$i<=50;$i++) { $enforDefender['u'.$i] += $enforce['u'.$i]; @@ -1174,7 +1174,7 @@ private function sendunitsComplete() { $i=40; } } - + //type of attack if($dataarray[$data_num]['attack_type'] == 1){ $type = 1; @@ -1208,14 +1208,14 @@ private function sendunitsComplete() { $def_ab[$ud+6] = $armory['a6']; $def_ab[$ud+7] = $armory['a7']; $def_ab[$ud+8] = $armory['a8']; - + //rams attack if(($data['t7']-$dead7-$traped7)>0 and $type=='3'){ $basearraywall = $database->getMInfo($data['to']); if($database->getFieldLevel($basearraywall['wref'],40)>'0'){ for ($w=1; $w<2; $w++){ if ($database->getFieldLevel($basearraywall['wref'],40)!='0'){ - + $walllevel = $database->getFieldLevel($basearraywall['wref'],40); $wallgid = $database->getFieldLevel($basearraywall['wref'],"40t"); $wallid = 40; @@ -1226,7 +1226,7 @@ private function sendunitsComplete() { $empty = 1; } } - + $tblevel = '1'; $stonemason = "1"; @@ -1254,7 +1254,7 @@ private function sendunitsComplete() { $rom = $ger = $gal = $nat = $natar = 0; $Defender = $database->getUnit($data['to']); $enforcementarray = $database->getEnforceVillage($data['to'],0); - + if(count($enforcementarray) > 0) { foreach($enforcementarray as $enforce) { for($i=1;$i<=50;$i++) { @@ -1276,7 +1276,7 @@ private function sendunitsComplete() { else if($i<=40){ $nat='1'; } else if($i<=50){ $natar='1'; } } - + } } if(!isset($Defender['hero'])){ @@ -1286,7 +1286,7 @@ private function sendunitsComplete() { $Defender['hero'] = '0'; } } - + //get attack units $Attacker = array(); $start = ($owntribe-1)*10+1; @@ -1322,7 +1322,7 @@ private function sendunitsComplete() { $residence = "0"; $attpop = $fromF['pop']; $defpop = 100; - + //type of attack if($dataarray[$data_num]['attack_type'] == 1){ $type = 1; @@ -1337,10 +1337,10 @@ private function sendunitsComplete() { if($dataarray[$data_num]['attack_type'] == 4){ $type = 4; } - + $att_ab1=$att_ab2=$att_ab3=$att_ab4=$att_ab5=$att_ab6=$att_ab7=$att_ab8=0; $def_ab[31]=$def_ab[32]=$def_ab[33]=$def_ab[34]=$def_ab[35]=$def_ab[36]=$def_ab[37]=$def_ab[38]=0; - + $empty='1'; $tblevel = '0'; $stonemason = "0"; @@ -1348,7 +1348,7 @@ private function sendunitsComplete() { //fix by ronix for ($i=1;$i<=50;$i++) $enforDefender['u'.$i]+=$Defender['u'.$i]; $defspy=($enforDefender['u4']>0 || $enforDefender['u14']>0 || $enforDefender['u23']>0 || $enforDefender['u44']>0)? true:false; - + if(PEACE == 0 || $targettribe == 4 || $targettribe == 5){ if($targettribe == 1){ $def_spy = $enforDefender['u4']; @@ -1376,7 +1376,7 @@ private function sendunitsComplete() { $traps -= $traps1; } } - if(!$scout || $def_spy >0 || $NatarCapital){ + if(!$scout || $def_spy >0 || $NatarCapital){ $totaltraped_att = $traped1+$traped2+$traped3+$traped4+$traped5+$traped6+$traped7+$traped8+$traped9+$traped10+$traped11; $database->modifyUnit($data['to'],array("99o"),array($totaltraped_att),array(1)); for($i=$start;$i<=$end;$i++) { @@ -1392,11 +1392,11 @@ private function sendunitsComplete() { $database->updatePrisoners($data['to'],$data['from'],$traped1,$traped2,$traped3,$traped4,$traped5,$traped6,$traped7,$traped8,$traped9,$traped10,$traped11); } } - } + } //to battle.php //fix by ronix $battlepart = $battle->calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$tblevel,$stonemason,$walllevel,0,0,0,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby); - + //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'].''; $herosend_att = $data['t11']; @@ -1414,7 +1414,7 @@ private function sendunitsComplete() { $DefenderHero[$d]=$DefenderID; } } - + $enforcementarray2 = $database->getEnforceVillage($data['to'],0); if(count($enforcementarray2) > 0) { foreach($enforcementarray2 as $enforce2) { @@ -1425,10 +1425,10 @@ private function sendunitsComplete() { } for ($i=1;$i<=50;$i++) { $Defender['u'.$i]+= $enforce2['u'.$i]; - } + } } - } - + } + $unitssend_def[1] = ''.$Defender['u1'].','.$Defender['u2'].','.$Defender['u3'].','.$Defender['u4'].','.$Defender['u5'].','.$Defender['u6'].','.$Defender['u7'].','.$Defender['u8'].','.$Defender['u9'].','.$Defender['u10'].''; $unitssend_def[2] = ''.$Defender['u11'].','.$Defender['u12'].','.$Defender['u13'].','.$Defender['u14'].','.$Defender['u15'].','.$Defender['u16'].','.$Defender['u17'].','.$Defender['u18'].','.$Defender['u19'].','.$Defender['u20'].''; $unitssend_def[3] = ''.$Defender['u21'].','.$Defender['u22'].','.$Defender['u23'].','.$Defender['u24'].','.$Defender['u25'].','.$Defender['u26'].','.$Defender['u27'].','.$Defender['u28'].','.$Defender['u29'].','.$Defender['u30'].''; @@ -1464,20 +1464,20 @@ private function sendunitsComplete() { $spy_def_Detect=0; for($i=1;$i<=(50);$i++) { if($i == 4 || $i == 14 || $i == 23 || $i == 34 || $i == 44){ - if($Defender['u'.$i]>0) { + if($Defender['u'.$i]>0) { $spy_def_Detect=$i; break; - } - } + } + } } - if($spy_def_Detect==0) { + if($spy_def_Detect==0) { $dead3=0; $dead4=0; $battlepart['casualties_attacker'][3]=0; $battlepart['casualties_attacker'][4]=0; - } - } - + } + } + ################################################# $dead=array(); @@ -1588,15 +1588,15 @@ private function sendunitsComplete() { // Set units returning from attack - + for ($i=1;$i<=11;$i++) { $t_units.="t".$i."=t".$i." - ".${dead.$i}.(($i > 10) ? '' : ', '); $p_units.="t".$i."=t".$i." - ".${traped.$i}.(($i > 10) ? '' : ', '); - } - + } + $database->modifyAttack3($data['ref'],$t_units); $database->modifyAttack3($data['ref'],$p_units); - + $unitsdead_att = ''.$dead1.','.$dead2.','.$dead3.','.$dead4.','.$dead5.','.$dead6.','.$dead7.','.$dead8.','.$dead9.','.$dead10.''; $unitstraped_att = ''.$traped1.','.$traped2.','.$traped3.','.$traped4.','.$traped5.','.$traped6.','.$traped7.','.$traped8.','.$traped9.','.$traped10.','.$traped11.''; if ($herosend_att>0){ @@ -1624,25 +1624,25 @@ private function sendunitsComplete() { for($i=1;$i<=50;$i++) { if($unitarray) { reset($unitarray); } $unitarray = $GLOBALS["u".$i]; - + $totaldead_def += $alldead[''.$i.'']; - + $totalpoint_att += ($alldead[''.$i.'']*$unitarray['pop']); } $totalpoint_att += ($alldead['hero']*6); - + if ($Attacker['uhero'] != 0){ $heroxp = $totalpoint_att; $database->modifyHeroXp("experience",$heroxp,$from['owner']); } - + for($i=1;$i<=10;$i++){ if($unitarray) { reset($unitarray); } $unitarray = $GLOBALS["u".(($att_tribe-1)*10+$i)]; $totalpoint_def += (${dead.$i}*$unitarray['pop']); } $totalpoint_def +=$dead11*6; - if($Defender['hero'] > 0){ + if($Defender['hero'] > 0){ //counting heroxp $defheroxp=intval($totalpoint_def/count($DefenderHero)); for ($i=1;$i<=count($DefenderHero);$i++){ @@ -1650,7 +1650,7 @@ private function sendunitsComplete() { $database->modifyHeroXp("experience",$reinfheroxp,$DefenderHero[$i]); } } - + $database->modifyPoints($toF['owner'],'dpall',$totalpoint_def); $database->modifyPoints($from['owner'],'apall',$totalpoint_att); $database->modifyPoints($toF['owner'],'dp',$totalpoint_def); @@ -1880,7 +1880,7 @@ private function sendunitsComplete() { if ($isoasis == 0) { $pop=$this->recountPop($data['to']); } else $pop=10; //oasis cannot be destroy bt cata/ram - if($pop<=0) { + if($pop<=0) { if($can_destroy==1) { $info_cat = "".$catp_pic.", Village already destroyed."; } else { @@ -2471,7 +2471,7 @@ private function sendunitsComplete() { $xp=" and gained ".$heroxp." XP from the battle"; $info_hero = $hero_pic.",Your hero gained ".$heroxp." XP"; } - + if ($isoasis != 0) { //oasis fix by ronix if ($to['owner']!=$from['owner']) { $troopcount = $database->countOasisTroops($data['to']); @@ -2479,7 +2479,7 @@ private function sendunitsComplete() { if ($canqured==1 && $troopcount==0) { $database->conquerOasis($data['from'],$data['to']); $info_hero = $hero_pic.",Your hero has conquered this oasis".$xp; - + }else{ if ($canqured==3 && $troopcount==0) { if ($type=='3') { @@ -2493,7 +2493,7 @@ private function sendunitsComplete() { } } } - } + } } else { global $form; if ($heroxp == 0) { @@ -2511,7 +2511,7 @@ private function sendunitsComplete() { $info_hero = $hero_pic.",".$form->getError("error").$xp; } }else{ - $info_hero = $hero_pic.",Your hero could not claim the artefact during raid".$xp; + $info_hero = $hero_pic.",Your hero could not claim the artefact during raid".$xp; } } } @@ -2520,11 +2520,11 @@ private function sendunitsComplete() { $xp=""; } else { $xp=" but gained ".$heroxp." XP from the battle"; - } + } if ($traped11>0) { $info_hero = $hero_pic.",Your hero was trapped".$xp; - }else $info_hero = $hero_pic.",Your hero died".$xp; - } + }else $info_hero = $hero_pic.",Your hero died".$xp; + } if ($DefenderID==0) { $natar=0; } @@ -2603,7 +2603,7 @@ private function sendunitsComplete() { //Undetected and detected in here. if($scout){ - + for($i=1;$i<=10;$i++){ if($battlepart['casualties_attacker'][$i]){ if($from['owner'] == 3){ @@ -2617,7 +2617,7 @@ private function sendunitsComplete() { break; } } - } + } } else { if($type == 3 && $totalsend_att - ($totaldead_att+$totaltraped_att) > 0){ @@ -2708,7 +2708,7 @@ private function sendunitsComplete() { } } } - + $newtraps = round(($mytroops+$anothertroops)/3); $database->modifyUnit($data['to'],array("99"),array($newtraps),array(0)); $database->modifyUnit($data['to'],array("99o"),array($mytroops+$anothertroops),array(0)); @@ -2780,12 +2780,12 @@ private function sendunitsComplete() { }else{ $database->addNotice($from['owner'],$to['wref'],$ownally,2,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime); } - } + } $database->setMovementProc($data['moveid']); if($chiefing_village != 1){ $database->addMovement(4,$DefenderWref,$AttackerWref,$data['ref'],$AttackArrivalTime,$endtime); - + // send the bounty on type 6. if($type !== 1){ @@ -2795,7 +2795,7 @@ private function sendunitsComplete() { }else{ $database->modifyOasisResource($DefenderWref,$steal[0],$steal[1],$steal[2],$steal[3],0); } - $database->addMovement(6,$DefenderWref,$AttackerWref,$reference,$AttackArrivalTime,$endtime,1,0,0,0,0,$data['ref']); + $database->addMovement(6,$DefenderWref,$AttackerWref,$reference,$AttackArrivalTime,$endtime,1,0,0,0,0,$data['ref']); $totalstolengain=$steal[0]+$steal[1]+$steal[2]+$steal[3]; $totalstolentaken=($totalstolentaken-($steal[0]+$steal[1]+$steal[2]+$steal[3])); $database->modifyPoints($from['owner'],'RR',$totalstolengain); @@ -2823,7 +2823,7 @@ private function sendunitsComplete() { } if($village_destroyed == 1){ if($can_destroy==1){ - $this->DelVillage($data['to']); + $this->DelVillage($data['to']); } } }else{ @@ -2969,7 +2969,7 @@ private function sendunitsComplete() { } if ($reload) header("Location: ".$_SERVER['PHP_SELF']); } - + function DelVillage($wref, $mode=0){ global $database, $units; $database->clearExpansionSlot($wref); @@ -2997,7 +2997,7 @@ function DelVillage($wref, $mode=0){ $database->query($q); $q = "DELETE FROM ".TB_PREFIX."movement where proc = 0 AND ((`to` = $wref AND sort_type=4) OR (`from` = $wref AND sort_type=3))"; $database->query($q); - + $getmovement = $database->getMovement(3,$wref,1); foreach($getmovement as $movedata) { $time = microtime(true); @@ -3007,17 +3007,17 @@ function DelVillage($wref, $mode=0){ } $q = "DELETE FROM ".TB_PREFIX."enforcement WHERE `from` = $wref"; $database->query($q); - + //check return enforcement from del village $units->returnTroops($wref); - + $q = "DELETE FROM ".TB_PREFIX."vdata WHERE `wref` = $wref"; $database->query($q); - + if (mysql_affected_rows()>0) { $q = "UPDATE ".TB_PREFIX."wdata set occupied = 0 where id = $wref"; $database->query($q); - + $getprisoners = $database->getPrisoners($wref); foreach($getprisoners as $pris) { $troops = 0; @@ -3190,7 +3190,7 @@ private function sendreinfunitsComplete() { $toF = $database->getOasisV($data['to']); $DefenderID = $to['owner']; $targettribe = $database->getUserField($DefenderID,"tribe",0); - $conqureby=$toF['conqured']; + $conqureby=$toF['conqured']; } if($data['from']==0){ $DefenderID = $database->getVillageField($data['to'],"owner"); @@ -3208,8 +3208,8 @@ private function sendreinfunitsComplete() { $fromF = $database->getVillage($data['from']); $AttackerID = $from['owner']; $owntribe = $database->getUserField($AttackerID,"tribe",0); - - + + if ($session->uid==$AttackerID || $session->uid==$DefenderID) $reload=true; //check to see if we're sending a hero between own villages and there's a Mansion at target village @@ -3226,9 +3226,9 @@ private function sendreinfunitsComplete() { } } } - for($i=1;$i<=10;$i++) { + for($i=1;$i<=10;$i++) { if($data['t'.$i]>0) { - $troopsPresent = 1; break; + $troopsPresent = 1; break; } } @@ -3248,7 +3248,7 @@ private function sendreinfunitsComplete() { $j='1'; for($i=$start;$i<=$end;$i++){ $t_units.="u".$i."=u".$i." + ".$data['t'.$j].(($j > 9) ? '' : ', ');$j++; - } + } $q = "UPDATE ".TB_PREFIX."enforcement set $t_units where id =".$check['id']; $database->query($q); $database->modifyEnforce($check['id'],'hero',$data['t11'],1); @@ -3258,8 +3258,8 @@ private function sendreinfunitsComplete() { //send rapport $unitssend_att = ''.$data['t1'].','.$data['t2'].','.$data['t3'].','.$data['t4'].','.$data['t5'].','.$data['t6'].','.$data['t7'].','.$data['t8'].','.$data['t9'].','.$data['t10'].','.$data['t11'].''; $data_fail = ''.$from['wref'].','.$from['owner'].','.$owntribe.','.$unitssend_att.''; - - + + if($isoasis == 0){ $to_name=$to['name']; }else{ @@ -3284,7 +3284,7 @@ private function sendreinfunitsComplete() { $database->setVillageField($data['to'], 'starvupdate', $time); } } - + //check empty reinforcement in rally point $e_units=''; for ($i=1;$i<=50;$i++) { @@ -3294,7 +3294,7 @@ private function sendreinfunitsComplete() { $q="DELETE FROM ".TB_PREFIX."enforcement WHERE ".$e_units." AND (vref=".$data['to']." OR `from`=".$data['to'].")"; $database->query($q); } - + if(file_exists("GameEngine/Prevention/sendreinfunits.txt")) { unlink("GameEngine/Prevention/sendreinfunits.txt"); } @@ -3572,7 +3572,7 @@ function getAllUnits($base) { $ownunit['u'.$i] += $enforce['u'.$i]; } } - } + } $movement = $database->getVillageMovement($base); if(!empty($movement)) { for($i=1;$i<=50;$i++) { @@ -4342,18 +4342,18 @@ private function starvation() { $database->setVillageField($village->wid, 'starvupdate', time()); } unset($crop,$unitarrays,$getvillage,$village_upkeep); - } - + } + // load villages with minus prod - + $starvarray = array(); $starvarray = $database->getStarvation(); foreach ($starvarray as $starv){ $unitarrays = $this->getAllUnits($starv['wref']); $howweeating=$this->getUpkeep($unitarrays, 0,$starv['wref']); $upkeep = $starv['pop'] + $howweeating; - - + + // get enforce other player from oasis $q = "SELECT e.*,o.conqured,o.wref,o.high, o.owner as ownero, v.owner as ownerv FROM ".TB_PREFIX."enforcement as e LEFT JOIN ".TB_PREFIX."odata as o ON e.vref=o.wref LEFT JOIN ".TB_PREFIX."vdata as v ON e.from=v.wref where o.conqured=".$starv['wref']." AND o.owner<>v.owner"; $enforceoasis = $database->query_return($q); @@ -4413,7 +4413,7 @@ private function starvation() { $maxcount = $enforce['hero']; $maxtype = "hero"; } - } + } }else{ //get own reinforcement from other village $q = "SELECT e.*, v.owner as ownerv, v1.owner as owner1 FROM ".TB_PREFIX."enforcement as e LEFT JOIN ".TB_PREFIX."vdata as v ON e.from=v.wref LEFT JOIN ".TB_PREFIX."vdata as v1 ON e.vref=v1.wref where e.vref=".$starv['wref']." AND v.owner=v1.owner"; $enforcearray = $database->query_return($q); @@ -4450,7 +4450,7 @@ private function starvation() { } } } - } + } // counting @@ -4470,7 +4470,7 @@ private function starvation() { $database->setVillageField($starv['wref'], 'crop', $newcrop); } } - + if($difcrop > 0){ global ${u.$maxtype}; $hungry=array(); @@ -4478,7 +4478,7 @@ private function starvation() { if ($hungry['crop']>0 && $oldcrop <=0) { $killunits = intval($difcrop/$hungry['crop']); }else $killunits=0; - + if($killunits > 0){ $pskolko = abs($skolko); if($killunits > $pskolko && $skolko <0){ @@ -4529,10 +4529,10 @@ private function starvation() { $database->setVillageField($starv['wref'], 'starvupdate', 0); } - + unset ($starv,$unitarrays,$enforcearray,$enforce,$starvarray); } - + if(file_exists("GameEngine/Prevention/starvation.txt")) { unlink("GameEngine/Prevention/starvation.txt"); } @@ -4744,9 +4744,9 @@ private function checkReviveHero(){ /************************************************ Function for automate medals - by yi12345 and Shadow - References: + References: ************************************************/ - + function medals(){ global $ranking,$database; @@ -4754,7 +4754,7 @@ function medals(){ $giveMedal = false; $q = "SELECT * FROM ".TB_PREFIX."config"; - $result = mysql_query($q); + $result = mysql_query($q); if($result) { $row=mysql_fetch_assoc($result); $stime = strtotime(START_DATE)-strtotime(date('m/d/Y'))+strtotime(START_TIME); @@ -4795,53 +4795,53 @@ function medals(){ //Aanvallers v/d Week $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY ap DESC, id DESC Limit 10"); - $i=0; + $i=0; while($row = mysql_fetch_array($result)){ - $i++; + $i++; $img="t2_".($i).""; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '1', '".($i)."', '".$week."', '".$row['ap']."', '".$img."')"; - $resul=mysql_query($quer); + $resul=mysql_query($quer); } //Verdediger v/d Week $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY dp DESC, id DESC Limit 10"); - $i=0; + $i=0; while($row = mysql_fetch_array($result)){ - $i++; + $i++; $img="t3_".($i).""; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '2', '".($i)."', '".$week."', '".$row['dp']."', '".$img."')"; - $resul=mysql_query($quer); - } + $resul=mysql_query($quer); + } //Klimmers v/d Week $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY Rc DESC, id DESC Limit 10"); - $i=0; + $i=0; while($row = mysql_fetch_array($result)){ - $i++; + $i++; $img="t1_".($i).""; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '3', '".($i)."', '".$week."', '".$row['Rc']."', '".$img."')"; - $resul=mysql_query($quer); - } + $resul=mysql_query($quer); + } //Rank climbers of the week $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY clp DESC Limit 10"); - $i=0; + $i=0; while($row = mysql_fetch_array($result)){ - $i++; + $i++; $img="t6_".($i).""; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '10', '".($i)."', '".$week."', '".$row['clp']."', '".$img."')"; - $resul=mysql_query($quer); - } + $resul=mysql_query($quer); + } //Overvallers v/d Week $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY RR DESC, id DESC Limit 10"); - $i=0; + $i=0; while($row = mysql_fetch_array($result)){ - $i++; + $i++; $img="t4_".($i).""; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '4', '".($i)."', '".$week."', '".$row['RR']."', '".$img."')"; - $resul=mysql_query($quer); - } + $resul=mysql_query($quer); + } //deel de bonus voor aanval+defence top 10 uit //Pak de top10 aanvallers @@ -4875,13 +4875,13 @@ function medals(){ $resul=mysql_query($quer); } } - } + } } - //je staat voor 3e / 5e / 10e keer in de top 3 aanvallers + //je staat voor 3e / 5e / 10e keer in de top 3 aanvallers //Pak de top10 aanvallers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY ap DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 1 AND plaats<=3"; $result1=mysql_query($query1); @@ -4889,29 +4889,29 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t120_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '6', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t121_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '6', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t122_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '6', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } } - //je staat voor 3e / 5e / 10e keer in de top 10 aanvallers + //je staat voor 3e / 5e / 10e keer in de top 10 aanvallers //Pak de top10 aanvallers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY ap DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 1 AND plaats<=10"; $result1=mysql_query($query1); @@ -4919,29 +4919,29 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t130_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '12', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t131_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '12', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t132_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '12', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } } - //je staat voor 3e / 5e / 10e keer in de top 3 verdedigers + //je staat voor 3e / 5e / 10e keer in de top 3 verdedigers //Pak de top10 verdedigers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY dp DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 2 AND plaats<=3"; $result1=mysql_query($query1); @@ -4949,29 +4949,29 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t140_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '7', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t141_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '7', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t142_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '7', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } } - //je staat voor 3e / 5e / 10e keer in de top 3 verdedigers + //je staat voor 3e / 5e / 10e keer in de top 3 verdedigers //Pak de top10 verdedigers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY dp DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 2 AND plaats<=10"; $result1=mysql_query($query1); @@ -4979,30 +4979,30 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t150_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '13', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t151_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '13', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t152_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '13', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } - } + } - //je staat voor 3e / 5e / 10e keer in de top 3 klimmers + //je staat voor 3e / 5e / 10e keer in de top 3 klimmers //Pak de top10 klimmers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY Rc DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 3 AND plaats<=3"; $result1=mysql_query($query1); @@ -5010,28 +5010,28 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t100_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '8', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t101_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '8', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t102_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '8', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } } - //je staat voor 3e / 5e / 10e keer in de top 3 klimmers + //je staat voor 3e / 5e / 10e keer in de top 3 klimmers //Pak de top10 klimmers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY Rc DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 3 AND plaats<=10"; $result1=mysql_query($query1); @@ -5039,29 +5039,29 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t110_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '14', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t111_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '14', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t112_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '14', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } } - //je staat voor 3e / 5e / 10e keer in de top 3 klimmers - //Pak de top3 rank climbers + //je staat voor 3e / 5e / 10e keer in de top 3 klimmers + //Pak de top3 rank climbers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY clp DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 10 AND plaats<=3"; $result1=mysql_query($query1); @@ -5069,28 +5069,28 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t200_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '11', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t201_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '11', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t202_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '11', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } } - //je staat voor 3e / 5e / 10e keer in de top 10klimmers - //Pak de top3 rank climbers + //je staat voor 3e / 5e / 10e keer in de top 10klimmers + //Pak de top3 rank climbers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY clp DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 10 AND plaats<=10"; $result1=mysql_query($query1); @@ -5098,29 +5098,29 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t210_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '16', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t211_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '16', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t212_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '16', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } - } + } - //je staat voor 3e / 5e / 10e keer in de top 10 overvallers + //je staat voor 3e / 5e / 10e keer in de top 10 overvallers //Pak de top10 overvallers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY RR DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 4 AND plaats<=3"; $result1=mysql_query($query1); @@ -5128,28 +5128,28 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t160_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '9', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t161_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '9', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t162_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '9', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); } - } - //je staat voor 3e / 5e / 10e keer in de top 10 overvallers + } + //je staat voor 3e / 5e / 10e keer in de top 10 overvallers //Pak de top10 overvallers $result = mysql_query("SELECT * FROM ".TB_PREFIX."users ORDER BY RR DESC, id DESC Limit 10"); - while($row = mysql_fetch_array($result)){ + while($row = mysql_fetch_array($result)){ $query1="SELECT count(*) FROM ".TB_PREFIX."medal WHERE userid='".$row['id']."' AND categorie = 4 AND plaats<=10"; $result1=mysql_query($query1); @@ -5157,19 +5157,19 @@ function medals(){ //2x in gestaan, dit is 3e dus lintje (brons) - if($row1[0]=='3'){ + if($row1[0]=='3'){ $img="t170_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '15', '0', '".$week."', 'Three', '".$img."')"; $resul=mysql_query($quer); } //4x in gestaan, dit is 5e dus lintje (zilver) - if($row1[0]=='5'){ + if($row1[0]=='5'){ $img="t171_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '15', '0', '".$week."', 'Five', '".$img."')"; $resul=mysql_query($quer); - } + } //9x in gestaan, dit is 10e dus lintje (goud) - if($row1[0]=='10'){ + if($row1[0]=='10'){ $img="t172_1"; $quer="insert into ".TB_PREFIX."medal(userid, categorie, plaats, week, points, img) values('".$row['id']."', '15', '0', '".$week."', 'Ten', '".$img."')"; $resul=mysql_query($quer); @@ -5190,7 +5190,7 @@ function medals(){ $i=0; while($row = mysql_fetch_array($result)){ $i++; $img="a2_".($i).""; $quer="insert into ".TB_PREFIX."allimedal(allyid, categorie, plaats, week, points, img) values('".$row['id']."', '1', '".($i)."', '".$allyweek."', '".$row['ap']."', '".$img."')"; - $resul=mysql_query($quer); + $resul=mysql_query($quer); } //Verdediger v/d Week @@ -5198,15 +5198,15 @@ function medals(){ $i=0; while($row = mysql_fetch_array($result)){ $i++; $img="a3_".($i).""; $quer="insert into ".TB_PREFIX."allimedal(allyid, categorie, plaats, week, points, img) values('".$row['id']."', '2', '".($i)."', '".$allyweek."', '".$row['dp']."', '".$img."')"; - $resul=mysql_query($quer); - } + $resul=mysql_query($quer); + } //Overvallers v/d Week $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY RR DESC, id DESC Limit 10"); $i=0; while($row = mysql_fetch_array($result)){ $i++; $img="a4_".($i).""; $quer="insert into ".TB_PREFIX."allimedal(allyid, categorie, plaats, week, points, img) values('".$row['id']."', '4', '".($i)."', '".$allyweek."', '".$row['RR']."', '".$img."')"; - $resul=mysql_query($quer); + $resul=mysql_query($quer); } //Rank climbers of the week @@ -5214,7 +5214,7 @@ function medals(){ $i=0; while($row = mysql_fetch_array($result)){ $i++; $img="a1_".($i).""; $quer="insert into ".TB_PREFIX."allimedal(allyid, categorie, plaats, week, points, img) values('".$row['id']."', '3', '".($i)."', '".$allyweek."', '".$row['clp']."', '".$img."')"; - $resul=mysql_query($quer); + $resul=mysql_query($quer); } $result = mysql_query("SELECT * FROM ".TB_PREFIX."alidata ORDER BY ap DESC, id DESC Limit 10"); @@ -5247,7 +5247,7 @@ function medals(){ $resul=mysql_query($quer); } } - } + } } $query="SELECT * FROM ".TB_PREFIX."alidata ORDER BY id+0 DESC"; @@ -5263,9 +5263,9 @@ function medals(){ /************************************************ Function for automate medals - by yi12345 and Shadow - References: + References: ************************************************/ - + private function artefactOfTheFool() { global $database; $time = time(); diff --git a/GameEngine/BBCode.php b/GameEngine/BBCode.php index 343fb3e2..12ce885b 100644 --- a/GameEngine/BBCode.php +++ b/GameEngine/BBCode.php @@ -1,4 +1,4 @@ -20) {$post['h_off_bonus']=20;} }else $post['h_off_bonus']=0; - + if(isset($post['h_def_bonus'])) { if (intval($post['h_def_bonus'])>20) {$post['h_def_bonus']=20;} }else $post['h_def_bonus']=0; - + if(isset($post['a1_1'])) { $sum = $sum2 = $post['walllevel'] = 0; for($i=1;$i<=10;$i++) { @@ -53,13 +53,13 @@ public function procSim($post) { } if($sum > 0) { $post['palast'] = intval($post['palast']); - if($post['palast'] > 20) $post['palast'] = 20; + if($post['palast'] > 20) $post['palast'] = 20; if(isset($post['wall1'])) { $post['wall1'] = intval($post['wall1']); if ($post['wall1'] > 20) $post['wall1']=20; if ($post['walllevel']==0) $post['walllevel']=$post['wall1']; - } + } if(isset($post['wall2'])) { $post['wall2'] = intval($post['wall2']); if ($post['wall2'] > 20) $post['wall2']=20; @@ -99,15 +99,15 @@ private function getBattleHero($uid) { $h_db = 1 + 0.010 * ($heroarray[0]['defencebonus']/5); return array('heroid'=>$heroarray[0]['heroid'],'unit'=>$heroarray[0]['unit'],'atk'=>$h_atk,'di'=>$h_di,'dc'=>$h_dc,'ob'=>$h_ob,'db'=>$h_db,'health'=>$heroarray['health']); } - + private function getBattleHeroSim($attbonus) { global $database; $h_atk =0; $h_ob = 1 + 0.010 * $attbonus; - + return array('unit'=>16,'atk'=>$h_atk,'ob'=>$h_ob); } - + private function simulate($post) { //set the arrays with attacking and defending units $attacker = array('u1'=>0,'u2'=>0,'u3'=>0,'u4'=>0,'u5'=>0,'u6'=>0,'u7'=>0,'u8'=>0,'u9'=>0,'u10'=>0,'u11'=>0,'u12'=>0,'u13'=>0,'u14'=>0,'u15'=>0,'u16'=>0,'u17'=>0,'u18'=>0,'u19'=>0,'u20'=>0,'u21'=>0,'u22'=>0,'u23'=>0,'u24'=>0,'u25'=>0,'u26'=>0,'u27'=>0,'u28'=>0,'u29'=>0,'u30'=>0,'u31'=>0,'u32'=>0,'u33'=>0,'u34'=>0,'u35'=>0,'u36'=>0,'u37'=>0,'u38'=>0,'u39'=>0,'u40'=>0,'u41'=>0,'u42'=>0,'u43'=>0,'u44'=>0,'u45'=>0,'u46'=>0,'u47'=>0,'u48'=>0,'u49'=>0,'u50'=>0); @@ -115,7 +115,7 @@ private function simulate($post) { $index = 1; $offhero=intval($post['h_off_bonus']); $hero_strenght=intval($post['h_off']); - $deffhero=intval($post['h_def_bonus']); + $deffhero=intval($post['h_def_bonus']); for($i=$start;$i<=($start+9);$i++) { $attacker['u'.$i] = $post['a1_'.$index]; if($index <=8) { @@ -123,7 +123,7 @@ private function simulate($post) { } $index += 1; } - + $defender = array(); $defscout=0; //fix by ronix @@ -134,7 +134,7 @@ private function simulate($post) { if($i == 4 || $i == 14 || $i == 23 || $i == 44){ $defscout+=$defender['u'.$i]; } - + } else { $defender['u'.$i] = 0; @@ -166,10 +166,10 @@ private function simulate($post) { if($scout ==1) { $palast = 0; //no def point palace n residence when scout } - - if(!$scout) + + if(!$scout) return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$palast,$post['ew1'],$post['ew2'],$post['ktyp']+3,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$post['kata'],$post['stonemason'],$walllevel,$offhero,$post['h_off'],$deffhero,0,0,0,0,0); - else + else return $this->calculateBattle($attacker,$defender,$wall,$post['a1_v'],$deftribe,$palast,$post['ew1'],$post['ew2'],1,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$post['kata'],$post['stonemason'],$walllevel,0,0,0,0,0,0,0,0); } @@ -223,7 +223,7 @@ public function getTypeLevel($tid,$vid) { //1 raid 0 normal function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$residence,$attpop,$defpop,$type,$def_ab,$att_ab1,$att_ab2,$att_ab3,$att_ab4,$att_ab5,$att_ab6,$att_ab7,$att_ab8,$tblevel,$stonemason,$walllevel,$offhero,$hero_strenght,$deffhero,$AttackerID,$DefenderID,$AttackerWref,$DefenderWref,$conqureby) { global $bid34,$bid35,$database; - + // Define the array, with the units $calvary = array(4,5,6,15,16,23,24,25,26,45,46); $catapult = array(8,18,28,48); @@ -235,8 +235,8 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $winner = false; // at 0 all partial results $cap = $ap = $dp = $cdp = $rap = $rdp = 0; - - + + $att_artefact = count($database->getOwnUniqueArtefactInfo2($AttackerID,3,3,0)); $att_artefact1 = count($database->getOwnUniqueArtefactInfo2($AttackerWref,3,1,1)); $att_artefact2 = count($database->getOwnUniqueArtefactInfo2($AttackerID,3,2,0)); @@ -293,7 +293,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re for ($i=1;$i<=50;$i++) {$def_ab[$i]=0;} $fromvillage = $defenders['from']; $enforcetribe = $database->getUserField($database->getVillageField($fromvillage,"owner"),"tribe",0); - $ud=($enforcetribe-1)*10; + $ud=($enforcetribe-1)*10; if($defenders['from']>0) { //don't check nature tribe $armory = $database->getABTech($defenders['from']); // Armory level every village enforcement $def_ab[$ud+1] = $armory['a1']; @@ -316,7 +316,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $dp+=$datadef['dp']; $cdp+=$datadef['cdp']; $involve=$datadef['involve']; - } + } $reinfowner = $database->getVillageField($fromvillage,"owner"); $defhero = $this->getBattleHero($reinfowner); //calculate def hero from enforcement @@ -325,7 +325,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re //$dp += $defhero['di']; $dp *= $defhero['db']; $cdp *= $defhero['db']; - } + } } } // Calculate the total number of points Attacker @@ -336,22 +336,22 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re }else{ $abcount = 4; } - + if($type == 1) {//scout for($i=$start;$i<=$end;$i++) { global ${'u'.$i}; $j = $i-$start+1; if($Attacker['u'.$i]>0 && ($i == 4 || $i == 14 || $i == 23 || $i == 44)){ - if(${'att_ab'.$abcount} > 0) { + if(${'att_ab'.$abcount} > 0) { $ap += (35 + (35 + 300 * ${'u'.$i}['pop'] / 7) * (pow(1.00697, ${'att_ab'.$abcount}) - 1)) * $Attacker['u'.$i];// ^ ($Attacker['u'.$i]/100); }else{ $ap += $Attacker['u'.$i]*35; } - } + } $involve += $Attacker['u'.$i]; $units['Att_unit'][$i] = $Attacker['u'.$i]; - + } $att_foolartefact = $database->getFoolArtefactInfo(3,$AttackerWref,$AttackerID); if(count($att_foolartefact) > 0){ @@ -364,7 +364,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re } } } - + }else{ //type=3 normal 4=raid $abcount = 1; for($i=$start;$i<=$end;$i++) { @@ -401,7 +401,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $cap *= $atkhero['ob']; $ap += $atkhero['atk']; } - + if ($offhero!=0 || $hero_strenght!=0) { $atkhero=$this->getBattleHeroSim($offhero); $ap *= $atkhero['ob']; @@ -413,67 +413,67 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $dp *= $dfdhero['ob']; $cdp *= $dfdhero['ob']; } - } + } // Formula for calculating the bonus defensive wall and Residence - if($def_wall > 0) { - // Set the factor calculation for the "wall" as the type of the civilization + if($def_wall > 0) { + // Set the factor calculation for the "wall" as the type of the civilization // Factor = 1030 Wall Roman - // Factor = 1020 Wall Teuton - // Factor = 1025 Wall Goul - $factor = ($def_tribe == 1)? 1.030 : (($def_tribe == 2)? 1.020 : 1.025); - // Defense infantry = Infantry * Wall (%) - // Defense calvary calvary = * Wall (%) + // Factor = 1020 Wall Teuton + // Factor = 1025 Wall Goul + $factor = ($def_tribe == 1)? 1.030 : (($def_tribe == 2)? 1.020 : 1.025); + // Defense infantry = Infantry * Wall (%) + // Defense calvary calvary = * Wall (%) if ($dp>0 || $cdp >0) { - if($type==1) { + if($type==1) { $dp *= pow($factor,$def_wall); $dp1 = 10 * pow($factor,$def_wall) * $def_wall; $dp +=$dp1; }else{ - $dp *= pow($factor,$def_wall); - $cdp *= pow($factor,$def_wall); - + $dp *= pow($factor,$def_wall); + $cdp *= pow($factor,$def_wall); + // Calculation of the Basic defense bonus "Residence" - $dp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); - $cdp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); + $dp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); + $cdp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); } } else { - $dp = 10 * pow($factor,$def_wall) * $def_wall; - // Defense calvary calvary = * Wall (%) + $dp = 10 * pow($factor,$def_wall) * $def_wall; + // Defense calvary calvary = * Wall (%) $cdp = 10 * pow($factor,$def_wall) * $def_wall; if($type!=1) { - // Calculation of the Basic defense bonus "Residence" - $dp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); - $cdp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); + // Calculation of the Basic defense bonus "Residence" + $dp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); + $cdp += ((2*(pow($residence,2)))*(pow($factor,$def_wall))); }else $cdp=0; } - }elseif($type!=1) { - // Calculation of the Basic defense bonus "Residence" - $dp += (2*(pow($residence,2))); - $cdp += (2*(pow($residence,2))); - } + }elseif($type!=1) { + // Calculation of the Basic defense bonus "Residence" + $dp += (2*(pow($residence,2))); + $cdp += (2*(pow($residence,2))); + } // Formula for calculating points attackers (Infantry & Cavalry) - + if($AttackerWref != 0){ $rap = ($ap+$cap)+(($ap+$cap)/100*$bid35[$this->getTypeLevel(35,$AttackerWref)]['attri']); }else{ $rap = $ap+$cap; } - + // Formula for calculating Defensive Points - - if ($rap==0) + + if ($rap==0) $rdp = ($dp) + ($cdp) + 10; else $rdp = ($dp * ($ap/$rap)) + ($cdp * ($cap/$rap)) + 10; - - + + // The Winner is....: $result['Attack_points'] = $rap; $result['Defend_points'] = $rdp; $winner = ($rap > $rdp); - + // Formula for calculating the Moral if($attpop > $defpop) { if ($rap < $rdp) { @@ -501,12 +501,12 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re if($type == 1){ $holder = pow((($rdp*$moralbonus)/$rap),$Mfactor); if($holder>1) $holder=1; - if ($rdp>$rap) $holder=1; - + if ($rdp>$rap) $holder=1; + // Attacker $result[1] = $holder; if ($att_tribe==5) $result[1] = 0; //Birds of Prey cannot die when scout - + // Defender $result[2] = 0; }else if($type == 2){ @@ -522,10 +522,10 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $catp -= round($catp*$result[1]/100); }else if($type == 3){ // Attacker - + $result[1] = ($winner)? round(pow((($rdp*$moralbonus)/$rap),$Mfactor),8) : 1; if ($result[1]>1) {$result[1]=1;$winner=false;$result['Winner'] = "defender";} - + // Defender $result[2] = (!$winner)? round(pow(($rap/($rdp*$moralbonus)),$Mfactor),8) : 1; if ($result[1]==1) {$result[2]=round(pow(($rap/($rdp*$moralbonus)),$Mfactor),8);} @@ -577,13 +577,13 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re } } } - + if($stonemason==0){ $need = round((($moralbonus * (pow($tblevel,2) + $tblevel + 1)) / (8 * (round(200 * pow(1.0205,$att_ab8))/200) / $strongerbuildings / $good_effect * $bad_effect)) + 0.5); }else{ $need = round((($moralbonus * (pow($tblevel,2) + $tblevel + 1)) / (8 * (round(200 * pow(1.0205,$att_ab8))/200) / ($bid34[$stonemason]['attri']/100) / $strongerbuildings / $good_effect * $bad_effect)) + 0.5); } - + // Number catapults to take down the building $result[3] = $need; //Number catapults nego @@ -630,7 +630,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re // Number catapults to action $result[8] = $wctp; - + } $result[6] = pow($rap/$rdp*$moralbonus,$Mfactor); @@ -652,7 +652,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $hero_id=$fdb['heroid']; $hero_health=$fdb['health']; $damage_health=round(100*$result[1]); - + if ($hero_health<=$damage_health or $damage_health>90){ //hero die $result['casualties_attacker']['11'] = 1; @@ -727,7 +727,7 @@ function calculateBattle($Attacker,$Defender,$def_wall,$att_tribe,$def_tribe,$re $result['bounty'] = $max_bounty; - + return $result; } @@ -738,11 +738,11 @@ public function getDataDefScout($defenders,$def_ab,$defender_artefact,$AttackerW $dp=0; $cdp=0; $detected=0; - + for($y=4;$y<=54;$y++) { if($y == 4 || $y == 14 || $y == 23 || $y == 44){ global ${'u'.$y}; - + if($defenders['u'.$y]>0 && $def_ab[$y] > 0) { $dp += (20 + (20 + 300 * ${'u'.$y}['pop'] / 7) * (pow(1.00696, $def_ab[$y]) - 1)) * $defenders['u'.$y] * $defender_artefact; @@ -761,17 +761,17 @@ public function getDataDefScout($defenders,$def_ab,$defender_artefact,$AttackerW if($defenders['u'.$y]>0) { $dp += $defenders['u'.$y]* 20 * $defender_artefact; } - + $units['Def_unit'][$y] = $defenders['u'.$y]; if($units['Def_unit'][$y] > 0){ $detected = 1; } } $invol += $defenders['u'.$y]; //total troops - $units['Def_unit'][$y] = $defenders['u'.$y]; + $units['Def_unit'][$y] = $defenders['u'.$y]; } } - + $datadef['dp']=$dp; $datadef['cdp']=$cdp; $datadef['detect']=($detected==1)? 1:0; @@ -792,18 +792,18 @@ public function getDataDef($defenders,$def_ab) { }else{ $dp += $defenders['u'.$y]*${'u'.$y}['di']; $cdp += $defenders['u'.$y]*${'u'.$y}['dc']; - } - + } + } - $invol += $defenders['u'.$y]; //total troops + $invol += $defenders['u'.$y]; //total troops $units['Def_unit'][$y] = $defenders['u'.$y]; } $datadef['dp']=$dp; $datadef['cdp']=$cdp; $datadef['involve']=$invol; - + return $datadef; - + } }; diff --git a/GameEngine/Building.php b/GameEngine/Building.php index 40ecf962..3b224b7e 100644 --- a/GameEngine/Building.php +++ b/GameEngine/Building.php @@ -35,7 +35,7 @@ public function Building() { } } } - + public function canProcess($id,$tid) { //add fix by ronix global $session; @@ -53,7 +53,7 @@ public function canProcess($id,$tid) { exit; } } - } + } public function procBuild($get) { global $session, $village, $database; @@ -75,7 +75,7 @@ public function procBuild($get) { if($session->access==BANNED){ header("Location: banned.php"); exit; - } + } $level = $database->getResourceLevel($village->wid); $database->addBuilding($village->wid, $get['id'], $get['master'], 1, $get['time'], 1, $level['f'.$get['id']] + 1 + count($database->getBuildingByField($village->wid,$get['id']))); if($get['id'] > 18) { @@ -83,7 +83,7 @@ public function procBuild($get) { } else { header("Location: dorf1.php"); } - } + } } if(isset($get['a']) && $get['c'] == $session->checker && isset($get['id'])) { $session->changeChecker(); @@ -546,7 +546,7 @@ private function meetRequirement($id) { break; case 39: if($this->getTypeLevel(15) >= 10) { return true; } else { return false; } - break; + break; case 40: $wwlevel = $village->resarray['f99']; if($wwlevel > 50){ @@ -712,7 +712,7 @@ public function finishAll() { global $database,$session,$logging,$village,$bid18,$bid10,$bid11,$technology,$_SESSION; if($session->access!=BANNED){ $finish = 0; - + foreach($this->buildArray as $jobs) { if($jobs['wid']==$village->wid){ $finish=2; @@ -766,7 +766,7 @@ public function finishAll() { $logging->goldFinLog($village->wid); $database->modifyGold($session->uid,2,0); } - $stillbuildingarray = $database->getJobs($village->wid); + $stillbuildingarray = $database->getJobs($village->wid); if(count($stillbuildingarray) == 1) { if($stillbuildingarray[0]['loopcon'] == 1) { //$q = "UPDATE ".TB_PREFIX."bdata SET loopcon=0,timestamp=".(time()+$stillbuildingarray[0]['timestamp']-$innertimestamp)." WHERE id=".$stillbuildingarray[0]['id']; @@ -779,7 +779,7 @@ public function finishAll() { }else{ header("Location: banned.php"); } - } + } public function resourceRequired($id,$tid,$plus=1) { $name = "bid".$tid; diff --git a/GameEngine/Data/cel.php b/GameEngine/Data/cel.php index 77b8b0fc..1542b49f 100644 --- a/GameEngine/Data/cel.php +++ b/GameEngine/Data/cel.php @@ -34,7 +34,7 @@ 19 => 44658, 20 => 43050); -$gc= array( +$gc= array( 10 => 155291, 11 => 149701, 12 => 144312, diff --git a/GameEngine/Data/cp.php b/GameEngine/Data/cp.php index a27ebb1e..57bf1617 100644 --- a/GameEngine/Data/cp.php +++ b/GameEngine/Data/cp.php @@ -138,7 +138,7 @@ 124 => 34180700, 125 => 34823200); -$cp1= array( +$cp1= array( 1 => 0, 2 => 2000, 3 => 8000, diff --git a/GameEngine/Data/hero_full.php b/GameEngine/Data/hero_full.php index febe6c12..9e7794e9 100644 --- a/GameEngine/Data/hero_full.php +++ b/GameEngine/Data/hero_full.php @@ -60,7 +60,7 @@ 330880), array('wood' => 143000, 'clay' => 165500, 'iron' => 206000, 'crop' => 49500, 'time' => 337920), array('wood' => 146500, 'clay' => 170000, 'iron' => 211500, 'crop' => 50500, 'time' => 344960), array('wood' => 150000, 'clay' => 174000, 'iron' => 216500, 'crop' => 52000, 'time' => 352000), array('wood' => 154000, 'clay' => 178500, 'iron' => 222000, 'crop' => 53000, 'time' => 359040), array('wood' => 46000, 'clay' => 183000, 'iron' => 227500, 'crop' => 54500, 'time' => 366080), array('wood' => 46000, 'clay' => 187500, 'iron' => 233000, 'crop' => 56000, 'time' => 373120), array('wood' => 166500, 'clay' => 192000, 'iron' => 238500, 'crop' => 57000, 'time' => 380160), array('wood' => 169500, 'clay' => 196000, 'iron' => 240000, 'crop' => 58500, 'time' => 387200), array('wood' => 173000, 'clay' => 200500, 'iron' => 240000, 'crop' => 59500, 'time' => 394240), array('wood' => 177000, 'clay' => 205000, 'iron' => 240000, 'crop' => 61000, 'time' => 401280), array('wood' => 181000, 'clay' => 209500, 'iron' => 240000, 'crop' => 62500, 'time' => 406970), array('wood' => 185000, 'clay' => 214000, 'iron' => 240000, 'crop' => 64000, 'time' => 415360), array('wood' => 188500, 'clay' => 219000, 'iron' => 240000, 'crop' => 65000, 'time' => 422400), array('wood' => 192500, 'clay' => 223500, 'iron' => 240000, 'crop' => 66500, 'time' => 429440)); - + //TEUTON UNITS $h11_full = array(array('wood' => 190, 'clay' => 150, 'iron' => 80, 'crop' => 80, 'time' => 1440), array('wood' => 520, 'clay' => 430, 'iron' => 260, 'crop' => 260, 'time' => 2880), array('wood' => 870, 'clay' => 710, 'iron' => 430, 'crop' => 430, 'time' => 4320), array('wood' => 1200, 'clay' => 1000, 'iron' => 620, 'crop' => 620, 'time' => 5760), array('wood' => 1600, 'clay' => 1300, 'iron' => 820, 'crop' => 820, 'time' => 7200), array('wood' => 2100, 'clay' => 1700, 'iron' => 1000, 'crop' => 1000, 'time' => 8640), array('wood' => 2500, 'clay' => 2000, 'iron' => 1300, 'crop' => 1300, 'time' => 10080), array('wood' => 3000, 'clay' => 2400, 'iron' => 1500, 'crop' => 1500, 'time' => 11520), array('wood' => 3400, 'clay' => 2800, 'iron' => 1700, 'crop' => 1700, 'time' => 12960), array('wood' => 3900, 'clay' => 3200, 'iron' => 2000, 'crop' => 2000, 'time' => 14400), array('wood' => 4400, 'clay' => 3600, 'iron' => 2200, 'crop' => 2200, 'time' => 15840), array('wood' => 4900, 'clay' => 4000, 'iron' => 2500, 'crop' => 2500, 'time' => 17280), array('wood' => 5400, 'clay' => 4400, 'iron' => 2700, @@ -116,7 +116,7 @@ 125000, 'crop' => 24000, 'time' => 284160), array('wood' => 120500, 'clay' => 137500, 'iron' => 128500, 'crop' => 24500, 'time' => 290080), array('wood' => 123500, 'clay' => 141000, 'iron' => 131500, 'crop' => 25500, 'time' => 296000), array('wood' => 126500, 'clay' => 144500, 'iron' => 135000, 'crop' => 26000, 'time' => 301920), array('wood' => 130000, 'clay' => 148000, 'iron' => 138000, 'crop' => 26500, 'time' => 307840), array('wood' => 133000, 'clay' => 151500, 'iron' => 141500, 'crop' => 27000, 'time' => 313760), array('wood' => 136000, 'clay' => 155000, 'iron' => 145000, 'crop' => 28000, 'time' => 319680), array('wood' => 139500, 'clay' => 159000, 'iron' => 148500, 'crop' => 28500, 'time' => 325600), array('wood' => 142500, 'clay' => 162500, 'iron' => 151500, 'crop' => 29000, 'time' => 331520), array('wood' => 145500, 'clay' => 166000, 'iron' => 155000, 'crop' => 30000, 'time' => 337440), array('wood' => 149000, 'clay' => 169500, 'iron' => 158500, 'crop' => 30500, 'time' => 343360), array('wood' => 152000, 'clay' => 173500, 'iron' => 162000, 'crop' => 31000, 'time' => 349280), array('wood' => 155500, 'clay' => 177000, 'iron' => 165500, 'crop' => 31500, 'time' => 355200), array('wood' => 158500, 'clay' => 180500, 'iron' => 169000, 'crop' => 32500, 'time' => 361120)); - + //GAUL UNITS $h21_full = array(array('wood' => 200, 'clay' => 260, 'iron' => 110, 'clay' => 60, 'time' => 2080), array('wood' => 550, 'clay' => 690, 'iron' => 330, 'clay' => 210, 'time' => 4160), array('wood' => 910, 'clay' => 1100, 'iron' => 550, 'clay' => 360, 'time' => 6240), array('wood' => 1300, 'clay' => 1600, 'iron' => 790, 'clay' => 510, 'time' => 8320), array('wood' => 1700, 'clay' => 2200, 'iron' => 1000, 'clay' => 670, 'time' => 10400), array('wood' => 2200, 'clay' => 2700, 'iron' => 1300, 'clay' => 850, 'time' => 12480), array('wood' => 2600, 'clay' => 3300, 'iron' => 1600, 'clay' => 1000, 'time' => 14560), array('wood' => 3100, 'clay' => 3900, 'iron' => 1900, 'clay' => 1200, 'time' => 16640), array('wood' => 3600, 'clay' => 4500, 'iron' => 2200, 'clay' => 1400, 'time' => 18720), array('wood' => 4100, 'clay' => 5200, 'iron' => 2500, 'clay' => 1600, 'time' => 20800), array('wood' => 4600, 'clay' => 5800, 'iron' => 2800, 'clay' => 1800, 'time' => 22880), array('wood' => 5100, 'clay' => 6500, diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index f805ed31..30e32716 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -4,14 +4,14 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Project: TravianZ ## -## Version: 01.09.2013 ## +## Version: 01.09.2013 ## ## Filename db_MYSQL.php ## -## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ## +## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ## ## Fixed by: Shadow - Doubleing Troops , STARVATION , HERO FIXED COMPL. ## ## License: TravianZ Project ## ## Copyright: TravianZ (c) 2010-2013. All rights reserved. ## ## URLs: http://travian.shadowss.ro ## -## Source code: http://github.com/Shadowss/TravianZ-by-Shadow/ ## +## Source code: http://github.com/Shadowss/TravianZ-by-Shadow/ ## ## ## ################################################################################# @@ -132,7 +132,7 @@ function getVilWref($x, $y) { $dbarray = mysql_fetch_array($result); return $dbarray['id']; } - + function caststruc($user) { //loop search village user $query = mysql_query("SELECT * FROM ".TB_PREFIX."vdata WHERE owner = ".$user.""); @@ -143,7 +143,7 @@ function caststruc($user) { $strutture= mysql_fetch_array($query1); return $strutture; } - + function removeMeSit($uid, $uid2) { $q = "UPDATE " . TB_PREFIX . "users set sit1 = 0 where id = $uid and sit1 = $uid2"; mysql_query($q, $this->connection); @@ -163,7 +163,7 @@ function getUserField($ref, $field, $mode) { return $dbarray[$field]; }elseif($field=="username"){ return "??"; - }else return 0; + }else return 0; } function getInvitedUser($uid) { @@ -196,7 +196,7 @@ function getUnstarvation(){ $q = "SELECT * FROM " . TB_PREFIX . "vdata where starv = 0 and starvupdate = 0"; $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); - } + } function getActivateField($ref, $field, $mode) { if(!$mode) { @@ -367,7 +367,7 @@ function UpdateOnline($mode, $name = "", $time = "", $uid = 0) { return mysql_query($q, $this->connection); } } - + function generateBase($sector, $mode=1) { $num_rows = 0; $count_while = 0; @@ -389,7 +389,7 @@ function generateBase($sector, $mode=1) { } } else { - $wide1=1; + $wide1=1; $wide2=WORLD_MAX; } switch($sector) { @@ -479,7 +479,7 @@ function isVillageOases($wref) { if($result){ $dbarray = mysql_fetch_array($result); return $dbarray['oasistype']; - }else return 0; + }else return 0; } public function VillageOasisCount($vref) { @@ -521,7 +521,7 @@ public function canConquerOasis($vref,$wref) { if($this->VillageOasisCount($vref) < floor(($HeroMansionLevel-5)/5)) { $OasisInfo = $this->getOasisInfo($wref); //fix by ronix - if($OasisInfo['conqured'] == 0 || $OasisInfo['conqured'] != 0 && intval($OasisInfo['loyalty']) < 99 / min(3,(4-$this->VillageOasisCount($OasisInfo['conqured'])))){ + if($OasisInfo['conqured'] == 0 || $OasisInfo['conqured'] != 0 && intval($OasisInfo['loyalty']) < 99 / min(3,(4-$this->VillageOasisCount($OasisInfo['conqured'])))){ $CoordsVillage = $this->getCoor($vref); $CoordsOasis = $this->getCoor($wref); $max = 2 * WORLD_MAX + 1; @@ -581,7 +581,7 @@ function populateOasisUnits($wid, $high) { }elseif($high == 1){ $max = rand(50,70); }elseif($high == 2){ - $max = rand(90,120); + $max = rand(90,120); } $max2 = 0; $rand = rand(0,3); @@ -763,7 +763,7 @@ function getVillagesID($uid) { } return $newarray; } - + function getVillagesID2($uid) { $q = "SELECT wref from " . TB_PREFIX . "vdata where owner = $uid order by capital DESC,pop DESC"; $result = mysql_query($q, $this->connection); @@ -828,7 +828,7 @@ function getVillageField($ref, $field) { return $dbarray[$field]; }elseif($field=="name"){ return "??"; - }else return 0; + }else return 0; } function getOasisField($ref, $field) { @@ -860,7 +860,7 @@ function getAdminLog() { return $this->mysql_fetch_all($result); } - //fix market log + //fix market log function getMarketLog() { $q = "SELECT id,wid,log from " . TB_PREFIX . "market_log where id != 0 ORDER BY id ASC"; $result = mysql_query($q, $this->connection); @@ -1174,7 +1174,7 @@ function getVoteSum($topic) { $sum += $array['vote'.$i]; } return $sum; - } + } /************************* @@ -1223,11 +1223,11 @@ function DeleteCat($id) { mysql_query($qs, $this->connection); return mysql_query($q, $this->connection); } - + function DeleteSurvey($id) { $qs = "DELETE from " . TB_PREFIX . "forum_survey where topic = '$id'"; return mysql_query($qs, $this->connection); - } + } function DeleteTopic($id) { $qs = "DELETE from " . TB_PREFIX . "forum_topic where id = '$id'"; @@ -1309,7 +1309,7 @@ function createAlliance($tag, $name, $uid, $max) { mysql_query($q, $this->connection); return mysql_insert_id($this->connection); } - + function procAllyPop($aid) { $ally = $this->getAlliance($aid); $memberlist = $this->getAllMember($ally['id']); @@ -1459,7 +1459,7 @@ function diplomacyInviteCheck($session_alliance) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function diplomacyInviteCheck2($ally1, $ally2) { $q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $ally1 AND alli2 = $ally2 accepted = 0"; $result = mysql_query($q, $this->connection); @@ -1530,7 +1530,7 @@ function diplomacyCancelExistingRelationship($id, $session_alliance) { $q = "DELETE FROM " . TB_PREFIX . "diplomacy WHERE id = $id AND alli2 = $session_alliance OR id = $id AND alli1 = $session_alliance"; return mysql_query($q, $this->connection); } - + function checkDiplomacyInviteAccept($aid, $type) { $q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $aid AND type = $type AND accepted = 1 OR alli2 = $aid AND type = $type AND accepted = 1"; $result = mysql_query($q, $this->connection); @@ -1632,7 +1632,7 @@ function getFieldType($vid, $field) { $result = mysql_query($q, $this->connection); return mysql_result($result, 0); } - + function getFieldDistance($wid) { $q = "SELECT * FROM " . TB_PREFIX . "vdata where owner > 4 and wref != $wid"; $array = $this->query_return($q); @@ -1659,7 +1659,7 @@ function getFieldDistance($wid) { } } return $vill; - } + } function getVSumField($uid, $field) { if($field != "cp"){ @@ -1746,7 +1746,7 @@ function getInvitation($uid) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getInvitation2($uid, $aid) { $q = "SELECT * FROM " . TB_PREFIX . "ali_invite where uid = $uid and alliance = $aid"; $result = mysql_query($q, $this->connection); @@ -2062,10 +2062,10 @@ function removeBuilding($d) { $fieldlevel = mysql_fetch_row($result); if($fieldlevel[0] == 0) { if ($village->natar==1 && $jobs[$jobDeleted]['field']==99) { //fix by ronix - }else{ + }else{ $x = "UPDATE " . TB_PREFIX . "fdata SET f" . $jobs[$jobDeleted]['field'] . "t=0 WHERE vref=" . $jobs[$jobDeleted]['wid']; mysql_query($x, $this->connection) or die(mysql_error()); - } + } } } if(($jobLoopconID >= 0) && ($jobs[$jobDeleted]['loopcon'] != 1)) { @@ -2108,7 +2108,7 @@ function finishDemolition($wid) { $q = "UPDATE " . TB_PREFIX . "demolition SET timetofinish=" . time() . " WHERE vref=" . $wid; $result= mysql_query($q, $this->connection); return mysql_affected_rows(); - } + } function delDemolition($wid) { $q = "DELETE FROM " . TB_PREFIX . "demolition WHERE vref=" . $wid; @@ -2160,7 +2160,7 @@ function getBuildingByField($wid,$field) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getBuildingByField2($wid,$field) { $q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and field = $field and master = 0"; $result = mysql_query($q, $this->connection); @@ -2172,7 +2172,7 @@ function getBuildingByType($wid,$type) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getBuildingByType2($wid,$type) { $q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and type = $type and master = 0"; $result = mysql_query($q, $this->connection); @@ -2416,13 +2416,13 @@ function modifyAttack($aid, $unit, $amt) { $q = "UPDATE " . TB_PREFIX . "attacks set $unit = $unit - $amt where id = $aid"; return mysql_query($q, $this->connection); } - + function modifyAttack2($aid, $unit, $amt) { $unit = 't' . $unit; $q = "UPDATE " . TB_PREFIX . "attacks set $unit = $unit + $amt where id = $aid"; return mysql_query($q, $this->connection); } - + function modifyAttack3($aid, $units) { $q = "UPDATE ".TB_PREFIX."attacks set $units WHERE id = $aid"; return mysql_query($q, $this->connection); @@ -2469,7 +2469,7 @@ function getAllMember($aid) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getAllMember2($aid) { $q = "SELECT * FROM " . TB_PREFIX . "users where alliance = $aid order by (SELECT sum(pop) FROM " . TB_PREFIX . "vdata WHERE owner = " . TB_PREFIX . "users.id) desc, " . TB_PREFIX . "users.id desc LIMIT 1"; $result = mysql_query($q, $this->connection); @@ -2730,7 +2730,7 @@ function getEnforce($vid, $from) { $result = mysql_query($q, $this->connection); return mysql_fetch_assoc($result); } - + function getOasisEnforce($ref, $mode=0) { if (!$mode) { $q = "SELECT e.*,o.conqured FROM ".TB_PREFIX."enforcement as e LEFT JOIN ".TB_PREFIX."odata as o ON e.vref=o.wref where o.conqured = $ref AND e.from !=$ref"; @@ -2740,7 +2740,7 @@ function getOasisEnforce($ref, $mode=0) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getOasisEnforceArray($id, $mode=0) { if (!$mode) { $q = "SELECT e.*,o.conqured FROM ".TB_PREFIX."enforcement as e LEFT JOIN ".TB_PREFIX."odata as o ON e.vref=o.wref where e.id = $id"; @@ -2750,7 +2750,7 @@ function getOasisEnforceArray($id, $mode=0) { $result = mysql_query($q, $this->connection); return mysql_fetch_assoc($result); } - + function getEnforceControllTroops($vid) { $q = "SELECT * from " . TB_PREFIX . "enforcement where vref = $vid"; $result = mysql_query($q, $this->connection); @@ -3094,12 +3094,12 @@ function populateOasisdata() { $wid = $row['id']; $basearray = $this->getOMInfo($wid); if($basearray['oasistype'] < 4) { - $high = 1; + $high = 1; } else if ($basearray['oasistype'] < 10){ - $high = 2; + $high = 2; }else { $high = 0; - } + } //We switch type of oasis and instert record with apropriate infomation. $q = "INSERT into " . TB_PREFIX . "odata VALUES ('" . $basearray['id'] . "'," . $basearray['oasistype'] . ",0,800,800,800,800,800,800," . time() . "," . time() . ",100,2,'Unoccupied Oasis',".$high.")"; $result = mysql_query($q, $this->connection); @@ -3208,13 +3208,13 @@ function getOwnArtefactInfo($vref) { $result = mysql_query($q, $this->connection); return mysql_fetch_array($result); } - + function getOwnArtefactInfo2($vref) { $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref"; $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getOwnArtefactInfo3($uid) { $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $uid"; $result = mysql_query($q, $this->connection); @@ -3265,13 +3265,13 @@ public function canClaimArtifact($from,$vref,$size,$type) { //fix by Ronix global $session, $form; $size1 = $size2 = $size3 = 0; - + $artifact = $this->getOwnArtefactInfo($from); if (!empty($artifact)) { $form->addError("error","Treasury is full. Your hero could not claim the artefact"); return false; } - $uid=$session->uid; + $uid=$session->uid; $q="SELECT Count(size) AS totals, SUM(IF(size = '1',1,0)) small, SUM(IF(size = '2',1,0)) great, @@ -3280,7 +3280,7 @@ public function canClaimArtifact($from,$vref,$size,$type) { $result = mysql_query($q, $this->connection); $artifact= $this->mysql_fetch_all($result); - if($artifact['totals'] < 3 || $type==11) { + if($artifact['totals'] < 3 || $type==11) { $DefenderFields = $this->getResourceLevel($vref); $defcanclaim = TRUE; for($i=19;$i<=38;$i++) { @@ -3317,7 +3317,7 @@ public function canClaimArtifact($from,$vref,$size,$type) { } if (($size == 1 && ($villageartifact || $accountartifact)) || (($size == 2 || $size == 3)&& $accountartifact)) { return true; -/* +/* if($this->getVillageField($from,"capital")==1 && $type==11) { $form->addError("error","Ancient Construction Plan cannot kept in capital village"); return FALSE; @@ -3572,24 +3572,24 @@ function setVillageEvasion($vid) { } return mysql_query($q, $this->connection); } - + function addPrisoners($wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11) { $q = "INSERT INTO " . TB_PREFIX . "prisoners values (0,$wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11)"; mysql_query($q, $this->connection); return mysql_insert_id($this->connection); } - + function updatePrisoners($wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11) { $q = "UPDATE " . TB_PREFIX . "prisoners set t1 = t1 + $t1, t2 = t2 + $t2, t3 = t3 + $t3, t4 = t4 + $t4, t5 = t5 + $t5, t6 = t6 + $t6, t7 = t7 + $t7, t8 = t8 + $t8, t9 = t9 + $t9, t10 = t10 + $t10, t11 = t11 + $t11 where wref = $wid and ".TB_PREFIX."prisoners.from = $from"; return mysql_query($q, $this->connection) or die(mysql_error()); } - + function getPrisoners($wid,$mode=0) { if(!$mode) { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where wref = $wid"; }else { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where `from` = $wid"; - } + } $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } @@ -3599,24 +3599,24 @@ function getPrisoners2($wid,$from) { $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function getPrisonersByID($id) { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where id = $id"; $result = mysql_query($q, $this->connection); return mysql_fetch_array($result); } - + function getPrisoners3($from) { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where " . TB_PREFIX . "prisoners.from = $from"; $result = mysql_query($q, $this->connection); return $this->mysql_fetch_all($result); } - + function deletePrisoners($id) { $q = "DELETE from " . TB_PREFIX . "prisoners where id = '$id'"; mysql_query($q, $this->connection); } - + /***************************************** Function to vacation mode - by advocaite References: @@ -3628,7 +3628,7 @@ function setvacmode($uid,$days){ $q ="UPDATE ".TB_PREFIX."users SET vac_mode = '1' , vac_time=".$time." WHERE id=".$uid.""; $result =mysql_query($q,$this->connection); } - + function removevacationmode($uid){ $q ="UPDATE ".TB_PREFIX."users SET vac_mode = '0' , vac_time='0' WHERE id=".$uid.""; $result =mysql_query($q,$this->connection); @@ -3656,7 +3656,7 @@ function getvacmodexy($wref){ return false; } } - + /***************************************** Function to vacation mode - by advocaite References: @@ -3673,7 +3673,7 @@ function getHeroDead($id) { $notend= mysql_fetch_array($result); return $notend['dead']; } - + /*************************** Function to get Hero In Revive Made by: Shadow @@ -3685,7 +3685,7 @@ function getHeroInRevive($id) { $notend= mysql_fetch_array($result); return $notend['inrevive']; } - + /*************************** Function to get Hero In Train Made by: Shadow @@ -3731,7 +3731,7 @@ function KillMyHero($id) { $q = "UPDATE " . TB_PREFIX . "hero set dead = 1 where uid = ".$id; return mysql_query($q, $this->connection); } - + /*************************** Function to find Hero place Made by: ronix @@ -3745,7 +3745,7 @@ function FindHeroInVil($wid) { unset($dbarray); return true; } - } + } return false; } function FindHeroInDef($wid) { @@ -3765,7 +3765,7 @@ function FindHeroInDef($wid) { unset($dbarray); return true; } - } + } return false; } function FindHeroInOasis($uid) { @@ -3789,7 +3789,7 @@ function FindHeroInOasis($uid) { } return 0; } - + function FindHeroInMovement($wid) { $outgoingarray = $this->getMovement(3, $wid, 0); if(!empty($outgoingarray)) { @@ -3797,7 +3797,7 @@ function FindHeroInMovement($wid) { if ($out['t11']>0) { $dbarray = $this->query("UPDATE ".TB_PREFIX."attacks SET t11=0 WHERE `id` = ".$out['ref']); return true; - break; + break; } } } @@ -3842,7 +3842,7 @@ function checkEnforce($wref, $toWref) { }else{ return false; } - } + } /*************************** Function checkScout @@ -3857,7 +3857,7 @@ function checkScout($wref, $toWref) { }else{ return false; } - } + } }; diff --git a/GameEngine/Database/db_MYSQLi.php b/GameEngine/Database/db_MYSQLi.php index 0b513c8b..7b42aa1d 100644 --- a/GameEngine/Database/db_MYSQLi.php +++ b/GameEngine/Database/db_MYSQLi.php @@ -15,7 +15,7 @@ class MYSQLi_DB { var $connection; function MYSQL_DB() { $this->connection = mysqli_connect(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB) or die('Connect Error (' . mysqli_connect_errno() . ') '. mysqli_connect_error()); - + ## Added even MySQL connection for inline mysql commands in temeplate files $con = mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS); mysql_select_db(SQL_DB, $this->connection); @@ -128,7 +128,7 @@ function getVilWref($x, $y) { $dbarray = mysqli_fetch_array($result, MYSQLI_BOTH); return $dbarray['id']; } - + function caststruc($user) { //loop search village user $query = mysqli_query($this->connection, "SELECT * FROM ".TB_PREFIX."vdata WHERE owner = ".$user.""); @@ -723,7 +723,7 @@ function getVillagesID($uid) { } return $newarray; } - + function getVillagesID2($uid) { $q = "SELECT wref from " . TB_PREFIX . "vdata where owner = $uid order by capital DESC,pop DESC"; $result = mysqli_query($this->connection, $q); @@ -1226,7 +1226,7 @@ function createAlliance($tag, $name, $uid, $max) { mysqli_query($this->connection, $q); return mysqli_insert_id($this->connection); } - + function procAllyPop($aid) { $ally = $this->getAlliance($aid); $memberlist = $this->getAllMember($ally['id']); @@ -1376,7 +1376,7 @@ function diplomacyInviteCheck($session_alliance) { $result = mysql_query($this->connection, $q); return $this->mysql_fetch_all($result); } - + function diplomacyInviteCheck2($ally1, $ally2) { $q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $ally1 AND alli2 = $ally2 accepted = 0"; $result = mysql_query($this->connection, $q); @@ -1447,7 +1447,7 @@ function diplomacyCancelExistingRelationship($id, $session_alliance) { $q = "DELETE FROM " . TB_PREFIX . "diplomacy WHERE id = $id AND alli2 = $session_alliance OR id = $id AND alli1 = $session_alliance"; return mysqli_query($this->connection, $q); } - + function checkDiplomacyInviteAccept($aid, $type) { $q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE alli1 = $aid AND type = $type AND accepted = 1 OR alli2 = $aid AND type = $type AND accepted = 1"; $result = mysqli_query($this->connection, $q); @@ -1550,7 +1550,7 @@ function updateOasis($vid) { $q = "UPDATE " . TB_PREFIX . "odata set lastupdated = $time where wref = $vid"; return mysqli_query($this->connection, $q); } - + function updateOasis2($vid, $time) { $time = time(); $q = "UPDATE " . TB_PREFIX . "odata set lastupdated2 = lastupdated2 + $time where wref = $vid"; @@ -1611,7 +1611,7 @@ function getInvitation($uid) { $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function getInvitation2($uid, $aid) { $q = "SELECT * FROM " . TB_PREFIX . "ali_invite where uid = $uid and alliance = $aid"; $result = mysqli_query($this->connection, $q); @@ -2018,7 +2018,7 @@ function getBuildingByField($wid,$field) { $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function getBuildingByField2($wid,$field) { $q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and field = $field and master = 0"; $result = mysqli_query($this->connection, $q); @@ -2030,7 +2030,7 @@ function getBuildingByType($wid,$type) { $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function getBuildingByType2($wid,$type) { $q = "SELECT * FROM " . TB_PREFIX . "bdata where wid = $wid and type = $type and master = 0"; $result = mysqli_query($this->connection, $q); @@ -2273,7 +2273,7 @@ function modifyAttack($aid, $unit, $amt) { $q = "UPDATE " . TB_PREFIX . "attacks set $unit = $unit - $amt where id = $aid"; return mysqli_query($this->connection, $q); } - + function modifyAttack2($aid, $unit, $amt) { $unit = 't' . $unit; $q = "UPDATE " . TB_PREFIX . "attacks set $unit = $unit + $amt where id = $aid"; @@ -2321,7 +2321,7 @@ function getAllMember($aid) { $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function getAllMember2($aid) { $q = "SELECT * FROM " . TB_PREFIX . "users where alliance = $aid order by (SELECT sum(pop) FROM " . TB_PREFIX . "vdata WHERE owner = " . TB_PREFIX . "users.id) desc, " . TB_PREFIX . "users.id desc LIMIT 1"; $result = mysqli_query($this->connection, $q); @@ -3020,13 +3020,13 @@ function getOwnArtefactInfo($vref) { $result = mysqli_query($this->connection, $q); return mysqli_fetch_array($result, MYSQLI_BOTH); } - + function getOwnArtefactInfo2($vref) { $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref"; $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function getOwnArtefactInfo3($uid) { $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $uid"; $result = mysqli_query($this->connection, $q); @@ -3373,18 +3373,18 @@ function setVillageEvasion($vid) { } return mysqli_query($this->connection, $q); } - + function addPrisoners($wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11) { $q = "INSERT INTO " . TB_PREFIX . "prisoners values (0,$wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11)"; mysqli_query($this->connection, $q); return mysqli_insert_id($this->connection); } - + function updatePrisoners($wid,$from,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11) { $q = "UPDATE " . TB_PREFIX . "prisoners set t1 = t1 + $t1, t2 = t2 + $t2, t3 = t3 + $t3, t4 = t4 + $t4, t5 = t5 + $t5, t6 = t6 + $t6, t7 = t7 + $t7, t8 = t8 + $t8, t9 = t9 + $t9, t10 = t10 + $t10, t11 = t11 + $t11 where wid = $wid and from = $from"; return mysqli_query($this->connection, $q) or die('Connect Error (' . mysqli_connect_errno() . ') '. mysqli_connect_error()); } - + function getPrisoners($wid) { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where wref = $wid"; $result = mysqli_query($this->connection, $q); @@ -3396,19 +3396,19 @@ function getPrisoners2($wid,$from) { $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function getPrisonersByID($id) { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where id = $id"; $result = mysqli_query($this->connection, $q); return mysqli_fetch_array($result, MYSQLI_BOTH); } - + function getPrisoners3($from) { $q = "SELECT * FROM " . TB_PREFIX . "prisoners where " . TB_PREFIX . "prisoners.from = $from"; $result = mysqli_query($this->connection, $q); return $this->mysqli_fetch_all($result); } - + function deletePrisoners($id) { $q = "DELETE from " . TB_PREFIX . "prisoners where id = '$id'"; mysqli_query($this->connection, $q); diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index 2c81b11e..12628f05 100644 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -840,7 +840,7 @@ To build a WW, you must own a plan yourself (you = the WW village owner) from lvl 0 to 49, from 50 to 100 you need an additional plan in your alliance! Two plans in the WW village account would not work! -The construction plans are conquerable immediately when they appear to the server. +The construction plans are conquerable immediately when they appear to the server. There will be a countdown in game, showing the exact time of the release, 5 days prior to the launch. "); @@ -849,16 +849,16 @@ define("PLAN","Ancient Construction Plan"); define("PLANVILLAGE","WW Buildingplan"); define("PLAN_DESC","With this ancient construction plan you will able to build World Wonder to level 50. to build further, your alliance must hold at least two plans."); -define("PLAN_INFO","World Wonder Construction Plans +define("PLAN_INFO","World Wonder Construction Plans -Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. +Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. -However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). +However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). -Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. +Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. -Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. +Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. In the end, we will see whether the free tribes of Travian can once again outwit the Natars and vanquish them once and for all. Do not be so foolish as to assume that the Natars will leave without a fight, though! @@ -916,7 +916,7 @@ $lang['screenshots']['title6']="Statistics"; $lang['screenshots']['desc6']="View your ranking in statistics"; $lang['screenshots']['title7']="Weapons or dough"; - $lang['screenshots']['desc7']="You can choose to play as military or economy"; + $lang['screenshots']['desc7']="You can choose to play as military or economy"; ?> \ No newline at end of file diff --git a/GameEngine/Lang/es.php b/GameEngine/Lang/es.php index 725870fc..399d69f5 100644 --- a/GameEngine/Lang/es.php +++ b/GameEngine/Lang/es.php @@ -608,11 +608,11 @@ define("ARTEFACT","Misteriosas Reliquias Mi señor, han aparecido misteriosas aldeas donde se dice que existen unos artefactos de gran poder, los ancianos del consejo las llaman reliquias. -Completamente resguardadas por la poderosa raza Natares y su temido ejército, pero no será impedimento para vos valeroso emperador, O sí. +Completamente resguardadas por la poderosa raza Natares y su temido ejército, pero no será impedimento para vos valeroso emperador, O sí. Vuestros generales me han comentado que su ejército crece y crece más, pronto podremos apoderarnos de esas reliquias, los talleres fabrican vuestras catapultas para destruir el tesoro que guarda la reliquia y vuestro mejor soldado nuestro héroe se entrena cada vez más fuerte para poder traerle esta reliquia. -Pero las tropas y los aldeanos necesitan de motivación, usted mi señor debe de generar esa fuerza necesaria para llevarnos a todos al triunfo y a la gloria. +Pero las tropas y los aldeanos necesitan de motivación, usted mi señor debe de generar esa fuerza necesaria para llevarnos a todos al triunfo y a la gloria. La mitad del camino ha llegado, la victoria está en sus manos mi señor. "); diff --git a/GameEngine/Lang/ru.php b/GameEngine/Lang/ru.php index fa749faa..0ba8aae2 100644 --- a/GameEngine/Lang/ru.php +++ b/GameEngine/Lang/ru.php @@ -660,7 +660,7 @@ To build a WW, you must own a plan yourself (you = the WW village owner) from lvl 0 to 49, from 50 to 100 you need an additional plan in your alliance! Two plans in the WW village account would not work! -The construction plans are conquerable immediately when they appear to the server. +The construction plans are conquerable immediately when they appear to the server. There will be a countdown in game, showing the exact time of the release, 5 days prior to the launch. "); @@ -669,16 +669,16 @@ define("PLAN","Ancient Construction Plan"); define("PLANVILLAGE","WW Buildingplan"); define("PLAN_DESC","With this ancient construction plan you will able to build World Wonder to level 50. to build further, your alliance must hold at least two plans."); -define("PLAN_INFO","World Wonder Construction Plans +define("PLAN_INFO","World Wonder Construction Plans -Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. +Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. -However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). +However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). -Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. +Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. -Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. +Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. In the end, we will see whether the free tribes of Travian can once again outwit the Natars and vanquish them once and for all. Do not be so foolish as to assume that the Natars will leave without a fight, though! diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php index 8f10cd57..f3ebb3b4 100644 --- a/GameEngine/Lang/zh_tw.php +++ b/GameEngine/Lang/zh_tw.php @@ -669,7 +669,7 @@ To build a WW, you must own a plan yourself (you = the WW village owner) from lvl 0 to 49, from 50 to 100 you need an additional plan in your alliance! Two plans in the WW village account would not work! -The construction plans are conquerable immediately when they appear to the server. +The construction plans are conquerable immediately when they appear to the server. There will be a countdown in game, showing the exact time of the release, 5 days prior to the launch. "); @@ -678,16 +678,16 @@ define("PLAN","Ancient Construction Plan"); define("PLANVILLAGE","WW Buildingplan"); define("PLAN_DESC","With this ancient construction plan you will able to build World Wonder to level 50. to build further, your alliance must hold at least two plans."); -define("PLAN_INFO","World Wonder Construction Plans +define("PLAN_INFO","World Wonder Construction Plans -Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. +Many moons ago the tribes of Travian were surprised by the unforeseen return of the Natars. This tribe from immemorial times surpassing all in wisdom, might and glory was about to trouble the free ones again. Thus they put all their efforts in preparing a last war against the Natars and vanquishing them forever. Many thought about the so-called 'Wonders of the World', a construction of many legends, as the only solution. It was told that it would render anyone invincible once completed. Ultimately making the constructors the rulers and conquerors of all known Travian. -However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). +However, it was also told that one would need construction plans to construct such a building. Due to this fact, the architects devised cunning plans about how to store these safely. After a while, one could see temple-like buildings in many a city and metropolis - the Treasure Chambers (Treasuries). -Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. +Sadly, no one - not even the wise and well versed - knew where to find these construction plans. The harder people tried to locate them, the more it seemed as if they where only legends. -Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. +Today, however, this last secret will be revealed. Deprivations and endeavors of the past will not have been in vain, as today scouts of several tribes have successfully obtained the whereabouts of the construction plans. Well guarded by the Natars, they lie hidden in several oases to be found all over Travian. Only the most valiant heroes will be able to secure such a plan and bring it home safely so that the construction can begin. In the end, we will see whether the free tribes of Travian can once again outwit the Natars and vanquish them once and for all. Do not be so foolish as to assume that the Natars will leave without a fight, though! diff --git a/GameEngine/Market.php b/GameEngine/Market.php index 055ddb6f..a80fb767 100644 --- a/GameEngine/Market.php +++ b/GameEngine/Market.php @@ -1,358 +1,358 @@ -loadMarket(); - if(isset($_SESSION['loadMarket'])) - { - $this->loadOnsale(); - unset($_SESSION['loadMarket']); - } - if(isset($post['ft'])) - { - switch($post['ft']) - { - case "mk1": $this->sendResource($post); break; - case "mk2": $this->addOffer($post); break; - case "mk3": $this->tradeResource($post); break; - } - } - } + public function procMarket($post) + { + $this->loadMarket(); + if(isset($_SESSION['loadMarket'])) + { + $this->loadOnsale(); + unset($_SESSION['loadMarket']); + } + if(isset($post['ft'])) + { + switch($post['ft']) + { + case "mk1": $this->sendResource($post); break; + case "mk2": $this->addOffer($post); break; + case "mk3": $this->tradeResource($post); break; + } + } + } - public function procRemove($get) - { - global $database,$village,$session; - - if(isset($get['t']) && $get['t'] == 1) - { - $this->filterNeed($get); - } - else if(isset($get['t']) && $get['t'] ==2 && isset($get['a']) && $get['a'] == 5 && isset($get['del'])) - { - //GET ALL FIELDS FROM MARKET - $type = $database->getMarketField($village->wid,"gtype"); - $amt = $database->getMarketField($village->wid,"gamt"); - $vref = $village->wid; - $database->getResourcesBack($vref,$type,$amt); - $database->addMarket($village->wid,$get['del'],0,0,0,0,0,0,1); - header("Location: build.php?id=".$get['id']."&t=2"); - } - if(isset($get['t']) && $get['t'] == 1 && isset($get['a']) && $get['a'] == $session->mchecker && !isset($get['del'])) - { - $session->changeChecker(); - $this->acceptOffer($get); - } - } + public function procRemove($get) + { + global $database,$village,$session; - public function merchantAvail() - { - return $this->merchant - $this->used; - } + if(isset($get['t']) && $get['t'] == 1) + { + $this->filterNeed($get); + } + else if(isset($get['t']) && $get['t'] ==2 && isset($get['a']) && $get['a'] == 5 && isset($get['del'])) + { + //GET ALL FIELDS FROM MARKET + $type = $database->getMarketField($village->wid,"gtype"); + $amt = $database->getMarketField($village->wid,"gamt"); + $vref = $village->wid; + $database->getResourcesBack($vref,$type,$amt); + $database->addMarket($village->wid,$get['del'],0,0,0,0,0,0,1); + header("Location: build.php?id=".$get['id']."&t=2"); + } + if(isset($get['t']) && $get['t'] == 1 && isset($get['a']) && $get['a'] == $session->mchecker && !isset($get['del'])) + { + $session->changeChecker(); + $this->acceptOffer($get); + } + } - private function loadMarket() - { - global $session,$building,$bid28,$bid17,$database,$village; - - $this->recieving = $database->getMovement(0,$village->wid,1); - $this->sending = $database->getMovement(0,$village->wid,0); - $this->return = $database->getMovement(2,$village->wid,1); - $this->merchant = ($building->getTypeLevel(17) > 0)? $bid17[$building->getTypeLevel(17)]['attri'] : 0; - $this->used = $database->totalMerchantUsed($village->wid); - $this->onmarket = $database->getMarket($village->wid,0); - $this->maxcarry = ($session->tribe == 1)? 500 : (($session->tribe == 2)? 1000 : 750); - $this->maxcarry *= TRADER_CAPACITY; - if($building->getTypeLevel(28) != 0) - { - $this->maxcarry *= $bid28[$building->getTypeLevel(28)]['attri'] / 100; - } - } + public function merchantAvail() + { + return $this->merchant - $this->used; + } - private function sendResource($post) - { - global $database,$village,$session,$generator,$logging; - - $wtrans = (isset($post['r1']) && $post['r1'] != "")? $post['r1'] : 0; - $ctrans = (isset($post['r2']) && $post['r2'] != "")? $post['r2'] : 0; - $itrans = (isset($post['r3']) && $post['r3'] != "")? $post['r3'] : 0; - $crtrans = (isset($post['r4']) && $post['r4'] != "")? $post['r4'] : 0; - $wtrans = str_replace("-", "", $wtrans); - $ctrans = str_replace("-", "", $ctrans); - $itrans = str_replace("-", "", $itrans); - $crtrans = str_replace("-", "", $crtrans); - $availableWood = $database->getWoodAvailable($village->wid); - $availableClay = $database->getClayAvailable($village->wid); - $availableIron = $database->getIronAvailable($village->wid); - $availableCrop = $database->getCropAvailable($village->wid); - if($session->access == BANNED) - { - header("Location: banned.php"); - } - else if($availableWood >= $post['r1'] AND $availableClay >= $post['r2'] AND $availableIron >= $post['r3'] AND $availableCrop >= $post['r4']) - { - $resource = array($wtrans,$ctrans,$itrans,$crtrans); - $reqMerc = ceil((array_sum($resource)-0.1)/$this->maxcarry); + private function loadMarket() + { + global $session,$building,$bid28,$bid17,$database,$village; - if($this->merchantAvail() != 0 && $reqMerc <= $this->merchantAvail()) - { - $id = $post['getwref']; - $coor = $database->getCoor($id); - if($database->getVillageState($id)) - { - $timetaken = $generator->procDistanceTime($coor,$village->coor,$session->tribe,0); - $res = $resource[0]+$resource[1]+$resource[2]+$resource[3]; - if($res!=0) - { - $reference = $database->sendResource($resource[0],$resource[1],$resource[2],$resource[3],$reqMerc,0); - $database->modifyResource($village->wid,$resource[0],$resource[1],$resource[2],$resource[3],0); - $database->addMovement(0,$village->wid,$id,$reference,time(),time()+$timetaken,$post['send3']); - $logging->addMarketLog($village->wid,1,array($resource[0],$resource[1],$resource[2],$resource[3],$id)); - } - } - } - header("Location: build.php?id=".$post['id']); - } - else - { - // something - } - } + $this->recieving = $database->getMovement(0,$village->wid,1); + $this->sending = $database->getMovement(0,$village->wid,0); + $this->return = $database->getMovement(2,$village->wid,1); + $this->merchant = ($building->getTypeLevel(17) > 0)? $bid17[$building->getTypeLevel(17)]['attri'] : 0; + $this->used = $database->totalMerchantUsed($village->wid); + $this->onmarket = $database->getMarket($village->wid,0); + $this->maxcarry = ($session->tribe == 1)? 500 : (($session->tribe == 2)? 1000 : 750); + $this->maxcarry *= TRADER_CAPACITY; + if($building->getTypeLevel(28) != 0) + { + $this->maxcarry *= $bid28[$building->getTypeLevel(28)]['attri'] / 100; + } + } - private function addOffer($post) - { - global $database,$village,$session; - - - if($post['rid1'] == $post['rid2']) - { - // Trading res for res of same type (invalid) - header("Location: build.php?id=".$post['id']."&t=2&e2"); - } - elseif($post['m1'] > (2 * $post['m2'])) - { - // Trade is for more than 2x (invalid) - header("Location: build.php?id=".$post['id']."&t=2&e2"); - } - elseif($post['m2'] > (2 * $post['m1'])) - { - // Trade is for less than 0.5x (invalid) - header("Location: build.php?id=".$post['id']."&t=2&e2"); - } - else - { - $wood = ($post['rid1'] == 1)? $post['m1'] : 0; - $clay = ($post['rid1'] == 2)? $post['m1'] : 0; - $iron = ($post['rid1'] == 3)? $post['m1'] : 0; - $crop = ($post['rid1'] == 4)? $post['m1'] : 0; - $availableWood = $database->getWoodAvailable($village->wid); - $availableClay = $database->getClayAvailable($village->wid); - $availableIron = $database->getIronAvailable($village->wid); - $availableCrop = $database->getCropAvailable($village->wid); - - if($session->access == BANNED) - { - header("Location: banned.php"); - } - - elseif($availableWood >= $wood AND $availableClay >= $clay AND $availableIron >= $iron AND $availableCrop >= $crop) - { - $reqMerc = 1; - - if(($wood+$clay+$iron+$crop) > $this->maxcarry) - { - $reqMerc = round(($wood+$clay+$iron+$crop)/$this->maxcarry); - - if(($wood+$clay+$iron+$crop) > $this->maxcarry*$reqMerc) - { - $reqMerc += 1; - } - } - if($this->merchantAvail() != 0 && $reqMerc <= $this->merchantAvail()) - { - if($database->modifyResource($village->wid,$wood,$clay,$iron,$crop,0)) - { - $time = 0; - if(isset($_POST['d1'])) - { - $time = $_POST['d2'] * 3600; - } - $alliance = (isset($post['ally']) && $post['ally'] == 1)? $session->userinfo['alliance'] : 0; - $database->addMarket($village->wid,$post['rid1'],$post['m1'],$post['rid2'],$post['m2'],$time,$alliance,$reqMerc,0); - } - // Enough merchants - header("Location: build.php?id=".$post['id']."&t=2"); - } - else - { - // Not enough merchants - header("Location: build.php?id=".$post['id']."&t=2&e3"); - } - } - else - { - // not enough resources - header("Location: build.php?id=".$post['id']."&t=2&e1"); - } - } - } + private function sendResource($post) + { + global $database,$village,$session,$generator,$logging; - private function acceptOffer($get) - { - global $database,$village,$session,$logging,$generator; - - $infoarray = $database->getMarketInfo($get['g']); - $reqMerc = 1; - if($infoarray['wamt'] > $this->maxcarry) - { - $reqMerc = round($infoarray['wamt']/$this->maxcarry); - if($infoarray['wamt'] > $this->maxcarry*$reqMerc) - { - $reqMerc += 1; - } - } - $myresource = $hisresource = array(1=>0,0,0,0); - $myresource[$infoarray['wtype']] = $infoarray['wamt']; - $mysendid = $database->sendResource($myresource[1],$myresource[2],$myresource[3],$myresource[4],$reqMerc,0); - $hisresource[$infoarray['gtype']] = $infoarray['gamt']; - $hissendid = $database->sendResource($hisresource[1],$hisresource[2],$hisresource[3],$hisresource[4],$infoarray['merchant'],0); - $hiscoor = $database->getCoor($infoarray['vref']); - $mytime = $generator->procDistanceTime($hiscoor,$village->coor,$session->tribe,0); - $targettribe = $database->getUserField($database->getVillageField($infoarray['vref'],"owner"),"tribe",0); - $histime = $generator->procDistanceTime($village->coor,$hiscoor,$targettribe,0); + $wtrans = (isset($post['r1']) && $post['r1'] != "")? $post['r1'] : 0; + $ctrans = (isset($post['r2']) && $post['r2'] != "")? $post['r2'] : 0; + $itrans = (isset($post['r3']) && $post['r3'] != "")? $post['r3'] : 0; + $crtrans = (isset($post['r4']) && $post['r4'] != "")? $post['r4'] : 0; + $wtrans = str_replace("-", "", $wtrans); + $ctrans = str_replace("-", "", $ctrans); + $itrans = str_replace("-", "", $itrans); + $crtrans = str_replace("-", "", $crtrans); + $availableWood = $database->getWoodAvailable($village->wid); + $availableClay = $database->getClayAvailable($village->wid); + $availableIron = $database->getIronAvailable($village->wid); + $availableCrop = $database->getCropAvailable($village->wid); + if($session->access == BANNED) + { + header("Location: banned.php"); + } + else if($availableWood >= $post['r1'] AND $availableClay >= $post['r2'] AND $availableIron >= $post['r3'] AND $availableCrop >= $post['r4']) + { + $resource = array($wtrans,$ctrans,$itrans,$crtrans); + $reqMerc = ceil((array_sum($resource)-0.1)/$this->maxcarry); + + if($this->merchantAvail() != 0 && $reqMerc <= $this->merchantAvail()) + { + $id = $post['getwref']; + $coor = $database->getCoor($id); + if($database->getVillageState($id)) + { + $timetaken = $generator->procDistanceTime($coor,$village->coor,$session->tribe,0); + $res = $resource[0]+$resource[1]+$resource[2]+$resource[3]; + if($res!=0) + { + $reference = $database->sendResource($resource[0],$resource[1],$resource[2],$resource[3],$reqMerc,0); + $database->modifyResource($village->wid,$resource[0],$resource[1],$resource[2],$resource[3],0); + $database->addMovement(0,$village->wid,$id,$reference,time(),time()+$timetaken,$post['send3']); + $logging->addMarketLog($village->wid,1,array($resource[0],$resource[1],$resource[2],$resource[3],$id)); + } + } + } + header("Location: build.php?id=".$post['id']); + } + else + { + // something + } + } + + private function addOffer($post) + { + global $database,$village,$session; + + + if($post['rid1'] == $post['rid2']) + { + // Trading res for res of same type (invalid) + header("Location: build.php?id=".$post['id']."&t=2&e2"); + } + elseif($post['m1'] > (2 * $post['m2'])) + { + // Trade is for more than 2x (invalid) + header("Location: build.php?id=".$post['id']."&t=2&e2"); + } + elseif($post['m2'] > (2 * $post['m1'])) + { + // Trade is for less than 0.5x (invalid) + header("Location: build.php?id=".$post['id']."&t=2&e2"); + } + else + { + $wood = ($post['rid1'] == 1)? $post['m1'] : 0; + $clay = ($post['rid1'] == 2)? $post['m1'] : 0; + $iron = ($post['rid1'] == 3)? $post['m1'] : 0; + $crop = ($post['rid1'] == 4)? $post['m1'] : 0; + $availableWood = $database->getWoodAvailable($village->wid); + $availableClay = $database->getClayAvailable($village->wid); + $availableIron = $database->getIronAvailable($village->wid); + $availableCrop = $database->getCropAvailable($village->wid); + + if($session->access == BANNED) + { + header("Location: banned.php"); + } + + elseif($availableWood >= $wood AND $availableClay >= $clay AND $availableIron >= $iron AND $availableCrop >= $crop) + { + $reqMerc = 1; + + if(($wood+$clay+$iron+$crop) > $this->maxcarry) + { + $reqMerc = round(($wood+$clay+$iron+$crop)/$this->maxcarry); + + if(($wood+$clay+$iron+$crop) > $this->maxcarry*$reqMerc) + { + $reqMerc += 1; + } + } + if($this->merchantAvail() != 0 && $reqMerc <= $this->merchantAvail()) + { + if($database->modifyResource($village->wid,$wood,$clay,$iron,$crop,0)) + { + $time = 0; + if(isset($_POST['d1'])) + { + $time = $_POST['d2'] * 3600; + } + $alliance = (isset($post['ally']) && $post['ally'] == 1)? $session->userinfo['alliance'] : 0; + $database->addMarket($village->wid,$post['rid1'],$post['m1'],$post['rid2'],$post['m2'],$time,$alliance,$reqMerc,0); + } + // Enough merchants + header("Location: build.php?id=".$post['id']."&t=2"); + } + else + { + // Not enough merchants + header("Location: build.php?id=".$post['id']."&t=2&e3"); + } + } + else + { + // not enough resources + header("Location: build.php?id=".$post['id']."&t=2&e1"); + } + } + } + + private function acceptOffer($get) + { + global $database,$village,$session,$logging,$generator; + + $infoarray = $database->getMarketInfo($get['g']); + $reqMerc = 1; + if($infoarray['wamt'] > $this->maxcarry) + { + $reqMerc = round($infoarray['wamt']/$this->maxcarry); + if($infoarray['wamt'] > $this->maxcarry*$reqMerc) + { + $reqMerc += 1; + } + } + $myresource = $hisresource = array(1=>0,0,0,0); + $myresource[$infoarray['wtype']] = $infoarray['wamt']; + $mysendid = $database->sendResource($myresource[1],$myresource[2],$myresource[3],$myresource[4],$reqMerc,0); + $hisresource[$infoarray['gtype']] = $infoarray['gamt']; + $hissendid = $database->sendResource($hisresource[1],$hisresource[2],$hisresource[3],$hisresource[4],$infoarray['merchant'],0); + $hiscoor = $database->getCoor($infoarray['vref']); + $mytime = $generator->procDistanceTime($hiscoor,$village->coor,$session->tribe,0); + $targettribe = $database->getUserField($database->getVillageField($infoarray['vref'],"owner"),"tribe",0); + $histime = $generator->procDistanceTime($village->coor,$hiscoor,$targettribe,0); $database->addMovement(0,$village->wid,$infoarray['vref'],$mysendid,time(),$mytime+time()); - $database->addMovement(0,$infoarray['vref'],$village->wid,$hissendid,time(),$histime+time()); - $resource = array(1=>0,0,0,0); - $resource[$infoarray['wtype']] = $infoarray['wamt']; - $database->modifyResource($village->wid,$resource[1],$resource[2],$resource[3],$resource[4],0); - $database->setMarketAcc($get['g']); - $database->removeAcceptedOffer($get['g']); - $logging->addMarketLog($village->wid,2,array($infoarray['vref'],$get['g'])); - header("Location: build.php?id=".$get['id']); - } + $database->addMovement(0,$infoarray['vref'],$village->wid,$hissendid,time(),$histime+time()); + $resource = array(1=>0,0,0,0); + $resource[$infoarray['wtype']] = $infoarray['wamt']; + $database->modifyResource($village->wid,$resource[1],$resource[2],$resource[3],$resource[4],0); + $database->setMarketAcc($get['g']); + $database->removeAcceptedOffer($get['g']); + $logging->addMarketLog($village->wid,2,array($infoarray['vref'],$get['g'])); + header("Location: build.php?id=".$get['id']); + } + + private function loadOnsale() + { + global $database,$village,$session,$multisort,$generator; - private function loadOnsale() - { - global $database,$village,$session,$multisort,$generator; - - $displayarray = $database->getMarket($village->wid,1); - $holderarray = array(); - foreach($displayarray as $value) - { - $targetcoor = $database->getCoor($value['vref']); + $displayarray = $database->getMarket($village->wid,1); + $holderarray = array(); + foreach($displayarray as $value) + { + $targetcoor = $database->getCoor($value['vref']); $duration = $generator->procDistanceTime($targetcoor,$village->coor,$session->tribe,0); - if($duration <= $value['maxtime'] || $value['maxtime'] == 0) - { - $value['duration'] = $duration; - array_push($holderarray,$value); - } - } - $this->onsale = $multisort->sorte($holderarray, "'duration'", true, 2); - } + if($duration <= $value['maxtime'] || $value['maxtime'] == 0) + { + $value['duration'] = $duration; + array_push($holderarray,$value); + } + } + $this->onsale = $multisort->sorte($holderarray, "'duration'", true, 2); + } + + private function filterNeed($get) + { + if(isset($get['v']) || isset($get['s']) || isset($get['b'])) + { + $holder = $holder2 = array(); + if(isset($get['v']) && $get['v'] == "1:1") + { + foreach($this->onsale as $equal) + { + if($equal['wamt'] <= $equal['gamt']) + { + array_push($holder,$equal); + } + } + } + else + { + $holder = $this->onsale; + } + foreach($holder as $sale) + { + if(isset($get['s']) && isset($get['b'])) + { + if($sale['gtype'] == $get['s'] && $sale['wtype'] == $get['b']) + { + array_push($holder2,$sale); + } + } + else if(isset($get['s']) && !isset($get['b'])) + { + if($sale['gtype'] == $get['s']) + { + array_push($holder2,$sale); + } + } + else if(isset($get['b']) && !isset($get['s'])) + { + if($sale['wtype'] == $get['b']) + { + array_push($holder2,$sale); + } + } + else + { + $holder2 = $holder; + } + } + $this->onsale = $holder2; + } + else + { + $this->loadOnsale(); + } + } - private function filterNeed($get) - { - if(isset($get['v']) || isset($get['s']) || isset($get['b'])) - { - $holder = $holder2 = array(); - if(isset($get['v']) && $get['v'] == "1:1") - { - foreach($this->onsale as $equal) - { - if($equal['wamt'] <= $equal['gamt']) - { - array_push($holder,$equal); - } - } - } - else - { - $holder = $this->onsale; - } - foreach($holder as $sale) - { - if(isset($get['s']) && isset($get['b'])) - { - if($sale['gtype'] == $get['s'] && $sale['wtype'] == $get['b']) - { - array_push($holder2,$sale); - } - } - else if(isset($get['s']) && !isset($get['b'])) - { - if($sale['gtype'] == $get['s']) - { - array_push($holder2,$sale); - } - } - else if(isset($get['b']) && !isset($get['s'])) - { - if($sale['wtype'] == $get['b']) - { - array_push($holder2,$sale); - } - } - else - { - $holder2 = $holder; - } - } - $this->onsale = $holder2; - } - else - { - $this->loadOnsale(); - } - } + private function tradeResource($post) + { + global $session,$database,$village; - private function tradeResource($post) - { - global $session,$database,$village; - - $wwvillage = $database->getResourceLevel($village->wid); - if($wwvillage['f99t']!=40) - { - if($session->userinfo['gold'] >= 3) - { - //kijken of ze niet meer gs invoeren dan ze hebben - if($session->access == BANNED) - { - header("Location: banned.php"); - } - else if (($post['m2'][0]+$post['m2'][1]+$post['m2'][2]+$post['m2'][3])<=(round($village->awood)+round($village->aclay)+round($village->airon)+round($village->acrop))) - { - $database->setVillageField($village->wid,"wood",$post['m2'][0]); - $database->setVillageField($village->wid,"clay",$post['m2'][1]); - $database->setVillageField($village->wid,"iron",$post['m2'][2]); - $database->setVillageField($village->wid,"crop",$post['m2'][3]); - $database->modifyGold($session->uid,3,0); - header("Location: build.php?id=".$post['id']."&t=3&c");; - } - else - { - header("Location: build.php?id=".$post['id']."&t=3"); - } - } - else - { - header("Location: build.php?id=".$post['id']."&t=3"); - } - } - } -}; + $wwvillage = $database->getResourceLevel($village->wid); + if($wwvillage['f99t']!=40) + { + if($session->userinfo['gold'] >= 3) + { + //kijken of ze niet meer gs invoeren dan ze hebben + if($session->access == BANNED) + { + header("Location: banned.php"); + } + else if (($post['m2'][0]+$post['m2'][1]+$post['m2'][2]+$post['m2'][3])<=(round($village->awood)+round($village->aclay)+round($village->airon)+round($village->acrop))) + { + $database->setVillageField($village->wid,"wood",$post['m2'][0]); + $database->setVillageField($village->wid,"clay",$post['m2'][1]); + $database->setVillageField($village->wid,"iron",$post['m2'][2]); + $database->setVillageField($village->wid,"crop",$post['m2'][3]); + $database->modifyGold($session->uid,3,0); + header("Location: build.php?id=".$post['id']."&t=3&c");; + } + else + { + header("Location: build.php?id=".$post['id']."&t=3"); + } + } + else + { + header("Location: build.php?id=".$post['id']."&t=3"); + } + } + } +}; -$market = new Market; +$market = new Market; ?> \ No newline at end of file diff --git a/GameEngine/Message.php b/GameEngine/Message.php index 6afc5bd3..e7f29c04 100644 --- a/GameEngine/Message.php +++ b/GameEngine/Message.php @@ -317,7 +317,7 @@ private function getMessages() { private function sendAMessage($topic,$text) { global $session,$database; - + // Vulnerability closed by Shadow $q = "SELECT * FROM ".TB_PREFIX."mdata WHERE owner='".$session->uid."' AND time > ".time()." - 60"; @@ -327,7 +327,7 @@ private function sendAMessage($topic,$text) { return; //flood // Vulnerability closed by Shadow - + $allmembersQ = mysql_query("SELECT id FROM ".TB_PREFIX."users WHERE alliance='".$session->alliance."'"); $userally = $database->getUserField($session->uid,"alliance",0); $permission=mysql_fetch_array(mysql_query("SELECT opt7 FROM ".TB_PREFIX."ali_permission WHERE uid='".$session->uid."'")); diff --git a/GameEngine/Profile.php b/GameEngine/Profile.php index 24f55f20..0156e25b 100644 --- a/GameEngine/Profile.php +++ b/GameEngine/Profile.php @@ -92,7 +92,7 @@ private function updateProfile($post) { $name = preg_replace("/[^a-zA-Z0-9_-\s]/", "", $k); $database->setVillageName($database->RemoveXSS($varray[$i]['wref']),$name); $database->setVillageName($database->RemoveXSS($varray[$i]['wref']),$k); - } + } header("Location: spieler.php?uid=".$post['uid']); } @@ -101,7 +101,7 @@ private function gpack($post) { $database->gpack($database->RemoveXSS($session->uid),$database->RemoveXSS($post['custom_url'])); header("Location: spieler.php?uid=".$session->uid); } - + /******************************************************* Function to vacation mode - by advocaite and Shadow References: diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index b5cd3ad2..083fec66 100644 --- a/GameEngine/Ranking.php +++ b/GameEngine/Ranking.php @@ -203,8 +203,8 @@ public function searchRank($name, $field) { return $key; break; } - } - } + } + } if(!next($this->rankarray)) { if($field != "userid"){ return $name; @@ -214,7 +214,7 @@ public function searchRank($name, $field) { break; } } - + } } @@ -263,7 +263,7 @@ public function procRankArray() { )allitag FROM " . TB_PREFIX . "users WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " - AND " . TB_PREFIX . "users.tribe <= 3 ORDER BY totalpop DESC, totalvillages DESC, userid DESC"; + AND " . TB_PREFIX . "users.tribe <= 3 ORDER BY totalpop DESC, totalvillages DESC, userid DESC"; } $result = (mysql_query($q)); diff --git a/GameEngine/Session.php b/GameEngine/Session.php index dcb0f79c..6a129475 100644 --- a/GameEngine/Session.php +++ b/GameEngine/Session.php @@ -146,7 +146,7 @@ private function checkLogin(){ return false; } } - + /*************************** Function to check Real Hero @@ -169,7 +169,7 @@ function CheckHeroReal () { $result3 = mysql_query($q3, $database->connection); $he3=mysql_fetch_array($result3); $hero+=$he3[0]; - $hero+=$database->HeroNotInVil($myvill); // check if hero is not in village (come back from attack , raid , etc.) + $hero+=$database->HeroNotInVil($myvill); // check if hero is not in village (come back from attack , raid , etc.) } $yes=true; //fix by ronix if($database->getHeroDead($this->uid) and !$hero){ // check if hero is already dead @@ -178,9 +178,9 @@ function CheckHeroReal () { $yes=false; }elseif($database->getHeroInTraining($this->uid) and !$hero){ // check if hero is in training $yes=false; - } + } if($yes and !$hero) $database->KillMyHero($this->uid); - } + } private function PopulateVar() { global $database; diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php index 07e8553c..4d29a128 100644 --- a/GameEngine/Technology.php +++ b/GameEngine/Technology.php @@ -261,8 +261,8 @@ function getAllUnits($base,$InVillageOnly=False,$mode=0) { } $ownunit['hero'] += $enforce['hero']; } - } - + } + $prisoners = $database->getPrisoners($base,1); if(!empty($prisoners)) { foreach($prisoners as $prisoner){ @@ -722,7 +722,7 @@ public function finishTech() { $q = "UPDATE ".TB_PREFIX."research SET timestamp=".(time()-1)." WHERE vref = ".$village->wid; $result = $database->query($q); return mysql_affected_rows(); - } + } public function calculateAvaliable($id,$resarray=array()) { global $village,$generator,${'r'.$id}; diff --git a/GameEngine/Units.php b/GameEngine/Units.php index 4d6ae555..01db086b 100644 --- a/GameEngine/Units.php +++ b/GameEngine/Units.php @@ -140,7 +140,7 @@ private function loadUnits($post) { $coor = $database->getCoor($id); } } - + // People search by coordinates // We confirm and seek coordinate coordinates Village if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") { @@ -154,15 +154,15 @@ private function loadUnits($post) { } //END Vaction mode check } - } - if (!empty($coor)) { + } + if (!empty($coor)) { if ($session->tribe == 1){$Gtribe = "";}elseif ($session->tribe == 2){$Gtribe = "1";}elseif ($session->tribe == 3){$Gtribe = "2";}elseif ($session->tribe == 4){$Gtribe = "3";}elseif ($session->tribe == 5){$Gtribe = "4";} for($i=1; $i<12; $i++){ if(isset($post['t'.$i])){ if ($i<10) $troophave=$village->unitarray['u'.$Gtribe.$i]; if ($i==10)$troophave=$village->unitarray['u'.floor(intval($Gtribe)+1)*$i]; if ($i==11)$troophave=$village->unitarray['hero']; - + if (intval($post['t'.$i]) > $troophave){ $form->addError("error","You can't send more units than you have"); break; @@ -174,7 +174,7 @@ private function loadUnits($post) { if(preg_match('/[^0-9]/',$post['t'.$i])){ $form->addError("error","Special characters can't entered"); break; - } + } } } } @@ -229,15 +229,15 @@ private function loadUnits($post) { } } - + public function returnTroops($wref,$mode=0) { global $database; if (!mode) { $getenforce=$database->getEnforceVillage($wref,0); foreach($getenforce as $enforce) { - $this->processReturnTroops($enforce); + $this->processReturnTroops($enforce); } - } + } //check oasis $getenforce1=$database->getOasisEnforce($wref,1); foreach($getenforce1 as $enforce) { @@ -250,7 +250,7 @@ public function returnTroops($wref,$mode=0) { $database->populateOasisUnits($getenforce1[0]['vref'],$getenforce1[0]['high']); $q = "UPDATE ".TB_PREFIX."odata SET conqured=0,wood=800,iron=800,clay=800,maxstore=800,crop=800,maxcrop=800,lastupdated=". time().",lastupdated2=".time().",loyalty=100,owner=2,name='Unoccupied Oasis' WHERE conqured=$wref"; $database->query($q); - } + } } private function processReturnTroops($enforce) { @@ -261,7 +261,7 @@ private function processReturnTroops($enforce) { else if ($database->getUserField($to['owner'],'tribe',0) == '3'){ $Gtribe = "2"; } else if ($database->getUserField($to['owner'],'tribe',0) == '4'){ $Gtribe = "3"; } else if ($database->getUserField($to['owner'],'tribe',0) == '5'){ $Gtribe = "4"; } - + $start = ($database->getUserField($to['owner'],'tribe',0)-1)*10+1; $end = ($database->getUserField($to['owner'],'tribe',0)*10); @@ -275,7 +275,7 @@ private function processReturnTroops($enforce) { //find slowest unit. for($i=$start;$i<=$end;$i++){ - + if(intval($enforce['u'.$i]) > 0){ if($unitarray) { reset($unitarray); } $unitarray = $GLOBALS["u".$i]; @@ -293,7 +293,7 @@ private function processReturnTroops($enforce) { }else{ $enforce['hero']='0'; } - + $artefact = count($database->getOwnUniqueArtefactInfo2($from['owner'],2,3,0)); $artefact1 = count($database->getOwnUniqueArtefactInfo2($enforce['from'],2,1,1)); $artefact2 = count($database->getOwnUniqueArtefactInfo2($from['owner'],2,2,0)); @@ -307,7 +307,7 @@ private function processReturnTroops($enforce) { $fastertroops = 1; } $time = round($generator->procDistanceTime($fromCor,$toCor,min($speeds),$enforce['from'])/$fastertroops); - + $foolartefact2 = $database->getFoolArtefactInfo(2,$enforce['from'],$from['owner']); if(count($foolartefact2) > 0){ foreach($foolartefact2 as $arte){ @@ -321,9 +321,9 @@ private function processReturnTroops($enforce) { } $reference = $database->addAttack($enforce['from'],$enforce['u'.$start],$enforce['u'.($start+1)],$enforce['u'.($start+2)],$enforce['u'.($start+3)],$enforce['u'.($start+4)],$enforce['u'.($start+5)],$enforce['u'.($start+6)],$enforce['u'.($start+7)],$enforce['u'.($start+8)],$enforce['u'.($start+9)],$enforce['hero'],2,0,0,0,0); $database->addMovement(4,$enforce['vref'],$enforce['from'],$reference,time(),($time+time())); - $database->deleteReinf($enforce['id']); + $database->deleteReinf($enforce['id']); } - + private function sendTroops($post) { global $form, $database, $village, $generator, $session; @@ -462,7 +462,7 @@ private function sendTroops($post) { $good_artefact = 1; } } - } + } }else{ $artefact_2 = count($database->getOwnUniqueArtefactInfo2($to_owner,7,3,0)); $artefact1_2 = count($database->getOwnUniqueArtefactInfo2($data['to_vid'],7,1,1)); @@ -476,11 +476,11 @@ private function sendTroops($post) { $good_artefact = 1; } } - } } - + } + if (isset($post['ctar1'])){ - if($artefact_2 > 0 or $artefact1_2 > 0 or $artefact2_2 > 0 or $good_artefact == 1){ + if($artefact_2 > 0 or $artefact1_2 > 0 or $artefact2_2 > 0 or $good_artefact == 1){ if ($post['ctar1'] != 40 or $post['ctar1'] != 27 and $iswwvilla == 1){ $post['ctar1'] = 99; }else{ @@ -489,11 +489,11 @@ private function sendTroops($post) { }else{ $post['ctar1'] = $post['ctar1']; } - }else{ + }else{ $post['ctar1'] = 0; } if (isset($post['ctar2'])){ - if($artefact_2 > 0 or $artefact1_2 > 0 or $artefact2_2 > 0 or $good_artefact == 1){ + if($artefact_2 > 0 or $artefact1_2 > 0 or $artefact2_2 > 0 or $good_artefact == 1){ if ($post['ctar2'] != 40 or $post['ctar2'] != 27 and $iswwvilla == 1){ $post['ctar2'] = 99; }else{ @@ -502,11 +502,11 @@ private function sendTroops($post) { }else{ $post['ctar2'] = $post['ctar2']; } - }else{ + }else{ $post['ctar2'] = 0;} if (isset($post['spy'])){ $post['spy'] = $post['spy']; - }else{ + }else{ $post['spy'] = 0; } $abdata = $database->getABTech($village->wid); @@ -671,7 +671,7 @@ private function sendTroopsBack($post) { header("Location: banned.php"); } } - + public function Settlers($post) { global $form, $database, $village, $session; if($session->access != BANNED){ diff --git a/GameEngine/Village.php b/GameEngine/Village.php index caa2f2fb..b537255d 100644 --- a/GameEngine/Village.php +++ b/GameEngine/Village.php @@ -31,7 +31,7 @@ function Village() { global $session, $database; if(isset($_SESSION['wid'])) { $this->wid = $_SESSION['wid']; - + } else { $this->wid = $session->villages[0]; diff --git a/Security/Security.class.php b/Security/Security.class.php index 9e7e6141..7b3d7971 100644 --- a/Security/Security.class.php +++ b/Security/Security.class.php @@ -17,7 +17,7 @@ // | Author: Kai Ratzeburg | // +----------------------------------------------------------------------+ -// Source Code Highlight +// Source Code Highlight /* Security Fix; Only dev if(isset($_GET['show_source'])) { @@ -41,7 +41,7 @@ class Security // Instance of the security class. protected static $instance; protected $magic_quotes_gpc = FALSE; - + /** * Gets the instance of the Security class. * @@ -53,11 +53,11 @@ public static function instance() { //return new Security; } - + //return self::$instance; } - - + + /** * Constructor. Sanitizes global data GET, POST and COOKIE data. * Also makes sure those pesty magic quotes and register globals @@ -76,13 +76,13 @@ protected function __construct() // Dear lord!! This is bad and deprected. Sort it out ;) set_magic_quotes_runtime(0); } - + if(get_magic_quotes_gpc()) { // This is also bad and deprected. See http://php.net/magic_quotes for more information. $this->magic_quotes_gpc = TRUE; } - + // Check for register globals and prevent security issues from arising. if(ini_get('register_globals')) { @@ -91,13 +91,13 @@ protected function __construct() // No no no.. just kill the script here and now exit('Illegal attack on global variable.'); } - + // Get rid of REQUEST $_REQUEST = array(); - + // The following globals are standard and shouldn't really be removed $preserve = array('GLOBALS', '_REQUEST', '_GET', '_POST', '_FILES', '_COOKIE', '_SERVER', '_ENV', '_SESSION'); - + // Same effect as disabling register_globals foreach($GLOBALS as $key => $value) { @@ -105,14 +105,14 @@ protected function __construct() { global $$key; $$key = NULL; - + unset($GLOBALS[$key], $$key); } } } - + // Sanitize global data - + if(is_array($_POST)) { foreach($_POST as $key => $value) @@ -124,7 +124,7 @@ protected function __construct() { $_POST = array(); } - + if(is_array($_GET)) { foreach($_GET as $key => $value) @@ -136,7 +136,7 @@ protected function __construct() { $_GET = array(); } - + if(is_array($_COOKIE)) { foreach($_COOKIE as $key => $value) @@ -148,15 +148,15 @@ protected function __construct() { $_COOKIE = array(); } - + // Just make REQUEST a merge of POST and GET. Who really wants cookies in it anyway? $_REQUEST = array_merge($_GET, $_POST); - + self::$instance = $this; } } - + /** * Cross site filtering (XSS). Recursive. * @@ -168,7 +168,7 @@ public function xss_clean($data) // If its empty there is no point cleaning it :\ if(empty($data)) return $data; - + // Recursive loop for arrays if(is_array($data)) { @@ -176,10 +176,10 @@ public function xss_clean($data) { $data[$key] = $this->xss_clean($data); } - + return $data; } - + // Fix &entity\n; $data = str_replace(array('&','<','>'), array('&','<','>'), $data); $data = preg_replace('/(&#*\w+)[\x00-\x20]+;/u', '$1;', $data); @@ -209,10 +209,10 @@ public function xss_clean($data) $data = preg_replace('#]*+>#i', '', $data); } while ($old_data !== $data); - + return $data; } - + /** * Enforces W3C specifications to prevent malicious exploitation. * @@ -222,15 +222,15 @@ public function xss_clean($data) protected function clean_input_keys($data) { $chars = PCRE_UNICODE_PROPERTIES ? '\pL' : 'a-zA-Z'; - + if ( ! preg_match('#^[' . $chars . '0-9:_.-]++$#uD', $data)) { exit('Illegal key characters in global data'); } - + return $data; } - + /** * Escapes data. * @@ -246,18 +246,18 @@ protected function clean_input_data($data) { $new_array[$this->clean_input_keys($key)] = $this->clean_input_data($value); } - + return $new_array; } - + if($this->magic_quotes_gpc === TRUE) { // Get rid of those pesky magic quotes! $data = stripslashes($data); } - + $data = $this->xss_clean($data); - + return $data; } } diff --git a/Templates/Alliance/medal.php b/Templates/Alliance/medal.php index c3e58e68..3959a59a 100644 --- a/Templates/Alliance/medal.php +++ b/Templates/Alliance/medal.php @@ -1,4 +1,4 @@ -gpack == null || GP_ENABLE == false) { $gpack= GP_LOCATE; @@ -7,7 +7,7 @@ } - + //de lintjes /****************************** INDELING CATEGORIEEN: @@ -24,10 +24,10 @@ ******************************/ //$geregistreerd=date('d-m-Y', ($allianceinfo['timestamp'])); -$profiel = preg_replace("/\[war]/s",'At war with
'.$database->getAllianceWar($aid), $profiel, 1); -$profiel = preg_replace("/\[ally]/s",'Confederacies
'.$database->getAllianceDipProfile($aid,1), $profiel, 1); -$profiel = preg_replace("/\[nap]/s",'NAPs
'.$database->getAllianceDipProfile($aid,2), $profiel, 1); -$profiel = preg_replace("/\[diplomatie]/s",'Confederacies
'.$database->getAllianceDipProfile($aid,1).'
NAPs
'.$database->getAllianceDipProfile($aid,2).'
At war with
'.$database->getAllianceWar($aid), $profiel, 1); +$profiel = preg_replace("/\[war]/s",'At war with
'.$database->getAllianceWar($aid), $profiel, 1); +$profiel = preg_replace("/\[ally]/s",'Confederacies
'.$database->getAllianceDipProfile($aid,1), $profiel, 1); +$profiel = preg_replace("/\[nap]/s",'NAPs
'.$database->getAllianceDipProfile($aid,2), $profiel, 1); +$profiel = preg_replace("/\[diplomatie]/s",'Confederacies
'.$database->getAllianceDipProfile($aid,1).'
NAPs
'.$database->getAllianceDipProfile($aid,2).'
At war with
'.$database->getAllianceWar($aid), $profiel, 1); foreach($varmedal as $medal) { diff --git a/Templates/Profile/medal.php b/Templates/Profile/medal.php index 732572e4..ffb7e802 100644 --- a/Templates/Profile/medal.php +++ b/Templates/Profile/medal.php @@ -1,4 +1,4 @@ -getUserField($_SESSION['username'], 'gpack', 1); @@ -24,7 +24,7 @@ $gpack= $separator.GP_LOCATE; } else { $gpack= $separator.$gpack_load; - } + } //de bird if($displayarray['protect'] > time()){ @@ -38,8 +38,8 @@ if(strlen($remainingSeconds) <= 1){ $nul1 = "0";} if(strlen($remainingMinutes) <= 1){ -$nul2 = "0";} -if(strlen($remainingHour) <= 1){ $nul3 = "0"; } +$nul2 = "0";} +if(strlen($remainingHour) <= 1){ $nul3 = "0"; } $left="$nul3$remainingHour:$nul2$remainingMinutes:$nul1$remainingSeconds"; $profiel = preg_replace("/\[#0]/is",'', $profiel, 1); } else { @@ -178,7 +178,7 @@ break; case "10": $titel="Rank Climbers of the week."; - $woord="Ranks"; + $woord="Ranks"; break; case "11": $titel="Receiving this medal shows that you were in the top 3 of the Rank Climbers of the week ".$medal['points']." in a row."; @@ -204,7 +204,7 @@ $titel="Receiving this medal shows that you were in the top 10 Rank Climbers of the week ".$medal['points']." in a row."; $bonus[$medal['id']]=1; break; - + } diff --git a/a2b.php b/a2b.php index 0991f14c..143be37d 100644 --- a/a2b.php +++ b/a2b.php @@ -170,10 +170,10 @@ $p_ander = $database->getCoor($prisoner['from']); $p_to = array('x'=>$p_ander['x'], 'y'=>$p_ander['y']); $p_tribe = $database->getUserField($p_owner,"tribe",0); - + $p_speeds = array(); - - //find slowest unit. + + //find slowest unit. for($i=1;$i<=10;$i++){ if ($prisoner['t'.$i]){ if($prisoner['t'.$i] != '' && $prisoner['t'.$i] > 0){ @@ -183,7 +183,7 @@ } } } - + if ($prisoner['t11']>0){ $p_qh = "SELECT * FROM ".TB_PREFIX."hero WHERE uid = ".$p_owner.""; $p_resulth = mysql_query($p_qh); @@ -191,7 +191,7 @@ $p_hero_unit=$p_hero_f['unit']; $p_speeds[] = $GLOBALS['u'.$p_hero_unit]['speed']; } - + $p_artefact = count($database->getOwnUniqueArtefactInfo2($p_owner,2,3,0)); $p_artefact1 = count($database->getOwnUniqueArtefactInfo2($prisoner['from'],2,1,1)); $p_artefact2 = count($database->getOwnUniqueArtefactInfo2($p_owner,2,2,0)); diff --git a/a2b2.php b/a2b2.php index d8106d44..26884fc6 100644 --- a/a2b2.php +++ b/a2b2.php @@ -23,7 +23,7 @@ } $automation->isWinner(); ?> - + @@ -66,16 +66,16 @@

Account transactions

-uid."'") or die(mysql_error()); $golds = mysql_fetch_array($MyGold); -$goldnow = $golds['6'] + 60; +$goldnow = $golds['6'] + 60; mysql_query("UPDATE ".TB_PREFIX."users set gold = '".$goldnow."' where `id`='".$session->uid."'") or die(mysql_error()); $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds1 = mysql_fetch_array($MyGold); -?>

Thank you for your purchase here at Travianist.com

Below you see the entry record. Out of it, you can observe your old as well as your new account balance.

+?>

Thank you for your purchase here at Travianist.com

Below you see the entry record. Out of it, you can observe your old as well as your new account balance.

@@ -111,7 +111,7 @@

Please verify the information.
It will let us know if the data is incorrect.

Please mail your username, package, order time and email used to our billing address.

- + uid."'") or die(mysql_error()); $golds = mysql_fetch_array($MyGold); -$goldnow = $golds['6'] + 120; +$goldnow = $golds['6'] + 120; mysql_query("UPDATE ".TB_PREFIX."users set gold = '".$goldnow."' where `id`='".$session->uid."'") or die(mysql_error()); $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds1 = mysql_fetch_array($MyGold); -?>

Thank you for your purchase here at TravianX.

Below you see the entry record. Out of it, you can observe your old as well as your new account balance.

+?>

Thank you for your purchase here at TravianX.

Below you see the entry record. Out of it, you can observe your old as well as your new account balance.

@@ -166,7 +166,7 @@ // Kontoauszug aufrufen für Goldpaket C $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds = mysql_fetch_array($MyGold); -$goldnow = $golds['6'] + 360; +$goldnow = $golds['6'] + 360; mysql_query("UPDATE ".TB_PREFIX."users set gold = '".$goldnow."' where `id`='".$session->uid."'") or die(mysql_error()); $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds1 = mysql_fetch_array($MyGold); @@ -213,7 +213,7 @@ // Kontoauszug aufrufen für Goldpaket D $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds = mysql_fetch_array($MyGold); -$goldnow = $golds['6'] + 1000; +$goldnow = $golds['6'] + 1000; mysql_query("UPDATE ".TB_PREFIX."users set gold = '".$goldnow."' where `id`='".$session->uid."'") or die(mysql_error()); $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds1 = mysql_fetch_array($MyGold); @@ -260,7 +260,7 @@ // Kontoauszug aufrufen für Goldpaket E $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds = mysql_fetch_array($MyGold); -$goldnow = $golds['6'] + 2000; +$goldnow = $golds['6'] + 2000; mysql_query("UPDATE ".TB_PREFIX."users set gold = '".$goldnow."' where `id`='".$session->uid."'") or die(mysql_error()); $MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error()); $golds1 = mysql_fetch_array($MyGold); @@ -302,13 +302,13 @@

Please mail your username, package, order time and email used to our billing address.

uid."'") or die(mysql_error()); - $golds = mysql_fetch_array($MyGold); + $golds = mysql_fetch_array($MyGold); ?> - -

Here you can see your current account statement.

+ +

Here you can see your current account statement.

@@ -329,8 +329,8 @@

Please verify the information.
It will let us know if the data is incorrect.

Please mail your username, package, order time and email used to our billing address.

- diff --git a/ajax.php b/ajax.php index e992cdee..05f3b4ab 100644 --- a/ajax.php +++ b/ajax.php @@ -43,7 +43,7 @@ $qact3=preg_replace("/[^a-zA-Z0-9_-]/","",$_GET['qact3']); }else { $qact3=null; - } + } if (!isset($_SESSION)) { session_start(); } @@ -51,7 +51,7 @@ include("Templates/Ajax/quest_core.tpl"); }else{ include("Templates/Ajax/quest_core25.tpl"); - } + } break; } ?> diff --git a/allianz.php b/allianz.php index 3f0c0218..a99b25a5 100644 --- a/allianz.php +++ b/allianz.php @@ -50,7 +50,7 @@ header("Location: ".$_SERVER['PHP_SELF']); } } - } + } } if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $session->alliance!=0){ ?> diff --git a/build.php b/build.php index c78ebe0c..e7f5e10f 100644 --- a/build.php +++ b/build.php @@ -345,7 +345,7 @@ $building->finishAll(); header("Location: build.php?gid=".$_GET['id']."&ty=".$_GET['ty']); } - } + } } }else{ header("Location: dorf1.php"); diff --git a/create_account.php b/create_account.php index 357c298b..e203294f 100644 --- a/create_account.php +++ b/create_account.php @@ -4,14 +4,14 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Project: TravianZ ## -## Version: 01.09.2013 ## +## Version: 01.09.2013 ## ## Filename create_account.php ## -## Developed by: Dzoki , Advocaite , Donnchadh , yi12345 , Shadow , MisterX ## +## Developed by: Dzoki , Advocaite , Donnchadh , yi12345 , Shadow , MisterX ## ## Fixed by: Shadow & MisterX - Scouting all players , artefact names. ## ## License: TravianZ Project ## ## Copyright: TravianZ (c) 2010-2013. All rights reserved. ## ## URLs: http://travian.shadowss.ro ## -## Source code: http://github.com/Shadowss/TravianZ-by-Shadow/ ## +## Source code: http://github.com/Shadowss/TravianZ-by-Shadow/ ## ## ## ################################################################################# @@ -99,7 +99,7 @@ function generateBase($kid, $uid, $username) { /** * Creating account & capital village - Fixed by Shadow - cata7007@gmail.com / Skype : cata7007 - */ + */ $username = "Natars"; $password = md5($_POST['password']); @@ -156,7 +156,7 @@ function generateBase($kid, $uid, $username) { $database->addABTech($wid); $database->updateUserField($uid, "access", USER, 1); } - + $wid = mysql_fetch_assoc(mysql_query("SELECT * FROM " . TB_PREFIX . "vdata WHERE owner = $uid")); $q = "UPDATE " . TB_PREFIX . "vdata SET pop = 834 WHERE owner = $uid"; mysql_query($q) or die(mysql_error()); @@ -171,11 +171,11 @@ function generateBase($kid, $uid, $username) { mysql_query($q3) or die(mysql_error()); $q4 = "UPDATE " . TB_PREFIX . "users SET desc2 = '$desc' WHERE id = $uid"; mysql_query($q4) or die(mysql_error()); - + /** * SCOUTING ALL PLAYERS FIX BY MisterX */ - + $natar = mysql_fetch_array(mysql_query("SELECT * FROM " . TB_PREFIX . "vdata WHERE owner = $uid and capital = 1")); $multiplier = NATARS_UNITS; $q = "SELECT * FROM " . TB_PREFIX . "vdata WHERE capital = '1' and owner > '5'"; diff --git a/dorf1.php b/dorf1.php index c6d1bb63..6f580be7 100644 --- a/dorf1.php +++ b/dorf1.php @@ -16,7 +16,7 @@ } if(isset($_GET['newdid'])) { $_SESSION['wid'] = $_GET['newdid']; - $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); + $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); header("Location: ".$_SERVER['PHP_SELF']); }else{ $building->procBuild($_GET); diff --git a/dorf2.php b/dorf2.php index 22187304..682e680f 100644 --- a/dorf2.php +++ b/dorf2.php @@ -13,7 +13,7 @@ $start = $generator->pageLoadTimeStart(); if(isset($_GET['newdid'])) { $_SESSION['wid'] = $_GET['newdid']; - $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); + $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); header("Location: ".$_SERVER['PHP_SELF']); }else{ $building->procBuild($_GET); diff --git a/dorf3.php b/dorf3.php index 178db277..496c60f7 100644 --- a/dorf3.php +++ b/dorf3.php @@ -15,7 +15,7 @@ $start = $generator->pageLoadTimeStart(); if(isset($_GET['newdid'])) { $_SESSION['wid'] = $_GET['newdid']; - $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); + $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); if(isset($_GET['s'])){ header("Location: ".$_SERVER['PHP_SELF']."?s=".$_GET['s']); }else{ diff --git a/install/include/wdata.php b/install/include/wdata.php index f70b1b44..0ac122dd 100644 --- a/install/include/wdata.php +++ b/install/include/wdata.php @@ -22,7 +22,7 @@ if(($x == 0 & $y == 0) || ($x == WORLD_MAX & $y == WORLD_MAX)) { $typ='3'; $otype='0'; - }else{ + }else{ $rand=rand(1, 1000); if("10" >= $rand){ $typ='1'; diff --git a/install/process.php b/install/process.php index 21031210..92d5150d 100644 --- a/install/process.php +++ b/install/process.php @@ -77,7 +77,7 @@ function constForm() { $text = preg_replace("'%ACTIVATE%'", $_POST['activate'], $text); $text = preg_replace("'%ARANK%'", $_POST['admin_rank'], $text); $text = preg_replace("'%QUEST%'", $_POST['quest'], $text); - $text = preg_replace("'%QTYPE%'", $_POST['qtype'], $text); + $text = preg_replace("'%QTYPE%'", $_POST['qtype'], $text); $text = preg_replace("'%BEGINNER%'", $_POST['beginner'], $text); $text = preg_replace("'%STARTTIME%'", time(), $text); $text = preg_replace("'%DOMAIN%'", $_POST['domain'], $text); diff --git a/mailme.php b/mailme.php index d7b13e90..344a50a6 100644 --- a/mailme.php +++ b/mailme.php @@ -1,56 +1,56 @@ -\n"; -$strFrom .= "X-Sender: \n"; -$strFrom .= "X-Mailer: PHP\n"; -$strFrom .= "X-Priority: 3\n"; -$strFrom .= "Errors-To: \n"; -$strFrom .= "Return-Path: \n"; -$strFrom .= "Reply-To: " . $_POST['Emailadress'] . "\n"; -$strFrom .= "Content-Type: text; charset=iso-8859-15\n"; +$strFrom = "From: TravianiX Support \n"; +$strFrom .= "X-Sender: \n"; +$strFrom .= "X-Mailer: PHP\n"; +$strFrom .= "X-Priority: 3\n"; +$strFrom .= "Errors-To: \n"; +$strFrom .= "Return-Path: \n"; +$strFrom .= "Reply-To: " . $_POST['Emailadress'] . "\n"; +$strFrom .= "Content-Type: text; charset=iso-8859-15\n"; -$strSubject = "New Ticket supported"; +$strSubject = "New Ticket supported"; -$strReturnhtml = 'dorf1.php'; +$strReturnhtml = 'dorf1.php'; -$strDelimiter = ":\t"; +$strDelimiter = ":\t"; -### end of config ### +### end of config ### -if($_POST) -{ - $strMailtext = ""; +if($_POST) +{ + $strMailtext = ""; - while(list($strName,$value) = each($_POST)) - { - if(is_array($value)) - { - foreach($value as $value_array) - { - $strMailtext .= $strName.$strDelimiter.$value_array."\n"; - } - } - else - { - $strMailtext .= $strName.$strDelimiter.$value."\n"; - } - } + while(list($strName,$value) = each($_POST)) + { + if(is_array($value)) + { + foreach($value as $value_array) + { + $strMailtext .= $strName.$strDelimiter.$value_array."\n"; + } + } + else + { + $strMailtext .= $strName.$strDelimiter.$value."\n"; + } + } - if(get_magic_quotes_gpc()) - { - $strMailtext = stripslashes($strMailtext); - } + if(get_magic_quotes_gpc()) + { + $strMailtext = stripslashes($strMailtext); + } - mail($strEmpfaenger, $strSubject, $strMailtext, $strFrom) - or die("The mail could not be send. Something get wrong!"); - header("Location: $strReturnhtml"); - exit; -} + mail($strEmpfaenger, $strSubject, $strMailtext, $strFrom) + or die("The mail could not be send. Something get wrong!"); + header("Location: $strReturnhtml"); + exit; +} ?> \ No newline at end of file diff --git a/plus1.php b/plus1.php index 995dbc71..6f9c7ac7 100644 --- a/plus1.php +++ b/plus1.php @@ -42,8 +42,8 @@ window.addEvent('domready', start); - - + +
@@ -84,9 +84,9 @@
-
@@ -94,7 +94,7 @@ Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms - +
Server time:
diff --git a/spielregeln.php b/spielregeln.php index 22b36ba3..0a194dcf 100644 --- a/spielregeln.php +++ b/spielregeln.php @@ -83,7 +83,7 @@ Each player may only own and play one account per server.
  • §1.1 Registration
    -The e-mail address used for the registration of an account must be under the personal and exclusive control of the person who registered the account. The person owning the e-mail address used to register an account is considered the owner of the account, regardless of any other personal or alliance agreements. The owner of an account is fully responsible for all actions taken with the account. +The e-mail address used for the registration of an account must be under the personal and exclusive control of the person who registered the account. The person owning the e-mail address used to register an account is considered the owner of the account, regardless of any other personal or alliance agreements. The owner of an account is fully responsible for all actions taken with the account.
  • §1.2 Password
    The owner of an account may not transfer the password of an account to any person playing on the same game world (server). Additionally, knowingly choosing the same password on the same game world as another person is illegal; any of these actions is considered multiaccounting, as defined in these rules. @@ -123,11 +123,11 @@
  • §3 Use of externals
    -The game must be played with an unmodified internet browser. The use of scripts or bots which automate is against the rules. +The game must be played with an unmodified internet browser. The use of scripts or bots which automate is against the rules.
  • §4 Program errors
    -Program errors (also called bugs) may not be used to one's benefit. Abuse can lead to a punishment of the account. +Program errors (also called bugs) may not be used to one's benefit. Abuse can lead to a punishment of the account.
  • §5 Money transactions
    @@ -149,7 +149,7 @@ Displaying battle reports or messages in public without consent of both concerned persons.
  • No real world politics are allowed in names, messages and descriptions.
    • -
  • Impersonation of officials or official positions is illegal in any way. +
  • Impersonation of officials or official positions is illegal in any way.
  • Advertisement of any kind that has not been permitted by the Travian Team is impermissible.
    • @@ -159,17 +159,17 @@
    Resources, buildings, villages or troops lost during the time of suspension do not count as punishment and will not be replaced by the Travian Team. No player has the right to claim payment or replacement for Plus/Gold time lost due to suspension.
    -here is no special treatment for Travian Plus/Gold users regarding the game rules neither in the time needed to deal with the case nor in the punishment. +here is no special treatment for Travian Plus/Gold users regarding the game rules neither in the time needed to deal with the case nor in the punishment.

    Players may talk to the Multihunter who banned them or an Administrator either via IGM (ingame message) or e-mail. Bans, punishments or deletions are not to be discussed in public (e.g. Chat or Forums). Appeals must be written in English.
    -Additionally, the Travian Team will not provide information to persons other than the account owner. +Additionally, the Travian Team will not provide information to persons other than the account owner.

    Multi accounts on the speed server and multi accounts with less than 100 population may be deleted on sight with no warning.
  • §8 Changing of rules
    -The Travian Team reserves the right to change the rules at any time. +The Travian Team reserves the right to change the rules at any time.
  • §9 Correction clause
    If individual regulations of this set of rules should be ineffective, it does not affect the validity of the remaining regulations of this set of rules. The Administrators commit themselves to replace ineffective regulations with new regulations which replace the ineffective regulations as fast as possible. diff --git a/support.php b/support.php index d4b182ed..1055ddbd 100644 --- a/support.php +++ b/support.php @@ -44,7 +44,7 @@ function chkFormular () { alert("Enter your username!"); document.Formular.Username.focus(); return false; - } + } if (document.Formular.Emailadress.value == "") { alert("Enter an emailadress!"); document.Formular.Emailadress.focus(); @@ -65,7 +65,7 @@ function chkFormular () { document.Formular.Message.focus(); return false; } - + } @@ -84,7 +84,7 @@ function chkFormular () {

    Bug reports, login errors, general questions and feedback

    - +
    @@ -105,7 +105,7 @@ function chkFormular () {
    -
                                  
    -
    -
    - +
    • + +




    ".$form->getValue('walllevel')." to level ".$totallvl."

    "; } } - + if (isset($_POST['result'][3])&&isset($_POST['result'][4])){ if ($form->getValue('ktyp') == 1) { echo "Hint: The catapult does not shoot during a raid.

    "; @@ -99,7 +99,7 @@ $totallvl = round(sqrt(pow(($form->getValue('kata')+0.5),2)-($_POST['result'][4]*8))); echo "Damage done by catapult: from level ".$form->getValue('kata')." to level ".$totallvl."

    "; } - } + } } $target = isset($_POST['target'])? $_POST['target'] : array(); $tribe = isset($_POST['mytribe'])? $_POST['mytribe'] : $session->tribe; From 05303f02b4f79b6e50b312ca039623c9f11ce739 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sat, 6 Dec 2014 00:04:05 +0800 Subject: [PATCH 12/33] Translate some template --- Admin/Mods/index.php | 4 +- Admin/Templates/Newmessage.tpl | 6 +- Admin/Templates/config.tpl | 150 ++++++++++++++++----------------- Admin/admin.php | 2 +- 4 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Admin/Mods/index.php b/Admin/Mods/index.php index 3bff1442..835afdb6 100644 --- a/Admin/Mods/index.php +++ b/Admin/Mods/index.php @@ -13,7 +13,7 @@

    404 - File not found

    Not Found
    -

    We looked 404 times already but can't find anything, Not even an X marking the spot.

    -

    This system is not complete yet. So the page probably does not exist.


    +

    我們已經找了肆佰零肆次次，但是連一隻螞蟻都沒發現。

    +

    這個系統尚未開發完成，還在等你的PR，所以你找不到這個頁面。


    diff --git a/Admin/Templates/Newmessage.tpl b/Admin/Templates/Newmessage.tpl index 21f341f6..24b1db05 100644 --- a/Admin/Templates/Newmessage.tpl +++ b/Admin/Templates/Newmessage.tpl @@ -69,7 +69,7 @@ if(isset($id)) Message Sent"; + echo "訊息已送出"; } else { @@ -78,5 +78,5 @@ if(isset($id)) } else { - echo "

    Not found. Go Back"; -}?> \ No newline at end of file + echo "

    找不到. 上一頁"; +}?> diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl index a50d11d9..ab387ee8 100644 --- a/Admin/Templates/config.tpl +++ b/Admin/Templates/config.tpl @@ -19,29 +19,29 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - +
    Server Settings 伺服器設定
    - - + + - + - - + + - - + + - + - + @@ -81,7 +81,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + @@ -98,11 +98,11 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + - + @@ -114,7 +114,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + @@ -138,13 +138,13 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + - + - + - - + +
    VariableValue變數內容
    Server Name伺服器名稱
    Server Started伺服器啟動時間
    Server Timezone
    伺服器時區
    Language語言 @@ -49,7 +49,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
    Server Speed伺服器速度
    Map Size地圖尺寸 x
    Activation MailEnabled"; } else { echo "Disabled"; } ?>啟用"; } else { echo "停用"; } ?>
    QuestEnabled"; } else { echo "Disabled"; } ?>啟用"; } else { echo "停用"; } ?>
    Quest Type
    World Wonder - StatisticsEnabled"; } else if(WW == false) { echo "Disabled"; } ?>啟用"; } else if(WW == false) { echo "停用"; } ?>
    Plus account duration
    Great WorkshopEnabled"; } else { echo "Disabled"; } ?>啟用"; } else { echo "停用"; } ?>
    Show Natars in Statistics True"; } else { echo "False"; } ?>
    Peace system和平系統
    Graphic PackEnabled"; } else { echo "Disabled"; } ?>啟用"; } else { echo "停用"; } ?>
    Error Reporting錯誤顯示
    - +
    Log Settings Log 設定
    - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
    VariableValue變數內容
    Log BuildEnabled"; } else if(LOG_BUILD == false){ echo "Disabled"; } ?>記錄建築行為啟用"; } else if(LOG_BUILD == false){ echo "停用"; } ?>
    Log TechnologyEnabled"; } else if(LOG_TECH == false){ echo "Disabled"; } ?>記錄科技研發啟用"; } else if(LOG_TECH == false){ echo "停用"; } ?>
    Log LoginEnabled"; } else if(LOG_LOGIN == false){ echo "Disabled"; } ?>記錄登入行為啟用"; } else if(LOG_LOGIN == false){ echo "停用"; } ?>
    Log GoldEnabled"; } else if(LOG_GOLD_FIN == false){ echo "Disabled"; } ?>紀錄黃金啟用"; } else if(LOG_GOLD_FIN == false){ echo "停用"; } ?>
    Log AdminEnabled"; } else if(LOG_ADMIN == false){ echo "Disabled"; } ?>記錄管理行為啟用"; } else if(LOG_ADMIN == false){ echo "停用"; } ?>
    Log WarEnabled"; } else if(LOG_WAR == false){ echo "Disabled"; } ?>記錄戰爭行為啟用"; } else if(LOG_WAR == false){ echo "停用"; } ?>
    Log MarketEnabled"; } else if(LOG_MARKET == false){ echo "Disabled"; } ?>記錄市場行為啟用"; } else if(LOG_MARKET == false){ echo "停用"; } ?>
    Log IllegalEnabled"; } else if(LOG_ILLEGAL == false){ echo "Disabled"; } ?>記錄非法行為啟用"; } else if(LOG_ILLEGAL == false){ echo "停用"; } ?>
    - +
    Newsbox Settings 資訊設定
    - - + + - - + + - - + + - - + +
    VariableValue變數內容
    Newsbox 1Enabled"; } else if(NEWSBOX1 == false){ echo "Disabled"; } ?> 資訊 1啟用"; } else if(NEWSBOX1 == false){ echo "停用"; } ?>
    Newsbox 2Enabled"; } else if(NEWSBOX2 == false){ echo "Disabled"; } ?> 資訊 2啟用"; } else if(NEWSBOX2 == false){ echo "停用"; } ?>
    Newsbox 3Enabled"; } else if(NEWSBOX3 == false){ echo "Disabled"; } ?> 資訊 3啟用"; } else if(NEWSBOX3 == false){ echo "停用"; } ?>
    - +
    SQL SettingsSQL 設定
    - - + + - + - + - + - + - + - +
    VariableValue變數內容
    Hostname主機名稱
    DB UsernameDB 使用者
    DB PasswordDB 密碼 *********
    DB NameDB 名稱
    Table PrefixTable 前綴
    DB TypeDB 類型
    @@ -291,49 +291,49 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - +
    Extra Settings 額外設定
    - - + + - - + + - - + +
    VariableValue變數內容
    Limit MailboxEnabled"; } else if(LIMIT_MAILBOX == false){ echo "Disabled"; } ?>限制郵箱啟用"; } else if(LIMIT_MAILBOX == false){ echo "停用"; } ?>
    Max number of mailsLimit mailbox disabled"; } ?>最大郵件數量郵件數量限制停用"; } ?>
    - +
    Admin Information 管理資訊
    - - + + - - + + - - + + - - + +
    VariableValue變數內容
    Admin EmailNo admin email defined!"; } else if(ADMIN_EMAIL != ''){ echo ADMIN_EMAIL; } ?>管理員郵件位址沒有指定管理員郵件位址!"; } else if(ADMIN_EMAIL != ''){ echo ADMIN_EMAIL; } ?>
    Admin NameNo admin name defined!"; } else if(ADMIN_NAME != ''){ echo ADMIN_NAME; } ?>管理員名稱沒有指定管理員名稱!"; } else if(ADMIN_NAME != ''){ echo ADMIN_NAME; } ?>
    Include Admin in RankEnabled"; } else if(INCLUDE_ADMIN == false){ echo "Disabled"; } ?>管理員參與排名啟用"; } else if(INCLUDE_ADMIN == false){ echo "停用"; } ?>
    diff --git a/Admin/admin.php b/Admin/admin.php index 3b9c7e01..5c9dd840 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -54,7 +54,7 @@ public function getTimeFormat($time) - Admin Panel + 管理頁面 From 0e0640b1fbb48e9a691a98f457e8e1a8d08b58a2 Mon Sep 17 00:00:00 2001 From: TitansWeng Date: Sat, 6 Dec 2014 00:04:11 +0800 Subject: [PATCH 13/33] Update zh_tw.php --- GameEngine/Lang/zh_tw.php | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php index 8f10cd57..3a41e1ff 100644 --- a/GameEngine/Lang/zh_tw.php +++ b/GameEngine/Lang/zh_tw.php @@ -32,7 +32,7 @@ define("UPDATE_T_10","更新前10名"); define("SYSTEM_MESSAGE","系統公告"); define("TRAVIAN_PLUS","Travian Plus"); -define("CONTACT","聯絡我們!"); +define("CONTACT","聯絡我們！"); define("GAME_RULES","遊戲規定"); //MENU @@ -45,27 +45,27 @@ //ERRORS -define("USRNM_EMPTY","(Username empty)"); -define("USRNM_TAKEN","(Name is already in use.)"); -define("USRNM_SHORT","(min. ".USRNM_MIN_LENGTH." figures)"); -define("USRNM_CHAR","(Invalid Characters)"); -define("PW_EMPTY","(Password empty)"); -define("PW_SHORT","(min. ".PW_MIN_LENGTH." figures)"); -define("PW_INSECURE","(Password insecure. Please choose a more secure one.)"); -define("EMAIL_EMPTY","(Email Empty)"); -define("EMAIL_INVALID","(Invalid email address)"); -define("EMAIL_TAKEN","(Email is already in use)"); -define("TRIBE_EMPTY","
  • Please choose a tribe.
    • "); -define("AGREE_ERROR","
  • You have to agree to the game rules and the general terms & conditions in order to register.
    • "); -define("LOGIN_USR_EMPTY","Enter name."); -define("LOGIN_PASS_EMPTY","Enter password."); -define("EMAIL_ERROR","Email does not match existing"); -define("PASS_MISMATCH","Passwords do not match"); -define("ALLI_OWNER","Please appoint an alliance owner before deleting"); -define("SIT_ERROR","Sitter already set"); -define("USR_NT_FOUND","Name does not exist."); -define("LOGIN_PW_ERROR","The password is wrong."); -define("WEL_TOPIC","Useful tips & information "); +define("USRNM_EMPTY","(玩家名稱空白)"); +define("USRNM_TAKEN","(玩家名稱已存在)"); +define("USRNM_SHORT","(玩家名稱至少 ".USRNM_MIN_LENGTH." 字)"); +define("USRNM_CHAR","(無效文字)"); +define("PW_EMPTY","(密碼空白)"); +define("PW_SHORT","(密碼至少 ".PW_MIN_LENGTH." 字)"); +define("PW_INSECURE","(密碼不安全. 請使用一個更有保障的)"); +define("EMAIL_EMPTY","(電子郵件地址空白)"); +define("EMAIL_INVALID","(電子郵件地址無效)"); +define("EMAIL_TAKEN","(電子郵件已存在)"); +define("TRIBE_EMPTY","
  • 請選擇一個種族
    • "); +define("AGREE_ERROR","
  • 你必須同意以上遊戲規則以及一般條款條件，才能進行註冊，本伺服器保留任何權力。
    • "); +define("LOGIN_USR_EMPTY","輸入玩家名稱"); +define("LOGIN_PASS_EMPTY","輸入密碼"); +define("EMAIL_ERROR","電子郵件不正確"); +define("PASS_MISMATCH","密碼不正確"); +define("ALLI_OWNER","在刪除前，請先指派一名委任盟主"); +define("SIT_ERROR","照看者已設立"); +define("USR_NT_FOUND","玩家名稱不存在"); +define("LOGIN_PW_ERROR","密碼不正確"); +define("WEL_TOPIC","錦囊妙計"); define("ATAG_EMPTY","Tag empty"); define("ANAME_EMPTY","Name empty"); define("ATAG_EXIST","Tag taken"); From 3689cc6809327b468ff176d4307d29fa0c5a6c0a Mon Sep 17 00:00:00 2001 From: yoyo930021 Date: Sat, 6 Dec 2014 00:26:57 +0800 Subject: [PATCH 14/33] =?UTF-8?q?404=E6=A8=99=E9=A1=8C=E7=B9=81=E5=8C=96?= =?UTF-8?q?=20notification=E7=B9=81=E5=8C=96=20=E5=85=A7=E5=AE=B9=E7=A8=80?= =?UTF-8?q?=E5=B0=91=E5=98=97=E8=A9=A6=E7=9C=8B=E7=9C=8Bwww?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- notification/lang/index.php | 2 +- notification/lang/zh_tw.php | 43 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 notification/lang/zh_tw.php diff --git a/notification/lang/index.php b/notification/lang/index.php index 2bb0d912..7cabd08d 100644 --- a/notification/lang/index.php +++ b/notification/lang/index.php @@ -11,7 +11,7 @@ ?>
    -

    404 - File not found

    +

    404 -檔案不存在

    Not Found

    We looked 404 times already but can't find anything, Not even an X marking the spot.

    This system is not complete yet. So the page probably does not exist.


    diff --git a/notification/lang/zh_tw.php b/notification/lang/zh_tw.php new file mode 100644 index 00000000..89d45583 --- /dev/null +++ b/notification/lang/zh_tw.php @@ -0,0 +1,43 @@ + \ No newline at end of file From 85285b7998374ae03bb879a72bafa61b9fecbdb3 Mon Sep 17 00:00:00 2001 From: Hedgehog Chen Date: Sat, 6 Dec 2014 00:47:49 +0800 Subject: [PATCH 15/33] =?UTF-8?q?=E5=BB=BA=E7=AF=89=E8=B2=AF=E5=88=97?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building.php 建築資訊中文化 Building.tpl 建造狀態中文化 zh_tw.php 部分建築名稱修改 --- GameEngine/Building.php | 86 +++++++++++++++++++-------------------- GameEngine/Lang/zh_tw.php | 6 +-- Templates/Building.tpl | 12 +++--- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/GameEngine/Building.php b/GameEngine/Building.php index 3b224b7e..ac48150c 100644 --- a/GameEngine/Building.php +++ b/GameEngine/Building.php @@ -225,49 +225,49 @@ public function rallying() { public function procResType($ref) { global $session; switch($ref) { - case 1: $build = "Woodcutter"; break; - case 2: $build = "Clay Pit"; break; - case 3: $build = "Iron Mine"; break; - case 4: $build = "Cropland"; break; - case 5: $build = "Sawmill"; break; - case 6: $build = "Brickyard"; break; - case 7: $build = "Iron Foundry"; break; - case 8: $build = "Grain Mill"; break; - case 9: $build = "Bakery"; break; - case 10: $build = "Warehouse"; break; - case 11: $build = "Granary"; break; - case 12: $build = "Blacksmith"; break; - case 13: $build = "Armoury"; break; - case 14: $build = "Tournament Square"; break; - case 15: $build = "Main Building"; break; - case 16: $build = "Rally Point"; break; - case 17: $build = "Marketplace"; break; - case 18: $build = "Embassy"; break; - case 19: $build = "Barracks"; break; - case 20: $build = "Stable"; break; - case 21: $build = "Workshop"; break; - case 22: $build = "Academy"; break; - case 23: $build = "Cranny"; break; - case 24: $build = "Town Hall"; break; - case 25: $build = "Residence"; break; - case 26: $build = "Palace"; break; - case 27: $build = "Treasury"; break; - case 28: $build = "Trade Office"; break; - case 29: $build = "Great Barracks"; break; - case 30: $build = "Great Stable"; break; - case 31: $build = "City Wall"; break; - case 32: $build = "Earth Wall"; break; - case 33: $build = "Palisade"; break; - case 34: $build = "Stonemason's Lodge"; break; - case 35: $build = "Brewery"; break; - case 36: $build = "Trapper"; break; - case 37: $build = "Hero's Mansion"; break; - case 38: $build = "Great Warehouse"; break; - case 39: $build = "Great Granary"; break; - case 40: $build = "Wonder of the World"; break; - case 41: $build = "Horse Drinking Trough"; break; - case 42: $build = "Great Workshop"; break; - default: $build = "Error"; break; + case 1: $build = "伐木場"; break; + case 2: $build = "泥坑"; break; + case 3: $build = "鐵礦場"; break; + case 4: $build = "農場"; break; + case 5: $build = "鋸木廠"; break; + case 6: $build = "磚塊廠"; break; + case 7: $build = "鋼鐵鑄造廠"; break; + case 8: $build = "麵粉廠"; break; + case 9: $build = "麵包房"; break; + case 10: $build = "倉庫"; break; + case 11: $build = "糧倉"; break; + case 12: $build = "鐵匠鋪"; break; + case 13: $build = "軍械庫"; break; + case 14: $build = "競技場"; break; + case 15: $build = "村莊大樓"; break; + case 16: $build = "集結點"; break; + case 17: $build = "市場"; break; + case 18: $build = "大使館"; break; + case 19: $build = "兵營"; break; + case 20: $build = "馬廄"; break; + case 21: $build = "工場"; break; + case 22: $build = "研發所"; break; + case 23: $build = "山洞"; break; + case 24: $build = "城鎮廳"; break; + case 25: $build = "行宮"; break; + case 26: $build = "皇宮"; break; + case 27: $build = "寶庫"; break; + case 28: $build = "交易所"; break; + case 29: $build = "大兵營"; break; + case 30: $build = "大馬廄"; break; + case 31: $build = "城牆"; break; + case 32: $build = "土牆"; break; + case 33: $build = "圍欄"; break; + case 34: $build = "石匠鋪"; break; + case 35: $build = "釀酒廠"; break; + case 36: $build = "陷阱"; break; + case 37: $build = "英雄館"; break; + case 38: $build = "大倉庫"; break; + case 39: $build = "大糧倉"; break; + case 40: $build = "世界奇觀"; break; + case 41: $build = "飲馬槽"; break; + case 42: $build = "大工場"; break; + default: $build = "毫無反應，就只是個Error"; break; } return $build; } diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php index 3c629c05..69164f2d 100644 --- a/GameEngine/Lang/zh_tw.php +++ b/GameEngine/Lang/zh_tw.php @@ -551,14 +551,14 @@ define("SAWMILL","鋸木廠"); define("BRICKYARD","磚塊廠"); define("IRONFOUNDRY","鋼鐵鑄造廠"); -define("GRAINMILL","大糧倉"); +define("GRAINMILL","麵粉廠"); define("BAKERY","麵包房"); define("WAREHOUSE","倉庫"); define("GRANARY","糧倉"); define("BLACKSMITH","鐵匠鋪"); define("ARMOURY","軍械庫"); define("TOURNAMENTSQUARE","競技場"); -define("MAINBUILDING","Main Building"); +define("MAINBUILDING","村莊大樓"); define("RALLYPOINT","集結點"); define("OVERVIEW","Resumen"); define("RALLYPOINT_DESC","Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages."); @@ -569,7 +569,7 @@ define("WORKSHOP","工場"); define("ACADEMY","研發所"); define("CRANNY","山洞"); -define("TOWNHALL","中心大樓"); +define("TOWNHALL","城鎮廳"); define("RESIDENCE","行宮"); define("PALACE","皇宮"); define("TREASURY","寶庫"); diff --git a/Templates/Building.tpl b/Templates/Building.tpl index e85be398..c0ec12b2 100644 --- a/Templates/Building.tpl +++ b/Templates/Building.tpl @@ -37,20 +37,20 @@ if($jobs['master'] == 0){ echo "checker\">"; echo "\"cancel\""; - echo $building->procResType($jobs['type'])." (Level ".$jobs['level'].")"; + echo $building->procResType($jobs['type'])." (等級 ".$jobs['level'].")"; if($jobs['loopcon'] == 0) { $BuildingList[] = $jobs['field']; } if($jobs['loopcon'] == 1) { - echo " (waiting loop)"; + echo " (等待貯列)"; } - echo "in "; + echo "等候 "; echo $generator->getTimeFormat($jobs['timestamp']-time()); - echo " hrs."; - echo "done at ".date('H:i', $jobs['timestamp']).""; + echo " 小時."; + echo "於".date('H:i', $jobs['timestamp'])." 完成"; $timer +=1; }else{ echo "checker\">"; echo "\"cancel\""; - echo $building->procResType($jobs['type'])." (Level ".$jobs['level'].")"; + echo $building->procResType($jobs['type'])." (等級 ".$jobs['level'].")"; } } ?> From f66b4e358105f30dc442af34917ec33aed0cd488 Mon Sep 17 00:00:00 2001 From: Lorex Date: Sat, 6 Dec 2014 08:01:35 +0800 Subject: [PATCH 16/33] Correcting typo --- Templates/News/newsbox1.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Templates/News/newsbox1.tpl b/Templates/News/newsbox1.tpl index dc54fde1..818878c8 100644 --- a/Templates/News/newsbox1.tpl +++ b/Templates/News/newsbox1.tpl @@ -41,7 +41,7 @@ $online = mysql_num_rows(mysql_query("SELECT * FROM " . TB_PREFIX . "users WHERE : = 86400){ echo ''.(MEDALINTERVAL/86400).' Days'; } else if(MEDALINTERVAL < 86400){ echo ''.(MEDALINTERVAL/3600).' Hours'; } ?> -開服日期t +開服日期 : From 35bffe41e5b3162327dfb8f72d2d7d616f8b0e5c Mon Sep 17 00:00:00 2001 From: Inndy Date: Sat, 6 Dec 2014 13:27:53 +0800 Subject: [PATCH 17/33] Remove error_log, it shouldn't be in the repo --- Admin/error_log | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 Admin/error_log diff --git a/Admin/error_log b/Admin/error_log deleted file mode 100644 index c1503fac..00000000 --- a/Admin/error_log +++ /dev/null @@ -1,28 +0,0 @@ -[20-Jan-2014 13:36:23 Europe/Bucharest] PHP Warning: mysql_fetch_assoc() expects parameter 1 to be resource, boolean given in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/report.tpl on line 14 -[20-Jan-2014 14:39:18 Europe/Bucharest] PHP Warning: mysql_fetch_assoc() expects parameter 1 to be resource, boolean given in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/report.tpl on line 14 -[23-Jan-2014 14:08:26 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:27 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:08:28 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:09:07 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:09:08 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:09:29 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:05 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:05 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:05 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:06 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:06 Europe/Bucharest] PHP Fatal error: Cannot redeclare class MYSQL_DB in /home/outlet/public_html/shadowss.ro/travian/GameEngine/Database/db_MYSQL.php on line 19 -[23-Jan-2014 14:10:22 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:10:29 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:10:30 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:10:33 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:13 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:14 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:16 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:17 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:17 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:18 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:19 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 -[23-Jan-2014 14:12:19 Europe/Bucharest] PHP Parse error: syntax error, unexpected '<' in /home/outlet/public_html/shadowss.ro/travian/Admin/Templates/playerinfo.tpl on line 185 From 97176ffe4095753d0cd18c0f49442d94b2367101 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sat, 6 Dec 2014 13:41:26 +0800 Subject: [PATCH 18/33] Translate some template --- Admin/Templates/Notice/0.tpl | 52 ++++++++++++++-------------- Admin/Templates/Notice/0x.tpl | 64 ++++++++++++++++++----------------- Admin/Templates/Notice/1.tpl | 6 ++-- 3 files changed, 63 insertions(+), 59 deletions(-) diff --git a/Admin/Templates/Notice/0.tpl b/Admin/Templates/Notice/0.tpl index 7b49fafd..8a3801f2 100644 --- a/Admin/Templates/Notice/0.tpl +++ b/Admin/Templates/Notice/0.tpl @@ -4,15 +4,17 @@ $dataarray = explode(",",$rep[0]['data']); - + - + procMtime($rep[0]['time']); ?> - - + + + + @@ -20,8 +22,8 @@ $dataarray = explode(",",$rep[0]['data']);
    Subject:主旨：:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -55,21 +57,21 @@ for($i=13;$i<=22;$i++) { echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -77,23 +79,23 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information - +
    - + +$start=1; ?> - + @@ -113,7 +115,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -131,8 +133,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    ".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -169,8 +171,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    - + @@ -208,8 +210,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    - + @@ -247,8 +249,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    - + @@ -281,4 +283,4 @@ for($i=129;$i<=138;$i++) {
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    -
    \ No newline at end of file + diff --git a/Admin/Templates/Notice/0x.tpl b/Admin/Templates/Notice/0x.tpl index d5a5c8b9..2de094e9 100644 --- a/Admin/Templates/Notice/0x.tpl +++ b/Admin/Templates/Notice/0x.tpl @@ -7,14 +7,16 @@ $dataarray = explode(",",$data); - + procMtime($time); ?> - + + + @@ -23,8 +25,8 @@ $dataarray = explode(",",$data);
    Subject:主旨:
    Sent:寄送時間: on at ".$date[1]; ?> hour
    - - + + @@ -36,7 +38,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -45,7 +47,7 @@ for($i=3;$i<=12;$i++) { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -58,28 +60,28 @@ for($i=13;$i<=22;$i++) { echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -95,8 +97,8 @@ $start=1; ?>
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - + @@ -107,7 +109,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -116,7 +118,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -134,8 +136,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -146,7 +148,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -155,7 +157,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -172,8 +174,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -184,7 +186,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -193,7 +195,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -211,8 +213,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -223,7 +225,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -232,7 +234,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -250,8 +252,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -262,7 +264,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -271,7 +273,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -284,4 +286,4 @@ for($i=129;$i<=138;$i++) {
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    -
    \ No newline at end of file + diff --git a/Admin/Templates/Notice/1.tpl b/Admin/Templates/Notice/1.tpl index 17a5a145..99f1a36d 100644 --- a/Admin/Templates/Notice/1.tpl +++ b/Admin/Templates/Notice/1.tpl @@ -30,13 +30,13 @@ if($database->isVillageOases($dataarray[29])){ - + procMtime($rep[0]['time']); ?> - + @@ -376,4 +376,4 @@ else {
    Subject:主旨:
    Sent:寄送時間: on at ".$date[1]; ?> hour
    - \ No newline at end of file + From 309de616af9aa992e11b7d68b2a3ec0123aa0535 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sat, 6 Dec 2014 13:42:10 +0800 Subject: [PATCH 19/33] Remove trailing spaces --- Admin/Templates/Notice/0.tpl | 34 +- Admin/Templates/Notice/0x.tpl | 44 +-- Admin/Templates/Notice/1.tpl | 40 +- Admin/Templates/Notice/18.tpl | 34 +- Admin/Templates/Notice/18x.tpl | 44 +-- Admin/Templates/Notice/19.tpl | 42 +- Admin/Templates/Notice/19x.tpl | 40 +- Admin/Templates/Notice/1x.tpl | 46 +-- Admin/Templates/Notice/2.tpl | 40 +- Admin/Templates/Notice/20.tpl | 34 +- Admin/Templates/Notice/20x.tpl | 44 +-- Admin/Templates/Notice/21.tpl | 34 +- Admin/Templates/Notice/21x.tpl | 44 +-- Admin/Templates/Notice/22.tpl | 2 +- Admin/Templates/Notice/2x.tpl | 46 +-- Admin/Templates/Notice/3.tpl | 42 +- Admin/Templates/Notice/3x.tpl | 42 +- Admin/Templates/Notice/4.tpl | 46 +-- Admin/Templates/Notice/4x.tpl | 46 +-- Admin/Templates/Notice/5.tpl | 44 +-- Admin/Templates/Notice/5x.tpl | 46 +-- Admin/Templates/Notice/6.tpl | 44 +-- Admin/Templates/Notice/6x.tpl | 46 +-- Admin/Templates/Notice/7.tpl | 14 +- Admin/Templates/Notice/7x.tpl | 62 +-- Admin/Templates/Notice/8.tpl | 4 +- Admin/Templates/Notice/9.tpl | 2 +- Admin/Templates/Notice/9x.tpl | 2 +- Admin/Templates/Notice/all.tpl | 17 +- Admin/Templates/addABTroops.tpl | 14 +- Admin/Templates/addTroops.tpl | 8 +- Admin/Templates/addUsers.tpl | 20 +- Admin/Templates/add_village.tpl | 24 +- Admin/Templates/editAdditional.tpl | 8 +- Admin/Templates/editExtraSet.tpl | 4 +- Admin/Templates/editHero.tpl | 100 ++--- Admin/Templates/editLogSet.tpl | 14 +- Admin/Templates/editNewsboxSet.tpl | 6 +- Admin/Templates/editServerSet.tpl | 10 +- Admin/Templates/inactive.tpl | 6 +- Admin/Templates/maintenence.tpl | 4 +- Admin/Templates/maintenenceBan.tpl | 6 +- Admin/Templates/maintenenceResetGold.tpl | 4 +- Admin/Templates/maintenenceResetPlus.tpl | 4 +- Admin/Templates/maintenenceResetPlusBonus.tpl | 4 +- Admin/Templates/maintenenceUnban.tpl | 10 +- Admin/Templates/map.tpl | 6 +- Admin/Templates/msg.tpl | 2 +- Admin/Templates/player.tpl | 2 +- Admin/Templates/playerheroinfo.tpl | 100 ++--- Admin/Templates/report.tpl | 4 +- Admin/Templates/report/0.tpl | 44 +-- Admin/Templates/report/1.tpl | 44 +-- Admin/Templates/report/2.tpl | 42 +- Admin/Templates/troopUpgrades.tpl | 5 +- Admin/Templates/troops.tpl | 2 +- Admin/Templates/update.tpl | 16 +- Admin/Templates/village.tpl | 12 +- GameEngine/Admin/Mods/constant_format.tpl | 20 +- Templates/Ajax/mapscroll.tpl | 4 +- Templates/Ajax/mapscroll2.tpl | 2 +- Templates/Ajax/plusmap.tpl | 8 +- Templates/Ajax/quest_core.tpl | 178 ++++----- Templates/Ajax/quest_core25.tpl | 162 ++++---- Templates/Alliance/Forum/forum_1.tpl | 10 +- Templates/Alliance/Forum/forum_10.tpl | 4 +- Templates/Alliance/Forum/forum_2.tpl | 32 +- Templates/Alliance/Forum/forum_4.tpl | 10 +- Templates/Alliance/Forum/forum_5.tpl | 4 +- Templates/Alliance/Forum/forum_6.tpl | 4 +- Templates/Alliance/Forum/forum_7.tpl | 4 +- Templates/Alliance/Forum/forum_8.tpl | 10 +- Templates/Alliance/Forum/forum_9.tpl | 4 +- Templates/Alliance/alli_menu.tpl | 4 +- Templates/Alliance/alliance.tpl | 4 +- Templates/Alliance/allidesc.tpl | 14 +- Templates/Alliance/assignpos.tpl | 2 +- Templates/Alliance/attack-attacker.tpl | 12 +- Templates/Alliance/attack-defender.tpl | 12 +- Templates/Alliance/attacks.tpl | 18 +- Templates/Alliance/changename.tpl | 2 +- Templates/Alliance/changepos.tpl | 2 +- Templates/Alliance/chat.tpl | 8 +- Templates/Alliance/chgdiplo.tpl | 30 +- Templates/Alliance/forum.tpl | 14 +- Templates/Alliance/invite.tpl | 8 +- Templates/Alliance/kick.tpl | 4 +- Templates/Alliance/linkforum.tpl | 2 +- Templates/Alliance/news.tpl | 2 +- Templates/Alliance/option.tpl | 22 +- Templates/Alliance/overview.tpl | 42 +- Templates/Alliance/quitalli.tpl | 2 +- Templates/Anleitung/0.tpl | 14 +- Templates/Anleitung/1.tpl | 14 +- Templates/Anleitung/3.tpl | 10 +- Templates/Anleitung/4.tpl | 14 +- Templates/Build/1.tpl | 12 +- Templates/Build/10.tpl | 4 +- Templates/Build/11.tpl | 6 +- Templates/Build/14.tpl | 4 +- Templates/Build/15.tpl | 6 +- Templates/Build/15_1.tpl | 6 +- Templates/Build/16.tpl | 12 +- Templates/Build/16_99.tpl | 2 +- Templates/Build/16_incomming.tpl | 30 +- Templates/Build/16_troops.tpl | 8 +- Templates/Build/16_walking.tpl | 18 +- Templates/Build/17.tpl | 204 +++++----- Templates/Build/17_1.tpl | 18 +- Templates/Build/17_2.tpl | 230 +++++------ Templates/Build/17_3.tpl | 206 +++++----- Templates/Build/17_4.tpl | 18 +- Templates/Build/17_create.tpl | 2 +- Templates/Build/17_menu.tpl | 14 +- Templates/Build/18.tpl | 2 +- Templates/Build/18_create.tpl | 5 +- Templates/Build/19_train.tpl | 12 +- Templates/Build/2.tpl | 12 +- Templates/Build/20.tpl | 2 +- Templates/Build/20_1.tpl | 2 +- Templates/Build/20_2.tpl | 2 +- Templates/Build/20_3.tpl | 2 +- Templates/Build/20_4.tpl | 2 +- Templates/Build/21.tpl | 8 +- Templates/Build/22_1.tpl | 4 +- Templates/Build/22_2.tpl | 6 +- Templates/Build/22_3.tpl | 6 +- Templates/Build/22_4.tpl | 6 +- Templates/Build/22_5.tpl | 6 +- Templates/Build/23.tpl | 4 +- Templates/Build/24.tpl | 2 +- Templates/Build/24_1.tpl | 10 +- Templates/Build/24_2.tpl | 2 +- Templates/Build/25.tpl | 2 +- Templates/Build/25_menu.tpl | 10 +- Templates/Build/26.tpl | 14 +- Templates/Build/26_menu.tpl | 10 +- Templates/Build/27.tpl | 8 +- Templates/Build/27_1.tpl | 6 +- Templates/Build/27_2.tpl | 30 +- Templates/Build/27_3.tpl | 30 +- Templates/Build/27_menu.tpl | 2 +- Templates/Build/28.tpl | 4 +- Templates/Build/29_train.tpl | 4 +- Templates/Build/3.tpl | 12 +- Templates/Build/30_train.tpl | 4 +- Templates/Build/31.tpl | 4 +- Templates/Build/32.tpl | 4 +- Templates/Build/33.tpl | 4 +- Templates/Build/34.tpl | 4 +- Templates/Build/35.tpl | 4 +- Templates/Build/36.tpl | 6 +- Templates/Build/37.tpl | 14 +- Templates/Build/37_hero.tpl | 366 +++++++++--------- Templates/Build/37_land.tpl | 2 +- Templates/Build/37_revive.tpl | 28 +- Templates/Build/37_train.tpl | 330 ++++++++-------- Templates/Build/38.tpl | 4 +- Templates/Build/39.tpl | 6 +- Templates/Build/4.tpl | 12 +- Templates/Build/41.tpl | 2 +- Templates/Build/42_train.tpl | 4 +- Templates/Build/5.tpl | 4 +- Templates/Build/6.tpl | 4 +- Templates/Build/7.tpl | 4 +- Templates/Build/8.tpl | 4 +- Templates/Build/9.tpl | 4 +- Templates/Build/avaliable.tpl | 22 +- Templates/Build/avaliable/availupgrade.tpl | 2 +- Templates/Build/avaliable/brewery.tpl | 30 +- Templates/Build/upgrade.tpl | 2 +- Templates/Build/ww.tpl | 2 +- Templates/Build/wwupgrade.tpl | 8 +- Templates/Building.tpl | 6 +- Templates/Manual/110.tpl | 2 +- Templates/Manual/114.tpl | 2 +- Templates/Manual/115.tpl | 2 +- Templates/Manual/118.tpl | 4 +- Templates/Manual/119.tpl | 2 +- Templates/Manual/120.tpl | 2 +- Templates/Manual/121.tpl | 2 +- Templates/Manual/18.tpl | 4 +- Templates/Manual/19.tpl | 2 +- Templates/Manual/416.tpl | 2 +- Templates/Manual/418.tpl | 2 +- Templates/Manual/423.tpl | 4 +- Templates/Manual/424.tpl | 2 +- Templates/Manual/426.tpl | 2 +- Templates/Manual/429.tpl | 2 +- Templates/Manual/43.tpl | 2 +- Templates/Manual/430.tpl | 2 +- Templates/Manual/432.tpl | 2 +- Templates/Manual/433.tpl | 2 +- Templates/Manual/434.tpl | 2 +- Templates/Manual/435.tpl | 2 +- Templates/Manual/436.tpl | 6 +- Templates/Manual/437.tpl | 2 +- Templates/Manual/44.tpl | 2 +- Templates/Manual/direct.tpl | 2 +- Templates/Map/mapview.tpl | 8 +- Templates/Map/mapviewlarge.tpl | 28 +- Templates/Map/vilview.tpl | 68 ++-- Templates/Message/archive.tpl | 6 +- Templates/Message/inbox.tpl | 6 +- Templates/Message/notes.tpl | 4 +- Templates/Message/read.tpl | 10 +- Templates/Message/sent.tpl | 4 +- Templates/Message/write.tpl | 34 +- Templates/News/newsbox3.tpl | 4 +- Templates/Notice/0.tpl | 44 +-- Templates/Notice/0x.tpl | 44 +-- Templates/Notice/1.tpl | 54 +-- Templates/Notice/10.tpl | 6 +- Templates/Notice/11.tpl | 6 +- Templates/Notice/12.tpl | 6 +- Templates/Notice/13.tpl | 6 +- Templates/Notice/14.tpl | 6 +- Templates/Notice/15.tpl | 2 +- Templates/Notice/16.tpl | 2 +- Templates/Notice/17.tpl | 2 +- Templates/Notice/18.tpl | 44 +-- Templates/Notice/18x.tpl | 44 +-- Templates/Notice/19.tpl | 50 +-- Templates/Notice/19x.tpl | 40 +- Templates/Notice/1x.tpl | 46 +-- Templates/Notice/2.tpl | 54 +-- Templates/Notice/20.tpl | 44 +-- Templates/Notice/20x.tpl | 44 +-- Templates/Notice/21.tpl | 44 +-- Templates/Notice/21x.tpl | 44 +-- Templates/Notice/22.tpl | 2 +- Templates/Notice/2x.tpl | 46 +-- Templates/Notice/3.tpl | 58 +-- Templates/Notice/3x.tpl | 42 +- Templates/Notice/4.tpl | 60 +-- Templates/Notice/4x.tpl | 46 +-- Templates/Notice/5.tpl | 60 +-- Templates/Notice/5x.tpl | 46 +-- Templates/Notice/6.tpl | 58 +-- Templates/Notice/6x.tpl | 46 +-- Templates/Notice/7.tpl | 76 ++-- Templates/Notice/7x.tpl | 62 +-- Templates/Notice/8.tpl | 6 +- Templates/Notice/9.tpl | 2 +- Templates/Notice/9x.tpl | 2 +- Templates/Notice/all.tpl | 17 +- Templates/Plus/1.tpl | 10 +- Templates/Plus/110.tpl | 12 +- Templates/Plus/111.tpl | 16 +- Templates/Plus/112.tpl | 16 +- Templates/Plus/113.tpl | 10 +- Templates/Plus/13.tpl | 2 +- Templates/Plus/2.tpl | 2 +- Templates/Plus/3110.tpl | 8 +- Templates/Plus/7.tpl | 2 +- Templates/Plus/getplus.tpl | 12 +- Templates/Profile/account.tpl | 6 +- Templates/Profile/graphic.tpl | 8 +- Templates/Profile/overview.tpl | 20 +- Templates/Profile/preference.tpl | 28 +- Templates/Profile/profile.tpl | 30 +- Templates/Profile/vacation.tpl | 4 +- Templates/Ranking/alliance.tpl | 4 +- Templates/Ranking/alliance_attack.tpl | 2 +- Templates/Ranking/alliance_defend.tpl | 2 +- Templates/Ranking/ally_top10.tpl | 10 +- Templates/Ranking/general.tpl | 6 +- Templates/Ranking/overview.tpl | 4 +- Templates/Ranking/player_1.tpl | 6 +- Templates/Ranking/player_2.tpl | 6 +- Templates/Ranking/player_3.tpl | 6 +- Templates/Ranking/player_attack.tpl | 8 +- Templates/Ranking/player_defend.tpl | 6 +- Templates/Ranking/player_top10.tpl | 8 +- Templates/Ranking/ranksearch.tpl | 6 +- Templates/Ranking/villages.tpl | 4 +- Templates/Ranking/ww.tpl | 102 ++--- Templates/Simulator/def_end.tpl | 4 +- Templates/Tutorial/1.tpl | 10 +- Templates/Tutorial/2.tpl | 8 +- Templates/Tutorial/3.tpl | 8 +- Templates/Tutorial/4.tpl | 10 +- Templates/Tutorial/5.tpl | 8 +- Templates/a2b/attack.tpl | 80 ++-- Templates/a2b/attack_5.tpl | 72 ++-- Templates/a2b/newdorf.tpl | 6 +- Templates/a2b/sendback_1.tpl | 48 +-- Templates/a2b/sendback_2.tpl | 46 +-- Templates/a2b/sendback_3.tpl | 44 +-- Templates/a2b/sendback_4.tpl | 46 +-- Templates/a2b/sendback_5.tpl | 46 +-- Templates/a2b/startRaid.tpl | 18 +- Templates/a2b/units_1.tpl | 46 +-- Templates/a2b/units_2.tpl | 46 +-- Templates/a2b/units_3.tpl | 46 +-- Templates/a2b/units_4.tpl | 46 +-- Templates/a2b/units_5.tpl | 44 +-- Templates/activate/activate.tpl | 136 +++---- Templates/activate/activated.tpl | 4 +- Templates/activate/delete.tpl | 6 +- Templates/dorf2.tpl | 16 +- Templates/dorf3/1.tpl | 2 +- Templates/dorf3/2.tpl | 12 +- Templates/dorf3/3.tpl | 24 +- Templates/dorf3/4.tpl | 12 +- Templates/dorf3/menu.tpl | 4 +- Templates/dorf3/noplus.tpl | 12 +- Templates/field.tpl | 6 +- Templates/footer.tpl | 2 +- Templates/goldClub/farmlist.tpl | 22 +- Templates/goldClub/farmlist_add.tpl | 4 +- Templates/goldClub/farmlist_addraid.tpl | 32 +- Templates/goldClub/farmlist_editraid.tpl | 18 +- Templates/goldClub/trooplist.tpl | 6 +- Templates/goldClub/trooplist2.tpl | 6 +- Templates/header.tpl | 4 +- Templates/links.tpl | 6 +- Templates/menu.tpl | 10 +- Templates/movement.tpl | 10 +- Templates/multivillage.tpl | 2 +- Templates/news.tpl | 2 +- Templates/production.tpl | 12 +- Templates/quest.tpl | 4 +- Templates/res.tpl | 18 +- Templates/rules.tpl | 274 ++++++------- Templates/text.tpl | 2 +- Templates/text_format.tpl | 2 +- Templates/troops.tpl | 2 +- install/data/constant_format.tpl | 18 +- install/templates/config.tpl | 2 +- 330 files changed, 3704 insertions(+), 3708 deletions(-) diff --git a/Admin/Templates/Notice/0.tpl b/Admin/Templates/Notice/0.tpl index 8a3801f2..f94afd7b 100644 --- a/Admin/Templates/Notice/0.tpl +++ b/Admin/Templates/Notice/0.tpl @@ -100,8 +100,8 @@ $start=1; ?>   - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -127,9 +127,9 @@ for($i=45;$i<=54;$i++) { ?> - + @@ -139,8 +139,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -167,7 +167,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -177,8 +177,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -205,8 +205,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -216,8 +216,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -245,7 +245,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -255,8 +255,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/0x.tpl b/Admin/Templates/Notice/0x.tpl index 2de094e9..c1842565 100644 --- a/Admin/Templates/Notice/0x.tpl +++ b/Admin/Templates/Notice/0x.tpl @@ -10,7 +10,7 @@ $dataarray = explode(",",$data); - + procMtime($time); ?> @@ -64,7 +64,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
     主旨:
    資訊 @@ -82,18 +82,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    資訊 - +
    - + +$start=1; ?> @@ -103,8 +103,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -130,9 +130,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -142,8 +142,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -170,7 +170,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -180,8 +180,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -208,8 +208,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -219,8 +219,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -248,7 +248,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -258,8 +258,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/1.tpl b/Admin/Templates/Notice/1.tpl index 99f1a36d..2cf92703 100644 --- a/Admin/Templates/Notice/1.tpl +++ b/Admin/Templates/Notice/1.tpl @@ -128,14 +128,14 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
     
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -203,18 +203,18 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -251,18 +251,18 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -300,7 +300,7 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=31; ?>
    Defender -
     
    @@ -310,8 +310,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -339,12 +339,12 @@ else { +$start=41; ?>
     
    + diff --git a/Admin/Templates/Notice/18.tpl b/Admin/Templates/Notice/18.tpl index 647d214c..da3d1430 100644 --- a/Admin/Templates/Notice/18.tpl +++ b/Admin/Templates/Notice/18.tpl @@ -121,18 +121,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    Defender -
    Information - +
    - + +$start=1; ?> @@ -142,8 +142,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -181,7 +181,7 @@ if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ +$start=11;?>
     
    @@ -191,8 +191,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -229,7 +229,7 @@ if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){
     
    +$start=21; ?> @@ -239,8 +239,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -278,7 +278,7 @@ if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ +$start=31; ?>
     
    @@ -288,8 +288,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -317,7 +317,7 @@ else { +$start=41; ?>
     
    @@ -327,8 +327,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/18x.tpl b/Admin/Templates/Notice/18x.tpl index bb723cc5..62b711e5 100644 --- a/Admin/Templates/Notice/18x.tpl +++ b/Admin/Templates/Notice/18x.tpl @@ -10,7 +10,7 @@ $dataarray = explode(",",$data); - + procMtime($time); ?> @@ -76,7 +76,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
     Subject:
    Information @@ -94,18 +94,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    Information - +
    - + +$start=1; ?> @@ -115,8 +115,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -142,9 +142,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -154,8 +154,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -182,7 +182,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -192,8 +192,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -220,8 +220,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -231,8 +231,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -260,7 +260,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -270,8 +270,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/19.tpl b/Admin/Templates/Notice/19.tpl index 0995b33c..365755ff 100644 --- a/Admin/Templates/Notice/19.tpl +++ b/Admin/Templates/Notice/19.tpl @@ -93,30 +93,30 @@ else { } } if(isset($dataarray[171]) && $dataarray[171] !=''){ //troop not return -?> +?>
     
    Information
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -144,18 +144,18 @@ else { +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -182,18 +182,18 @@ else {
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -221,7 +221,7 @@ else { +$start=31; ?>
    Defender -
     
    @@ -231,8 +231,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -260,18 +260,18 @@ else { +$start=41; ?>
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/19x.tpl b/Admin/Templates/Notice/19x.tpl index c1a19186..c300594e 100644 --- a/Admin/Templates/Notice/19x.tpl +++ b/Admin/Templates/Notice/19x.tpl @@ -10,7 +10,7 @@ $dataarray = explode(",",$data); - + procMtime($time); ?> @@ -72,13 +72,13 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; ?>
    Defender -
     Subject:
    - + +$start=1; ?> @@ -88,8 +88,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -115,9 +115,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -127,8 +127,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -155,7 +155,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -165,8 +165,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -193,8 +193,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -204,8 +204,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -233,7 +233,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -243,8 +243,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/1x.tpl b/Admin/Templates/Notice/1x.tpl index b7ef8744..f52d3533 100644 --- a/Admin/Templates/Notice/1x.tpl +++ b/Admin/Templates/Notice/1x.tpl @@ -12,7 +12,7 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2 - + procMtime($time); ?> @@ -90,7 +90,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
     Subject:
    Information @@ -108,26 +108,26 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief if ($dataarray[145]!='' and $dataarray[146]!=''){ //spy ?>
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> @@ -143,8 +143,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -180,9 +180,9 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ ?>
     
    - + @@ -198,8 +198,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -236,7 +236,7 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +$start=21; ?> @@ -252,8 +252,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -290,8 +290,8 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +if ($dataarray[97]=='1'){ +$start=31; ?> @@ -307,8 +307,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -346,7 +346,7 @@ if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=41; ?>
     
    @@ -362,8 +362,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/2.tpl b/Admin/Templates/Notice/2.tpl index 328df3da..a7348f21 100644 --- a/Admin/Templates/Notice/2.tpl +++ b/Admin/Templates/Notice/2.tpl @@ -133,14 +133,14 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
     
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -208,18 +208,18 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -256,18 +256,18 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -305,7 +305,7 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=31; ?>
    Defender -
     
    @@ -315,8 +315,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -344,12 +344,12 @@ else { +$start=41; ?>
     
    + diff --git a/Admin/Templates/Notice/20.tpl b/Admin/Templates/Notice/20.tpl index 647d214c..da3d1430 100644 --- a/Admin/Templates/Notice/20.tpl +++ b/Admin/Templates/Notice/20.tpl @@ -121,18 +121,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    Defender -
    Information - +
    - + +$start=1; ?> @@ -142,8 +142,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -181,7 +181,7 @@ if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ +$start=11;?>
     
    @@ -191,8 +191,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -229,7 +229,7 @@ if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){
     
    +$start=21; ?> @@ -239,8 +239,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -278,7 +278,7 @@ if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ +$start=31; ?>
     
    @@ -288,8 +288,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -317,7 +317,7 @@ else { +$start=41; ?>
     
    @@ -327,8 +327,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/20x.tpl b/Admin/Templates/Notice/20x.tpl index bb723cc5..62b711e5 100644 --- a/Admin/Templates/Notice/20x.tpl +++ b/Admin/Templates/Notice/20x.tpl @@ -10,7 +10,7 @@ $dataarray = explode(",",$data); - + procMtime($time); ?> @@ -76,7 +76,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
     Subject:
    Information @@ -94,18 +94,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    Information - +
    - + +$start=1; ?> @@ -115,8 +115,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -142,9 +142,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -154,8 +154,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -182,7 +182,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -192,8 +192,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -220,8 +220,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -231,8 +231,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -260,7 +260,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -270,8 +270,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/21.tpl b/Admin/Templates/Notice/21.tpl index 647d214c..da3d1430 100644 --- a/Admin/Templates/Notice/21.tpl +++ b/Admin/Templates/Notice/21.tpl @@ -121,18 +121,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
     
    Information - +
    - + +$start=1; ?> @@ -142,8 +142,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -181,7 +181,7 @@ if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ +$start=11;?>
     
    @@ -191,8 +191,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -229,7 +229,7 @@ if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){
     
    +$start=21; ?> @@ -239,8 +239,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -278,7 +278,7 @@ if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ +$start=31; ?>
     
    @@ -288,8 +288,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -317,7 +317,7 @@ else { +$start=41; ?>
     
    @@ -327,8 +327,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/21x.tpl b/Admin/Templates/Notice/21x.tpl index bb723cc5..62b711e5 100644 --- a/Admin/Templates/Notice/21x.tpl +++ b/Admin/Templates/Notice/21x.tpl @@ -10,7 +10,7 @@ $dataarray = explode(",",$data); - + procMtime($time); ?> @@ -76,7 +76,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
     Subject:
    Information @@ -94,18 +94,18 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
    Information - +
    - + +$start=1; ?> @@ -115,8 +115,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -142,9 +142,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -154,8 +154,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -182,7 +182,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -192,8 +192,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -220,8 +220,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -231,8 +231,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -260,7 +260,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -270,8 +270,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/22.tpl b/Admin/Templates/Notice/22.tpl index 960f9935..7084a2f3 100644 --- a/Admin/Templates/Notice/22.tpl +++ b/Admin/Templates/Notice/22.tpl @@ -26,7 +26,7 @@ $message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you - + procMtime($rep[0]['time']); ?> diff --git a/Admin/Templates/Notice/2x.tpl b/Admin/Templates/Notice/2x.tpl index b7ef8744..f52d3533 100644 --- a/Admin/Templates/Notice/2x.tpl +++ b/Admin/Templates/Notice/2x.tpl @@ -12,7 +12,7 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2 - + procMtime($time); ?> @@ -90,7 +90,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
     Subject:
    Subject:
    Information @@ -108,26 +108,26 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief if ($dataarray[145]!='' and $dataarray[146]!=''){ //spy ?>
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> @@ -143,8 +143,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -180,9 +180,9 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ ?>
     
    - + @@ -198,8 +198,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -236,7 +236,7 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +$start=21; ?> @@ -252,8 +252,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -290,8 +290,8 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +if ($dataarray[97]=='1'){ +$start=31; ?> @@ -307,8 +307,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -346,7 +346,7 @@ if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=41; ?>
     
    @@ -362,8 +362,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/3.tpl b/Admin/Templates/Notice/3.tpl index fe86d617..5fc58042 100644 --- a/Admin/Templates/Notice/3.tpl +++ b/Admin/Templates/Notice/3.tpl @@ -136,31 +136,31 @@ if ($dataarray[172]!='' and $dataarray[173]!=''){ //hero +?>
     
    Information
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -188,18 +188,18 @@ else { +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -226,18 +226,18 @@ else {
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -265,7 +265,7 @@ else { +$start=31; ?>
    Defender -
     
    @@ -275,8 +275,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -304,18 +304,18 @@ else { +$start=41; ?>
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/3x.tpl b/Admin/Templates/Notice/3x.tpl index ebeeb0e8..eeaff2fa 100644 --- a/Admin/Templates/Notice/3x.tpl +++ b/Admin/Templates/Notice/3x.tpl @@ -2,7 +2,7 @@ ############################################################ ## DO NOT REMOVE THIS NOTICE ## ## ADVOCAITE ROCKS TRAVIANX NUTS ## -## GIT HUB REV ## +## GIT HUB REV ## ############################################################ $topic = $database->getNotice2($_GET['id'], 'topic'); $time = $database->getNotice2($_GET['id'], 'time'); @@ -17,7 +17,7 @@ $colspan2 = 10; - + procMtime($time); ?> @@ -88,13 +88,13 @@ if(isset($dataarray[151]) and $dataarray[151]!=0){ } echo ""; ?>
    Defender -
     Subject:
    - + +$start=1; ?> @@ -104,8 +104,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -131,9 +131,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -143,8 +143,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -171,7 +171,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -181,8 +181,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -209,8 +209,8 @@ for($i=87;$i<=96;$i++) {
     
    - + @@ -220,8 +220,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -249,7 +249,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -259,8 +259,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/4.tpl b/Admin/Templates/Notice/4.tpl index 04f47f23..72b715fe 100644 --- a/Admin/Templates/Notice/4.tpl +++ b/Admin/Templates/Notice/4.tpl @@ -133,14 +133,14 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief +?> @@ -160,23 +160,23 @@ if(isset($dataarray[164]) && $dataarray[164] !=''){ //troop not return
     
    Information - +
    Information - +
    Information
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -214,18 +214,18 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -262,18 +262,18 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -311,7 +311,7 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=31; ?>
    Defender -
     
    @@ -321,8 +321,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -350,18 +350,18 @@ else { +$start=41; ?>
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/4x.tpl b/Admin/Templates/Notice/4x.tpl index b7ef8744..f52d3533 100644 --- a/Admin/Templates/Notice/4x.tpl +++ b/Admin/Templates/Notice/4x.tpl @@ -12,7 +12,7 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2 - + procMtime($time); ?> @@ -90,7 +90,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
    Defender -
     Subject:
    Information @@ -108,26 +108,26 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief if ($dataarray[145]!='' and $dataarray[146]!=''){ //spy ?>
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> @@ -143,8 +143,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -180,9 +180,9 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ ?>
     
    - + @@ -198,8 +198,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -236,7 +236,7 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +$start=21; ?> @@ -252,8 +252,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -290,8 +290,8 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +if ($dataarray[97]=='1'){ +$start=31; ?> @@ -307,8 +307,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -346,7 +346,7 @@ if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=41; ?>
     
    @@ -362,8 +362,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/5.tpl b/Admin/Templates/Notice/5.tpl index 7e32dcab..72b715fe 100644 --- a/Admin/Templates/Notice/5.tpl +++ b/Admin/Templates/Notice/5.tpl @@ -133,14 +133,14 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
     
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -214,18 +214,18 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -262,18 +262,18 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -311,7 +311,7 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=31; ?>
    Defender -
     
    @@ -321,8 +321,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -350,18 +350,18 @@ else { +$start=41; ?>
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/5x.tpl b/Admin/Templates/Notice/5x.tpl index b7ef8744..f52d3533 100644 --- a/Admin/Templates/Notice/5x.tpl +++ b/Admin/Templates/Notice/5x.tpl @@ -12,7 +12,7 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2 - + procMtime($time); ?> @@ -90,7 +90,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
    Defender -
     Subject:
    Information @@ -108,26 +108,26 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief if ($dataarray[145]!='' and $dataarray[146]!=''){ //spy ?>
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> @@ -143,8 +143,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -180,9 +180,9 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ ?>
     
    - + @@ -198,8 +198,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -236,7 +236,7 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +$start=21; ?> @@ -252,8 +252,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -290,8 +290,8 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +if ($dataarray[97]=='1'){ +$start=31; ?> @@ -307,8 +307,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -346,7 +346,7 @@ if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=41; ?>
     
    @@ -362,8 +362,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/6.tpl b/Admin/Templates/Notice/6.tpl index cea8ba72..65e958e6 100644 --- a/Admin/Templates/Notice/6.tpl +++ b/Admin/Templates/Notice/6.tpl @@ -133,14 +133,14 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief
     
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -208,18 +208,18 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=11;?>
    Defender -
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -256,18 +256,18 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
    Defender -
     
    +$start=21; ?> + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -305,7 +305,7 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=31; ?>
    Defender -
     
    @@ -315,8 +315,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -344,18 +344,18 @@ else { +$start=41; ?>
     
    + - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/6x.tpl b/Admin/Templates/Notice/6x.tpl index b7ef8744..f52d3533 100644 --- a/Admin/Templates/Notice/6x.tpl +++ b/Admin/Templates/Notice/6x.tpl @@ -12,7 +12,7 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2 - + procMtime($time); ?> @@ -90,7 +90,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram -
    Defender -
     Subject:
    Information @@ -108,26 +108,26 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief if ($dataarray[145]!='' and $dataarray[146]!=''){ //spy ?>
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> @@ -143,8 +143,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -180,9 +180,9 @@ if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ ?>
     
    - + @@ -198,8 +198,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -236,7 +236,7 @@ if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +$start=21; ?> @@ -252,8 +252,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -290,8 +290,8 @@ if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){
     
    +if ($dataarray[97]=='1'){ +$start=31; ?> @@ -307,8 +307,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -346,7 +346,7 @@ if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ +$start=41; ?>
     
    @@ -362,8 +362,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/7.tpl b/Admin/Templates/Notice/7.tpl index 92a3952d..1b270f17 100644 --- a/Admin/Templates/Notice/7.tpl +++ b/Admin/Templates/Notice/7.tpl @@ -131,14 +131,14 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief +?> @@ -168,7 +168,7 @@ $start=1; ?> + @@ -215,7 +215,7 @@ $start=11;?> + @@ -261,7 +261,7 @@ $start=21; ?> + @@ -346,7 +346,7 @@ $start=41; ?> + diff --git a/Admin/Templates/Notice/7x.tpl b/Admin/Templates/Notice/7x.tpl index 446b7db9..a8c5c117 100644 --- a/Admin/Templates/Notice/7x.tpl +++ b/Admin/Templates/Notice/7x.tpl @@ -12,7 +12,7 @@ $colspan2 = 10; - + procMtime($time); ?> @@ -90,7 +90,7 @@ if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram Ram - -
     
    Information - +
    Information - +
    Information
    Defender -
    Defender -
    Defender -
    Defender -
    Subject:
    Information @@ -108,27 +108,27 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief if ($dataarray[145]!='' and $dataarray[146]!=''){ //spy ?>
    Information - +
    Information - +
    Bounty
    Lumber | Clay | Iron | Crop
    carry
    - + +$start=1; ?> @@ -138,8 +138,8 @@ $start=1; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -165,9 +165,9 @@ for($i=45;$i<=54;$i++) { ?>
     
    - + @@ -177,8 +177,8 @@ $start=11;?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -205,7 +205,7 @@ for($i=66;$i<=75;$i++) {
     
    +$start=21; ?> @@ -215,8 +215,8 @@ $start=21; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -244,8 +244,8 @@ for($i=87;$i<=96;$i++) { +if ($dataarray[97]=='1'){ +$start=31; ?>
     
    @@ -255,8 +255,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -284,7 +284,7 @@ for($i=118;$i<=127;$i++) { +$start=41; ?>
     
    @@ -294,8 +294,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -323,8 +323,8 @@ for($i=139;$i<=148;$i++) { +if ($dataarray[97]=='1'){ +$start=31; ?>
     
    @@ -334,8 +334,8 @@ $start=31; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; @@ -363,7 +363,7 @@ for($i=108;$i<=117;$i++) { +$start=41; ?>
     
    @@ -373,8 +373,8 @@ $start=41; ?> - - + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; diff --git a/Admin/Templates/Notice/8.tpl b/Admin/Templates/Notice/8.tpl index ea41ff53..5467fa66 100644 --- a/Admin/Templates/Notice/8.tpl +++ b/Admin/Templates/Notice/8.tpl @@ -29,7 +29,7 @@ $date = $generator->procMtime($rep[0]['time']); ?> - @@ -56,7 +56,7 @@ if(isset($id)) - +
     
    - + @@ -57,7 +57,7 @@ if($dataarray[13] != 0) { echo ""; $unitarray['hero'] = 1; } - + ?> diff --git a/Admin/Templates/Notice/9.tpl b/Admin/Templates/Notice/9.tpl index 88229cea..9d7370d7 100644 --- a/Admin/Templates/Notice/9.tpl +++ b/Admin/Templates/Notice/9.tpl @@ -1,4 +1,4 @@ getNotice2($_GET['id'], 'archive'); -include("".$archive.".tpl"); +include("".$archive.".tpl"); ?> \ No newline at end of file diff --git a/Admin/Templates/Notice/9x.tpl b/Admin/Templates/Notice/9x.tpl index 97750ece..65db207d 100644 --- a/Admin/Templates/Notice/9x.tpl +++ b/Admin/Templates/Notice/9x.tpl @@ -1,4 +1,4 @@ getNotice2($_GET['id'], 'archive'); -include("".$archive."x.tpl"); +include("".$archive."x.tpl"); ?> \ No newline at end of file diff --git a/Admin/Templates/Notice/all.tpl b/Admin/Templates/Notice/all.tpl index 2f6d3f68..23befb0a 100644 --- a/Admin/Templates/Notice/all.tpl +++ b/Admin/Templates/Notice/all.tpl @@ -1,4 +1,4 @@ - @@ -20,17 +20,17 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att -There are no reports available."; - } + } ?> - +
    sender from the village
    ".$dataarray[13]."
    upkeep getUpkeep($unitarray,$dataarray[2]); ?>Cropper hour
    - plus) { + plus) { if(isset($_GET['t']) && $_GET['t'] == 5) { echo ""; } else { - echo ""; + echo ""; } }?> -
    - \ No newline at end of file diff --git a/Admin/Templates/addABTroops.tpl b/Admin/Templates/addABTroops.tpl index 2b63d97a..ec9c1435 100644 --- a/Admin/Templates/addABTroops.tpl +++ b/Admin/Templates/addABTroops.tpl @@ -16,10 +16,10 @@ if(isset($id)) { $village = $database->getVillage($id); $user = $database->getUserArray($village['owner'],1); - $abtech = $database->getABTech($id); // Armory/blacksmith level + $abtech = $database->getABTech($id); // Armory/blacksmith level $units = $database->getUnit($village['wref']); $coor = $database->getCoor($village['wref']); - + $tribe = $user['tribe']; if($tribe ==1){ $img = 0;} if($tribe ==2){ $img = 10;} @@ -28,8 +28,8 @@ if(isset($id)) if($tribe ==5){ $img = 40;} if($tribe ==6){ $img = 50;} include("search2.tpl"); -?> - +?> + @@ -42,7 +42,7 @@ if(isset($id))     		Armour Blackmith
    '.$unarray[$img+$i].'')" />
    - + diff --git a/Admin/Templates/addTroops.tpl b/Admin/Templates/addTroops.tpl index d1be5e96..7f788f0f 100644 --- a/Admin/Templates/addTroops.tpl +++ b/Admin/Templates/addTroops.tpl @@ -26,7 +26,7 @@ if(isset($id)) if($tribe ==5){ $img = 40;} if($tribe ==6){ $img = 50;} include("search2.tpl"); -?> +?>
    @@ -35,7 +35,7 @@ if(isset($id)) Edit troops - '.$unarray[$img+$i].' @@ -49,8 +49,8 @@ if(isset($id)) ')" /> - - + +
    (and their home Villages) on your Users created will be Farm1, Farm2, Farm3, Farm4, Farm5


    - + (and their home Villages) on your // Should never reach here $tribe = 'Unknown'; } - + echo '

    ' - . $amount . + . $amount . ' Users and Villages added using Base Name ' - . $baseName . + . $baseName . '
    '; - + // Say if Beginners Protection was set for any Users created if ($amount > 0) { @@ -123,16 +123,16 @@ Submitting this form will create new Users
    (and their home Villages) on your } $begMessage .= 'set for ' . $usersMessage . '
    '; echo $begMessage; - + // Say Tribes chosen $tribeMessage = 'Tribe for ' . $usersMessage . ' was '; $tribeMessage .= $tribe . '
    '; - echo $tribeMessage; + echo $tribeMessage; } if ($skipped > 0) { echo '' - . $skipped . + . $skipped . ' Users not created as the user name already exists
    '; diff --git a/Admin/Templates/add_village.tpl b/Admin/Templates/add_village.tpl index 12650283..d9ab78d1 100644 --- a/Admin/Templates/add_village.tpl +++ b/Admin/Templates/add_village.tpl @@ -1,4 +1,4 @@ - +.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);} +
    - +
    - - + + - - + + - + - + - - + +
    Add Village
    Coordinates (X|Y)
    X: >
    Y: >
    >
    diff --git a/Admin/Templates/editAdditional.tpl b/Admin/Templates/editAdditional.tpl index 75c3fe1f..044e570e 100644 --- a/Admin/Templates/editAdditional.tpl +++ b/Admin/Templates/editAdditional.tpl @@ -27,7 +27,7 @@ function go_url(url) { location=url; return(false); } - +
    @@ -91,7 +91,7 @@ function go_url(url) { } ?> - + Give Protection For @@ -134,14 +134,14 @@ function go_url(url) { Points - + ')" /> - +
    Max Number of Mails - 30 + 30 - +
    diff --git a/Admin/Templates/editHero.tpl b/Admin/Templates/editHero.tpl index 85644bf2..1ed343cb 100644 --- a/Admin/Templates/editHero.tpl +++ b/Admin/Templates/editHero.tpl @@ -11,10 +11,10 @@ $id = isset($_GET['uid']); if(isset($_GET['uid'])){ $id = $_GET['uid']; - include_once("../GameEngine/Data/hero_full.php"); + include_once("../GameEngine/Data/hero_full.php"); include_once("../GameEngine/Units.php"); $user = $database->getUserArray($id,1); - $result = mysql_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = ".$id); + $result = mysql_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = ".$id); $hero_info = mysql_fetch_array($result); $hero = $units->Hero($id,1); $unarray = array(1=>U1,U2,U3,U4,U5,U6,U7,U8,U9,U10,U11,U12,U13,U14,U15,U16,U17,U18,U19,U20,U21,U22,U23,U24,U25,U26,U27,U28,U29,U30,U31,U32,U33,U34,U35,U36,U37,U38,U39,U40,U41,U42,U43,U44,U45,U46,U47,U48,U49,U50,U99,U0); @@ -62,11 +62,11 @@ function changeValue(u,c) { document.frmHero.exp.value='0'; }else{ if (l<99) l++; - } + } v=parseInt(n) + 5; } } -if (v>0) document.getElementById(c+'0').innerHTML="(-)"; +if (v>0) document.getElementById(c+'0').innerHTML="(-)"; if (v<99) document.getElementById(c+'1').innerHTML="(+)"; if (v<1) document.getElementById(c+'0').innerHTML="(-)"; if (v>98) document.getElementById(c+'1').innerHTML="(+)"; @@ -101,17 +101,17 @@ function check_unit(el) { New Value - Hero Name + Hero Name - + - Hero Level - -
    0
    + Hero Level + +
    0
    - Hero Unit + Hero Unit getUnitName($hero_info['unit'])."\" title=\"".$technology->getUnitName($hero_info['unit'])."\" /> (".$technology->getUnitName($hero_info['unit']); ?>)
    getUnitName($hero_info['unit'])."\" title=\"".$technology->getUnitName($hero_info['unit'])."\" />";?>
    - + Items @@ -133,63 +133,63 @@ function check_unit(el) { Level - Offence - - + Offence + + (-) - (+) -
    0
    - - - Defence + (+) +
    0
    + + + Defence - + (-) - (+) + (+)
    0
    - - - Off-Bonus - % - + + + Off-Bonus + % + (-) - (+) + (+)
    0
    - - - Def-Bonus - % - + + + Def-Bonus + % + (-) - (+) + (+)
    0
    - - - Regeneration - /Day - + + + Regeneration + /Day + (-) - (+) + (+)
    0
    - - + $count_level_exp) $hero_info['points']=$count_level_exp; if($hero_info['experience'] < 495000){ ?> Experience % ( - ) + ) Experience - 100% () + 100% () -
    5
    - +
    5
    + - + Health - % - % + % + % ')" /> @@ -198,7 +198,7 @@ function check_unit(el) { Please fill hero name
    '; } diff --git a/Admin/Templates/editLogSet.tpl b/Admin/Templates/editLogSet.tpl index 5fd06c9b..b7c1a8ff 100644 --- a/Admin/Templates/editLogSet.tpl +++ b/Admin/Templates/editLogSet.tpl @@ -40,7 +40,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + Log Login @@ -49,7 +49,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + Log Gold @@ -58,7 +58,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + Log Admin @@ -67,7 +67,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + Log War @@ -76,8 +76,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - - + + Log Market @@ -97,7 +97,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - +
    diff --git a/Admin/Templates/editNewsboxSet.tpl b/Admin/Templates/editNewsboxSet.tpl index 2d4d31e2..3a105ac6 100644 --- a/Admin/Templates/editNewsboxSet.tpl +++ b/Admin/Templates/editNewsboxSet.tpl @@ -40,7 +40,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + Newsbox 3 @@ -49,10 +49,10 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + - +
    diff --git a/Admin/Templates/editServerSet.tpl b/Admin/Templates/editServerSet.tpl index c453d594..45301af4 100644 --- a/Admin/Templates/editServerSet.tpl +++ b/Admin/Templates/editServerSet.tpl @@ -68,7 +68,7 @@ function refresh(tz) { - + Server Speed @@ -76,7 +76,7 @@ function refresh(tz) { Troop Speed - + Evasion Speed @@ -129,7 +129,7 @@ function refresh(tz) { - + Register Open @@ -148,7 +148,7 @@ function refresh(tz) { - + Quest - + Tourn Threshold diff --git a/Admin/Templates/inactive.tpl b/Admin/Templates/inactive.tpl index e679713e..df03856c 100644 --- a/Admin/Templates/inactive.tpl +++ b/Admin/Templates/inactive.tpl @@ -44,7 +44,7 @@ global $database; $from_time=time() - (86400*7); $q = "SELECT * FROM ".TB_PREFIX."users where $from_time > timestamp AND id>5"; } - + $result = $database->query($q); $active = $database->mysql_fetch_all($result); for ($i = 0; $i <= count($active)-1; $i++){ @@ -67,7 +67,7 @@ global $database; $getmin=((time()-$active[$i]['timestamp'])/60); $gethr=((time()-$active[$i]['timestamp'])/3600); $getday=intval((time()-$active[$i]['timestamp'])/86400); - + echo " ".$active[$i]['username']." [".$active[$i]['access']."] @@ -79,7 +79,7 @@ global $database; "; } - } + } ?> diff --git a/Admin/Templates/maintenence.tpl b/Admin/Templates/maintenence.tpl index f4d2ad11..9c49b82a 100644 --- a/Admin/Templates/maintenence.tpl +++ b/Admin/Templates/maintenence.tpl @@ -13,13 +13,13 @@ Server Maintenence - + Description Execute - + Close Server for Maintenece, This will ban all players (Access 2) till you can fix bugs, or a crap version of a ceasefire lol
    diff --git a/Admin/Templates/maintenenceBan.tpl b/Admin/Templates/maintenenceBan.tpl index 73c33d9b..795eedb4 100644 --- a/Admin/Templates/maintenenceBan.tpl +++ b/Admin/Templates/maintenenceBan.tpl @@ -11,18 +11,18 @@ ?>
    -
    +
    - + - + diff --git a/Admin/Templates/maintenenceResetGold.tpl b/Admin/Templates/maintenenceResetGold.tpl index 68278c75..bfdcf40d 100644 --- a/Admin/Templates/maintenenceResetGold.tpl +++ b/Admin/Templates/maintenenceResetGold.tpl @@ -15,9 +15,9 @@ - + - + diff --git a/Admin/Templates/maintenenceResetPlus.tpl b/Admin/Templates/maintenenceResetPlus.tpl index 63652085..88e05130 100644 --- a/Admin/Templates/maintenenceResetPlus.tpl +++ b/Admin/Templates/maintenenceResetPlus.tpl @@ -15,9 +15,9 @@ - + - + diff --git a/Admin/Templates/maintenenceResetPlusBonus.tpl b/Admin/Templates/maintenenceResetPlusBonus.tpl index 8536167d..22b1b5f8 100644 --- a/Admin/Templates/maintenenceResetPlusBonus.tpl +++ b/Admin/Templates/maintenenceResetPlusBonus.tpl @@ -15,9 +15,9 @@ - + - + diff --git a/Admin/Templates/maintenenceUnban.tpl b/Admin/Templates/maintenenceUnban.tpl index bf206f9f..613bd5f8 100644 --- a/Admin/Templates/maintenenceUnban.tpl +++ b/Admin/Templates/maintenenceUnban.tpl @@ -13,19 +13,19 @@ $bannedUsers = $admin->search_banned(); ?> - -
    + +
    Close Server (Ban Everyone)
    Duration Starting
    ">
    Reset All Players Gold
    Reset All Players Resource Bonus
    Reset All Players Plus
    - + - + @@ -64,7 +64,7 @@ $bannedUsers = $admin->search_banned(); $name = $database->getUserField($bannedUsers[$i]['uid'],'username',0); $link = ''.$name.''; - } + } if($bannedUsers[$i]['end']) { $end = date("d.m.y H:i",$bannedUsers[$i]['end']); diff --git a/Admin/Templates/map.tpl b/Admin/Templates/map.tpl index 2e654c17..7c9464dd 100644 --- a/Admin/Templates/map.tpl +++ b/Admin/Templates/map.tpl @@ -91,7 +91,7 @@ if ($check1=="" && $check2=="") {$criteria="WHERE tribe=0)";} $p_x=250; $p_y=250; } - + echo '
    '.$p_info.'
    '; } ?> @@ -120,9 +120,9 @@ if ($check1=="" && $check2=="") {$criteria="WHERE tribe=0)";}     -
    Open Server (Unban Players by Reason)
    Unban "Reason" Action
    Multihunter
    +
    - +
    diff --git a/Admin/Templates/msg.tpl b/Admin/Templates/msg.tpl index 7361c2b2..d5a1998b 100644 --- a/Admin/Templates/msg.tpl +++ b/Admin/Templates/msg.tpl @@ -38,7 +38,7 @@ if($msg)
    -"; include("playermedals.tpl"); include ("villages.tpl"); ?> diff --git a/Admin/Templates/playerheroinfo.tpl b/Admin/Templates/playerheroinfo.tpl index 6d0175da..8a575482 100644 --- a/Admin/Templates/playerheroinfo.tpl +++ b/Admin/Templates/playerheroinfo.tpl @@ -9,16 +9,16 @@ ## ## ################################################################################# -include_once("../GameEngine/Data/hero_full.php"); +include_once("../GameEngine/Data/hero_full.php"); include_once("../GameEngine/Units.php"); $id=$user['id']; -$hero = mysql_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = ".$id); +$hero = mysql_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = ".$id); $hero_info = mysql_fetch_array($hero); if (!empty($hero_info)) { $hero = $units->Hero($id,1); }else { $hero="none"; -} +} ?> 1759 or $hour < 500) { $day_night_img = 'night_image'; } elseif ($hour > 1200) { diff --git a/Templates/links.tpl b/Templates/links.tpl index ae33f4bc..8e7f9dc7 100644 --- a/Templates/links.tpl +++ b/Templates/links.tpl @@ -1,4 +1,4 @@ -getLinks($session->uid); +$query = $database->getLinks($session->uid); if (mysql_num_rows($query) > 0){ $links = array(); while($data = mysql_fetch_assoc($query)) { @@ -29,7 +29,7 @@ foreach($links as $link) { $external = ''; } - echo '●'; + echo '●'; if($session->plus == 0) { echo "buy Plus"; } else { echo '' . $link['name'] . $external . ''; } diff --git a/Templates/menu.tpl b/Templates/menu.tpl index a1120800..07d27618 100644 --- a/Templates/menu.tpl +++ b/Templates/menu.tpl @@ -49,8 +49,8 @@ div.c1 {text-align: center} Plus

    - - + +

    isDeleting($session->uid); @@ -94,9 +94,9 @@ div.c1 {text-align: center}
    -
    diff --git a/Templates/movement.tpl b/Templates/movement.tpl index d10cb641..bfd65354 100644 --- a/Templates/movement.tpl +++ b/Templates/movement.tpl @@ -1,4 +1,4 @@ - 0){ $aantal = count($database->getMovement(5,$village->wid,0)); $aantal2 = $database->getMovement(5,$village->wid,0); if($aantal > 0){ - if(!empty($NextArrival5)) { reset($NextArrival5); } + if(!empty($NextArrival5)) { reset($NextArrival5); } foreach($aantal2 as $receive) { $action = 'att3'; $aclass = 'a3'; @@ -152,7 +152,7 @@ if($aantal > 0){ $short = ''.NEWVILLAGE.''; $NextArrival5[] = $receive['endtime']; } - + echo ''.$title.'»
    '.$aantal.' '.$short.'
    in '.$generator->getTimeFormat(min($NextArrival5)-time()).' '.HOURS.'
    '; $timer += 1; @@ -169,7 +169,7 @@ $aantal += count($database->getMovement(6,$conqured['wref'],0)); $aantal2 = array_merge($database->getMovement(6,$conqured['wref'],0), $aantal2); } if($aantal > 0){ - if(!empty($NextArrival6)) { reset($NextArrival6); } + if(!empty($NextArrival6)) { reset($NextArrival6); } foreach($aantal2 as $receive) { if($receive['attack_type'] == 2){ $action = 'def3'; @@ -184,7 +184,7 @@ if($aantal > 0){ } $NextArrival6[] = $receive['endtime']; } - + echo ''.$title.'»
    '.$aantal.' '.$short.'
    in '.$generator->getTimeFormat(min($NextArrival6)-time()).' '.HOURS.'
    '; $timer += 1; diff --git a/Templates/multivillage.tpl b/Templates/multivillage.tpl index 8848d53e..b5995605 100644 --- a/Templates/multivillage.tpl +++ b/Templates/multivillage.tpl @@ -1,4 +1,4 @@ - : - + <?php echo LUMBER; ?> : getProd("wood"); ?> - + <?php echo CLAY; ?> : getProd("clay"); ?> - + <?php echo IRON; ?> : getProd("iron"); ?> - + <?php echo CROP; ?> : getProd("crop"); ?> - + \ No newline at end of file diff --git a/Templates/quest.tpl b/Templates/quest.tpl index 5b4b1f72..da8c712f 100644 --- a/Templates/quest.tpl +++ b/Templates/quest.tpl @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Templates/res.tpl b/Templates/res.tpl index c256560b..1fdc5000 100644 --- a/Templates/res.tpl +++ b/Templates/res.tpl @@ -1,4 +1,4 @@ -getProd("clay")); $iron = round($village->getProd("iron")); $crop = round($village->getProd("crop")); $totalproduction = $village->allcrop; // all crops + bakery + grain mill -?> +?>
    @@ -41,13 +41,13 @@ $totalproduction = $village->allcrop; // all crops + bakery + grain mill - + - + - - - - - + + + +
                                                                                            gold <= 1){ echo 'Remaining gold '.$session->gold.' Gold'; } @@ -56,10 +56,10 @@ $totalproduction = $village->allcrop; // all crops + bakery + grain mill } ?>
    diff --git a/Templates/rules.tpl b/Templates/rules.tpl index 953430c3..1ee37596 100644 --- a/Templates/rules.tpl +++ b/Templates/rules.tpl @@ -1,138 +1,138 @@ -

    Game rules

    -
    -

    - The following set of rules are in conjunction to the General Terms and Conditions of Travian. You should familiarize yourself with the General Terms and Conditions to verify what is allowed and what is prohibited, especially in case of an account that has been banned for a rule violation. -
    -
    - Inciting, manipulating, encouraging, assisting or conspiring with others to violate any of Travian Rules is impermissible. These rules apply for players that will delete their accounts or are currently deleting their accounts without exception. -

    -
      -
    • - §1 Password, Registration & ownership -
      - Each player may only own and play one account per server. -
        -
      • - §1.1 Registration -
        - The e-mail address used for the registration of an account must be under the personal and exclusive control of the person who registered the account. The person owning the e-mail address currently registered for an account is considered the owner of the account, regardless of any other personal or alliance agreements. The owner of an account is fully responsible for all actions taken by the account. -
        • -
      • - §1.2 Password -
        - The owner of an account may not transfer the password of an account to any person playing on the same game world (server). Additionally, knowingly choosing the same password on the same game world as another person is illegal; any of these actions is considered multiaccounting, as defined in these rules. -
        -
        - However, it is permissible to transfer the password of an account to a person or persons playing on a different game world (or not playing at all) in order to play a single account together. -
        -
        - There is no compensation for damages done by someone knowing the password of an account. The person receiving the password is subjected to the rules of Travian as well as the General Terms and Conditions. -
        • -
      • - §1.3 Email changes / account transfers -
        - In order to change the email address of your account or to transfer your account to another player NOT playing on the same server, go into your account profile (/spieler.php?s=3) and fill out the new email information. -
        • -
      • - §1.4 Switching accounts -
        - In order to switch an account with another person on the same game world, both persons must send an e-mail message to admin@travian.com from the e-mail address currently registered to the account. The e-mail must contain the following information: -
          -
            -
          1. The game world on which the account resides
            2. -
          2. The nickname of the account
            3. -
          3. The e-mail address of the new owner.
            4. -
          -
        - Afterwards, both parties must request the password for their new account via the password retrieval function. -
        • -
      -
      • -
    • - §2 Sitting & same pc usage -
      -
        -
      • - §2.1 Sitting -
        - Every player has the right to name two sitters who may play the account during the owner's absence. Sitters must play the account they are sitting to the account’s full benefit. Abuse of this function is punishable. -
        - The sitter of an account must sit the account using the ingame account sitting function. The sitter of an account may not tend to an account by logging in with the password of the account they are sitting (see §1.2). -
        - There is no compensation for damages done by a sitter. Account owners are fully responsible for the actions done by the chosen sitters of their account. In the event that sitters of an account do not follow these rules and the General Terms and Conditions of Travian, both the account owner and the sitter may be held responsible and punished. -
        • -
      • - §2.2 Same pc usage -
        - Players using the same computer and wanting to access each - other's account must use the sitter function. -
        • -
      -
      • -
    • - §3 Use of externals -
      - The game must be played with an unmodified internet browser. The use of scripts or bots which automate account actions is against the rules. -
      • -
    • - §4 Program errors -
      - Program errors (also called bugs) may not be used to one's benefit. Abuse can lead to a punishment of the account. -
      • -
    • - §5 Money transactions -
      - Any sales or purchases concerning real money regarding accounts, units, villages, resources, services or any other aspect of Travian are impermissible. The sale of Travian accounts as well as any indirect transfer (even as gifts) in connection with auction sites or other money transactions is impermissible. -
      • -
    • - §6 Netiquette -
      - Everyone must communicate in a polite, conversational tone. Multihunters may change inappropriate profiles and village names without warning. -
        -
      1. - Following behavior is punishable and applies to all descriptions, the account name, alliance names, village names and messages: -
        - Participation in abusive, defamatory, sexist, racist or profane language; disparaging any religion, race, nation, gender, age group, or sexual orientation; threatening a person with actions in real life. -
        - Posting or transmission of any material not suitable for - underage persons. -
        - Blackmailing players in a way that violates any of Travian's rules in accordance with the General Terms and Conditions. -
        - Displaying battle reports or messages in public without consent of both concerned parties. -
        2. -
      2. No real world politics are allowed in names, messages and descriptions.
        3. -
      3. English is the only language tolerated in messages and descriptions.
        4. -
      4. Impersonating officials or official positions is illegal in any way.
        5. -
      5. Advertisement of any kind that has not been permitted by the Travian Team is impermissible.
        6. -
      -
      • -
    • - §7 Punishments -
      - If there is an offence against these game rules, the Multihunters and, if necessary, the Administrators will ban the account(s) in question and decide on a proper punishment. Punishments will always exceed the gain of the violation of the rules. -
      - Resources, buildings, villages or troops lost during the time of suspension do not count as punishment and will not be replaced by the Travian Team. No player has the right to claim payment or replacement for Plus/Gold time lost due to suspension. -
      - There is no special treatment for Travian Plus/Gold users regarding the game rules neither in the time needed to deal with the case nor in the punishment. -
      -
      - Players may talk to the Multihunter who banned them or an Administrator either via IGM (ingame message) or e-mail. Bans, punishments or deletions are not to be discussed in public (e.g. Chat or Forums). Appeals must be written in English. -
      - Additionally, the Travian Team will not provide information concerning bans to any person, other than the account owner. -
      -
      - Multiaccounts on the speed server and multiaccounts with less than 100 population may be deleted on sight with no prior warning. -
      • -
    • - §8 Changing of rules -
      - The Travian Team reserves the right to change the rules at any time. -
      • -
    • - §9 Correction clause -
      - If individual regulations of this set of rules should prove to be in any way ineffective, it does not affect the validity of the remaining regulations of this set of rules. The Administrators commit themselves to replace ineffective regulations with new regulations which replace the ineffective regulations as fast as possible. -
      • -
    +

    Game rules

    +
    +

    + The following set of rules are in conjunction to the General Terms and Conditions of Travian. You should familiarize yourself with the General Terms and Conditions to verify what is allowed and what is prohibited, especially in case of an account that has been banned for a rule violation. +
    +
    + Inciting, manipulating, encouraging, assisting or conspiring with others to violate any of Travian Rules is impermissible. These rules apply for players that will delete their accounts or are currently deleting their accounts without exception. +

    +
      +
    • + §1 Password, Registration & ownership +
      + Each player may only own and play one account per server. +
        +
      • + §1.1 Registration +
        + The e-mail address used for the registration of an account must be under the personal and exclusive control of the person who registered the account. The person owning the e-mail address currently registered for an account is considered the owner of the account, regardless of any other personal or alliance agreements. The owner of an account is fully responsible for all actions taken by the account. +
        • +
      • + §1.2 Password +
        + The owner of an account may not transfer the password of an account to any person playing on the same game world (server). Additionally, knowingly choosing the same password on the same game world as another person is illegal; any of these actions is considered multiaccounting, as defined in these rules. +
        +
        + However, it is permissible to transfer the password of an account to a person or persons playing on a different game world (or not playing at all) in order to play a single account together. +
        +
        + There is no compensation for damages done by someone knowing the password of an account. The person receiving the password is subjected to the rules of Travian as well as the General Terms and Conditions. +
        • +
      • + §1.3 Email changes / account transfers +
        + In order to change the email address of your account or to transfer your account to another player NOT playing on the same server, go into your account profile (/spieler.php?s=3) and fill out the new email information. +
        • +
      • + §1.4 Switching accounts +
        + In order to switch an account with another person on the same game world, both persons must send an e-mail message to admin@travian.com from the e-mail address currently registered to the account. The e-mail must contain the following information: +
          +
            +
          1. The game world on which the account resides
            2. +
          2. The nickname of the account
            3. +
          3. The e-mail address of the new owner.
            4. +
          +
        + Afterwards, both parties must request the password for their new account via the password retrieval function. +
        • +
      +
      • +
    • + §2 Sitting & same pc usage +
      +
        +
      • + §2.1 Sitting +
        + Every player has the right to name two sitters who may play the account during the owner's absence. Sitters must play the account they are sitting to the account’s full benefit. Abuse of this function is punishable. +
        + The sitter of an account must sit the account using the ingame account sitting function. The sitter of an account may not tend to an account by logging in with the password of the account they are sitting (see §1.2). +
        + There is no compensation for damages done by a sitter. Account owners are fully responsible for the actions done by the chosen sitters of their account. In the event that sitters of an account do not follow these rules and the General Terms and Conditions of Travian, both the account owner and the sitter may be held responsible and punished. +
        • +
      • + §2.2 Same pc usage +
        + Players using the same computer and wanting to access each + other's account must use the sitter function. +
        • +
      +
      • +
    • + §3 Use of externals +
      + The game must be played with an unmodified internet browser. The use of scripts or bots which automate account actions is against the rules. +
      • +
    • + §4 Program errors +
      + Program errors (also called bugs) may not be used to one's benefit. Abuse can lead to a punishment of the account. +
      • +
    • + §5 Money transactions +
      + Any sales or purchases concerning real money regarding accounts, units, villages, resources, services or any other aspect of Travian are impermissible. The sale of Travian accounts as well as any indirect transfer (even as gifts) in connection with auction sites or other money transactions is impermissible. +
      • +
    • + §6 Netiquette +
      + Everyone must communicate in a polite, conversational tone. Multihunters may change inappropriate profiles and village names without warning. +
        +
      1. + Following behavior is punishable and applies to all descriptions, the account name, alliance names, village names and messages: +
        + Participation in abusive, defamatory, sexist, racist or profane language; disparaging any religion, race, nation, gender, age group, or sexual orientation; threatening a person with actions in real life. +
        + Posting or transmission of any material not suitable for + underage persons. +
        + Blackmailing players in a way that violates any of Travian's rules in accordance with the General Terms and Conditions. +
        + Displaying battle reports or messages in public without consent of both concerned parties. +
        2. +
      2. No real world politics are allowed in names, messages and descriptions.
        3. +
      3. English is the only language tolerated in messages and descriptions.
        4. +
      4. Impersonating officials or official positions is illegal in any way.
        5. +
      5. Advertisement of any kind that has not been permitted by the Travian Team is impermissible.
        6. +
      +
      • +
    • + §7 Punishments +
      + If there is an offence against these game rules, the Multihunters and, if necessary, the Administrators will ban the account(s) in question and decide on a proper punishment. Punishments will always exceed the gain of the violation of the rules. +
      + Resources, buildings, villages or troops lost during the time of suspension do not count as punishment and will not be replaced by the Travian Team. No player has the right to claim payment or replacement for Plus/Gold time lost due to suspension. +
      + There is no special treatment for Travian Plus/Gold users regarding the game rules neither in the time needed to deal with the case nor in the punishment. +
      +
      + Players may talk to the Multihunter who banned them or an Administrator either via IGM (ingame message) or e-mail. Bans, punishments or deletions are not to be discussed in public (e.g. Chat or Forums). Appeals must be written in English. +
      + Additionally, the Travian Team will not provide information concerning bans to any person, other than the account owner. +
      +
      + Multiaccounts on the speed server and multiaccounts with less than 100 population may be deleted on sight with no prior warning. +
      • +
    • + §8 Changing of rules +
      + The Travian Team reserves the right to change the rules at any time. +
      • +
    • + §9 Correction clause +
      + If individual regulations of this set of rules should prove to be in any way ineffective, it does not affect the validity of the remaining regulations of this set of rules. The Administrators commit themselves to replace ineffective regulations with new regulations which replace the ineffective regulations as fast as possible. +
      • +
    \ No newline at end of file diff --git a/Templates/text.tpl b/Templates/text.tpl index ab1b58a6..a4444278 100644 --- a/Templates/text.tpl +++ b/Templates/text.tpl @@ -1,4 +1,4 @@ -Error creating constant.php - + Storage Multipler: Tourn Threshold: Great Workshop: From 24b50463a808045ba55df5274244da9b9de3297f Mon Sep 17 00:00:00 2001 From: Inndy Date: Sun, 7 Dec 2014 00:54:44 +0800 Subject: [PATCH 20/33] Translate some template --- Admin/Templates/Notice/0.tpl | 34 +++++++------- Admin/Templates/Notice/0x.tpl | 12 ++--- Admin/Templates/Notice/1.tpl | 58 +++++++++++------------ Admin/Templates/Notice/10.tpl | 10 ++-- Admin/Templates/Notice/11.tpl | 10 ++-- Admin/Templates/Notice/12.tpl | 10 ++-- Admin/Templates/Notice/13.tpl | 10 ++-- Admin/Templates/Notice/14.tpl | 10 ++-- Admin/Templates/Notice/15.tpl | 14 +++--- Admin/Templates/Notice/16.tpl | 14 +++--- Admin/Templates/Notice/17.tpl | 14 +++--- Admin/Templates/Notice/18.tpl | 56 +++++++++++------------ Admin/Templates/Notice/18x.tpl | 64 +++++++++++++------------- Admin/Templates/Notice/19.tpl | 50 ++++++++++---------- Admin/Templates/Notice/19x.tpl | 56 +++++++++++------------ Admin/Templates/Notice/1x.tpl | 78 +++++++++++++++---------------- Admin/Templates/Notice/2.tpl | 62 ++++++++++++------------- Admin/Templates/Notice/20.tpl | 56 +++++++++++------------ Admin/Templates/Notice/20x.tpl | 64 +++++++++++++------------- Admin/Templates/Notice/21.tpl | 56 +++++++++++------------ Admin/Templates/Notice/21x.tpl | 64 +++++++++++++------------- Admin/Templates/Notice/22.tpl | 14 +++--- Admin/Templates/Notice/2x.tpl | 78 +++++++++++++++---------------- Admin/Templates/Notice/3.tpl | 58 +++++++++++------------ Admin/Templates/Notice/3x.tpl | 56 +++++++++++------------ Admin/Templates/Notice/4.tpl | 64 +++++++++++++------------- Admin/Templates/Notice/4x.tpl | 78 +++++++++++++++---------------- Admin/Templates/Notice/5.tpl | 64 +++++++++++++------------- Admin/Templates/Notice/5x.tpl | 78 +++++++++++++++---------------- Admin/Templates/Notice/6.tpl | 62 ++++++++++++------------- Admin/Templates/Notice/6x.tpl | 78 +++++++++++++++---------------- Admin/Templates/Notice/7.tpl | 80 ++++++++++++++++---------------- Admin/Templates/Notice/7x.tpl | 84 +++++++++++++++++----------------- Admin/Templates/Notice/8.tpl | 10 ++-- Admin/Templates/Notice/all.tpl | 2 +- 35 files changed, 804 insertions(+), 804 deletions(-) diff --git a/Admin/Templates/Notice/0.tpl b/Admin/Templates/Notice/0.tpl index f94afd7b..7cc8816d 100644 --- a/Admin/Templates/Notice/0.tpl +++ b/Admin/Templates/Notice/0.tpl @@ -35,7 +35,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo "getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -echo "Troops"; +echo "軍隊"; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -44,7 +44,7 @@ for($i=3;$i<=12;$i++) { echo "".$dataarray[$i].""; } } -echo "Casualties"; +echo "傷亡"; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -78,7 +78,7 @@ if ($dataarray[143]!='' and $dataarray[144]!=''){ //chief - Information + 資訊 @@ -95,7 +95,7 @@ $start=1; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -106,7 +106,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo "getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -echo "Troops"; +echo "軍隊"; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -134,7 +134,7 @@ $start=11;?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -145,7 +145,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo "getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -echo "Troops"; +echo "軍隊"; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -154,7 +154,7 @@ for($i=56;$i<=65;$i++) { echo "".$dataarray[$i].""; } } -echo "Casualties"; +echo "傷亡"; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -172,7 +172,7 @@ $start=21; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -183,7 +183,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo "getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -echo "Troops"; +echo "軍隊"; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -192,7 +192,7 @@ for($i=77;$i<=86;$i++) { echo "".$dataarray[$i].""; } } -echo "Casualties"; +echo "傷亡"; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -211,7 +211,7 @@ $start=31; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -222,7 +222,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo "getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -echo "Troops"; +echo "軍隊"; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -231,7 +231,7 @@ for($i=98;$i<=107;$i++) { echo "".$dataarray[$i].""; } } -echo "Casualties"; +echo "傷亡"; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -250,7 +250,7 @@ $start=41; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -261,7 +261,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo "getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } -echo "Troops"; +echo "軍隊"; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo "0"; @@ -270,7 +270,7 @@ for($i=119;$i<=128;$i++) { echo "".$dataarray[$i].""; } } -echo "Casualties"; +echo "傷亡"; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo "0"; diff --git a/Admin/Templates/Notice/0x.tpl b/Admin/Templates/Notice/0x.tpl index c1842565..f83a2715 100644 --- a/Admin/Templates/Notice/0x.tpl +++ b/Admin/Templates/Notice/0x.tpl @@ -17,7 +17,7 @@ $dataarray = explode(",",$data); 寄送時間: - on at ".$date[1]; ?> hour + on at ".$date[1]; ?> 小時 @@ -98,7 +98,7 @@ $start=1; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -137,7 +137,7 @@ $start=11;?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -175,7 +175,7 @@ $start=21; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -214,7 +214,7 @@ $start=31; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> @@ -253,7 +253,7 @@ $start=41; ?> 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo "援兵"; } ?> diff --git a/Admin/Templates/Notice/1.tpl b/Admin/Templates/Notice/1.tpl index 2cf92703..879e831d 100644 --- a/Admin/Templates/Notice/1.tpl +++ b/Admin/Templates/Notice/1.tpl @@ -37,7 +37,7 @@ if($database->isVillageOases($dataarray[29])){ procMtime($rep[0]['time']); ?> 寄送時間: - on at ".$date[1]; ?> hour + on at ".$date[1]; ?> 小時 @@ -45,8 +45,8 @@ $date = $generator->procMtime($rep[0]['time']); ?> - - + + @@ -63,7 +63,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -75,7 +75,7 @@ else { if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -89,7 +89,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -106,47 +106,47 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - - -
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Information +
    資訊 Hero
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -158,7 +158,7 @@ $start=1; ?> - @@ -173,7 +173,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -185,7 +185,7 @@ else { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -222,7 +222,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -234,7 +234,7 @@ else { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -255,7 +255,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -270,7 +270,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -282,7 +282,7 @@ else { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -304,8 +304,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + @@ -316,7 +316,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -325,7 +325,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -343,7 +343,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -354,7 +354,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -363,7 +363,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/10.tpl b/Admin/Templates/Notice/10.tpl index 58b03e98..e4641100 100644 --- a/Admin/Templates/Notice/10.tpl +++ b/Admin/Templates/Notice/10.tpl @@ -14,15 +14,15 @@ if($database->getVillageField($dataarray[1],'name')!="??") {
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -30,9 +30,9 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - + - +
     > from the village > 來自村莊
    Resources資源 Wood | Clay | diff --git a/Admin/Templates/Notice/11.tpl b/Admin/Templates/Notice/11.tpl index 339dce01..1b352c7a 100644 --- a/Admin/Templates/Notice/11.tpl +++ b/Admin/Templates/Notice/11.tpl @@ -14,15 +14,15 @@ if($database->getVillageField($dataarray[1],'name')!="??") { - + procMtime($rep[0]['time']); ?> - - + + @@ -30,9 +30,9 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - + - +
     > from the village > 來自村莊
    Resources資源 Wood | Clay | diff --git a/Admin/Templates/Notice/12.tpl b/Admin/Templates/Notice/12.tpl index 58b03e98..e4641100 100644 --- a/Admin/Templates/Notice/12.tpl +++ b/Admin/Templates/Notice/12.tpl @@ -14,15 +14,15 @@ if($database->getVillageField($dataarray[1],'name')!="??") { - + procMtime($rep[0]['time']); ?> - - + + @@ -30,9 +30,9 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - + - +
     > from the village > 來自村莊
    Resources資源 Wood | Clay | diff --git a/Admin/Templates/Notice/13.tpl b/Admin/Templates/Notice/13.tpl index 58b03e98..e4641100 100644 --- a/Admin/Templates/Notice/13.tpl +++ b/Admin/Templates/Notice/13.tpl @@ -14,15 +14,15 @@ if($database->getVillageField($dataarray[1],'name')!="??") { - + procMtime($rep[0]['time']); ?> - - + + @@ -30,9 +30,9 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - + - +
     > from the village > 來自村莊
    Resources資源 Wood | Clay | diff --git a/Admin/Templates/Notice/14.tpl b/Admin/Templates/Notice/14.tpl index 58b03e98..e4641100 100644 --- a/Admin/Templates/Notice/14.tpl +++ b/Admin/Templates/Notice/14.tpl @@ -14,15 +14,15 @@ if($database->getVillageField($dataarray[1],'name')!="??") { - + procMtime($rep[0]['time']); ?> - - + + @@ -30,9 +30,9 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - + - +
     > from the village > 來自村莊
    Resources資源 Wood | Clay | diff --git a/Admin/Templates/Notice/15.tpl b/Admin/Templates/Notice/15.tpl index 48b087a0..3888e2ec 100644 --- a/Admin/Templates/Notice/15.tpl +++ b/Admin/Templates/Notice/15.tpl @@ -16,14 +16,14 @@ if($database->getVillageField($dataarray[26],'name')!="??") { - + procMtime($rep[0]['time']); ?> - - + + @@ -31,8 +31,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -47,7 +47,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -59,7 +59,7 @@ else { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=14;$i<=23;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/16.tpl b/Admin/Templates/Notice/16.tpl index 48b087a0..3888e2ec 100644 --- a/Admin/Templates/Notice/16.tpl +++ b/Admin/Templates/Notice/16.tpl @@ -16,14 +16,14 @@ if($database->getVillageField($dataarray[26],'name')!="??") {
    Defender from the village 防禦者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[24]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -31,8 +31,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -47,7 +47,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -59,7 +59,7 @@ else { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=14;$i<=23;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/17.tpl b/Admin/Templates/Notice/17.tpl index 48b087a0..3888e2ec 100644 --- a/Admin/Templates/Notice/17.tpl +++ b/Admin/Templates/Notice/17.tpl @@ -16,14 +16,14 @@ if($database->getVillageField($dataarray[26],'name')!="??") {
    Defender from the village 防禦者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[24]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -31,8 +31,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -47,7 +47,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -59,7 +59,7 @@ else { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=14;$i<=23;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/18.tpl b/Admin/Templates/Notice/18.tpl index da3d1430..9ba9048f 100644 --- a/Admin/Templates/Notice/18.tpl +++ b/Admin/Templates/Notice/18.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender from the village 防禦者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[24]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -63,7 +63,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,7 +72,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -82,7 +82,7 @@ else { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -99,28 +99,28 @@ if(isset($dataarray[148]) and $dataarray[148]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -136,7 +136,7 @@ $start=1; ?>
    Attacker from the village 攻擊者 來自村莊
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - @@ -151,7 +151,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -163,7 +163,7 @@ else { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -185,7 +185,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - @@ -200,7 +200,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -212,7 +212,7 @@ else { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -233,7 +233,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - @@ -248,7 +248,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -260,7 +260,7 @@ else { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -282,8 +282,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - + @@ -294,7 +294,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -303,7 +303,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -321,7 +321,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -333,7 +333,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -342,7 +342,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/18x.tpl b/Admin/Templates/Notice/18x.tpl index 62b711e5..c0df3aee 100644 --- a/Admin/Templates/Notice/18x.tpl +++ b/Admin/Templates/Notice/18x.tpl @@ -7,15 +7,15 @@ $dataarray = explode(",",$data);
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -23,8 +23,8 @@ $dataarray = explode(",",$data);
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -45,7 +45,7 @@ for($i=3;$i<=12;$i++) { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=13;$i<=22;$i++) { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,28 +72,28 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -109,8 +109,8 @@ $start=1; ?>
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - + @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -130,7 +130,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -148,8 +148,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -169,7 +169,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,8 +186,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -225,8 +225,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -246,7 +246,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -264,8 +264,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -285,7 +285,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/19.tpl b/Admin/Templates/Notice/19.tpl index 365755ff..5542550e 100644 --- a/Admin/Templates/Notice/19.tpl +++ b/Admin/Templates/Notice/19.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -63,7 +63,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,7 +72,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -82,7 +82,7 @@ else { } } if($dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0 or $dataarray[162] != 0){ -echo ""; +echo ""; for($i=153;$i<=162;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -94,7 +94,7 @@ else { } if(isset($dataarray[171]) && $dataarray[171] !=''){ //troop not return ?> - @@ -109,7 +109,7 @@ $start=1; ?>
    Attacker from the village 攻擊者 來自村莊
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊
    - @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -130,7 +130,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -148,7 +148,7 @@ $start=11;?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -169,7 +169,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,7 +186,7 @@ $start=21; ?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -225,8 +225,8 @@ $start=31; ?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -246,7 +246,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -264,7 +264,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -285,7 +285,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/19x.tpl b/Admin/Templates/Notice/19x.tpl index c300594e..87f0bb5d 100644 --- a/Admin/Templates/Notice/19x.tpl +++ b/Admin/Templates/Notice/19x.tpl @@ -7,15 +7,15 @@ $dataarray = explode(",",$data);
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + procMtime($time); ?> - - + + @@ -23,8 +23,8 @@ $dataarray = explode(",",$data);
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -45,7 +45,7 @@ for($i=3;$i<=12;$i++) { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=13;$i<=22;$i++) { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -82,8 +82,8 @@ $start=1; ?>
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    - + @@ -94,7 +94,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -103,7 +103,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -121,8 +121,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + @@ -133,7 +133,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -142,7 +142,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -159,8 +159,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + @@ -171,7 +171,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -180,7 +180,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -198,8 +198,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + @@ -210,7 +210,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -219,7 +219,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -237,8 +237,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + @@ -249,7 +249,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -258,7 +258,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/1x.tpl b/Admin/Templates/Notice/1x.tpl index f52d3533..ad898f49 100644 --- a/Admin/Templates/Notice/1x.tpl +++ b/Admin/Templates/Notice/1x.tpl @@ -9,15 +9,15 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?".$dataarray[$i]."
    Casualties
    傷亡?
    - + procMtime($time); ?> - - + + @@ -25,8 +25,8 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=3;$i<=12;$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -86,40 +86,40 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - -
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -131,13 +131,13 @@ $start=1; ?> - + - + @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -164,7 +164,7 @@ for($i=35;$i<=44;$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,13 +186,13 @@ $start=11;?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -219,7 +219,7 @@ for($i=56;$i<=65;$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -240,13 +240,13 @@ $start=21; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -273,7 +273,7 @@ for($i=77;$i<=86;$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,13 +295,13 @@ $start=31; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ for($i=98;$i<=107;$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -350,13 +350,13 @@ $start=41; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -383,7 +383,7 @@ for($i=119;$i<=128;$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/2.tpl b/Admin/Templates/Notice/2.tpl index a7348f21..b7bf5dd8 100644 --- a/Admin/Templates/Notice/2.tpl +++ b/Admin/Templates/Notice/2.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -68,7 +68,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -80,7 +80,7 @@ else { if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -94,7 +94,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -111,47 +111,47 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - - -
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Information +
    資訊 Hero
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -163,7 +163,7 @@ $start=1; ?> - @@ -178,7 +178,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -190,7 +190,7 @@ else { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -212,7 +212,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -227,7 +227,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -239,7 +239,7 @@ else { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -260,7 +260,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -275,7 +275,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -287,7 +287,7 @@ else { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -309,8 +309,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + @@ -321,7 +321,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -330,7 +330,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -348,7 +348,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -359,7 +359,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -368,7 +368,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/20.tpl b/Admin/Templates/Notice/20.tpl index da3d1430..9ba9048f 100644 --- a/Admin/Templates/Notice/20.tpl +++ b/Admin/Templates/Notice/20.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -63,7 +63,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,7 +72,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -82,7 +82,7 @@ else { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -99,28 +99,28 @@ if(isset($dataarray[148]) and $dataarray[148]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -136,7 +136,7 @@ $start=1; ?>
    Attacker from the village 攻擊者 來自村莊
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - @@ -151,7 +151,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -163,7 +163,7 @@ else { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -185,7 +185,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - @@ -200,7 +200,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -212,7 +212,7 @@ else { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -233,7 +233,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - @@ -248,7 +248,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -260,7 +260,7 @@ else { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -282,8 +282,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - + @@ -294,7 +294,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -303,7 +303,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -321,7 +321,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -333,7 +333,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -342,7 +342,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/20x.tpl b/Admin/Templates/Notice/20x.tpl index 62b711e5..c0df3aee 100644 --- a/Admin/Templates/Notice/20x.tpl +++ b/Admin/Templates/Notice/20x.tpl @@ -7,15 +7,15 @@ $dataarray = explode(",",$data);
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -23,8 +23,8 @@ $dataarray = explode(",",$data);
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -45,7 +45,7 @@ for($i=3;$i<=12;$i++) { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=13;$i<=22;$i++) { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,28 +72,28 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -109,8 +109,8 @@ $start=1; ?>
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - + @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -130,7 +130,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -148,8 +148,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -169,7 +169,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,8 +186,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -225,8 +225,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -246,7 +246,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -264,8 +264,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -285,7 +285,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/21.tpl b/Admin/Templates/Notice/21.tpl index da3d1430..9ba9048f 100644 --- a/Admin/Templates/Notice/21.tpl +++ b/Admin/Templates/Notice/21.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -63,7 +63,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,7 +72,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -82,7 +82,7 @@ else { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -99,28 +99,28 @@ if(isset($dataarray[148]) and $dataarray[148]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -136,7 +136,7 @@ $start=1; ?>
    Attacker from the village 攻擊者 來自村莊
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - @@ -151,7 +151,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -163,7 +163,7 @@ else { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -185,7 +185,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - @@ -200,7 +200,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -212,7 +212,7 @@ else { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -233,7 +233,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - @@ -248,7 +248,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -260,7 +260,7 @@ else { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -282,8 +282,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[150]
    Casualties
    傷亡0
    - + @@ -294,7 +294,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -303,7 +303,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -321,7 +321,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -333,7 +333,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -342,7 +342,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/21x.tpl b/Admin/Templates/Notice/21x.tpl index 62b711e5..c0df3aee 100644 --- a/Admin/Templates/Notice/21x.tpl +++ b/Admin/Templates/Notice/21x.tpl @@ -7,15 +7,15 @@ $dataarray = explode(",",$data);
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -23,8 +23,8 @@ $dataarray = explode(",",$data);
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -45,7 +45,7 @@ for($i=3;$i<=12;$i++) { echo ""; } } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=13;$i<=22;$i++) { } } if($dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=152;$i<=161;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,28 +72,28 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - @@ -109,8 +109,8 @@ $start=1; ?>
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    - + @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -130,7 +130,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -148,8 +148,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -169,7 +169,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,8 +186,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -225,8 +225,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -246,7 +246,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -264,8 +264,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -285,7 +285,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/22.tpl b/Admin/Templates/Notice/22.tpl index 7084a2f3..819674c6 100644 --- a/Admin/Templates/Notice/22.tpl +++ b/Admin/Templates/Notice/22.tpl @@ -23,15 +23,15 @@ $message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -39,8 +39,8 @@ $message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -55,7 +55,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[14]) and $dataarray[14]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if(isset($dataarray[14]) and $dataarray[14]!=0){ } ?> - diff --git a/Admin/Templates/Notice/2x.tpl b/Admin/Templates/Notice/2x.tpl index f52d3533..ad898f49 100644 --- a/Admin/Templates/Notice/2x.tpl +++ b/Admin/Templates/Notice/2x.tpl @@ -9,15 +9,15 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0
    Information +
    資訊 Peace
    - + procMtime($time); ?> - - + + @@ -25,8 +25,8 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=3;$i<=12;$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -86,40 +86,40 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - -
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -131,13 +131,13 @@ $start=1; ?> - + - + @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -164,7 +164,7 @@ for($i=35;$i<=44;$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,13 +186,13 @@ $start=11;?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -219,7 +219,7 @@ for($i=56;$i<=65;$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -240,13 +240,13 @@ $start=21; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -273,7 +273,7 @@ for($i=77;$i<=86;$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,13 +295,13 @@ $start=31; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ for($i=98;$i<=107;$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -350,13 +350,13 @@ $start=41; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -383,7 +383,7 @@ for($i=119;$i<=128;$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/3.tpl b/Admin/Templates/Notice/3.tpl index 5fc58042..773259e7 100644 --- a/Admin/Templates/Notice/3.tpl +++ b/Admin/Templates/Notice/3.tpl @@ -36,14 +36,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -51,8 +51,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -67,7 +67,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[151]) and $dataarray[151]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -79,7 +79,7 @@ else { if(isset($dataarray[151]) and $dataarray[151]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -93,7 +93,7 @@ if(isset($dataarray[151]) and $dataarray[151]!=0){ echo ""; } if($dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0 or $dataarray[162] != 0 or $dataarray[163] != 0){ -echo ""; +echo ""; for($i=153;$i<=162;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -109,35 +109,35 @@ if(isset($dataarray[151]) and $dataarray[151]!=0){ } if ($dataarray[165]!='' and $dataarray[166]!=''){ //ram ?> - - - - - @@ -153,7 +153,7 @@ $start=1; ?>
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[151]
    Casualties
    傷亡0$dataarray[152]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊 Hero
    Information +
    資訊
    - @@ -165,7 +165,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -174,7 +174,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -192,7 +192,7 @@ $start=11;?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - @@ -204,7 +204,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -213,7 +213,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -230,7 +230,7 @@ $start=21; ?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - @@ -242,7 +242,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -251,7 +251,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -269,8 +269,8 @@ $start=31; ?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + @@ -281,7 +281,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -290,7 +290,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -308,7 +308,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - @@ -320,7 +320,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -329,7 +329,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == "?") { echo ""; diff --git a/Admin/Templates/Notice/3x.tpl b/Admin/Templates/Notice/3x.tpl index eeaff2fa..e1305342 100644 --- a/Admin/Templates/Notice/3x.tpl +++ b/Admin/Templates/Notice/3x.tpl @@ -14,15 +14,15 @@ $colspan2 = 10;
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + procMtime($time); ?> - - + + @@ -30,8 +30,8 @@ $colspan2 = 10;
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -46,7 +46,7 @@ for($i=$start;$i<=($start+9);$i++) { if ($dataarray[151]!="" and $dataarray[151]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -58,7 +58,7 @@ for($i=3;$i<=12;$i++) { if ($dataarray[151]!="" and $dataarray[151]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -72,7 +72,7 @@ if ($dataarray[151]!="" and $dataarray[151]!=0){ echo ""; } if($dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0 or $dataarray[162] != 0){ -echo ""; +echo ""; for($i=153;$i<=162;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -98,8 +98,8 @@ $start=1; ?>
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[151]
    Casualties
    傷亡0$dataarray[152]
    Prisoners
    囚犯0
    - + @@ -110,7 +110,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -119,7 +119,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -137,8 +137,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + @@ -149,7 +149,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -158,7 +158,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -175,8 +175,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + @@ -187,7 +187,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -196,7 +196,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -214,8 +214,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + @@ -226,7 +226,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -235,7 +235,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -253,8 +253,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + @@ -265,7 +265,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -274,7 +274,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == "?") { echo ""; diff --git a/Admin/Templates/Notice/4.tpl b/Admin/Templates/Notice/4.tpl index 72b715fe..c8f8ae07 100644 --- a/Admin/Templates/Notice/4.tpl +++ b/Admin/Templates/Notice/4.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊??
    Casualties
    傷亡?
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -68,7 +68,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -80,7 +80,7 @@ else { if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -94,7 +94,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -111,53 +111,53 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - - - -
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Information +
    資訊 Hero
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -169,7 +169,7 @@ $start=1; ?> - @@ -184,7 +184,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -196,7 +196,7 @@ else { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -218,7 +218,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -233,7 +233,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -245,7 +245,7 @@ else { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -266,7 +266,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -281,7 +281,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -293,7 +293,7 @@ else { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -315,8 +315,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + @@ -327,7 +327,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -336,7 +336,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -354,7 +354,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -366,7 +366,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -375,7 +375,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/4x.tpl b/Admin/Templates/Notice/4x.tpl index f52d3533..ad898f49 100644 --- a/Admin/Templates/Notice/4x.tpl +++ b/Admin/Templates/Notice/4x.tpl @@ -9,15 +9,15 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -25,8 +25,8 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=3;$i<=12;$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -86,40 +86,40 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - -
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -131,13 +131,13 @@ $start=1; ?> - + - + @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -164,7 +164,7 @@ for($i=35;$i<=44;$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,13 +186,13 @@ $start=11;?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -219,7 +219,7 @@ for($i=56;$i<=65;$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -240,13 +240,13 @@ $start=21; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -273,7 +273,7 @@ for($i=77;$i<=86;$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,13 +295,13 @@ $start=31; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ for($i=98;$i<=107;$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -350,13 +350,13 @@ $start=41; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -383,7 +383,7 @@ for($i=119;$i<=128;$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/5.tpl b/Admin/Templates/Notice/5.tpl index 72b715fe..c8f8ae07 100644 --- a/Admin/Templates/Notice/5.tpl +++ b/Admin/Templates/Notice/5.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -68,7 +68,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -80,7 +80,7 @@ else { if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -94,7 +94,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -111,53 +111,53 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - - - -
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Information +
    資訊 Hero
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -169,7 +169,7 @@ $start=1; ?> - @@ -184,7 +184,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -196,7 +196,7 @@ else { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -218,7 +218,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -233,7 +233,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -245,7 +245,7 @@ else { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -266,7 +266,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -281,7 +281,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -293,7 +293,7 @@ else { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -315,8 +315,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + @@ -327,7 +327,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -336,7 +336,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -354,7 +354,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -366,7 +366,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -375,7 +375,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/5x.tpl b/Admin/Templates/Notice/5x.tpl index f52d3533..ad898f49 100644 --- a/Admin/Templates/Notice/5x.tpl +++ b/Admin/Templates/Notice/5x.tpl @@ -9,15 +9,15 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -25,8 +25,8 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=3;$i<=12;$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -86,40 +86,40 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - -
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -131,13 +131,13 @@ $start=1; ?> - + - + @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -164,7 +164,7 @@ for($i=35;$i<=44;$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,13 +186,13 @@ $start=11;?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -219,7 +219,7 @@ for($i=56;$i<=65;$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -240,13 +240,13 @@ $start=21; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -273,7 +273,7 @@ for($i=77;$i<=86;$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,13 +295,13 @@ $start=31; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ for($i=98;$i<=107;$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -350,13 +350,13 @@ $start=41; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -383,7 +383,7 @@ for($i=119;$i<=128;$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/6.tpl b/Admin/Templates/Notice/6.tpl index 65e958e6..7c1bca95 100644 --- a/Admin/Templates/Notice/6.tpl +++ b/Admin/Templates/Notice/6.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -68,7 +68,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -80,7 +80,7 @@ else { if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -94,7 +94,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -111,47 +111,47 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - - -
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Information +
    資訊 Hero
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -163,7 +163,7 @@ $start=1; ?> - @@ -178,7 +178,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -190,7 +190,7 @@ else { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -212,7 +212,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -227,7 +227,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -239,7 +239,7 @@ else { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -260,7 +260,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -275,7 +275,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -287,7 +287,7 @@ else { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -309,8 +309,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + @@ -321,7 +321,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -330,7 +330,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -348,7 +348,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -360,7 +360,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -369,7 +369,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/6x.tpl b/Admin/Templates/Notice/6x.tpl index f52d3533..ad898f49 100644 --- a/Admin/Templates/Notice/6x.tpl +++ b/Admin/Templates/Notice/6x.tpl @@ -9,15 +9,15 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -25,8 +25,8 @@ if(isset($dataarray[149]) and $dataarray[149]!=0){$colspan2="11";}else{$colspan2
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=3;$i<=12;$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -86,40 +86,40 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - -
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -131,13 +131,13 @@ $start=1; ?> - + - + @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -164,7 +164,7 @@ for($i=35;$i<=44;$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -186,13 +186,13 @@ $start=11;?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -219,7 +219,7 @@ for($i=56;$i<=65;$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -240,13 +240,13 @@ $start=21; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -273,7 +273,7 @@ for($i=77;$i<=86;$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,13 +295,13 @@ $start=31; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ for($i=98;$i<=107;$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -350,13 +350,13 @@ $start=41; ?>
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + - + @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -383,7 +383,7 @@ for($i=119;$i<=128;$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/7.tpl b/Admin/Templates/Notice/7.tpl index 1b270f17..c050841c 100644 --- a/Admin/Templates/Notice/7.tpl +++ b/Admin/Templates/Notice/7.tpl @@ -35,14 +35,14 @@ if($database->isVillageOases($dataarray[29])){
    Defender + 防禦者 - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?> getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - +procMtime($rep[0]['time']); ?> - - + + @@ -50,8 +50,8 @@ $date = $generator->procMtime($rep[0]['time']); ?> - + From 9518d5f92b79a9dd8dc75792e4c2b7197405b9f1 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sun, 7 Dec 2014 01:01:23 +0800 Subject: [PATCH 21/33] Translate "calculating time" --- Templates/menu.tpl | 2 +- a2b2.php | 2 +- build.php | 2 +- crop_finder.php | 2 +- dorf2.php | 2 +- dorf3.php | 2 +- karte.php | 2 +- logout.php | 2 +- nachrichten.php | 2 +- plus.php | 2 +- plus1.php | 2 +- rules.php | 2 +- spieler.php | 2 +- statistiken.php | 2 +- support.php | 2 +- version.php | 2 +- warsim.php | 2 +- winner.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Templates/menu.tpl b/Templates/menu.tpl index 07d27618..357ff933 100644 --- a/Templates/menu.tpl +++ b/Templates/menu.tpl @@ -102,7 +102,7 @@ div.c1 {text-align: center}
    - Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms
    diff --git a/a2b2.php b/a2b2.php index 26884fc6..0e3d35dc 100644 --- a/a2b2.php +++ b/a2b2.php @@ -358,7 +358,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/build.php b/build.php index e7f5e10f..0fd22619 100644 --- a/build.php +++ b/build.php @@ -374,7 +374,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/crop_finder.php b/crop_finder.php index 8611bbe1..972ecb4a 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -337,7 +337,7 @@ function getDistance($coorx1, $coory1, $coorx2, $coory2) {
    -Calculated in pageLoadTimeEnd() - $start) * 1000); diff --git a/dorf2.php b/dorf2.php index 682e680f..5056e052 100644 --- a/dorf2.php +++ b/dorf2.php @@ -88,7 +88,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/dorf3.php b/dorf3.php index 496c60f7..d07ae335 100644 --- a/dorf3.php +++ b/dorf3.php @@ -106,7 +106,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/karte.php b/karte.php index 424aaab2..54136c5d 100644 --- a/karte.php +++ b/karte.php @@ -102,7 +102,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/logout.php b/logout.php index adfc50fb..e3da0ae9 100644 --- a/logout.php +++ b/logout.php @@ -78,7 +78,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/nachrichten.php b/nachrichten.php index 1e76135d..46c601fb 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -159,7 +159,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/plus.php b/plus.php index 90c76df0..84141985 100644 --- a/plus.php +++ b/plus.php @@ -144,7 +144,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/plus1.php b/plus1.php index 6f9c7ac7..f1f5f606 100644 --- a/plus1.php +++ b/plus1.php @@ -91,7 +91,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/rules.php b/rules.php index d2cd0e2f..c361536b 100644 --- a/rules.php +++ b/rules.php @@ -82,7 +82,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/spieler.php b/spieler.php index 50b4e9f2..805b3493 100644 --- a/spieler.php +++ b/spieler.php @@ -177,7 +177,7 @@ function med_showDescription(coords, desc_string){
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/statistiken.php b/statistiken.php index d7ae8137..290a6751 100644 --- a/statistiken.php +++ b/statistiken.php @@ -158,7 +158,7 @@
    -Calculated in pageLoadTimeEnd()-$__start)*1000); ?> ms diff --git a/support.php b/support.php index 1055ddbd..8667a372 100644 --- a/support.php +++ b/support.php @@ -158,7 +158,7 @@ function chkFormular () {
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/version.php b/version.php index 9e8dc68d..db9955c1 100644 --- a/version.php +++ b/version.php @@ -117,7 +117,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/warsim.php b/warsim.php index 1d79509c..93adcd75 100644 --- a/warsim.php +++ b/warsim.php @@ -170,7 +170,7 @@
    -Calculated in pageLoadTimeEnd()-$start)*1000); ?> ms diff --git a/winner.php b/winner.php index 3de7948f..9f3e1ee9 100644 --- a/winner.php +++ b/winner.php @@ -243,7 +243,7 @@
    - Calculated in pageLoadTimeEnd()-$start)*1000);?> ms + 運算耗時 pageLoadTimeEnd()-$start)*1000);?> ms
    Server time:
    From 1ac6127a2f87ddc3108f14012b4c15117e6e1266 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sun, 7 Dec 2014 01:02:22 +0800 Subject: [PATCH 22/33] Translate "Server time" --- Templates/menu.tpl | 2 +- a2b2.php | 2 +- build.php | 2 +- crop_finder.php | 2 +- dorf2.php | 2 +- dorf3.php | 2 +- karte.php | 2 +- logout.php | 2 +- nachrichten.php | 2 +- plus.php | 2 +- plus1.php | 2 +- rules.php | 2 +- spieler.php | 2 +- statistiken.php | 2 +- support.php | 2 +- version.php | 2 +- warsim.php | 2 +- winner.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Templates/menu.tpl b/Templates/menu.tpl index 357ff933..de16a92d 100644 --- a/Templates/menu.tpl +++ b/Templates/menu.tpl @@ -106,7 +106,7 @@ div.c1 {text-align: center} echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms
    - Server time: + 伺服器時間:
    diff --git a/a2b2.php b/a2b2.php index 0e3d35dc..ad4ec4a5 100644 --- a/a2b2.php +++ b/a2b2.php @@ -362,7 +362,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/build.php b/build.php index 0fd22619..a3cf612f 100644 --- a/build.php +++ b/build.php @@ -378,7 +378,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/crop_finder.php b/crop_finder.php index 972ecb4a..fd4d00e3 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -343,7 +343,7 @@ function getDistance($coorx1, $coory1, $coorx2, $coory2) { ?>     ms -
    Server time: 伺服器時間: pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/dorf3.php b/dorf3.php index d07ae335..570d066d 100644 --- a/dorf3.php +++ b/dorf3.php @@ -110,7 +110,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/karte.php b/karte.php index 54136c5d..315c7380 100644 --- a/karte.php +++ b/karte.php @@ -106,7 +106,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/logout.php b/logout.php index e3da0ae9..6cbf6f17 100644 --- a/logout.php +++ b/logout.php @@ -82,7 +82,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/nachrichten.php b/nachrichten.php index 46c601fb..82c7bfd2 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -163,7 +163,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/plus.php b/plus.php index 84141985..5b376987 100644 --- a/plus.php +++ b/plus.php @@ -148,7 +148,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/plus1.php b/plus1.php index f1f5f606..e4a12aa4 100644 --- a/plus1.php +++ b/plus1.php @@ -95,7 +95,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/rules.php b/rules.php index c361536b..09d38ec4 100644 --- a/rules.php +++ b/rules.php @@ -86,7 +86,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/spieler.php b/spieler.php index 805b3493..3f2e7a28 100644 --- a/spieler.php +++ b/spieler.php @@ -181,7 +181,7 @@ function med_showDescription(coords, desc_string){ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/statistiken.php b/statistiken.php index 290a6751..fade5b76 100644 --- a/statistiken.php +++ b/statistiken.php @@ -162,7 +162,7 @@ echo round(($generator->pageLoadTimeEnd()-$__start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/support.php b/support.php index 8667a372..6dc9ef0b 100644 --- a/support.php +++ b/support.php @@ -162,7 +162,7 @@ function chkFormular () { echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/version.php b/version.php index db9955c1..59f13101 100644 --- a/version.php +++ b/version.php @@ -121,7 +121,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/warsim.php b/warsim.php index 93adcd75..47db3342 100644 --- a/warsim.php +++ b/warsim.php @@ -174,7 +174,7 @@ echo round(($generator->pageLoadTimeEnd()-$start)*1000); ?> ms -
    Server time: +
    伺服器時間:
    diff --git a/winner.php b/winner.php index 9f3e1ee9..9444ee48 100644 --- a/winner.php +++ b/winner.php @@ -244,7 +244,7 @@
    運算耗時 pageLoadTimeEnd()-$start)*1000);?> ms -
    Server time: +
    伺服器時間:
    From 7f375343ca3c11c89df241eb21a54b53abc21249 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sun, 7 Dec 2014 01:06:23 +0800 Subject: [PATCH 23/33] Translate some template --- Admin/Templates/add_village.tpl | 4 ++-- Admin/Templates/config.tpl | 2 +- Admin/Templates/editNewsboxSet.tpl | 8 ++++---- install/templates/config.tpl | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Admin/Templates/add_village.tpl b/Admin/Templates/add_village.tpl index d9ab78d1..3c31fba0 100644 --- a/Admin/Templates/add_village.tpl +++ b/Admin/Templates/add_village.tpl @@ -18,12 +18,12 @@
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -66,7 +66,7 @@ for($i=$start;$i<=($start+9);$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -78,7 +78,7 @@ else { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -92,7 +92,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0 or $dataarray[161] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -109,53 +109,53 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - - - -
    Attacker from the village 攻擊者 來自村莊
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Information +
    資訊 Hero
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    - @@ -180,7 +180,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -192,7 +192,7 @@ else { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -214,7 +214,7 @@ $start=11;?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -227,7 +227,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -239,7 +239,7 @@ else { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -260,7 +260,7 @@ $start=21; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - @@ -273,7 +273,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -285,7 +285,7 @@ else { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -308,8 +308,8 @@ $start=31; ?>
    Defender + 防禦者
    \"Hero\"
    Troops
    軍隊0$dataarray[149]
    Casualties
    傷亡0
    - + @@ -318,7 +318,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -327,7 +327,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=118;$i<=127;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -345,7 +345,7 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - @@ -355,7 +355,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -364,7 +364,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=139;$i<=148;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -383,8 +383,8 @@ $start=31; ?>
    Defender + 防禦者
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -393,7 +393,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -402,7 +402,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -420,8 +420,8 @@ $start=41; ?>
    Defender - '.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + '.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -430,7 +430,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -439,7 +439,7 @@ else { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/7x.tpl b/Admin/Templates/Notice/7x.tpl index a8c5c117..dbcc6fe5 100644 --- a/Admin/Templates/Notice/7x.tpl +++ b/Admin/Templates/Notice/7x.tpl @@ -9,15 +9,15 @@ $colspan2 = 10;
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($time); ?> - - + + @@ -25,8 +25,8 @@ $colspan2 = 10;
    Subject:主旨:
    Sent:on at ".$date[1]; ?> hour寄送時間:on at ".$date[1]; ?> 小時
    - - + + @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -55,7 +55,7 @@ for($i=3;$i<=12;$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=13;$i<=22;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -69,7 +69,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } if($dataarray[151] != 0 or $dataarray[152] != 0 or $dataarray[153] != 0 or $dataarray[154] != 0 or $dataarray[155] != 0 or $dataarray[156] != 0 or $dataarray[157] != 0 or $dataarray[158] != 0 or $dataarray[159] != 0 or $dataarray[160] != 0){ -echo ""; +echo ""; for($i=151;$i<=160;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -86,40 +86,40 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram ?> - - - - - -
    Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>攻擊者">getUserField($dataarray[0],"username",0); ?> 來自村莊 getVillageField($dataarray[1],"name"); ?>
    \"Hero\"
    Troops
    軍隊0$dataarray[147]
    Casualties
    傷亡0$dataarray[148]
    Prisoners
    囚犯0
    Information +
    資訊 Ram
    Information +
    資訊 Catapult
    Information +
    資訊 Chief
    Information +
    資訊
    Information +
    資訊
    Bounty +
    賞金
    Lumber | Clay | Iron | Crop
    carry
    @@ -132,8 +132,8 @@ $start=1; ?> - + @@ -144,7 +144,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -153,7 +153,7 @@ for($i=35;$i<=44;$i++) { echo ""; } } -echo ""; +echo ""; for($i=45;$i<=54;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -171,8 +171,8 @@ $start=11;?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -183,7 +183,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -192,7 +192,7 @@ for($i=56;$i<=65;$i++) { echo ""; } } -echo ""; +echo ""; for($i=66;$i<=75;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -209,8 +209,8 @@ $start=21; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -221,7 +221,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -230,7 +230,7 @@ for($i=77;$i<=86;$i++) { echo ""; } } -echo ""; +echo ""; for($i=87;$i<=96;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -249,8 +249,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -261,7 +261,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -270,7 +270,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=118;$i<=127;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -288,8 +288,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -300,7 +300,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -309,7 +309,7 @@ for($i=129;$i<=138;$i++) { echo ""; } } -echo ""; +echo ""; for($i=139;$i<=148;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,8 +328,8 @@ $start=31; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -340,7 +340,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -349,7 +349,7 @@ for($i=98;$i<=107;$i++) { echo ""; } } -echo ""; +echo ""; for($i=108;$i<=117;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -367,8 +367,8 @@ $start=41; ?>
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + @@ -379,7 +379,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -388,7 +388,7 @@ for($i=119;$i<=128;$i++) { echo ""; } } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/Notice/8.tpl b/Admin/Templates/Notice/8.tpl index 5467fa66..ecce60ab 100644 --- a/Admin/Templates/Notice/8.tpl +++ b/Admin/Templates/Notice/8.tpl @@ -15,13 +15,13 @@ if($database->getVillageField($dataarray[0],'name')!="??" || $dataarray[0] == 0)
    Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>防禦者 + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' 來自村莊 '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
    getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0".$dataarray[$i]."
    Casualties
    傷亡0
    - + procMtime($rep[0]['time']); ?> - + @@ -31,7 +31,7 @@ $date = $generator->procMtime($rep[0]['time']); ?>
    Subject:主旨:
    Sent:寄送時間: on at ".$date[1]; ?>
    - +"; } -echo ""; +echo ""; for($i=3;$i<13;$i++) { $unitarray['u'.($i-3+$start).''] = $dataarray[$i]; if($dataarray[$i] == 0) { @@ -60,6 +60,6 @@ if($dataarray[13] != 0) { ?> +getUpkeep($unitarray,$dataarray[2]); ?>Crop每小時
    sender from the village
    寄件者 來自村莊
     
    Troops
    軍隊
    upkeep -getUpkeep($unitarray,$dataarray[2]); ?>Cropper hour
    \ No newline at end of file diff --git a/Admin/Templates/Notice/all.tpl b/Admin/Templates/Notice/all.tpl index 23befb0a..549efc6c 100644 --- a/Admin/Templates/Notice/all.tpl +++ b/Admin/Templates/Notice/all.tpl @@ -6,7 +6,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att class="row_table_data">
    Subject:主旨: Sent
    - + - + diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl index ab387ee8..19a2e2ad 100644 --- a/Admin/Templates/config.tpl +++ b/Admin/Templates/config.tpl @@ -213,7 +213,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
    Add Village新增村莊
    Coordinates (X|Y)
    座標 (X|Y)
    - +
    資訊設定資訊設定
    diff --git a/Admin/Templates/editNewsboxSet.tpl b/Admin/Templates/editNewsboxSet.tpl index 3a105ac6..5f3120d0 100644 --- a/Admin/Templates/editNewsboxSet.tpl +++ b/Admin/Templates/editNewsboxSet.tpl @@ -20,12 +20,12 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); - + - + - + - + diff --git a/Admin/Templates/editLogSet.tpl b/Admin/Templates/editLogSet.tpl index b7c1a8ff..882189f5 100644 --- a/Admin/Templates/editLogSet.tpl +++ b/Admin/Templates/editLogSet.tpl @@ -28,8 +28,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -37,8 +37,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -46,8 +46,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -55,8 +55,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -64,8 +64,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -73,8 +73,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -82,8 +82,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); @@ -91,8 +91,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); diff --git a/Admin/Templates/editServerSet.tpl b/Admin/Templates/editServerSet.tpl index 45301af4..367fbcf6 100644 --- a/Admin/Templates/editServerSet.tpl +++ b/Admin/Templates/editServerSet.tpl @@ -143,8 +143,8 @@ function refresh(tz) { @@ -152,8 +152,8 @@ function refresh(tz) { @@ -282,16 +282,16 @@ function refresh(tz) { diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index 12628f05..f31f2cbd 100644 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -115,8 +115,8 @@ define("DONE_AT","done at"); define("CANCEL","cancel"); define("LOYALTY","Loyalty:"); -define("CALCULATED_IN","Calculated in"); -define("SEVER_TIME","Server time:"); +define("CALCULATED_IN","運算耗時 "); +define("SEVER_TIME","伺服器時間:"); //QUEST define("Q_BUTN","Send"); @@ -698,8 +698,8 @@ define("WE_LOOKED","We looked 404 times already but can't find anything"); //TIME RELATED -define("CALCULATED","Calculated in"); -define("SERVER_TIME","Server time:"); +define("CALCULATED","運算耗時 "); +define("SERVER_TIME","伺服器時間:"); //MASSMESSAGE.php define("MASS","Message Content"); diff --git a/install/templates/config.tpl b/install/templates/config.tpl index 5c655d9c..e2559483 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -191,8 +191,8 @@ echo "
    Error creating constant.php Admin Name:

    Admin Email:

    Admin rank:

    + +

    @@ -202,8 +202,8 @@ echo "
    Error creating constant.php GPack:

    + +

    GPack Design:

    @@ -234,41 +234,41 @@ echo "
    Error creating constant.php LOG RELATED (You should disable them)
    Edit Newsbox Settings編輯資訊設定
    Newsbox 1資訊 1
    Newsbox 2資訊 2
    Newsbox 3資訊 3 - - -
    Newsbox 1:資訊 1:
    Newsbox 2:資訊 2:
    Newsbox 3:資訊 3:

    From 299386bb48ff4fb21e9fb932fcc43db6aa8960b8 Mon Sep 17 00:00:00 2001 From: Inndy Date: Sun, 7 Dec 2014 01:07:17 +0800 Subject: [PATCH 24/33] Translate "Yes", "No" --- Admin/Templates/editExtraSet.tpl | 4 +- Admin/Templates/editLogSet.tpl | 32 ++++++++-------- Admin/Templates/editServerSet.tpl | 16 ++++---- GameEngine/Lang/en.php | 8 ++-- install/templates/config.tpl | 64 +++++++++++++++---------------- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Admin/Templates/editExtraSet.tpl b/Admin/Templates/editExtraSet.tpl index 73bac06b..d413c00f 100644 --- a/Admin/Templates/editExtraSet.tpl +++ b/Admin/Templates/editExtraSet.tpl @@ -28,8 +28,8 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);     		Limit Mailbox
    Log Building
    Log Tech
    Log Login
    Log Gold
    Log Admin
    Log War
    Log Market
    Log Illegal
    Activation Mail
    Quest
    Graphic Pack
    Error Reporting
    Log Building:
    Log Tech:
    Log Login:
    Log Gold:
    Log Admin:
    Log War:
    Log Market:
    Log Illegal:
    Log :

    @@ -277,20 +277,20 @@ echo "
    Error creating constant.php EXTRA OPTIONS @@ -305,12 +305,12 @@ echo "
    Error creating constant.php
    Quest:
    Quest Type:
    Activate:
    Limit Mailbox: (NOT DONE)
    Max mails: (NOT DONE)
    Error Reporting:
    T4 is Coming screen:

    From 1ed8ed7f923c11a942a75d8de457f0a3fa8ed6cd Mon Sep 17 00:00:00 2001 From: Lorex Date: Sun, 7 Dec 2014 01:43:59 +0800 Subject: [PATCH 25/33] server local changes --- GameEngine/Account.php | 0 GameEngine/Admin/.htaccess | 0 GameEngine/Admin/Mods/.htaccess | 0 GameEngine/Admin/Mods/addABTroops.php | 0 GameEngine/Admin/Mods/addTroops.php | 0 GameEngine/Admin/Mods/addUsers.php | 0 GameEngine/Admin/Mods/additional.php | 0 GameEngine/Admin/Mods/constant_format.tpl | 0 GameEngine/Admin/Mods/cp.php | 0 GameEngine/Admin/Mods/delallymedal.php | 0 GameEngine/Admin/Mods/delallymedalbyaid.php | 0 GameEngine/Admin/Mods/delallymedalbyweek.php | 0 GameEngine/Admin/Mods/deletemedalbyuser.php | 0 GameEngine/Admin/Mods/deletemedalbyweek.php | 0 GameEngine/Admin/Mods/editAccess.php | 0 GameEngine/Admin/Mods/editAdminInfo.php | 0 GameEngine/Admin/Mods/editBuildings.php | 0 GameEngine/Admin/Mods/editExtraSet.php | 0 GameEngine/Admin/Mods/editHero.php | 0 GameEngine/Admin/Mods/editLogSet.php | 0 GameEngine/Admin/Mods/editNewsboxSet.php | 0 GameEngine/Admin/Mods/editOverall.php | 0 GameEngine/Admin/Mods/editPassword.php | 0 GameEngine/Admin/Mods/editPlus.php | 0 GameEngine/Admin/Mods/editProtection.php | 0 GameEngine/Admin/Mods/editResources.php | 0 GameEngine/Admin/Mods/editServerSet.php | 0 GameEngine/Admin/Mods/editSitter.php | 0 GameEngine/Admin/Mods/editUser.php | 0 GameEngine/Admin/Mods/editUsername.php | 0 GameEngine/Admin/Mods/editVillageOwner.php | 0 GameEngine/Admin/Mods/editWeek.php | 0 GameEngine/Admin/Mods/givePlus.php | 0 GameEngine/Admin/Mods/givePlusRes.php | 0 GameEngine/Admin/Mods/giveResBonus.php | 0 GameEngine/Admin/Mods/gold.php | 0 GameEngine/Admin/Mods/gold_1.php | 0 GameEngine/Admin/Mods/index.php | 0 GameEngine/Admin/Mods/mainteneceBan.php | 0 GameEngine/Admin/Mods/mainteneceCleanBanData.php | 0 GameEngine/Admin/Mods/mainteneceResetGold.php | 0 GameEngine/Admin/Mods/mainteneceResetPlus.php | 0 GameEngine/Admin/Mods/mainteneceResetPlusBonus.php | 0 GameEngine/Admin/Mods/mainteneceUnban.php | 0 GameEngine/Admin/Mods/medals.php | 0 GameEngine/Admin/Mods/natarbuildingplan.php | 0 GameEngine/Admin/Mods/natarend.php | 0 GameEngine/Admin/Mods/recalcWH.php | 0 GameEngine/Admin/Mods/renameVillage.php | 0 GameEngine/Admin/Mods/sendMessage.php | 0 GameEngine/Admin/admin.php | 0 GameEngine/Admin/ajax.js | 0 GameEngine/Admin/database.php | 0 GameEngine/Admin/function.php | 0 GameEngine/Admin/welcome.tpl | 0 GameEngine/Alliance.php | 0 GameEngine/Automation.php | 0 GameEngine/BBCode.php | 0 GameEngine/Battle.php | 0 GameEngine/Building.php | 0 GameEngine/Chat.php | 0 GameEngine/Data/buidata.php | 0 GameEngine/Data/cel.php | 0 GameEngine/Data/cp.php | 0 GameEngine/Data/hero_full.php | 0 GameEngine/Data/hunitdata.php | 0 GameEngine/Data/index.php | 0 GameEngine/Data/resdata.php | 0 GameEngine/Data/unitdata.php | 0 GameEngine/Database.php | 0 GameEngine/Database/db_MYSQL.php | 0 GameEngine/Database/db_MYSQLi.php | 0 GameEngine/Database/index.php | 0 GameEngine/Form.php | 0 GameEngine/Game/WorldWonderName.php | 0 GameEngine/Game/index.php | 0 GameEngine/Generator.php | 0 GameEngine/Lang/en.php | 0 GameEngine/Lang/es.php | 0 GameEngine/Lang/index.php | 0 GameEngine/Lang/ru.php | 0 GameEngine/Lang/zh_tw.php | 0 GameEngine/Logging.php | 0 GameEngine/Mailer.php | 0 GameEngine/Market.php | 0 GameEngine/Message.php | 0 GameEngine/Multisort.php | 0 GameEngine/Notes/DO NOT REMOVE THIS FOLDER.txt | 0 GameEngine/Notes/index.php | 0 GameEngine/Prevention/empty.txt | 0 GameEngine/Prevention/index.php | 0 GameEngine/Prevention/lock.lock | 0 GameEngine/Profile.php | 0 GameEngine/Protection.php | 0 GameEngine/Ranking.php | 0 GameEngine/Session.php | 0 GameEngine/Technology.php | 0 GameEngine/Units.php | 0 GameEngine/Village.php | 0 GameEngine/favicon.ico | Bin GameEngine/functions.php | 0 GameEngine/index.php | 0 install/data/.htaccess | 0 install/data/constant_format.tpl | 0 install/data/sql.sql | 0 install/include/database.php | 0 install/include/multihunter.php | 0 install/include/oasis.php | 0 install/include/wdata.php | 0 install/index.php | 0 install/process.php | 0 install/templates/.htaccess | 0 install/templates/config.tpl | 0 install/templates/dataform.tpl | 0 install/templates/end.tpl | 0 install/templates/field.tpl | 0 install/templates/greet.tpl | 0 install/templates/menu.tpl | 0 install/templates/multihunter.tpl | 0 install/templates/oasis.tpl | 0 install/templates/script.tpl | 0 121 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 GameEngine/Account.php mode change 100644 => 100755 GameEngine/Admin/.htaccess mode change 100644 => 100755 GameEngine/Admin/Mods/.htaccess mode change 100644 => 100755 GameEngine/Admin/Mods/addABTroops.php mode change 100644 => 100755 GameEngine/Admin/Mods/addTroops.php mode change 100644 => 100755 GameEngine/Admin/Mods/addUsers.php mode change 100644 => 100755 GameEngine/Admin/Mods/additional.php mode change 100644 => 100755 GameEngine/Admin/Mods/constant_format.tpl mode change 100644 => 100755 GameEngine/Admin/Mods/cp.php mode change 100644 => 100755 GameEngine/Admin/Mods/delallymedal.php mode change 100644 => 100755 GameEngine/Admin/Mods/delallymedalbyaid.php mode change 100644 => 100755 GameEngine/Admin/Mods/delallymedalbyweek.php mode change 100644 => 100755 GameEngine/Admin/Mods/deletemedalbyuser.php mode change 100644 => 100755 GameEngine/Admin/Mods/deletemedalbyweek.php mode change 100644 => 100755 GameEngine/Admin/Mods/editAccess.php mode change 100644 => 100755 GameEngine/Admin/Mods/editAdminInfo.php mode change 100644 => 100755 GameEngine/Admin/Mods/editBuildings.php mode change 100644 => 100755 GameEngine/Admin/Mods/editExtraSet.php mode change 100644 => 100755 GameEngine/Admin/Mods/editHero.php mode change 100644 => 100755 GameEngine/Admin/Mods/editLogSet.php mode change 100644 => 100755 GameEngine/Admin/Mods/editNewsboxSet.php mode change 100644 => 100755 GameEngine/Admin/Mods/editOverall.php mode change 100644 => 100755 GameEngine/Admin/Mods/editPassword.php mode change 100644 => 100755 GameEngine/Admin/Mods/editPlus.php mode change 100644 => 100755 GameEngine/Admin/Mods/editProtection.php mode change 100644 => 100755 GameEngine/Admin/Mods/editResources.php mode change 100644 => 100755 GameEngine/Admin/Mods/editServerSet.php mode change 100644 => 100755 GameEngine/Admin/Mods/editSitter.php mode change 100644 => 100755 GameEngine/Admin/Mods/editUser.php mode change 100644 => 100755 GameEngine/Admin/Mods/editUsername.php mode change 100644 => 100755 GameEngine/Admin/Mods/editVillageOwner.php mode change 100644 => 100755 GameEngine/Admin/Mods/editWeek.php mode change 100644 => 100755 GameEngine/Admin/Mods/givePlus.php mode change 100644 => 100755 GameEngine/Admin/Mods/givePlusRes.php mode change 100644 => 100755 GameEngine/Admin/Mods/giveResBonus.php mode change 100644 => 100755 GameEngine/Admin/Mods/gold.php mode change 100644 => 100755 GameEngine/Admin/Mods/gold_1.php mode change 100644 => 100755 GameEngine/Admin/Mods/index.php mode change 100644 => 100755 GameEngine/Admin/Mods/mainteneceBan.php mode change 100644 => 100755 GameEngine/Admin/Mods/mainteneceCleanBanData.php mode change 100644 => 100755 GameEngine/Admin/Mods/mainteneceResetGold.php mode change 100644 => 100755 GameEngine/Admin/Mods/mainteneceResetPlus.php mode change 100644 => 100755 GameEngine/Admin/Mods/mainteneceResetPlusBonus.php mode change 100644 => 100755 GameEngine/Admin/Mods/mainteneceUnban.php mode change 100644 => 100755 GameEngine/Admin/Mods/medals.php mode change 100644 => 100755 GameEngine/Admin/Mods/natarbuildingplan.php mode change 100644 => 100755 GameEngine/Admin/Mods/natarend.php mode change 100644 => 100755 GameEngine/Admin/Mods/recalcWH.php mode change 100644 => 100755 GameEngine/Admin/Mods/renameVillage.php mode change 100644 => 100755 GameEngine/Admin/Mods/sendMessage.php mode change 100644 => 100755 GameEngine/Admin/admin.php mode change 100644 => 100755 GameEngine/Admin/ajax.js mode change 100644 => 100755 GameEngine/Admin/database.php mode change 100644 => 100755 GameEngine/Admin/function.php mode change 100644 => 100755 GameEngine/Admin/welcome.tpl mode change 100644 => 100755 GameEngine/Alliance.php mode change 100644 => 100755 GameEngine/Automation.php mode change 100644 => 100755 GameEngine/BBCode.php mode change 100644 => 100755 GameEngine/Battle.php mode change 100644 => 100755 GameEngine/Building.php mode change 100644 => 100755 GameEngine/Chat.php mode change 100644 => 100755 GameEngine/Data/buidata.php mode change 100644 => 100755 GameEngine/Data/cel.php mode change 100644 => 100755 GameEngine/Data/cp.php mode change 100644 => 100755 GameEngine/Data/hero_full.php mode change 100644 => 100755 GameEngine/Data/hunitdata.php mode change 100644 => 100755 GameEngine/Data/index.php mode change 100644 => 100755 GameEngine/Data/resdata.php mode change 100644 => 100755 GameEngine/Data/unitdata.php mode change 100644 => 100755 GameEngine/Database.php mode change 100644 => 100755 GameEngine/Database/db_MYSQL.php mode change 100644 => 100755 GameEngine/Database/db_MYSQLi.php mode change 100644 => 100755 GameEngine/Database/index.php mode change 100644 => 100755 GameEngine/Form.php mode change 100644 => 100755 GameEngine/Game/WorldWonderName.php mode change 100644 => 100755 GameEngine/Game/index.php mode change 100644 => 100755 GameEngine/Generator.php mode change 100644 => 100755 GameEngine/Lang/en.php mode change 100644 => 100755 GameEngine/Lang/es.php mode change 100644 => 100755 GameEngine/Lang/index.php mode change 100644 => 100755 GameEngine/Lang/ru.php mode change 100644 => 100755 GameEngine/Lang/zh_tw.php mode change 100644 => 100755 GameEngine/Logging.php mode change 100644 => 100755 GameEngine/Mailer.php mode change 100644 => 100755 GameEngine/Market.php mode change 100644 => 100755 GameEngine/Message.php mode change 100644 => 100755 GameEngine/Multisort.php mode change 100644 => 100755 GameEngine/Notes/DO NOT REMOVE THIS FOLDER.txt mode change 100644 => 100755 GameEngine/Notes/index.php mode change 100644 => 100755 GameEngine/Prevention/empty.txt mode change 100644 => 100755 GameEngine/Prevention/index.php mode change 100644 => 100755 GameEngine/Prevention/lock.lock mode change 100644 => 100755 GameEngine/Profile.php mode change 100644 => 100755 GameEngine/Protection.php mode change 100644 => 100755 GameEngine/Ranking.php mode change 100644 => 100755 GameEngine/Session.php mode change 100644 => 100755 GameEngine/Technology.php mode change 100644 => 100755 GameEngine/Units.php mode change 100644 => 100755 GameEngine/Village.php mode change 100644 => 100755 GameEngine/favicon.ico mode change 100644 => 100755 GameEngine/functions.php mode change 100644 => 100755 GameEngine/index.php mode change 100644 => 100755 install/data/.htaccess mode change 100644 => 100755 install/data/constant_format.tpl mode change 100644 => 100755 install/data/sql.sql mode change 100644 => 100755 install/include/database.php mode change 100644 => 100755 install/include/multihunter.php mode change 100644 => 100755 install/include/oasis.php mode change 100644 => 100755 install/include/wdata.php mode change 100644 => 100755 install/index.php mode change 100644 => 100755 install/process.php mode change 100644 => 100755 install/templates/.htaccess mode change 100644 => 100755 install/templates/config.tpl mode change 100644 => 100755 install/templates/dataform.tpl mode change 100644 => 100755 install/templates/end.tpl mode change 100644 => 100755 install/templates/field.tpl mode change 100644 => 100755 install/templates/greet.tpl mode change 100644 => 100755 install/templates/menu.tpl mode change 100644 => 100755 install/templates/multihunter.tpl mode change 100644 => 100755 install/templates/oasis.tpl mode change 100644 => 100755 install/templates/script.tpl diff --git a/GameEngine/Account.php b/GameEngine/Account.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/.htaccess b/GameEngine/Admin/.htaccess old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/.htaccess b/GameEngine/Admin/Mods/.htaccess old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/addABTroops.php b/GameEngine/Admin/Mods/addABTroops.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/addTroops.php b/GameEngine/Admin/Mods/addTroops.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/additional.php b/GameEngine/Admin/Mods/additional.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/constant_format.tpl b/GameEngine/Admin/Mods/constant_format.tpl old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/cp.php b/GameEngine/Admin/Mods/cp.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/delallymedal.php b/GameEngine/Admin/Mods/delallymedal.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/delallymedalbyaid.php b/GameEngine/Admin/Mods/delallymedalbyaid.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/delallymedalbyweek.php b/GameEngine/Admin/Mods/delallymedalbyweek.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/deletemedalbyuser.php b/GameEngine/Admin/Mods/deletemedalbyuser.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/deletemedalbyweek.php b/GameEngine/Admin/Mods/deletemedalbyweek.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editAccess.php b/GameEngine/Admin/Mods/editAccess.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editAdminInfo.php b/GameEngine/Admin/Mods/editAdminInfo.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editBuildings.php b/GameEngine/Admin/Mods/editBuildings.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editExtraSet.php b/GameEngine/Admin/Mods/editExtraSet.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editHero.php b/GameEngine/Admin/Mods/editHero.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editLogSet.php b/GameEngine/Admin/Mods/editLogSet.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editNewsboxSet.php b/GameEngine/Admin/Mods/editNewsboxSet.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editOverall.php b/GameEngine/Admin/Mods/editOverall.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editPassword.php b/GameEngine/Admin/Mods/editPassword.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editPlus.php b/GameEngine/Admin/Mods/editPlus.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editProtection.php b/GameEngine/Admin/Mods/editProtection.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editResources.php b/GameEngine/Admin/Mods/editResources.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editServerSet.php b/GameEngine/Admin/Mods/editServerSet.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editSitter.php b/GameEngine/Admin/Mods/editSitter.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editUser.php b/GameEngine/Admin/Mods/editUser.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editUsername.php b/GameEngine/Admin/Mods/editUsername.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editVillageOwner.php b/GameEngine/Admin/Mods/editVillageOwner.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/editWeek.php b/GameEngine/Admin/Mods/editWeek.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/givePlus.php b/GameEngine/Admin/Mods/givePlus.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/givePlusRes.php b/GameEngine/Admin/Mods/givePlusRes.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/giveResBonus.php b/GameEngine/Admin/Mods/giveResBonus.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/gold.php b/GameEngine/Admin/Mods/gold.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/gold_1.php b/GameEngine/Admin/Mods/gold_1.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/index.php b/GameEngine/Admin/Mods/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/mainteneceBan.php b/GameEngine/Admin/Mods/mainteneceBan.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/mainteneceCleanBanData.php b/GameEngine/Admin/Mods/mainteneceCleanBanData.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/mainteneceResetGold.php b/GameEngine/Admin/Mods/mainteneceResetGold.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/mainteneceResetPlus.php b/GameEngine/Admin/Mods/mainteneceResetPlus.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/mainteneceResetPlusBonus.php b/GameEngine/Admin/Mods/mainteneceResetPlusBonus.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/mainteneceUnban.php b/GameEngine/Admin/Mods/mainteneceUnban.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/medals.php b/GameEngine/Admin/Mods/medals.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/natarbuildingplan.php b/GameEngine/Admin/Mods/natarbuildingplan.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/recalcWH.php b/GameEngine/Admin/Mods/recalcWH.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/renameVillage.php b/GameEngine/Admin/Mods/renameVillage.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/Mods/sendMessage.php b/GameEngine/Admin/Mods/sendMessage.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/admin.php b/GameEngine/Admin/admin.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/ajax.js b/GameEngine/Admin/ajax.js old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/database.php b/GameEngine/Admin/database.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/function.php b/GameEngine/Admin/function.php old mode 100644 new mode 100755 diff --git a/GameEngine/Admin/welcome.tpl b/GameEngine/Admin/welcome.tpl old mode 100644 new mode 100755 diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php old mode 100644 new mode 100755 diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php old mode 100644 new mode 100755 diff --git a/GameEngine/BBCode.php b/GameEngine/BBCode.php old mode 100644 new mode 100755 diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php old mode 100644 new mode 100755 diff --git a/GameEngine/Building.php b/GameEngine/Building.php old mode 100644 new mode 100755 diff --git a/GameEngine/Chat.php b/GameEngine/Chat.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/buidata.php b/GameEngine/Data/buidata.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/cel.php b/GameEngine/Data/cel.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/cp.php b/GameEngine/Data/cp.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/hero_full.php b/GameEngine/Data/hero_full.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/hunitdata.php b/GameEngine/Data/hunitdata.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/index.php b/GameEngine/Data/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/resdata.php b/GameEngine/Data/resdata.php old mode 100644 new mode 100755 diff --git a/GameEngine/Data/unitdata.php b/GameEngine/Data/unitdata.php old mode 100644 new mode 100755 diff --git a/GameEngine/Database.php b/GameEngine/Database.php old mode 100644 new mode 100755 diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php old mode 100644 new mode 100755 diff --git a/GameEngine/Database/db_MYSQLi.php b/GameEngine/Database/db_MYSQLi.php old mode 100644 new mode 100755 diff --git a/GameEngine/Database/index.php b/GameEngine/Database/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Form.php b/GameEngine/Form.php old mode 100644 new mode 100755 diff --git a/GameEngine/Game/WorldWonderName.php b/GameEngine/Game/WorldWonderName.php old mode 100644 new mode 100755 diff --git a/GameEngine/Game/index.php b/GameEngine/Game/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Generator.php b/GameEngine/Generator.php old mode 100644 new mode 100755 diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php old mode 100644 new mode 100755 diff --git a/GameEngine/Lang/es.php b/GameEngine/Lang/es.php old mode 100644 new mode 100755 diff --git a/GameEngine/Lang/index.php b/GameEngine/Lang/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Lang/ru.php b/GameEngine/Lang/ru.php old mode 100644 new mode 100755 diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php old mode 100644 new mode 100755 diff --git a/GameEngine/Logging.php b/GameEngine/Logging.php old mode 100644 new mode 100755 diff --git a/GameEngine/Mailer.php b/GameEngine/Mailer.php old mode 100644 new mode 100755 diff --git a/GameEngine/Market.php b/GameEngine/Market.php old mode 100644 new mode 100755 diff --git a/GameEngine/Message.php b/GameEngine/Message.php old mode 100644 new mode 100755 diff --git a/GameEngine/Multisort.php b/GameEngine/Multisort.php old mode 100644 new mode 100755 diff --git a/GameEngine/Notes/DO NOT REMOVE THIS FOLDER.txt b/GameEngine/Notes/DO NOT REMOVE THIS FOLDER.txt old mode 100644 new mode 100755 diff --git a/GameEngine/Notes/index.php b/GameEngine/Notes/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Prevention/empty.txt b/GameEngine/Prevention/empty.txt old mode 100644 new mode 100755 diff --git a/GameEngine/Prevention/index.php b/GameEngine/Prevention/index.php old mode 100644 new mode 100755 diff --git a/GameEngine/Prevention/lock.lock b/GameEngine/Prevention/lock.lock old mode 100644 new mode 100755 diff --git a/GameEngine/Profile.php b/GameEngine/Profile.php old mode 100644 new mode 100755 diff --git a/GameEngine/Protection.php b/GameEngine/Protection.php old mode 100644 new mode 100755 diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php old mode 100644 new mode 100755 diff --git a/GameEngine/Session.php b/GameEngine/Session.php old mode 100644 new mode 100755 diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php old mode 100644 new mode 100755 diff --git a/GameEngine/Units.php b/GameEngine/Units.php old mode 100644 new mode 100755 diff --git a/GameEngine/Village.php b/GameEngine/Village.php old mode 100644 new mode 100755 diff --git a/GameEngine/favicon.ico b/GameEngine/favicon.ico old mode 100644 new mode 100755 diff --git a/GameEngine/functions.php b/GameEngine/functions.php old mode 100644 new mode 100755 diff --git a/GameEngine/index.php b/GameEngine/index.php old mode 100644 new mode 100755 diff --git a/install/data/.htaccess b/install/data/.htaccess old mode 100644 new mode 100755 diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl old mode 100644 new mode 100755 diff --git a/install/data/sql.sql b/install/data/sql.sql old mode 100644 new mode 100755 diff --git a/install/include/database.php b/install/include/database.php old mode 100644 new mode 100755 diff --git a/install/include/multihunter.php b/install/include/multihunter.php old mode 100644 new mode 100755 diff --git a/install/include/oasis.php b/install/include/oasis.php old mode 100644 new mode 100755 diff --git a/install/include/wdata.php b/install/include/wdata.php old mode 100644 new mode 100755 diff --git a/install/index.php b/install/index.php old mode 100644 new mode 100755 diff --git a/install/process.php b/install/process.php old mode 100644 new mode 100755 diff --git a/install/templates/.htaccess b/install/templates/.htaccess old mode 100644 new mode 100755 diff --git a/install/templates/config.tpl b/install/templates/config.tpl old mode 100644 new mode 100755 diff --git a/install/templates/dataform.tpl b/install/templates/dataform.tpl old mode 100644 new mode 100755 diff --git a/install/templates/end.tpl b/install/templates/end.tpl old mode 100644 new mode 100755 diff --git a/install/templates/field.tpl b/install/templates/field.tpl old mode 100644 new mode 100755 diff --git a/install/templates/greet.tpl b/install/templates/greet.tpl old mode 100644 new mode 100755 diff --git a/install/templates/menu.tpl b/install/templates/menu.tpl old mode 100644 new mode 100755 diff --git a/install/templates/multihunter.tpl b/install/templates/multihunter.tpl old mode 100644 new mode 100755 diff --git a/install/templates/oasis.tpl b/install/templates/oasis.tpl old mode 100644 new mode 100755 diff --git a/install/templates/script.tpl b/install/templates/script.tpl old mode 100644 new mode 100755 From bf0e7bfe08a4a47517e966287deebbcaf1e067ad Mon Sep 17 00:00:00 2001 From: Lorex Date: Sun, 7 Dec 2014 23:58:24 +0800 Subject: [PATCH 26/33] Translate construction interface. --- Templates/Build/12_upgrades.tpl | 4 +- Templates/Build/13_upgrades.tpl | 4 +- Templates/Build/25_train.tpl | 6 +-- Templates/Build/avaliable/armoury.tpl | 4 +- Templates/Build/avaliable/availupgrade.tpl | 42 ++++++++++---------- Templates/Build/avaliable/bakery.tpl | 4 +- Templates/Build/avaliable/barracks.tpl | 4 +- Templates/Build/avaliable/blacksmith.tpl | 4 +- Templates/Build/avaliable/brickyard.tpl | 4 +- Templates/Build/avaliable/citywall.tpl | 4 +- Templates/Build/avaliable/cranny.tpl | 4 +- Templates/Build/avaliable/earthwall.tpl | 4 +- Templates/Build/avaliable/embassy.tpl | 4 +- Templates/Build/avaliable/grainmill.tpl | 4 +- Templates/Build/avaliable/granary.tpl | 4 +- Templates/Build/avaliable/greatbarracks.tpl | 4 +- Templates/Build/avaliable/greatgranary.tpl | 4 +- Templates/Build/avaliable/greatstable.tpl | 4 +- Templates/Build/avaliable/greatwarehouse.tpl | 4 +- Templates/Build/avaliable/greatworkshop.tpl | 6 +-- Templates/Build/avaliable/hero.tpl | 4 +- Templates/Build/avaliable/horsedrinking.tpl | 4 +- Templates/Build/avaliable/ironfoundry.tpl | 4 +- Templates/Build/avaliable/mainbuilding.tpl | 4 +- Templates/Build/avaliable/marketplace.tpl | 4 +- Templates/Build/avaliable/palace.tpl | 4 +- Templates/Build/avaliable/palisade.tpl | 4 +- Templates/Build/avaliable/rallypoint.tpl | 5 ++- Templates/Build/avaliable/residence.tpl | 4 +- Templates/Build/avaliable/sawmill.tpl | 4 +- Templates/Build/avaliable/stable.tpl | 4 +- Templates/Build/avaliable/stonemason.tpl | 4 +- Templates/Build/avaliable/townhall.tpl | 4 +- Templates/Build/avaliable/tradeoffice.tpl | 4 +- Templates/Build/avaliable/trapper.tpl | 4 +- Templates/Build/avaliable/treasury.tpl | 5 ++- Templates/Build/avaliable/tsquare.tpl | 4 +- Templates/Build/avaliable/warehouse.tpl | 4 +- Templates/Build/avaliable/workshop.tpl | 4 +- Templates/Build/soon/academy.tpl | 4 +- 40 files changed, 103 insertions(+), 101 deletions(-) diff --git a/Templates/Build/12_upgrades.tpl b/Templates/Build/12_upgrades.tpl index 501db088..5a9746a8 100644 --- a/Templates/Build/12_upgrades.tpl +++ b/Templates/Build/12_upgrades.tpl @@ -1,8 +1,8 @@ - - + + diff --git a/Templates/Build/13_upgrades.tpl b/Templates/Build/13_upgrades.tpl index 1770a66e..e74f6dd9 100644 --- a/Templates/Build/13_upgrades.tpl +++ b/Templates/Build/13_upgrades.tpl @@ -1,8 +1,8 @@
    BlacksmithAction鐵匠鋪動作
    - - + + diff --git a/Templates/Build/25_train.tpl b/Templates/Build/25_train.tpl index fc98237c..16f1f3ce 100644 --- a/Templates/Build/25_train.tpl +++ b/Templates/Build/25_train.tpl @@ -36,9 +36,9 @@
    ArmouryAction軍械庫動作
    - - - + + + diff --git a/Templates/Build/avaliable/armoury.tpl b/Templates/Build/avaliable/armoury.tpl index 723bf4d6..8ca3e012 100644 --- a/Templates/Build/avaliable/armoury.tpl +++ b/Templates/Build/avaliable/armoury.tpl @@ -1,7 +1,7 @@ -

    Armoury

    +

    軍械庫

    NameQuantityMax名稱數量最大
    - +
    In the armoury's melting furnaces your warriors' armour is enhanced. By increasing its level you can order the fabrication of even better armour.在軍械庫，你可以增強你的軍隊裝甲。通過升級，你可以製作更好的鎧甲來強化軍隊。 Armoury diff --git a/Templates/Build/avaliable/availupgrade.tpl b/Templates/Build/avaliable/availupgrade.tpl index cde2ae74..78b297d9 100644 --- a/Templates/Build/avaliable/availupgrade.tpl +++ b/Templates/Build/avaliable/availupgrade.tpl @@ -20,69 +20,69 @@ $_SESSION['mas'][$bid]=$bid.",".$id.",".$mastertime; The workers are already at work."; + echo "所有的工人皆已有工作。"; if($session->goldclub == 1){ ?>
    gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; - echo '(costs: Gold1)'; + echo "checker\">雇用大師進行建造"; + echo '(需要花費：Gold1)'; }else{ - echo "Constructing with master builder"; - echo '(costs: Gold1)'; + echo "雇用大師進行建造"; + echo '(需要花費：Gold1)'; } } } else if($bindicator == 3) { - echo "The workers are already at work. (waiting loop)"; + echo "所有的工人皆已有工作。(排入建築貯列)"; if($session->goldclub == 1){ ?>
    gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; - echo '(costs: Gold1)'; + echo "checker\">雇用大師進行建造"; + echo '(需要花費：Gold1)'; }else{ - echo "Constructing with master builder"; - echo '(costs: Gold1)'; + echo "雇用大師進行建造"; + echo '(需要花費：Gold1)'; } } } else if($bindicator == 4) { - echo "Not enough food. Expand cropland."; + echo "沒有足夠的食物。請擴大耕地。"; } else if($bindicator == 5) { - echo "Upgrade Warehouse."; + echo "升級倉庫"; } else if($bindicator == 6) { - echo "Upgrade Granary."; + echo "升級糧倉"; } else if($bindicator == 7) { $neededtime = $building->calculateAvaliable($id,$bid); - echo "Enough resources ".$neededtime[0]." at ".$neededtime[1].""; + echo "有足夠的資源".$neededtime[0]." at ".$neededtime[1].""; if($session->goldclub == 1){ ?>
    gold >= 1 && $village->master == 0){ - echo "checker\">Constructing with master builder "; - echo '(costs: Gold1)'; + echo "checker\">雇用大師進行建造"; + echo '(需要花費：Gold1)'; }else{ echo "Constructing with master builder"; - echo '(costs: Gold1)'; + echo '(需要花費：Gold1)'; } } } else if($bindicator == 8) { if($session->access!=BANNED){ - echo "checker\">Construct building."; + echo "checker\">建設此建築"; }else{ - echo "Construct building."; + echo "建設此建築<"; } } else if($bindicator == 9) { if($session->access!=BANNED){ - echo "checker\">Construct building. (waiting loop)"; + echo "checker\">建設此建築 (排入建築貯列)"; }else{ - echo "checker\">Construct building. (waiting loop)"; + echo "checker\">建設此建築 (排入建築貯列)"; } } ?> diff --git a/Templates/Build/avaliable/bakery.tpl b/Templates/Build/avaliable/bakery.tpl index 8961c15d..a0336ba5 100644 --- a/Templates/Build/avaliable/bakery.tpl +++ b/Templates/Build/avaliable/bakery.tpl @@ -1,7 +1,7 @@ -

    Bakery

    +

    麵包廠

    - +
    Here the flour produced in your mill is used to bake bread. In conjunction with the grain mill the increase in crop production can go up to 50 percent.在這裡你可以用生產的麵粉來烤麵包。配合麵粉場可以增加作物的產量最高可達到50%。 Bakery diff --git a/Templates/Build/avaliable/barracks.tpl b/Templates/Build/avaliable/barracks.tpl index 9faaff83..468d2f68 100644 --- a/Templates/Build/avaliable/barracks.tpl +++ b/Templates/Build/avaliable/barracks.tpl @@ -1,8 +1,8 @@ -

    Barracks

    +

    軍營

    - +
    In the barracks infantry can be trained. The higher its level the faster the troops are trained.在軍營，你可以訓練你的軍隊。等級越高速度越快訓練速度愈快 Barracks diff --git a/Templates/Build/avaliable/blacksmith.tpl b/Templates/Build/avaliable/blacksmith.tpl index 41e47b4a..056f19e3 100644 --- a/Templates/Build/avaliable/blacksmith.tpl +++ b/Templates/Build/avaliable/blacksmith.tpl @@ -1,7 +1,7 @@ -

    Blacksmith

    +

    鐵匠鋪

    -
    In the blacksmith's melting furnaces your warriors' weapons are enhanced. By increasing its level you can order the fabrication of even better weapons. + 在鐵匠，你可以使軍隊的武器增強。通過升級，你可以製作更好的武器來強化軍隊。 diff --git a/Templates/Build/avaliable/brickyard.tpl b/Templates/Build/avaliable/brickyard.tpl index 8ce0112d..84bfdabb 100644 --- a/Templates/Build/avaliable/brickyard.tpl +++ b/Templates/Build/avaliable/brickyard.tpl @@ -1,7 +1,7 @@ -

    Brickyard

    +

    磚瓦廠

    - +
    Here clay is processed into bricks. Based on its level your Brickyard can increase your clay production up to 25 percent.在這裡，黏土加工成磚。根據其級別的磚廠可以增加你的粘土生產量最高可達25％。 Brickyard diff --git a/Templates/Build/avaliable/citywall.tpl b/Templates/Build/avaliable/citywall.tpl index 116e8c43..e72b726b 100644 --- a/Templates/Build/avaliable/citywall.tpl +++ b/Templates/Build/avaliable/citywall.tpl @@ -1,8 +1,8 @@ -

    City Wall

    +

    城牆

    - + diff --git a/Templates/Build/avaliable/cranny.tpl b/Templates/Build/avaliable/cranny.tpl index c6ca57ea..aae680e9 100644 --- a/Templates/Build/avaliable/cranny.tpl +++ b/Templates/Build/avaliable/cranny.tpl @@ -1,8 +1,8 @@ -

    Cranny

    +

    山洞

    By building a City Wall you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.通過升級城牆，你可以保護你的村莊。在城牆級別越高，越提升防守的加成。
    - +
    The cranny is used to hide some of your resources when the village is attacked. These resources cannot be stolen.該山洞是用來隱藏你的一些資源時，當村里被攻擊。這些資源不能被竊取。 Cranny diff --git a/Templates/Build/avaliable/earthwall.tpl b/Templates/Build/avaliable/earthwall.tpl index 73fd1038..c1664772 100644 --- a/Templates/Build/avaliable/earthwall.tpl +++ b/Templates/Build/avaliable/earthwall.tpl @@ -1,8 +1,8 @@ -

    Earth Wall

    +

    高級城牆

    - + diff --git a/Templates/Build/avaliable/embassy.tpl b/Templates/Build/avaliable/embassy.tpl index 79c36ba7..5dd64791 100644 --- a/Templates/Build/avaliable/embassy.tpl +++ b/Templates/Build/avaliable/embassy.tpl @@ -1,8 +1,8 @@ -

    Embassy

    +

    大使館

    By building an Earth Wall you can protect your village against the barbarian hordes of your enemies. A higher level Earth Wall will give your troops a higher defence bonus.通過建造高級城牆，你可以保護你的村莊。在城牆級別越高，能提升防守的加成。
    - +
    The embassy is a place for diplomats. The higher its level the more options the king gains.大使館是外交的地方。等級越高越多選項可以使用。 Embassy diff --git a/Templates/Build/avaliable/grainmill.tpl b/Templates/Build/avaliable/grainmill.tpl index c11e1266..18566eab 100644 --- a/Templates/Build/avaliable/grainmill.tpl +++ b/Templates/Build/avaliable/grainmill.tpl @@ -1,7 +1,7 @@ -

    Grain Mill

    +

    麵粉廠

    - +
    Here your grain is milled in order to produce flour. Based on its level your grain mill can increase your crop production by up to 25 percent.在這裡，能將穀物碾碎以產生麵粉。根據其級別的麵粉最高可增加25％作物產量。 Grain Mill diff --git a/Templates/Build/avaliable/granary.tpl b/Templates/Build/avaliable/granary.tpl index 0906adca..9f9d0ccd 100644 --- a/Templates/Build/avaliable/granary.tpl +++ b/Templates/Build/avaliable/granary.tpl @@ -1,9 +1,9 @@ -

    Granary

    +

    糧倉

    - +
    In the granary the crop produced in your farms is stored. By increasing its level you increase the granary’s capacity. 在糧倉，儲存農場生產的農作物。通過增加級別增加糧倉的儲存量。 Granary diff --git a/Templates/Build/avaliable/greatbarracks.tpl b/Templates/Build/avaliable/greatbarracks.tpl index c703a34b..3df6d290 100644 --- a/Templates/Build/avaliable/greatbarracks.tpl +++ b/Templates/Build/avaliable/greatbarracks.tpl @@ -1,8 +1,8 @@ -

    Great Barracks

    +

    高級軍營

    - +
    In the great barracks infantry can be trained, albeit at triple the cost of a standard unit. The higher its level the faster the troops are trained.在高級的軍營可以訓練高級單位，儘管訓練一個是標準單位的三倍的成本。等級越高速度越快部隊進行訓練。 Great Barracks diff --git a/Templates/Build/avaliable/greatgranary.tpl b/Templates/Build/avaliable/greatgranary.tpl index 62d6fa08..14692986 100644 --- a/Templates/Build/avaliable/greatgranary.tpl +++ b/Templates/Build/avaliable/greatgranary.tpl @@ -1,9 +1,9 @@ -

    Great Granary

    +

    大型糧倉

    - +
    Crop produced by your farms is stored in the granary. The great granary offers you more space and keeps your crops drier and safer than the normal one.儲存農場生產的作物。大糧倉，為您提供更多的空間，讓你的作物能更好的乾燥，並且更安全。 Great Granary diff --git a/Templates/Build/avaliable/greatstable.tpl b/Templates/Build/avaliable/greatstable.tpl index 265e6a31..889d91c9 100644 --- a/Templates/Build/avaliable/greatstable.tpl +++ b/Templates/Build/avaliable/greatstable.tpl @@ -1,7 +1,7 @@ -

    Great Stable

    +

    高級馬廄

    - +
    In the great stable cavalry is trained, albeit at triple the cost of a standard unit. The higher its level the faster the troops are trained.在高級的馬廄可以訓練高級單位，儘管訓練一個是標準單位的三倍的成本。等級越高速度越快部隊進行訓練。 Great Stable diff --git a/Templates/Build/avaliable/greatwarehouse.tpl b/Templates/Build/avaliable/greatwarehouse.tpl index 8432f4e9..95b56007 100644 --- a/Templates/Build/avaliable/greatwarehouse.tpl +++ b/Templates/Build/avaliable/greatwarehouse.tpl @@ -1,8 +1,8 @@ -

    Great Warehouse

    +

    大倉庫

    - +
    Wood, clay and iron are stored in the warehouse. The great warehouse offers you more space and keeps your goods drier and safer than the normal one.儲存木材，粘土和鐵。大倉庫能為您提供更多的空間，讓你的貨比更好的乾燥，並且更安全。 Great Warehouse diff --git a/Templates/Build/avaliable/greatworkshop.tpl b/Templates/Build/avaliable/greatworkshop.tpl index 2d4403c4..85148251 100644 --- a/Templates/Build/avaliable/greatworkshop.tpl +++ b/Templates/Build/avaliable/greatworkshop.tpl @@ -1,11 +1,11 @@ -

    Great Workshop

    +

    高級攻城所

    - + + Hero's Mansion +

    英雄館

    In the great workshop siege engines like catapults and rams can be built, albeit at triple the cost of a standard unit. The higher its level the faster units are produced.在高級的攻城所可以訓練高級攻城器，儘管訓練一個是標準單位的三倍的成本。等級越高訓練速度越快。 Great Workshop -
    - +
    In the Hero's Mansion you can train a hero and starting with building level 10 occupy oases in your surrounding area.在英雄館，你可以培養英雄，並在10級時開始建設佔據在你周邊地區的綠洲。 Hero's Mansion diff --git a/Templates/Build/avaliable/horsedrinking.tpl b/Templates/Build/avaliable/horsedrinking.tpl index 8afcc078..b1a1a5f7 100644 --- a/Templates/Build/avaliable/horsedrinking.tpl +++ b/Templates/Build/avaliable/horsedrinking.tpl @@ -1,7 +1,7 @@ -

    Horse Drinking Trough

    +

    馬飲水槽

    - +
    The horse drinking trough cares for the well-being of your horses, lowers their crop consumption and makes their training faster.馬飲水槽關心福祉你的馬，降低了它們的作物消耗，並使他們的訓練速度更快。 Horse Drinking Trough diff --git a/Templates/Build/avaliable/ironfoundry.tpl b/Templates/Build/avaliable/ironfoundry.tpl index b8b3be52..78548c51 100644 --- a/Templates/Build/avaliable/ironfoundry.tpl +++ b/Templates/Build/avaliable/ironfoundry.tpl @@ -1,7 +1,7 @@ -

    Iron Foundry

    +

    鑄鐵廠

    - +
    Iron is melted here. Based on its level your Iron Foundry can increase your iron production up to 25 percent.鐵在這裡融化。根據其級別的鑄鐵廠可以增加你的鐵產量達25％。 Iron Foundry diff --git a/Templates/Build/avaliable/mainbuilding.tpl b/Templates/Build/avaliable/mainbuilding.tpl index d7d36a49..78325bbe 100644 --- a/Templates/Build/avaliable/mainbuilding.tpl +++ b/Templates/Build/avaliable/mainbuilding.tpl @@ -1,8 +1,8 @@ -

    Main Building

    +

    村莊大樓

    - +
    In the main building the village's master builders live. The higher its level the faster your master builders complete the construction of new buildings.村莊大樓里建築大師的居住地。等級越高速度越快的完成新建築的建設。 Main Building diff --git a/Templates/Build/avaliable/marketplace.tpl b/Templates/Build/avaliable/marketplace.tpl index 20511baf..6ce8852b 100644 --- a/Templates/Build/avaliable/marketplace.tpl +++ b/Templates/Build/avaliable/marketplace.tpl @@ -1,7 +1,7 @@ -

    Marketplace

    +

    市場

    - +
    At the marketplace you can trade resources with other players. The higher its level, the more resources can be transported at the same time.在市場上，你可以與其他玩家交易資源。在它的級別越高，更多的資源可以在同一時間進行運輸。 Marketplace diff --git a/Templates/Build/avaliable/palace.tpl b/Templates/Build/avaliable/palace.tpl index d63d7dbc..5a9e0b8c 100644 --- a/Templates/Build/avaliable/palace.tpl +++ b/Templates/Build/avaliable/palace.tpl @@ -1,7 +1,7 @@ -

    Palace

    +

    宮殿

    - +
    The king or queen of the empire lives in the palace. Only one palace can exist in your realm at a time. You need a palace in order to proclaim a village to be your capital.帝國的國王或女王所住之地。只有一個皇宮可以在你的國家存在。你是為了宣布一個村莊成為你的領地需要一個宮殿。 Palace diff --git a/Templates/Build/avaliable/palisade.tpl b/Templates/Build/avaliable/palisade.tpl index f5fd601b..615012eb 100644 --- a/Templates/Build/avaliable/palisade.tpl +++ b/Templates/Build/avaliable/palisade.tpl @@ -1,8 +1,8 @@ -

    Palisade

    +

    柵欄

    - + diff --git a/Templates/Build/avaliable/rallypoint.tpl b/Templates/Build/avaliable/rallypoint.tpl index 358d77c0..f14b5533 100644 --- a/Templates/Build/avaliable/rallypoint.tpl +++ b/Templates/Build/avaliable/rallypoint.tpl @@ -1,8 +1,9 @@ -

    Rally point

    +

    集結點

    By building a Palisade you can protect your village against the barbarian hordes of your enemies. A higher level Palisade will give your troops a higher defence bonus.通過建立柵欄，你可以保護你的村莊。在城柵欄級別越高，越提升防守的加成。
    - +
    Your village's troops meet here. From here you can send them out to conquer, raid or reinforce other villages. +你的部隊在這裡舉行會議。從這裡你可以命令他們去征服，增援或搶奪其他村莊。 Rally point diff --git a/Templates/Build/avaliable/residence.tpl b/Templates/Build/avaliable/residence.tpl index 83a6291b..80cf9f2a 100644 --- a/Templates/Build/avaliable/residence.tpl +++ b/Templates/Build/avaliable/residence.tpl @@ -1,7 +1,7 @@ -

    Residence

    +

    行宮

    - +
    The residence is a small palace, where the king or queen lives when (s)he visits the village. The residence protects the village against enemies who want to conquer it.該行宮是一個小宮殿，當他（她）參觀村莊國王或女王的生活。該行宮可防止誰想要征服此村。 Residence diff --git a/Templates/Build/avaliable/sawmill.tpl b/Templates/Build/avaliable/sawmill.tpl index 59caae63..e988fa3e 100644 --- a/Templates/Build/avaliable/sawmill.tpl +++ b/Templates/Build/avaliable/sawmill.tpl @@ -1,7 +1,7 @@ -

    Sawmill

    +

    鋸木廠

    - + ".U11."
    - \"Wood\"".$u11['wood']."| - \"Clay\"".$u11['clay']."| - \"Iron\"".$u11['iron']."| - \"Crop\"".$u11['crop']."| - \"Crop6| + \"木材\"".$u11['wood']."| + \"磚塊\"".$u11['clay']."| + \"鋼鐵\"".$u11['iron']."| + \"穀物\"".$u11['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u11['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -229,9 +229,9 @@ $output.=" ".U12."
    - \"Wood\"".$u12['wood']."| - \"Clay\"".$u12['clay']."| - \"Iron\"".$u12['iron']."| - \"Crop\"".$u12['crop']."| - \"Crop6| + \"木材\"".$u12['wood']."| + \"磚塊\"".$u12['clay']."| + \"鋼鐵\"".$u12['iron']."| + \"穀物\"".$u12['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u12['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -260,9 +260,9 @@ $output.=" ".U13."
    - \"Wood\"".$u13['wood']."| - \"Clay\"".$u13['clay']."| - \"Iron\"".$u13['iron']."| - \"Crop\"".$u13['crop']."| - \"Crop6| + \"木材\"".$u13['wood']."| + \"磚塊\"".$u13['clay']."| + \"鋼鐵\"".$u13['iron']."| + \"穀物\"".$u13['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u13['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -292,9 +292,9 @@ $output.=" ".U15."
    - \"Wood\"".$u15['wood']."| - \"Clay\"".$u15['clay']."| - \"Iron\"".$u15['iron']."| - \"Crop\"".$u15['crop']."| - \"Crop6| + \"木材\"".$u15['wood']."| + \"磚塊\"".$u15['clay']."| + \"鋼鐵\"".$u15['iron']."| + \"穀物\"".$u15['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u15['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -323,9 +323,9 @@ $output.=" ".U16."
    - \"Wood\"".$u16['wood']."| - \"Clay\"".$u16['clay']."| - \"Iron\"".$u16['iron']."| - \"Crop\"".$u16['crop']."| - \"Crop6| + \"木材\"".$u16['wood']."| + \"磚塊\"".$u16['clay']."| + \"鋼鐵\"".$u16['iron']."| + \"穀物\"".$u16['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u16['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -355,9 +355,9 @@ $output.=" ".U21."
    - \"Wood\"".$u21['wood']."| - \"Clay\"".$u21['clay']."| - \"Iron\"".$u21['iron']."| - \"Crop\"".$u21['crop']."| - \"Crop6| + \"木材\"".$u21['wood']."| + \"磚塊\"".$u21['clay']."| + \"鋼鐵\"".$u21['iron']."| + \"穀物\"".$u21['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u21['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -389,9 +389,9 @@ $output.=" ".U22."
    - \"Wood\"".$u22['wood']."| - \"Clay\"".$u22['clay']."| - \"Iron\"".$u22['iron']."| - \"Crop\"".$u22['crop']."| - \"Crop6| + \"木材\"".$u22['wood']."| + \"磚塊\"".$u22['clay']."| + \"鋼鐵\"".$u22['iron']."| + \"穀物\"".$u22['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u22['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -420,9 +420,9 @@ $output.=" ".U24."
    - \"Wood\"".$u24['wood']."| - \"Clay\"".$u24['clay']."| - \"Iron\"".$u24['iron']."| - \"Crop\"".$u24['crop']."| - \"Crop6| + \"木材\"".$u24['wood']."| + \"磚塊\"".$u24['clay']."| + \"鋼鐵\"".$u24['iron']."| + \"穀物\"".$u24['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u24['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -452,9 +452,9 @@ $output.=" ".U25."
    - \"Wood\"".$u25['wood']."| - \"Clay\"".$u25['clay']."| - \"Iron\"".$u25['iron']."| - \"Crop\"".$u25['crop']."| - \"Crop6| + \"木材\"".$u25['wood']."| + \"磚塊\"".$u25['clay']."| + \"鋼鐵\"".$u25['iron']."| + \"穀物\"".$u25['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u25['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -483,9 +483,9 @@ $output.=" ".U26."
    - \"Wood\"".$u26['wood']."| - \"Clay\"".$u26['clay']."| - \"Iron\"".$u26['iron']."| - \"Crop\"".$u26['crop']."| - \"Crop6| + \"木材\"".$u26['wood']."| + \"磚塊\"".$u26['clay']."| + \"鋼鐵\"".$u26['iron']."| + \"穀物\"".$u26['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u26['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -515,9 +515,9 @@ $output.="
    Here lumber delivered by your woodcutters is processed. Based on its level your Sawmill can increase your lumber production up to 25 percent.在這裡將木材交付樵夫處理。根據其級別的鋸木廠最高可以提高你的木材產量可達25％. Sawmill diff --git a/Templates/Build/avaliable/stable.tpl b/Templates/Build/avaliable/stable.tpl index ce09e40d..0593023f 100644 --- a/Templates/Build/avaliable/stable.tpl +++ b/Templates/Build/avaliable/stable.tpl @@ -1,7 +1,7 @@ -

    Stable

    +

    馬廄

    - + "; + echo "\"Lumber\"".$send['wood']." | \"磚塊\"".$send['clay']." | \"鋼鐵\"".$send['iron']." | \"穀物\"".$send['crop'].""; echo "
    In the stable cavalry is trained. The higher its level the faster the troops are trained.在這裡訓練騎兵。等級越高訓練速度越快。 Stable diff --git a/Templates/Build/avaliable/stonemason.tpl b/Templates/Build/avaliable/stonemason.tpl index 869166a7..c78cba31 100644 --- a/Templates/Build/avaliable/stonemason.tpl +++ b/Templates/Build/avaliable/stonemason.tpl @@ -1,7 +1,7 @@ -

    Stonemason's Lodge

    +

    石匠的小屋

    - + diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl index 9b209eff..43b75ac7 100644 --- a/Templates/Build/17.tpl +++ b/Templates/Build/17.tpl @@ -250,7 +250,7 @@ echo "

    Merchants coming:

    "; } echo "at ".$datetime[1].""; echo ""; + echo "\"Lumber\"".$recieve['wood']." | \"磚塊\"".$recieve['clay']." | \"鋼鐵\"".$recieve['iron']." | \"穀物\"".$recieve['crop'].""; echo "
    The stonemason's lodge is an expert in cutting stone. The further the building is extended the higher the stability of the village's buildings.在石匠的小屋是切割石材的專家。進一步使村里的建築物有更高的穩定性。 Stonemason's Lodge diff --git a/Templates/Build/avaliable/townhall.tpl b/Templates/Build/avaliable/townhall.tpl index bd8aa48e..50707334 100644 --- a/Templates/Build/avaliable/townhall.tpl +++ b/Templates/Build/avaliable/townhall.tpl @@ -1,7 +1,7 @@ -

    Town Hall

    +

    市政廳

    - + "; echo ""; } echo " -"; +"; echo "
    In the Town Hall you can hold pompous celebrations. Such a celebration increases your culture points.在大會堂可以舉辦華麗的慶祝活動。這樣的慶祝活動會增加你的文化點。 Town Hall diff --git a/Templates/Build/avaliable/tradeoffice.tpl b/Templates/Build/avaliable/tradeoffice.tpl index bf12ad41..0e58271e 100644 --- a/Templates/Build/avaliable/tradeoffice.tpl +++ b/Templates/Build/avaliable/tradeoffice.tpl @@ -1,7 +1,7 @@ -

    Trade Office

    +

    貿易辦事處

    - + "; echo ""; } echo " -"; +"; echo "
    In the trade office the merchants' carts get improved and equipped with powerful horses. The higher its level the more your merchants are able to carry.在貿易辦公室商人的車得到改善，並配備了強大的馬匹。等級越高越多，你的商人速度越快。 Trade Office diff --git a/Templates/Build/avaliable/trapper.tpl b/Templates/Build/avaliable/trapper.tpl index 2d701668..3171bd88 100644 --- a/Templates/Build/avaliable/trapper.tpl +++ b/Templates/Build/avaliable/trapper.tpl @@ -1,7 +1,7 @@ -

    Trapper

    +

    陷阱

    - + "; } echo " -"; +"; echo "
    The Trapper protects your village with well hidden traps. Enemies can be imprisoned and won't be able to harm your village anymore. 陷阱保護您的村莊，隱藏的陷阱。敵人可以被監禁，將無法再傷害你的村莊。 Trapper diff --git a/Templates/Build/avaliable/treasury.tpl b/Templates/Build/avaliable/treasury.tpl index 0db89974..96ecb933 100644 --- a/Templates/Build/avaliable/treasury.tpl +++ b/Templates/Build/avaliable/treasury.tpl @@ -1,7 +1,8 @@ -

    Treasury

    +

    金庫

    - + "; } echo " -"; +"; echo "
    The riches of your empire are kept in the treasury. The treasury has room for one treasure. After you have captured an artefact it takes 24 hours to be effective. +你的帝國的財富保留在國庫。國庫可以放置一寶。如果捕獲的是假象它需要24小時是有效的。 Treasury diff --git a/Templates/Build/avaliable/tsquare.tpl b/Templates/Build/avaliable/tsquare.tpl index 243e6a6f..a99c2572 100644 --- a/Templates/Build/avaliable/tsquare.tpl +++ b/Templates/Build/avaliable/tsquare.tpl @@ -1,7 +1,7 @@ -

    Tournament Square

    +

    訓練場

    - + "; echo ""; } echo " -"; +"; echo "
    At the tournament square your troops can train to increase their stamina. The further the building is upgraded the faster your troops are beyond a minimum distance of squares.在訓練場你的部隊可以訓練，以提高他們的耐力。進一步的建築升級加快你的部隊超出廣場的最小距離。 Tournament Square diff --git a/Templates/Build/avaliable/warehouse.tpl b/Templates/Build/avaliable/warehouse.tpl index 3b5e4170..cf2cf047 100644 --- a/Templates/Build/avaliable/warehouse.tpl +++ b/Templates/Build/avaliable/warehouse.tpl @@ -1,8 +1,8 @@ -

    Warehouse

    +

    倉庫

    - +
    In your warehouse the resources lumber, clay and iron are stored. By increasing its level you increase your warehouse's capacity.在您的倉庫儲存資源木材，粘土，鐵。通過增加級別增加你的倉庫的容量。 Warehouse diff --git a/Templates/Build/avaliable/workshop.tpl b/Templates/Build/avaliable/workshop.tpl index fa67b832..6a02f9af 100644 --- a/Templates/Build/avaliable/workshop.tpl +++ b/Templates/Build/avaliable/workshop.tpl @@ -1,7 +1,7 @@ -

    Workshop

    +

    攻城所

    - + - +
    In the workshop siege engines like catapults and rams can be built. The higher its level the faster units are produced.在攻城所可以訓練攻城器。等級越高訓練速度越快。 Workshop diff --git a/Templates/Build/soon/academy.tpl b/Templates/Build/soon/academy.tpl index 8c461110..bf18584f 100644 --- a/Templates/Build/soon/academy.tpl +++ b/Templates/Build/soon/academy.tpl @@ -8,11 +8,11 @@
    Prerequisites先決條件
    - Barracks Level 3, Main Building Level 3 + 軍營 Level 3, 村莊大樓 Level 3
    \ No newline at end of file From 13985981893b5ae48901c16c577bd004176c049f Mon Sep 17 00:00:00 2001 From: Lorex Date: Sun, 7 Dec 2014 23:59:58 +0800 Subject: [PATCH 27/33] Translate "brewery.tpl" --- Templates/Build/avaliable/brewery.tpl | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Templates/Build/avaliable/brewery.tpl diff --git a/Templates/Build/avaliable/brewery.tpl b/Templates/Build/avaliable/brewery.tpl deleted file mode 100644 index f5b64d4f..00000000 --- a/Templates/Build/avaliable/brewery.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

    Brewery

    - - - - - - - - -
    In the Teuton’s brewery mead is brewed, the soldiers drink to give themselves Dutch courage before battle. The higher the level of the brewery, the greater is the attack bonus. The mead-festivals always last 72 hours. - - Brewery -
    \ No newline at end of file From c6f0655aec785392de24df10ddc731b0d0d23d03 Mon Sep 17 00:00:00 2001 From: Lorex Date: Mon, 8 Dec 2014 00:04:44 +0800 Subject: [PATCH 28/33] Translate "brewery.tpl" --- Templates/Build/avaliable/brewery.tpl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Templates/Build/avaliable/brewery.tpl diff --git a/Templates/Build/avaliable/brewery.tpl b/Templates/Build/avaliable/brewery.tpl new file mode 100644 index 00000000..d3c4e014 --- /dev/null +++ b/Templates/Build/avaliable/brewery.tpl @@ -0,0 +1,16 @@ +

    釀酒廠

    + + + + + + + + +
    在日耳曼啤酒公司，製作的釀造蜂蜜酒，戰鬥前使用可以給自己的軍隊勇氣。該釀酒廠的級別越高，攻擊加成越高。效果可持續72小時。 + + Brewery +
    \ No newline at end of file From f85ed094d66327b7dea2e4aa68db2632573a21b6 Mon Sep 17 00:00:00 2001 From: Inndy Date: Mon, 8 Dec 2014 15:41:59 +0800 Subject: [PATCH 29/33] Translate "residence" --- Templates/Anleitung/1.tpl | 4 ++-- Templates/Build/25.tpl | 2 +- Templates/Build/25_2.tpl | 2 +- Templates/Build/25_3.tpl | 2 +- Templates/Build/25_4.tpl | 2 +- Templates/Build/soon/palace.tpl | 2 +- Templates/Build/soon/residence.tpl | 2 +- Templates/Manual/110.tpl | 2 +- Templates/Manual/120.tpl | 2 +- Templates/Manual/130.tpl | 2 +- Templates/Manual/33.tpl | 2 +- Templates/Manual/425.tpl | 2 +- Templates/Manual/426.tpl | 2 +- Templates/Manual/67.tpl | 2 +- Templates/Plus/2.tpl | 2 +- Templates/a2b/attack_5.tpl | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Templates/Anleitung/1.tpl b/Templates/Anleitung/1.tpl index 0f269b86..6422f148 100644 --- a/Templates/Anleitung/1.tpl +++ b/Templates/Anleitung/1.tpl @@ -635,9 +635,9 @@ The Capital is the only place a stonemason's lodge can be erected. Also the capi
    - Embassy Level 1, Main Building Level 5, Residence

    + Embassy Level 1, Main Building Level 5, 行宮

    -

    Residence

    +

    行宮

    diff --git a/Templates/Build/25.tpl b/Templates/Build/25.tpl index bea7a005..9e281339 100644 --- a/Templates/Build/25.tpl +++ b/Templates/Build/25.tpl @@ -1,4 +1,4 @@ -
    - Embassy Level 1, Main Building Level 5, Residence + Embassy Level 1, Main Building Level 5, 行宮
    \ No newline at end of file diff --git a/Templates/Build/soon/residence.tpl b/Templates/Build/soon/residence.tpl index 4cfc16d3..e99b4956 100644 --- a/Templates/Build/soon/residence.tpl +++ b/Templates/Build/soon/residence.tpl @@ -1,4 +1,4 @@ -

    Residence

    +

    行宮

    diff --git a/Templates/Manual/110.tpl b/Templates/Manual/110.tpl index 9ef858e7..7bca4c44 100644 --- a/Templates/Manual/110.tpl +++ b/Templates/Manual/110.tpl @@ -41,7 +41,7 @@ Settler
    Settlers are brave and daring citizens who move out of the village after a long training session to found a new village in your honour.

    -As the journey and the founding of the new village are very difficult, three settlers are bound to stick together. They need a basis of 750 units per resource.
    Prerequisites
    Palace Level 10 or Residence Level 10
    +As the journey and the founding of the new village are very difficult, three settlers are bound to stick together. They need a basis of 750 units per resource.
    Prerequisites
    Palace Level 10 or 行宮 Level 10
    diff --git a/Templates/Manual/120.tpl b/Templates/Manual/120.tpl index 5877dd6a..abb518fe 100644 --- a/Templates/Manual/120.tpl +++ b/Templates/Manual/120.tpl @@ -41,7 +41,7 @@ Settler
    Settlers are brave and daring citizens who move out of the village after a long training session to found a new village in your honour.

    -As the journey and the founding of the new village are very difficult, three settlers are bound to stick together. They need a basis of 750 units per resource.
    Prerequisites
    Palace Level 10 or Residence Level 10
    +As the journey and the founding of the new village are very difficult, three settlers are bound to stick together. They need a basis of 750 units per resource.
    Prerequisites
    Palace Level 10 or 行宮 Level 10
    diff --git a/Templates/Manual/130.tpl b/Templates/Manual/130.tpl index 2b91445c..8e57677c 100644 --- a/Templates/Manual/130.tpl +++ b/Templates/Manual/130.tpl @@ -41,7 +41,7 @@ Settler
    Settlers are brave and daring citizens who move out of the village after a long training session to found a new village in your honour.

    -As the journey and the founding of the new village are very difficult, three settlers are bound to stick together. They need a basis of 750 units per resource.
    Prerequisites
    Palace Level 10 or Residence Level 10
    +As the journey and the founding of the new village are very difficult, three settlers are bound to stick together. They need a basis of 750 units per resource.
    Prerequisites
    Palace Level 10 or 行宮 Level 10
    diff --git a/Templates/Manual/33.tpl b/Templates/Manual/33.tpl index efc9b7a7..fa3609f5 100644 --- a/Templates/Manual/33.tpl +++ b/Templates/Manual/33.tpl @@ -1,4 +1,4 @@ -

    Buildings (Infrastructure)

    +

    Buildings (Infrastructure)

    diff --git a/Templates/Manual/425.tpl b/Templates/Manual/425.tpl index 0414fcdf..840c8e5e 100644 --- a/Templates/Manual/425.tpl +++ b/Templates/Manual/425.tpl @@ -1,4 +1,4 @@ -

    Residence

    ResidenceThe residence is a small palace where the King or Queen lives when he or she visits the village. The residence protects the village against enemies who want to conquer it.

    Costs and construction time for level 1:
    Lumber580 | Clay460 | Iron350 | Crop180 | Crop consumption1 | duration0:33:20

    +

    行宮

    ResidenceThe residence is a small palace where the King or Queen lives when he or she visits the village. The residence protects the village against enemies who want to conquer it.

    Costs and construction time for level 1:
    Lumber580 | Clay460 | Iron350 | Crop180 | Crop consumption1 | duration0:33:20

    Prerequisites
    Main Building Level 5, Palace

    diff --git a/Templates/Manual/426.tpl b/Templates/Manual/426.tpl index 16fd12fd..0d87deb9 100644 --- a/Templates/Manual/426.tpl +++ b/Templates/Manual/426.tpl @@ -1,7 +1,7 @@

    Palace

    PalaceThe King or Queen of the empire lives in the palace. Only one palace can exist in your realm at a time. You need a palace in order to proclaim a village to be your capital.

    The capital can not be conquered. Additionally, the capital is the only place where resource fields can only be extended beyond level 10 and the only place where the stonemason's lodge can be built.

    Costs and construction time for level 1:
    Lumber550 | Clay800 | Iron750 | Crop250 | Crop consumption1 | duration1:23:20

    -

    Prerequisites
    Embassy Level 1, Main Building Level 5, Residence

    +

    Prerequisites
    Embassy Level 1, Main Building Level 5, 行宮

    diff --git a/Templates/Manual/67.tpl b/Templates/Manual/67.tpl index 41740273..43acb64b 100644 --- a/Templates/Manual/67.tpl +++ b/Templates/Manual/67.tpl @@ -6,6 +6,6 @@

    Complete construction orders & research immediately.

    In the current village all construction orders and research in the academy as well as the blacksmith and armoury will be completed immediately.

    -However, the buildings Residence and Palace and villages with a wonder of the world inside them are excluded.
    +However, the buildings行宮 and Palace and villages with a wonder of the world inside them are excluded.

    This feature is NOT included in the gold club! \ No newline at end of file diff --git a/Templates/Plus/2.tpl b/Templates/Plus/2.tpl index 38dac554..3ad33c54 100644 --- a/Templates/Plus/2.tpl +++ b/Templates/Plus/2.tpl @@ -198,7 +198,7 @@ The bonus will not be added to the single resource fields but to the sum of the     diff --git a/Templates/a2b/attack_5.tpl b/Templates/a2b/attack_5.tpl index 034b37d2..2d122288 100644 --- a/Templates/a2b/attack_5.tpl +++ b/Templates/a2b/attack_5.tpl @@ -223,7 +223,7 @@ $actionType = "Raid"; - + @@ -277,7 +277,7 @@ $actionType = "Raid"; - + From 5db13a24a12ab9f0854d55efdc5fcd3db643f6d3 Mon Sep 17 00:00:00 2001 From: Inndy Date: Mon, 8 Dec 2014 15:43:10 +0800 Subject: [PATCH 30/33] Translate "Train" --- Templates/Build/25_menu.tpl | 2 +- Templates/Build/26_menu.tpl | 2 +- Templates/Build/37_train.tpl | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Templates/Build/25_menu.tpl b/Templates/Build/25_menu.tpl index c1b2e141..1b5f8a0f 100644 --- a/Templates/Build/25_menu.tpl +++ b/Templates/Build/25_menu.tpl @@ -1,6 +1,6 @@
    - >Train + >訓練 | >Culture points | >Loyalty | >Expansion diff --git a/Templates/Build/26_menu.tpl b/Templates/Build/26_menu.tpl index c1b2e141..1b5f8a0f 100644 --- a/Templates/Build/26_menu.tpl +++ b/Templates/Build/26_menu.tpl @@ -1,6 +1,6 @@
    - >Train + >訓練 | >Culture points | >Loyalty | >Expansion diff --git a/Templates/Build/37_train.tpl b/Templates/Build/37_train.tpl index 1e79639e..eb02d5b5 100644 --- a/Templates/Build/37_train.tpl +++ b/Templates/Build/37_train.tpl @@ -69,7 +69,7 @@ if($session->tribe == 1) { $output.="Not enough resources"; elseif($units['u1'] == 0) $output.="Not available units"; - else $output.="Train"; + else $output.="訓練"; $output.=" @@ -103,7 +103,7 @@ if($session->tribe == 1) { elseif($units['u2'] == 0) $output.="Not available units"; else - $output.="Train"; + $output.="訓練"; $output.="
    "; @@ -137,7 +137,7 @@ if($session->tribe == 1) { }else if($units['u3'] == 0){ $output.="Not available units"; }else { - $output.="Train"; + $output.="訓練"; } " " ; @@ -168,7 +168,7 @@ if($session->tribe == 1) { }else if($units['u5'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -199,7 +199,7 @@ if($session->tribe == 1) { }else if($units['u6'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=" @@ -233,7 +233,7 @@ $output.=" }else if($units['u11'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -264,7 +264,7 @@ $output.=" }else if($units['u12'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -296,7 +296,7 @@ $output.=" }else if($units['u13'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -327,7 +327,7 @@ $output.=" }else if($units['u15'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -359,7 +359,7 @@ $output.=" }else if($units['u16'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -393,7 +393,7 @@ $output.=" }else if($units['u21'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -424,7 +424,7 @@ $output.=" }else if($units['u22'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -456,7 +456,7 @@ $output.=" }else if($units['u24'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -487,7 +487,7 @@ $output.=" }else if($units['u25'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; @@ -519,7 +519,7 @@ $output.=" }else if($units['u26'] == 0){ $output.= "Not available units"; }else { - $output.= "Train"; + $output.= "訓練"; } $output.=""; From 8c0b4ad6a30e9bf91c27338427859106a203519b Mon Sep 17 00:00:00 2001 From: Inndy Date: Mon, 8 Dec 2014 18:36:25 +0800 Subject: [PATCH 31/33] Translate "Warehouse" --- Admin/Templates/village.tpl | 2 +- Templates/Anleitung/1.tpl | 2 +- Templates/Build/soon/marketplace.tpl | 2 +- Templates/Manual/31.tpl | 2 +- Templates/Manual/417.tpl | 2 +- Templates/a2b/attack_5.tpl | 4 ++-- Templates/dorf3/3.tpl | 2 +- Templates/dorf3/menu.tpl | 2 +- Templates/dorf3/noplus.tpl | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index dfcc93b7..a664ba74 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -156,7 +156,7 @@ if(isset($id)) - + diff --git a/Templates/Anleitung/1.tpl b/Templates/Anleitung/1.tpl index 6422f148..114150ee 100644 --- a/Templates/Anleitung/1.tpl +++ b/Templates/Anleitung/1.tpl @@ -59,7 +59,7 @@ Romans: Can build/extend a resource field and a village building at the same tim none

    -

    Warehouse

    +

    倉庫

    diff --git a/Templates/Build/soon/marketplace.tpl b/Templates/Build/soon/marketplace.tpl index 4a5de8bb..d8c4381d 100644 --- a/Templates/Build/soon/marketplace.tpl +++ b/Templates/Build/soon/marketplace.tpl @@ -12,7 +12,7 @@
    The residence is a small palace, where the king or queen lives when (s)he visits the village. The residence protects the village against enemies who want to conquer it.Complete construction orders & research immediately. In the current village all construction orders and research in the academy as well as the blacksmith and armoury will be completed immediately.

    -However, the buildings Residence and Palace and villages with a wonder of the world inside them are excluded. +However, the buildings行宮 and Palace and villages with a wonder of the world inside them are excluded.

    This feature is NOT included in the gold club!
    ResourceWarehouse倉庫 Production
    - Main Building Level 3, Warehouse Level 1, Granary Level 1 + Main Building Level 3, 倉庫 Level 1, Granary Level 1
    \ No newline at end of file diff --git a/Templates/Manual/31.tpl b/Templates/Manual/31.tpl index 1fa5e047..3908c2b3 100644 --- a/Templates/Manual/31.tpl +++ b/Templates/Manual/31.tpl @@ -1,4 +1,4 @@ -

    Buildings (Resources)

    +

    Buildings (Resources)

    diff --git a/Templates/Manual/417.tpl b/Templates/Manual/417.tpl index ba763c36..d363141f 100644 --- a/Templates/Manual/417.tpl +++ b/Templates/Manual/417.tpl @@ -1,5 +1,5 @@

    Marketplace

    MarketplaceAt the marketplace you can trade resources with other players. The higher its level, the more resources can be transported at the same time.

    Costs and construction time for level 1:
    Lumber80 | Clay70 | Iron120 | Crop70 | Crop consumption4 | duration0:30:00

    -

    Prerequisites
    Main Building Level 3, Warehouse Level 1, Granary Level 1

    +

    Prerequisites
    Main Building Level 3, 倉庫 Level 1, Granary Level 1

    diff --git a/Templates/a2b/attack_5.tpl b/Templates/a2b/attack_5.tpl index 2d122288..7673c75a 100644 --- a/Templates/a2b/attack_5.tpl +++ b/Templates/a2b/attack_5.tpl @@ -216,7 +216,7 @@ $actionType = "Raid"; getTypeLevel(16) >= 3) { ?> - + getTypeLevel(16) >= 10) { ?> @@ -270,7 +270,7 @@ $actionType = "Raid"; getTypeLevel(16) >= 3) { ?> - + getTypeLevel(16) >= 10) { ?> diff --git a/Templates/dorf3/3.tpl b/Templates/dorf3/3.tpl index 6b5abe1d..84ab3ca8 100644 --- a/Templates/dorf3/3.tpl +++ b/Templates/dorf3/3.tpl @@ -2,7 +2,7 @@ include('menu.tpl'); ?> - + diff --git a/Templates/dorf3/menu.tpl b/Templates/dorf3/menu.tpl index f81e91f5..a64fe496 100644 --- a/Templates/dorf3/menu.tpl +++ b/Templates/dorf3/menu.tpl @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/Templates/dorf3/noplus.tpl b/Templates/dorf3/noplus.tpl index debf26da..434f398b 100644 --- a/Templates/dorf3/noplus.tpl +++ b/Templates/dorf3/noplus.tpl @@ -1,7 +1,7 @@
    Overview | Resources - | Warehouse + | 倉庫 | CP | Troops
    From 889f66b288c6ad7f4c8d0a9fb88d6f163e71f1fb Mon Sep 17 00:00:00 2001 From: Inndy Date: Mon, 8 Dec 2014 18:36:55 +0800 Subject: [PATCH 32/33] Translate "Troops" --- Admin/Templates/report/0.tpl | 12 ++++++------ Admin/Templates/report/1.tpl | 12 ++++++------ Admin/Templates/report/2.tpl | 12 ++++++------ Templates/Anleitung/3.tpl | 2 +- Templates/Notice/0.tpl | 12 ++++++------ Templates/Notice/0x.tpl | 12 ++++++------ Templates/Notice/1.tpl | 12 ++++++------ Templates/Notice/15.tpl | 2 +- Templates/Notice/16.tpl | 2 +- Templates/Notice/17.tpl | 2 +- Templates/Notice/18.tpl | 12 ++++++------ Templates/Notice/18x.tpl | 12 ++++++------ Templates/Notice/19.tpl | 12 ++++++------ Templates/Notice/19x.tpl | 12 ++++++------ Templates/Notice/1x.tpl | 12 ++++++------ Templates/Notice/2.tpl | 12 ++++++------ Templates/Notice/20.tpl | 12 ++++++------ Templates/Notice/20x.tpl | 12 ++++++------ Templates/Notice/21.tpl | 12 ++++++------ Templates/Notice/21x.tpl | 12 ++++++------ Templates/Notice/22.tpl | 2 +- Templates/Notice/2x.tpl | 12 ++++++------ Templates/Notice/3.tpl | 12 ++++++------ Templates/Notice/3x.tpl | 12 ++++++------ Templates/Notice/4.tpl | 12 ++++++------ Templates/Notice/4x.tpl | 12 ++++++------ Templates/Notice/5.tpl | 12 ++++++------ Templates/Notice/5x.tpl | 12 ++++++------ Templates/Notice/6.tpl | 12 ++++++------ Templates/Notice/6x.tpl | 12 ++++++------ Templates/Notice/7.tpl | 16 ++++++++-------- Templates/Notice/7x.tpl | 16 ++++++++-------- Templates/Notice/8.tpl | 2 +- Templates/a2b/attack_5.tpl | 2 +- Templates/a2b/newdorf.tpl | 2 +- Templates/dorf3/1.tpl | 2 +- Templates/dorf3/4.tpl | 2 +- Templates/dorf3/menu.tpl | 2 +- Templates/dorf3/noplus.tpl | 4 ++-- Templates/goldClub/farmlist.tpl | 2 +- 40 files changed, 180 insertions(+), 180 deletions(-) diff --git a/Admin/Templates/report/0.tpl b/Admin/Templates/report/0.tpl index 7e21b3de..2e30e33b 100644 --- a/Admin/Templates/report/0.tpl +++ b/Admin/Templates/report/0.tpl @@ -37,7 +37,7 @@ error_reporting(0); { echo ""; } - echo ""; + echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) @@ -149,7 +149,7 @@ error_reporting(0); { echo ""; } - echo ""; + echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) @@ -196,7 +196,7 @@ error_reporting(0); { echo ""; } - echo ""; + echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) @@ -243,7 +243,7 @@ error_reporting(0); { echo ""; } - echo ""; + echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) @@ -290,7 +290,7 @@ error_reporting(0); { echo ""; } - echo ""; + echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) @@ -337,7 +337,7 @@ error_reporting(0); { echo ""; } - echo ""; + echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) diff --git a/Admin/Templates/report/1.tpl b/Admin/Templates/report/1.tpl index 837f1a46..3e600f87 100644 --- a/Admin/Templates/report/1.tpl +++ b/Admin/Templates/report/1.tpl @@ -33,7 +33,7 @@ $start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -106,7 +106,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -145,7 +145,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -183,7 +183,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -222,7 +222,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Admin/Templates/report/2.tpl b/Admin/Templates/report/2.tpl index 88cf4962..858735da 100644 --- a/Admin/Templates/report/2.tpl +++ b/Admin/Templates/report/2.tpl @@ -37,7 +37,7 @@ $dataarray = explode(",",$rep['data']); { echo ""; } - echo ""; + echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) @@ -149,7 +149,7 @@ $dataarray = explode(",",$rep['data']); { echo ""; } - echo ""; + echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) @@ -196,7 +196,7 @@ $dataarray = explode(",",$rep['data']); { echo ""; } - echo ""; + echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) @@ -243,7 +243,7 @@ $dataarray = explode(",",$rep['data']); { echo ""; } - echo ""; + echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) @@ -290,7 +290,7 @@ $dataarray = explode(",",$rep['data']); { echo ""; } - echo ""; + echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) @@ -337,7 +337,7 @@ $dataarray = explode(",",$rep['data']); { echo ""; } - echo ""; + echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) diff --git a/Templates/Anleitung/3.tpl b/Templates/Anleitung/3.tpl index f7b10794..2a4019bb 100644 --- a/Templates/Anleitung/3.tpl +++ b/Templates/Anleitung/3.tpl @@ -37,7 +37,7 @@

    Help, my crop production sinks more and more!

    -

    At Production (e.g. 10) your crop production minus your use of crop because of population (e.g. 5) and Troops is shown. Your total crop production is shown in the upper right corner. e.g. use of crop 5/15 +

    At Production (e.g. 10) your crop production minus your use of crop because of population (e.g. 5) and 軍隊 is shown. Your total crop production is shown in the upper right corner. e.g. use of crop 5/15
    In the example 8 would be your use of crop, 15 your total crop production,
    15 - 8 = 7 units of crop per hour.

    diff --git a/Templates/Notice/0.tpl b/Templates/Notice/0.tpl index 105fb77e..ba268ea5 100644 --- a/Templates/Notice/0.tpl +++ b/Templates/Notice/0.tpl @@ -33,7 +33,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -104,7 +104,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -143,7 +143,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -181,7 +181,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -220,7 +220,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -259,7 +259,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/0x.tpl b/Templates/Notice/0x.tpl index d0073620..5cc68075 100644 --- a/Templates/Notice/0x.tpl +++ b/Templates/Notice/0x.tpl @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -107,7 +107,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -146,7 +146,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -184,7 +184,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -223,7 +223,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -262,7 +262,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/1.tpl b/Templates/Notice/1.tpl index 7e29d0c2..3c4ee4e1 100644 --- a/Templates/Notice/1.tpl +++ b/Templates/Notice/1.tpl @@ -64,7 +64,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -174,7 +174,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -223,7 +223,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -271,7 +271,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -317,7 +317,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -355,7 +355,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/15.tpl b/Templates/Notice/15.tpl index a2f1ef9d..c9282f1a 100644 --- a/Templates/Notice/15.tpl +++ b/Templates/Notice/15.tpl @@ -48,7 +48,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/16.tpl b/Templates/Notice/16.tpl index a2f1ef9d..c9282f1a 100644 --- a/Templates/Notice/16.tpl +++ b/Templates/Notice/16.tpl @@ -48,7 +48,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/17.tpl b/Templates/Notice/17.tpl index a2f1ef9d..c9282f1a 100644 --- a/Templates/Notice/17.tpl +++ b/Templates/Notice/17.tpl @@ -48,7 +48,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[24]) and $dataarray[24]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/18.tpl b/Templates/Notice/18.tpl index 04dd93d4..c6f1e575 100644 --- a/Templates/Notice/18.tpl +++ b/Templates/Notice/18.tpl @@ -64,7 +64,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -201,7 +201,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -249,7 +249,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,7 +295,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -334,7 +334,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/18x.tpl b/Templates/Notice/18x.tpl index 62b711e5..9b7da674 100644 --- a/Templates/Notice/18x.tpl +++ b/Templates/Notice/18x.tpl @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/19.tpl b/Templates/Notice/19.tpl index d5295bdc..a49cc363 100644 --- a/Templates/Notice/19.tpl +++ b/Templates/Notice/19.tpl @@ -64,7 +64,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -122,7 +122,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -161,7 +161,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -199,7 +199,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -238,7 +238,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -277,7 +277,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/19x.tpl b/Templates/Notice/19x.tpl index c300594e..c84b11b1 100644 --- a/Templates/Notice/19x.tpl +++ b/Templates/Notice/19x.tpl @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -94,7 +94,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -133,7 +133,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -171,7 +171,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -210,7 +210,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -249,7 +249,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/1x.tpl b/Templates/Notice/1x.tpl index f52d3533..bf325032 100644 --- a/Templates/Notice/1x.tpl +++ b/Templates/Notice/1x.tpl @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/2.tpl b/Templates/Notice/2.tpl index 33c6620a..e878531a 100644 --- a/Templates/Notice/2.tpl +++ b/Templates/Notice/2.tpl @@ -69,7 +69,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -179,7 +179,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -228,7 +228,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -276,7 +276,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -322,7 +322,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -360,7 +360,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/20.tpl b/Templates/Notice/20.tpl index 04dd93d4..c6f1e575 100644 --- a/Templates/Notice/20.tpl +++ b/Templates/Notice/20.tpl @@ -64,7 +64,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -201,7 +201,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -249,7 +249,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,7 +295,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -334,7 +334,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/20x.tpl b/Templates/Notice/20x.tpl index 62b711e5..9b7da674 100644 --- a/Templates/Notice/20x.tpl +++ b/Templates/Notice/20x.tpl @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/21.tpl b/Templates/Notice/21.tpl index 04dd93d4..c6f1e575 100644 --- a/Templates/Notice/21.tpl +++ b/Templates/Notice/21.tpl @@ -64,7 +64,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -201,7 +201,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -249,7 +249,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[150]) and $dataarray[150]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -295,7 +295,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -334,7 +334,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/21x.tpl b/Templates/Notice/21x.tpl index 62b711e5..9b7da674 100644 --- a/Templates/Notice/21x.tpl +++ b/Templates/Notice/21x.tpl @@ -36,7 +36,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -121,7 +121,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -160,7 +160,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -198,7 +198,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -237,7 +237,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -276,7 +276,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/22.tpl b/Templates/Notice/22.tpl index 975c6258..3d491731 100644 --- a/Templates/Notice/22.tpl +++ b/Templates/Notice/22.tpl @@ -55,7 +55,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[14]) and $dataarray[14]!=0){ echo ""; } -echo ""; +echo ""; for($i=4;$i<=13;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/2x.tpl b/Templates/Notice/2x.tpl index f52d3533..bf325032 100644 --- a/Templates/Notice/2x.tpl +++ b/Templates/Notice/2x.tpl @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/3.tpl b/Templates/Notice/3.tpl index 18df12d0..bbcf2558 100644 --- a/Templates/Notice/3.tpl +++ b/Templates/Notice/3.tpl @@ -68,7 +68,7 @@ for($i=$start;$i<=($start+9);$i++) { if(isset($dataarray[151]) and $dataarray[151]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -166,7 +166,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -205,7 +205,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -243,7 +243,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -282,7 +282,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -321,7 +321,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == "?") { echo ""; diff --git a/Templates/Notice/3x.tpl b/Templates/Notice/3x.tpl index eeaff2fa..c7a6b22c 100644 --- a/Templates/Notice/3x.tpl +++ b/Templates/Notice/3x.tpl @@ -46,7 +46,7 @@ for($i=$start;$i<=($start+9);$i++) { if ($dataarray[151]!="" and $dataarray[151]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -110,7 +110,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -149,7 +149,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -187,7 +187,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -226,7 +226,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == "?") { echo ""; @@ -265,7 +265,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == "?") { echo ""; diff --git a/Templates/Notice/4.tpl b/Templates/Notice/4.tpl index 87bac250..bba7f408 100644 --- a/Templates/Notice/4.tpl +++ b/Templates/Notice/4.tpl @@ -69,7 +69,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -185,7 +185,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -234,7 +234,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -282,7 +282,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -367,7 +367,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/4x.tpl b/Templates/Notice/4x.tpl index f52d3533..bf325032 100644 --- a/Templates/Notice/4x.tpl +++ b/Templates/Notice/4x.tpl @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/5.tpl b/Templates/Notice/5.tpl index 87bac250..bba7f408 100644 --- a/Templates/Notice/5.tpl +++ b/Templates/Notice/5.tpl @@ -69,7 +69,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -185,7 +185,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -234,7 +234,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -282,7 +282,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -367,7 +367,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/5x.tpl b/Templates/Notice/5x.tpl index f52d3533..bf325032 100644 --- a/Templates/Notice/5x.tpl +++ b/Templates/Notice/5x.tpl @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/6.tpl b/Templates/Notice/6.tpl index e15df8ab..f525480a 100644 --- a/Templates/Notice/6.tpl +++ b/Templates/Notice/6.tpl @@ -69,7 +69,7 @@ if(isset($dataarray[147]) and $dataarray[147]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -179,7 +179,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -228,7 +228,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -276,7 +276,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -322,7 +322,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -361,7 +361,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/6x.tpl b/Templates/Notice/6x.tpl index f52d3533..bf325032 100644 --- a/Templates/Notice/6x.tpl +++ b/Templates/Notice/6x.tpl @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -152,7 +152,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -207,7 +207,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -316,7 +316,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '4' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -371,7 +371,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '5' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/7.tpl b/Templates/Notice/7.tpl index 1f291a62..03a9ab30 100644 --- a/Templates/Notice/7.tpl +++ b/Templates/Notice/7.tpl @@ -67,7 +67,7 @@ for($i=$start;$i<=($start+9);$i++) { if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -184,7 +184,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '1' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -233,7 +233,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '2' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -281,7 +281,7 @@ for($i=$start;$i<=($start+9);$i++) { if($targettribe == '3' and isset($dataarray[149]) and $dataarray[149]!=0){ echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -328,7 +328,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -367,7 +367,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -407,7 +407,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -446,7 +446,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/7x.tpl b/Templates/Notice/7x.tpl index a8c5c117..59afd3eb 100644 --- a/Templates/Notice/7x.tpl +++ b/Templates/Notice/7x.tpl @@ -43,7 +43,7 @@ if (isset($dataarray[147]) and $dataarray[147] != 0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<=12;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -144,7 +144,7 @@ $start=1; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=35;$i<=44;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -183,7 +183,7 @@ $start=11;?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=56;$i<=65;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -221,7 +221,7 @@ $start=21; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=77;$i<=86;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -261,7 +261,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -300,7 +300,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=129;$i<=138;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -340,7 +340,7 @@ $start=31; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=98;$i<=107;$i++) { if($dataarray[$i] == 0) { echo ""; @@ -379,7 +379,7 @@ $start=41; ?> for($i=$start;$i<=($start+9);$i++) { echo ""; } -echo ""; +echo ""; for($i=119;$i<=128;$i++) { if($dataarray[$i] == 0) { echo ""; diff --git a/Templates/Notice/8.tpl b/Templates/Notice/8.tpl index df35719b..f6252ef9 100644 --- a/Templates/Notice/8.tpl +++ b/Templates/Notice/8.tpl @@ -44,7 +44,7 @@ for($i=$start;$i<=($start+9);$i++) { if($dataarray[13]!=0){ echo ""; } -echo ""; +echo ""; for($i=3;$i<13;$i++) { $unitarray['u'.($i-3+$start).''] = $dataarray[$i]; if($dataarray[$i] == 0) { diff --git a/Templates/a2b/attack_5.tpl b/Templates/a2b/attack_5.tpl index 7673c75a..55fcb5d2 100644 --- a/Templates/a2b/attack_5.tpl +++ b/Templates/a2b/attack_5.tpl @@ -153,7 +153,7 @@ $actionType = "Raid"; - + diff --git a/Templates/a2b/newdorf.tpl b/Templates/a2b/newdorf.tpl index 07be455a..8ef62637 100644 --- a/Templates/a2b/newdorf.tpl +++ b/Templates/a2b/newdorf.tpl @@ -56,7 +56,7 @@ echo ''; } ?> - + 0"; } ?> diff --git a/Templates/dorf3/1.tpl b/Templates/dorf3/1.tpl index 42d4ac9a..671cdfbb 100644 --- a/Templates/dorf3/1.tpl +++ b/Templates/dorf3/1.tpl @@ -4,7 +4,7 @@
    Warehouse
    倉庫
    Village Wood Clay
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊0
    Troops
    軍隊0
    Troops
    軍隊0
    Troops
    軍隊0
    Troops
    軍隊0
    Troops
    軍隊0
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊
    Troops
    軍隊getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊?\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0\"Hero\"
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
    Troops
    軍隊0
    Troops
    軍隊
    Troops軍隊 0"; }else{ echo ">".$process['t1'];} ?>
    Troops軍隊
    - + - +">Resources | 倉庫 | CP - | Troops + | 軍隊 \ No newline at end of file diff --git a/Templates/dorf3/noplus.tpl b/Templates/dorf3/noplus.tpl index 434f398b..a22fe536 100644 --- a/Templates/dorf3/noplus.tpl +++ b/Templates/dorf3/noplus.tpl @@ -3,7 +3,7 @@ | Resources | 倉庫 | CP - | Troops + | 軍隊
    Overview
    VillageAttacksBuildingTroopsMerchants
    VillageAttacksBuilding軍隊Merchants
    Culture points
    VillageCP/dayCelebrationsTroopsSlots
    VillageCP/dayCelebrations軍隊Slots
    @@ -13,7 +13,7 @@ - + , 'village');">Village - + From 96428f8297fe1a3287cd0f5853a221f785c88242 Mon Sep 17 00:00:00 2001 From: Inndy Date: Mon, 8 Dec 2014 18:51:58 +0800 Subject: [PATCH 33/33] Translate resource name --- GameEngine/Automation.php | 6 +- Templates/Ajax/quest_core.tpl | 160 +++++++++++------------ Templates/Ajax/quest_core25.tpl | 144 ++++++++++----------- Templates/Build/12_upgrades.tpl | 2 +- Templates/Build/13_upgrades.tpl | 2 +- Templates/Build/16.tpl | 12 +- Templates/Build/16_incomming.tpl | 2 +- Templates/Build/17.tpl | 4 +- Templates/Build/17_1.tpl | 16 +-- Templates/Build/17_2.tpl | 18 +-- Templates/Build/19_train.tpl | 4 +- Templates/Build/20_1.tpl | 4 +- Templates/Build/20_2.tpl | 2 +- Templates/Build/20_3.tpl | 2 +- Templates/Build/20_4.tpl | 2 +- Templates/Build/20_5.tpl | 2 +- Templates/Build/21.tpl | 2 +- Templates/Build/22_1.tpl | 2 +- Templates/Build/22_2.tpl | 2 +- Templates/Build/22_3.tpl | 2 +- Templates/Build/22_4.tpl | 2 +- Templates/Build/22_5.tpl | 2 +- Templates/Build/24_1.tpl | 4 +- Templates/Build/25_create.tpl | 2 +- Templates/Build/25_train.tpl | 2 +- Templates/Build/26_create.tpl | 2 +- Templates/Build/26_train.tpl | 2 +- Templates/Build/29_train.tpl | 2 +- Templates/Build/30_train.tpl | 2 +- Templates/Build/37_train.tpl | 210 +++++++++++++++---------------- Templates/Build/42_train.tpl | 2 +- 31 files changed, 311 insertions(+), 311 deletions(-) diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index cc60a038..2e7761af 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -2531,9 +2531,9 @@ private function sendunitsComplete() { if($scout){ if ($data['spy'] == 1){ $info_spy = "".$spy_pic.",
    \"Lumber\"".round($totwood)." | - \"Clay\"".round($totclay)." | - \"Iron\"".round($totiron)." | - \"Crop\"".round($totcrop)."
    + \"磚塊\"".round($totclay)." | + \"鋼鐵\"".round($totiron)." | + \"穀物\"".round($totcrop)."
    \"carry\"Total Resources : ".round($totwood+$totclay+$totiron+$totcrop)."
    "; }else if($data['spy'] == 2){ diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl index 4dcf2802..9df920ff 100644 --- a/Templates/Ajax/quest_core.tpl +++ b/Templates/Ajax/quest_core.tpl @@ -458,7 +458,7 @@ $vName=$village->vname; if ($vName==$session->userinfo['username']."'s village"){?> {"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/p>\"Lumber\"30  \"Clay\"60  \"Iron\"30  \"Crop\"20  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":3,"reward":{"wood":30,"clay":60,"iron":30,"crop":20},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/p>\"Lumber\"30  \"磚塊\"60  \"鋼鐵\"30  \"穀物\"20  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":3,"reward":{"wood":30,"clay":60,"iron":30,"crop":20},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} searchRank($displayarray['username'],"username"); if ($rRes!=$rSubmited){?> {"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/div>
    \"\/>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-4,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/p>\"Lumber\"40  \"Clay\"30  \"Iron\"20  \"Crop\"30  <\/div>
    <\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/p>\"Lumber\"40  \"磚塊\"30  \"鋼鐵\"20  \"穀物\"30  <\/div>
    <\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} {"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-5,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/p>\"Lumber\"50  \"Clay\"60  \"Iron\"30  \"Crop\"30  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":5,"reward":{"wood":50,"clay":60,"iron":30,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"<\/h1>
    ””<\/i>

    <\/p>\"Lumber\"50  \"磚塊\"60  \"鋼鐵\"30  \"穀物\"30  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":5,"reward":{"wood":50,"clay":60,"iron":30,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} 0){$cropL++;};if($tRes['f8']>0){$cropL++;};if($tRes['f9']>0){$cro if ($ironL<2 || $clayL<2 || $woodL<2 || $cropL<2){?> {"markup":"\n\t\t

    \"\"q;?><\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-7,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””\r\n

    \r\n<\/i>

    <\/p>\"Lumber\"75  \"Clay\"80  \"Iron\"30  \"Crop\"50  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":7,"reward":{"wood":75,"clay":80,"iron":30,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””\r\n

    \r\n<\/i>

    <\/p>\"Lumber\"75  \"磚塊\"80  \"鋼鐵\"30  \"穀物\"50  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":7,"reward":{"wood":75,"clay":80,"iron":30,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    \"Crop\"200 \" \/>

    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-8,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    \"穀物\"200 \" \/>

    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-8,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} 0){$cropL++;};if($tRes['f8']>0){$cropL++;};if($tRes['f9']>0){$cro if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> {"markup":"\n\t\t

    \"\"q;?> <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-9,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ”.”<\/i>

    <\/p>\"Lumber\"75  \"Clay\"80  \"Iron\"30  \"Crop\"50  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":9,"reward":{"wood":75,"clay":80,"iron":30,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ”.”<\/i>

    <\/p>\"Lumber\"75  \"磚塊\"80  \"鋼鐵\"30  \"穀物\"50  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":9,"reward":{"wood":75,"clay":80,"iron":30,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getVillageField($nvillage,"name"); if ($x!=$ncoor['x'] or $y!=$ncoor['y']){?> {"markup":"\n\t\t

    \"\"


    ” . ”

    X Y \" onclick=\"qst_next2('1','coor',document.getElementById('qst_val_x').value,document.getElementById('qst_val_y').value)\">
    <\/span><\/div><\/div>\n\t\t
    <\/div>\n\t\t","number":-11,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -{"markup":"\n\t\t

    \"\" <\/h1>
    ” <\/b> ”<\/i>

    <\/p>\"Lumber\"60  \"Clay\"30  \"Iron\"40  \"Crop\"90  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":11,"reward":{"wood":60,"clay":30,"iron":40,"crop":90},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ” <\/b> ”<\/i>

    <\/p>\"Lumber\"60  \"磚塊\"30  \"鋼鐵\"40  \"穀物\"90  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":11,"reward":{"wood":60,"clay":30,"iron":40,"crop":90},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(23); if ($cranny == 0){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-12,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"150  \"Clay\"180  \"Iron\"30  \"Crop\"130  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":12,"reward":{"wood":150,"clay":180,"iron":30,"crop":130},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"150  \"磚塊\"180  \"鋼鐵\"30  \"穀物\"130  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":12,"reward":{"wood":150,"clay":180,"iron":30,"crop":130},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} 1){$cropL++;};if($tRes['f8']>1){$cropL++;};if($tRes['f9']>1){$cro if ($ironL<1 || $clayL<1 || $woodL<1 || $cropL<1){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-13","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"60  \"Clay\"50  \"Iron\"40  \"Crop\"30  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":13,"reward":{"wood":60,"clay":50,"iron":40,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"60  \"磚塊\"50  \"鋼鐵\"40  \"穀物\"30  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":13,"reward":{"wood":60,"clay":50,"iron":40,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} if ($lSubmited!=210){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    \"\/>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-14","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"50  \"Clay\"30  \"Iron\"60  \"Crop\"20  <\/div>
    <\/a><\/span><\/div>\n\t\t","number":14,"reward":{"wood":50,"clay":30,"iron":60,"crop":20},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"50  \"磚塊\"30  \"鋼鐵\"60  \"穀物\"20  <\/div>
    <\/a><\/span><\/div>\n\t\t","number":14,"reward":{"wood":50,"clay":30,"iron":60,"crop":20},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} getTypeLevel(15); if ($mainbuilding<3){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-15,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"75  \"Clay\"75  \"Iron\"40  \"Crop\"40  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":15,"reward":{"wood":75,"clay":75,"iron":40,"crop":40},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"75  \"磚塊\"75  \"鋼鐵\"40  \"穀物\"40  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":15,"reward":{"wood":75,"clay":75,"iron":40,"crop":40},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} searchRank($displayarray['username'],"username"); if ($rRes!=$rSubmited){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    \"\/>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-16","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"100  \"Clay\"90  \"Iron\"100  \"Crop\"60  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":16,"reward":{"wood":100,"clay":90,"iron":100,"crop":60},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"100  \"磚塊\"90  \"鋼鐵\"100  \"穀物\"60  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":16,"reward":{"wood":100,"clay":90,"iron":100,"crop":60},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} getTypeLevel(16); if ($rallypoint==0){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ”     <\/a> ”<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-18","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ” ”<\/i>

    <\/p>\"Lumber\"80  \"Clay\"90  \"Iron\"60  \"Crop\"40  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":18,"reward":{"wood":80,"clay":90,"iron":60,"crop":40},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ” ”<\/i>

    <\/p>\"Lumber\"80  \"磚塊\"90  \"鋼鐵\"60  \"穀物\"40  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":18,"reward":{"wood":80,"clay":90,"iron":60,"crop":40},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(19); if ($barrack==0){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-19","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"70  \"Clay\"100  \"Iron\"90  \"Crop\"100  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":19,"reward":{"wood":70,"clay":100,"iron":90,"crop":100},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"70  \"磚塊\"100  \"鋼鐵\"90  \"穀物\"100  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":19,"reward":{"wood":70,"clay":100,"iron":90,"crop":100},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} userinfo['tribe']]]<2){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ” userinfo['tribe']];?>.”<\/i>

    userinfo['tribe']];?>.<\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-20","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ”     <\/a> ”<\/i>

    <\/p>\"Lumber\"300  \"Clay\"320  \"Iron\"360  \"Crop\"570  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":20,"reward":{"wood":300,"clay":320,"iron":360,"crop":570},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ”     <\/a> ”<\/i>

    <\/p>\"Lumber\"300  \"磚塊\"320  \"鋼鐵\"360  \"穀物\"570  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":20,"reward":{"wood":300,"clay":320,"iron":360,"crop":570},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(11); if ($granary ==0){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-21","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"80  \"Clay\"90  \"Iron\"60  \"Crop\"40  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":21,"reward":{"wood":80,"clay":90,"iron":60,"crop":40},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"80  \"磚塊\"90  \"鋼鐵\"60  \"穀物\"40  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":21,"reward":{"wood":80,"clay":90,"iron":60,"crop":40},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(10); if ($warehouse==0){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””\r\n

    \r\n<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-22","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ”

    <\/p>\"Lumber\"70  \"Clay\"120  \"Iron\"90  \"Crop\"50  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":22,"reward":{"wood":70,"clay":120,"iron":90,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ”

    <\/p>\"Lumber\"70  \"磚塊\"120  \"鋼鐵\"90  \"穀物\"50  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":22,"reward":{"wood":70,"clay":120,"iron":90,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(17); if ($market==0){ ?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-23","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"200  \"Clay\"200  \"Iron\"700  \"Crop\"450  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":23,"reward":{"wood":200,"clay":200,"iron":700,"crop":450},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"200  \"磚塊\"200  \"鋼鐵\"700  \"穀物\"450  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":23,"reward":{"wood":200,"clay":200,"iron":700,"crop":450},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getAlliance($aid); if ($aid==0){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-28","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -{"markup":"\n\t\t

    \"\" <\/h1>
    ” <\/b>”<\/i>

    <\/p>\"Lumber\"240  \"Clay\"280  \"Iron\"180  \"Crop\"100  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":28,"reward":{"wood":240,"clay":280,"iron":180,"crop":100},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ” <\/b>”<\/i>

    <\/p>\"Lumber\"240  \"磚塊\"280  \"鋼鐵\"180  \"穀物\"100  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":28,"reward":{"wood":240,"clay":280,"iron":180,"crop":100},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(15); if ($mainbuilding < 5){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-29","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"600  \"Clay\"750  \"Iron\"600  \"Crop\"300  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":29,"reward":{"wood":600,"clay":750,"iron":600,"crop":300},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"600  \"磚塊\"750  \"鋼鐵\"600  \"穀物\"300  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":29,"reward":{"wood":600,"clay":750,"iron":600,"crop":300},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(11); if ($granary < 3){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ”.”<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-30","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"900  \"Clay\"850  \"Iron\"600  \"Crop\"300  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":30,"reward":{"wood":900,"clay":850,"iron":600,"crop":300},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"900  \"磚塊\"850  \"鋼鐵\"600  \"穀物\"300  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":30,"reward":{"wood":900,"clay":850,"iron":600,"crop":300},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} getTypeLevel(10); if ($warehouse < 7){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-31","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"1800  \"Clay\"2000  \"Iron\"1650  \"Crop\"800  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":31,"reward":{"wood":1800,"clay":2000,"iron":1650,"crop":800},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"1800  \"磚塊\"2000  \"鋼鐵\"1650  \"穀物\"800  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":31,"reward":{"wood":1800,"clay":2000,"iron":1650,"crop":800},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} 4){$cropL++;};if($tRes['f8']>4){$cropL++;};if($tRes['f9']>4){$cro if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-32","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"1600  \"Clay\"1800  \"Iron\"1950  \"Crop\"1200  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":32,"reward":{"wood":1600,"clay":1800,"iron":1950,"crop":1200},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"1600  \"磚塊\"1800  \"鋼鐵\"1950  \"穀物\"1200  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":32,"reward":{"wood":1600,"clay":1800,"iron":1950,"crop":1200},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-33","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ” ”<\/i>

    <\/p>\"Lumber\"3400  \"Clay\"2800  \"Iron\"3600  \"Crop\"2200  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":33,"reward":{"wood":3400,"clay":2800,"iron":3600,"crop":2200},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ” ”<\/i>

    <\/p>\"Lumber\"3400  \"磚塊\"2800  \"鋼鐵\"3600  \"穀物\"2200  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":33,"reward":{"wood":3400,"clay":2800,"iron":3600,"crop":2200},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} userinfo['tribe']]]<3){ $cp = CP;?> {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-34","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ” getProfileVillages($session->uid)); echo ${'cp'.$mode}[$total+1]; ?><\/b> ”<\/i>

    <\/p>\"Lumber\"1050  \"Clay\"800  \"Iron\"900  \"Crop\"750  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":34,"reward":{"wood":1050,"clay":800,"iron":900,"crop":750},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\" <\/h1>
    ” getProfileVillages($session->uid)); echo ${'cp'.$mode}[$total+1]; ?><\/b> ”<\/i>

    <\/p>\"Lumber\"1050  \"磚塊\"800  \"鋼鐵\"900  \"穀物\"750  <\/div>
    <\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":34,"reward":{"wood":1050,"clay":800,"iron":900,"crop":750},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} {"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-35","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\" <\/h1>
    ””<\/i>

    <\/p>\"Lumber\"1600  \"Clay\"2000  \"Iron\"1800  \"Crop\"1300  <\/div>
    <\/a><\/span><\/div>\n\t\t

    Village Attacks BuildingTroops軍隊 Merchants
    Pop DistanceTroops軍隊 LastRaid
    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":91,"reward":{"gold":15,"plus":1},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":91,"reward":{"gold":15,"plus":1},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} } elseif($_SESSION['qst']==91){ $time=time(); if ($_SESSION['qst_time']>= $time ){ ?> -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-92,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-92,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":92,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":92,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} @@ -826,9 +826,9 @@ if ($_SESSION['qst_time']>= $time ){ ?> } else if($_SESSION['qst']==92){ $time=time(); if ($_SESSION['qst_time']>= $time ){ ?> -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-93,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-93,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":93,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":93,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} = $time ){ ?> } else if($_SESSION['qst']==93){ $time=time(); if ($_SESSION['qst_time']>= $time ){ ?> -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} @@ -848,9 +848,9 @@ if ($_SESSION['qst_time']>= $time ){ ?> } else if($_SESSION['qst']==94){ $time=time(); if ($_SESSION['qst_time']>= $time ){ ?> -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":95,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} @@ -859,9 +859,9 @@ if ($_SESSION['qst_time']>= $time ){ ?> } else if($_SESSION['qst']==95){ $time=time(); if ($_SESSION['qst_time']>= $time ){ ?> -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-96,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":-96,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":96,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":96,"reward":{"wood":217,"clay":247,"iron":177,"crop":207},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} = $time ){ ?> } else if($_SESSION['qst']==96){ $time=time(); if ($_SESSION['qst_time']>= $time ){ ?> -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    \n\t\t","number":-24,"reward":{"gold":20,"plus":2},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    getTimeFormat($uArray['quest_time']-time());?>
    \n\t\t","number":-24,"reward":{"gold":20,"plus":2},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"Clay\"247  \"Iron\"177  \"Crop\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":24,"reward":{"gold":20,"plus":2},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} +{"markup":"\n\t\t

    \"\"


    1 Plus
    15 Gold
    		0:00:00
    2\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    3\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    4\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    5\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    6\"Lumber\"217  \"磚塊\"247  \"鋼鐵\"177  \"穀物\"207  getTimeFormat($skipp_time); ?>
    7 Plus
    20 Gold
    		getTimeFormat($skipp_time); ?>
    \n\t\t","number":24,"reward":{"gold":20,"plus":2},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} // End tasks message @@ -912,7 +912,7 @@ $cropL=$tRes['f2']+$tRes['f8']+$tRes['f9']+$tRes['f12']+$tRes['f13']+$tRes['f15' if ($cropL<1){?> {"markup":"\n\t\t

    \"\" Task 2: Crop<\/h1>
    ”Now your subjects are hungry from working all day. Extend a cropland to improve your subjects' supply. Come back here once the building is complete.”<\/i>

    Order:<\/p>Extend one cropland.<\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-2","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -{"markup":"\n\t\t

    \"\" Task 2: Crop<\/h1>
    ”Very good. Now your subjects have enough to eat again...”<\/i>

    Your reward:<\/p>\"Lumber\"50  \"Clay\"60  \"Iron\"30  \"Crop\"10  <\/div>
    Continue with the next task.<\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":2,"reward":{"plus":1},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} +{"markup":"\n\t\t

    \"\" Task 2: Crop<\/h1>
    ”Very good. Now your subjects have enough to eat again...”<\/i>

    Your reward:<\/p>\"Lumber\"50  \"磚塊\"60  \"鋼鐵\"30  \"穀物\"10  <\/div>
    Continue with the next task.<\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":2,"reward":{"plus":1},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} vname; if ($vName==$session->userinfo['username']."'s village"){?> {"markup":"\n\t\t

    \"\"Task 3: Your Village's Name<\/h1>
    ”Creative as you are you can grant your village the ultimate name.\r\n

    \r\nClick on 'profile' in the left hand menu and then select 'change profile'...”<\/i>

    Order:<\/p>Change your village's name to something nice.<\/div>
    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -{"markup":"\n\t\t

    \"\"Task 3: Your Village's Name<\/h1>
    ”Wow, a great name for their village. It could have been the name of my village!...”<\/i>

    Your reward:<\/p>\"Lumber\"30  \"Clay\"60  \"Iron\"30  \"Crop\"20  <\/div>
    Continue with the next task.<\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":3,"reward":{"wood":30,"clay":60,"iron":30,"crop":20},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} +{"markup":"\n\t\t

    \"\"Task 3: Your Village's Name<\/h1>
    ”Wow, a great name for their village. It could have been the name of my village!...”<\/i>

    Your reward:<\/p>\"Lumber\"30  \"磚塊\"60  \"鋼鐵\"30  \"穀物\"20  <\/div>
    Continue with the next task.<\/a><\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":3,"reward":{"wood":30,"clay":60,"iron":30,"crop":20},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} searchRank($displayarray['username'],"username"); if ($rRes!=$rSubmited){?> {"markup":"\n\t\t

    \"\" Task 4: Other Players<\/h1>
    ”In you play along with billions of other players. Click 'statistics' in the top menu to look up your rank and enter it here.”<\/i>

    Order:<\/p>Look for your rank in the statistics and enter it here.<\/div>

    <\/span><\/div>\n\t\t

    <\/div>\n\t\t","number":-4,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -{"markup":"\n\t\t

    \"\" Task 4: Other Players<\/h1>
    ”Exactly! That's your rank.”<\/i>

    Your reward:<\/p>\"Lumber\"40  \"Clay\"30  \"Iron\"20  \"Crop\"30  <\/div>
    Continue with the next task.<\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} +{"markup":"\n\t\t

    \"\" Task 4: Other Players<\/h1>
    ”Exactly! That's your rank.”<\/i>

    Your reward:<\/p>\"Lumber\"40  \"磚塊\"30  \"鋼鐵\"20  \"穀物\"30  <\/div>
    Continue with the next task.<\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} {"markup":"\n\t\t

    \"\" Task 5: Two Building Orders<\/h1>
    ”Build an iron mine and a clay pit. Of iron and clay one can never have enough.”<\/i>

    Order:<\/p>

    		".$enforce['hero']."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
    ".SEND_BACK."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"穀物\"".PER_HR."
    ".SEND_BACK."
    "; }else{ echo ""; echo ""; } echo " -"; +"; echo "
    @@ -112,7 +112,7 @@ echo $enforce['u'.$i]."".$enforce['hero']."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
    ".SEND_BACK."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"穀物\"".PER_HR."
    ".SEND_BACK."
    "; } } @@ -170,7 +170,7 @@ if($enforce['hero']!=0){ echo "    		".$enforce['hero']."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
    ".SEND_BACK."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"穀物\"".PER_HR."
    ".SEND_BACK."
    "; } } @@ -210,7 +210,7 @@ if($enforce['hero']!=0){ echo "    		".$enforce['hero']."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"Crop\"".PER_HR."
    ".SEND_BACK."
    ".UPKEEP."
    ".$technology->getUpkeep($enforce,$tribe)."\"穀物\"".PER_HR."
    ".SEND_BACK."
    "; } } @@ -247,7 +247,7 @@ echo $prisoners['t'.$i]."    		".$prisoners['t11']."
    ".UPKEEP."
    ".$technology->getUpkeep($prisoners,$tribe,0,1)."\"Crop\"".PER_HR."
    ".KILL."
    ".UPKEEP."
    ".$technology->getUpkeep($prisoners,$tribe,0,1)."\"穀物\"".PER_HR."
    ".KILL."
    "; } } @@ -285,7 +285,7 @@ echo $prisoners['t'.$i]."    		".$prisoners['t11']."
    \"Crop\"
    ".SEND_BACK."
    \"穀物\"
    ".SEND_BACK."
    "; } } diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl index a23c7906..ef17ead5 100644 --- a/Templates/Build/16_incomming.tpl +++ b/Templates/Build/16_incomming.tpl @@ -191,7 +191,7 @@ $to = $database->getMInfo($units[$y]['vref']);     		"> \"Lumber\"".$res['wood']."\"Clay\"".$res['clay']."\"Iron\"".$res['iron']."\"Crop\"".$res['crop'].""; + echo "
    \"Lumber\"".$res['wood']."\"磚塊\"".$res['clay']."\"鋼鐵\"".$res['iron']."\"穀物\"".$res['crop']."
    "; echo "
    \"carry\"".$totalres."/".$totalcarry."
    "; ?>
    Resource "; - echo "\"Lumber\"".$recieve['wood']." | \"Clay\"".$recieve['clay']." | \"Iron\"".$recieve['iron']." | \"Crop\"".$recieve['crop']."
    "; $timer +=1; } @@ -272,7 +272,7 @@ if(count($market->sending) > 0) { } echo "at ".$datetime[1].""; echo "
    Resource"; - echo "\"Lumber\"".$send['wood']." | \"Clay\"".$send['clay']." | \"Iron\"".$send['iron']." | \"Crop\"".$send['crop']."
    "; $timer += 1; } diff --git a/Templates/Build/17_1.tpl b/Templates/Build/17_1.tpl index 3fca79ac..e96a5068 100644 --- a/Templates/Build/17_1.tpl +++ b/Templates/Build/17_1.tpl @@ -73,18 +73,18 @@ if($market->onsale[$i]['wamt'] > $market->maxcarry) { } } switch($market->onsale[$i]['gtype']) { - case 1: echo "\"Wood\""; break; - case 2: echo "\"Clay\""; break; - case 3: echo "\"Iron\""; break; - case 4: echo "\"Crop\""; break; + case 1: echo "\"木材\""; break; + case 2: echo "\"磚塊\""; break; + case 3: echo "\"鋼鐵\""; break; + case 4: echo "\"穀物\""; break; } echo $market->onsale[$i]['gamt']; echo "    		 "; switch($market->onsale[$i]['wtype']) { - case 1: echo "\"Wood\""; break; - case 2: echo "\"Clay\""; break; - case 3: echo "\"Iron\""; break; - case 4: echo "\"Crop\""; break; + case 1: echo "\"木材\""; break; + case 2: echo "\"磚塊\""; break; + case 3: echo "\"鋼鐵\""; break; + case 4: echo "\"穀物\""; break; } echo $market->onsale[$i]['wamt']; echo "getVillageField($market->onsale[$i]['vref'],"name")."\">"; diff --git a/Templates/Build/17_2.tpl b/Templates/Build/17_2.tpl index 2d980294..01d3b8b9 100644 --- a/Templates/Build/17_2.tpl +++ b/Templates/Build/17_2.tpl @@ -48,7 +48,7 @@ Not enough resources

    "; + echo "

    資源數量不足

    "; } elseif(isset($_GET['e2'])) { @@ -83,10 +83,10 @@ if(count($market->onmarket) > 0) } switch($offer['gtype']) { - case 1: echo "\"Wood\""; break; - case 2: echo "\"Clay\""; break; - case 3: echo "\"Iron\""; break; - case 4: echo "\"Crop\""; break; + case 1: echo "\"木材\""; break; + case 2: echo "\"磚塊\""; break; + case 3: echo "\"鋼鐵\""; break; + case 4: echo "\"穀物\""; break; } echo $offer['gamt']; $sss = ($offer['wamt']/$offer['gamt']); @@ -101,10 +101,10 @@ if(count($market->onmarket) > 0) echo "    		 ".$ratio." "; switch($offer['wtype']) { - case 1: echo "\"Wood\""; break; - case 2: echo "\"Clay\""; break; - case 3: echo "\"Iron\""; break; - case 4: echo "\"Crop\""; break; + case 1: echo "\"木材\""; break; + case 2: echo "\"磚塊\""; break; + case 3: echo "\"鋼鐵\""; break; + case 4: echo "\"穀物\""; break; } echo $offer['wamt']; echo "".$offer['merchant']." "; diff --git a/Templates/Build/19_train.tpl b/Templates/Build/19_train.tpl index 7abb2bd4..d66d5f84 100644 --- a/Templates/Build/19_train.tpl +++ b/Templates/Build/19_train.tpl @@ -25,7 +25,7 @@ echo "
    ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -\"Wood\"".(${'u'.$i}['wood'])."|\"Clay\"".(${'u'.$i}['clay'])."|\"Iron\"".(${'u'.$i}['iron'])."|\"Crop\"".(${'u'.$i}['crop'])."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; +\"木材\"".(${'u'.$i}['wood'])."|\"磚塊\"".(${'u'.$i}['clay'])."|\"鋼鐵\"".(${'u'.$i}['iron'])."|\"穀物\"".(${'u'.$i}['crop'])."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid19[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ @@ -58,7 +58,7 @@ echo "
    ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -\"Wood\"".(${'u'.$i}['wood'])."|\"Clay\"".(${'u'.$i}['clay'])."|\"Iron\"".(${'u'.$i}['iron'])."|\"Crop\"".(${'u'.$i}['crop'])."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; +\"木材\"".(${'u'.$i}['wood'])."|\"磚塊\"".(${'u'.$i}['clay'])."|\"鋼鐵\"".(${'u'.$i}['iron'])."|\"穀物\"".(${'u'.$i}['crop'])."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid19[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/20_1.tpl b/Templates/Build/20_1.tpl index 9532e62d..5ac72186 100644 --- a/Templates/Build/20_1.tpl +++ b/Templates/Build/20_1.tpl @@ -22,10 +22,10 @@ for($i=4;$i<=6;$i++) { ".$technology->getUnitName($i)." (Avaliable: ".$village->unitarray['u'.$i].")
    "; if(${'u'.$i}['drinking'] <= $building->getTypeLevel(41)) { echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".(${'u'.$i}['pop']-1)."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".(${'u'.$i}['pop']-1)."|\"Duration\""; }else{ echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".(${'u'.$i}['pop'])."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".(${'u'.$i}['pop'])."|\"Duration\""; } $dur=round(${'u'.$i}['time'] * ($bid20[$village->resarray['f'.$id]]['attri'] / 100) * ($building->getTypeLevel(41)>=1?(1/$bid41[$building->getTypeLevel(41)]['attri']):1) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); diff --git a/Templates/Build/20_2.tpl b/Templates/Build/20_2.tpl index 2fbde2ad..bfad6411 100644 --- a/Templates/Build/20_2.tpl +++ b/Templates/Build/20_2.tpl @@ -21,7 +21,7 @@ for($i=15;$i<=16;$i++) { echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Avaliable: ".$village->unitarray['u'.$i].")
    "; echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid20[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/20_3.tpl b/Templates/Build/20_3.tpl index de3227b3..c3edee2d 100644 --- a/Templates/Build/20_3.tpl +++ b/Templates/Build/20_3.tpl @@ -21,7 +21,7 @@ for($i=23;$i<=26;$i++) { echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Avaliable: ".$village->unitarray['u'.$i].")
    "; echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid20[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/20_4.tpl b/Templates/Build/20_4.tpl index 3047d906..3b20525b 100644 --- a/Templates/Build/20_4.tpl +++ b/Templates/Build/20_4.tpl @@ -21,7 +21,7 @@ for($i=35;$i<=36;$i++) { echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Avaliable: ".$village->unitarray['u'.$i].")
    "; echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid20[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/20_5.tpl b/Templates/Build/20_5.tpl index ae672c1f..34dc27bb 100644 --- a/Templates/Build/20_5.tpl +++ b/Templates/Build/20_5.tpl @@ -21,7 +21,7 @@ for($i=45;$i<=46;$i++) { echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Avaliable: ".$village->unitarray['u'.$i].")
    "; echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid20[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/21.tpl b/Templates/Build/21.tpl index 24d6b0ce..5d6b2e7e 100644 --- a/Templates/Build/21.tpl +++ b/Templates/Build/21.tpl @@ -51,7 +51,7 @@ echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Avaliable: ".$village->unitarray['u'.$i].")
    "; echo "
    - \"Wood\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; + \"木材\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid21[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/22_1.tpl b/Templates/Build/22_1.tpl index 698d80d1..27a1feb1 100644 --- a/Templates/Build/22_1.tpl +++ b/Templates/Build/22_1.tpl @@ -15,7 +15,7 @@ for($i=2;$i<=9;$i++) { \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)."
    -
    \"Lumber\"".${'r'.$i}['wood']."|\"Clay\"".${'r'.$i}['clay']."|\"Iron\"".${'r'.$i}['iron']."|\"Crop\"".${'r'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'r'.$i}['wood']."|\"磚塊\"".${'r'.$i}['clay']."|\"鋼鐵\"".${'r'.$i}['iron']."|\"穀物\"".${'r'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'r'.$i}['time'] * ($bid22[$village->resarray['f'.$id]]['attri'] / 100)/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { echo "|\"NPC"; diff --git a/Templates/Build/22_2.tpl b/Templates/Build/22_2.tpl index 4296333b..5dd0a807 100644 --- a/Templates/Build/22_2.tpl +++ b/Templates/Build/22_2.tpl @@ -15,7 +15,7 @@ for($i=12;$i<=19;$i++) { \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)."
    -
    \"Lumber\"".${'r'.$i}['wood']."|\"Clay\"".${'r'.$i}['clay']."|\"Iron\"".${'r'.$i}['iron']."|\"Crop\"".${'r'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'r'.$i}['wood']."|\"磚塊\"".${'r'.$i}['clay']."|\"鋼鐵\"".${'r'.$i}['iron']."|\"穀物\"".${'r'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'r'.$i}['time'] * ($bid22[$village->resarray['f'.$id]]['attri'] / 100)/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { echo "|\"NPC"; diff --git a/Templates/Build/22_3.tpl b/Templates/Build/22_3.tpl index 3f7698e1..e96251f4 100644 --- a/Templates/Build/22_3.tpl +++ b/Templates/Build/22_3.tpl @@ -15,7 +15,7 @@ for($i=22;$i<=29;$i++) { \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)."
    -
    \"Lumber\"".${'r'.$i}['wood']."|\"Clay\"".${'r'.$i}['clay']."|\"Iron\"".${'r'.$i}['iron']."|\"Crop\"".${'r'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'r'.$i}['wood']."|\"磚塊\"".${'r'.$i}['clay']."|\"鋼鐵\"".${'r'.$i}['iron']."|\"穀物\"".${'r'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'r'.$i}['time'] * ($bid22[$village->resarray['f'.$id]]['attri'] / 100)/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { echo "|\"NPC"; diff --git a/Templates/Build/22_4.tpl b/Templates/Build/22_4.tpl index c8afbbd8..4101a525 100644 --- a/Templates/Build/22_4.tpl +++ b/Templates/Build/22_4.tpl @@ -15,7 +15,7 @@ for($i=32;$i<=39;$i++) { \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)."
    -
    \"Lumber\"".${'r'.$i}['wood']."|\"Clay\"".${'r'.$i}['clay']."|\"Iron\"".${'r'.$i}['iron']."|\"Crop\"".${'r'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'r'.$i}['wood']."|\"磚塊\"".${'r'.$i}['clay']."|\"鋼鐵\"".${'r'.$i}['iron']."|\"穀物\"".${'r'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'r'.$i}['time'] * ($bid22[$village->resarray['f'.$id]]['attri'] / 100)/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { echo "|\"NPC"; diff --git a/Templates/Build/22_5.tpl b/Templates/Build/22_5.tpl index 4ffd370f..29ab78c7 100644 --- a/Templates/Build/22_5.tpl +++ b/Templates/Build/22_5.tpl @@ -15,7 +15,7 @@ for($i=42;$i<=49;$i++) { \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)."
    -
    \"Lumber\"".${'r'.$i}['wood']."|\"Clay\"".${'r'.$i}['clay']."|\"Iron\"".${'r'.$i}['iron']."|\"Crop\"".${'r'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'r'.$i}['wood']."|\"磚塊\"".${'r'.$i}['clay']."|\"鋼鐵\"".${'r'.$i}['iron']."|\"穀物\"".${'r'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'r'.$i}['time'] * ($bid22[$village->resarray['f'.$id]]['attri'] / 100)/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { echo "|\"NPC"; diff --git a/Templates/Build/24_1.tpl b/Templates/Build/24_1.tpl index 5aa1cfc0..544dd4c8 100644 --- a/Templates/Build/24_1.tpl +++ b/Templates/Build/24_1.tpl @@ -14,7 +14,7 @@ $time = Time(); $i = 1; echo "
    ".$cel[$i]['name']." (".$cel[$i]['attri']." culture points)
    -
    \"Lumber\"".$cel[$i]['wood']."|\"Clay\"".$cel[$i]['clay']."|\"Iron\"".$cel[$i]['iron']."|\"Crop\"".$cel[$i]['crop']."|\"duration\""; +
    \"Lumber\"".$cel[$i]['wood']."|\"磚塊\"".$cel[$i]['clay']."|\"鋼鐵\"".$cel[$i]['iron']."|\"穀物\"".$cel[$i]['crop']."|\"duration\""; echo $generator->getTimeFormat(round($cel[$i]['time'] * ($bid24[$building->getTypeLevel(24)]['attri'] / 100)/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) { echo "|\"NPC"; @@ -45,7 +45,7 @@
    Great celebration (2000 culture points)
    -
    \"Lumber\"29700|\"Clay\"33250|\"Iron\"32000|\"Crop\"6700|\"duration\""; +
    \"Lumber\"29700|\"磚塊\"33250|\"鋼鐵\"32000|\"穀物\"6700|\"duration\""; echo $generator->getTimeFormat(round($gc[$level]/SPEED)); if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { echo "|\"NPC"; diff --git a/Templates/Build/25_create.tpl b/Templates/Build/25_create.tpl index 1701f85e..4c2d6f18 100644 --- a/Templates/Build/25_create.tpl +++ b/Templates/Build/25_create.tpl @@ -18,7 +18,7 @@ $i = 20; \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -
    \"Lumber\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'u'.$i}['time']/SPEED)); //if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { //echo "|\"NPC"; diff --git a/Templates/Build/25_train.tpl b/Templates/Build/25_train.tpl index 16f1f3ce..f9487d8e 100644 --- a/Templates/Build/25_train.tpl +++ b/Templates/Build/25_train.tpl @@ -51,7 +51,7 @@ echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -
    \"Lumber\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"duration\""; $dur=round(${'u'.$i}['time'] * ($bid25[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/26_create.tpl b/Templates/Build/26_create.tpl index 1701f85e..4c2d6f18 100644 --- a/Templates/Build/26_create.tpl +++ b/Templates/Build/26_create.tpl @@ -18,7 +18,7 @@ $i = 20; \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -
    \"Lumber\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"duration\""; echo $generator->getTimeFormat(round(${'u'.$i}['time']/SPEED)); //if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) > 1) { //echo "|\"NPC"; diff --git a/Templates/Build/26_train.tpl b/Templates/Build/26_train.tpl index c79ddb3c..5306435d 100644 --- a/Templates/Build/26_train.tpl +++ b/Templates/Build/26_train.tpl @@ -51,7 +51,7 @@ echo "
    \"".$technology-getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /> ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -
    \"Lumber\"".${'u'.$i}['wood']."|\"Clay\"".${'u'.$i}['clay']."|\"Iron\"".${'u'.$i}['iron']."|\"Crop\"".${'u'.$i}['crop']."|\"duration\""; +
    \"Lumber\"".${'u'.$i}['wood']."|\"磚塊\"".${'u'.$i}['clay']."|\"鋼鐵\"".${'u'.$i}['iron']."|\"穀物\"".${'u'.$i}['crop']."|\"duration\""; $dur=round(${'u'.$i}['time'] * ($bid26[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/29_train.tpl b/Templates/Build/29_train.tpl index de20627e..869bff28 100644 --- a/Templates/Build/29_train.tpl +++ b/Templates/Build/29_train.tpl @@ -24,7 +24,7 @@ echo "
    ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -\"Wood\"".(${'u'.$i}['wood']*3)."|\"Clay\"".(${'u'.$i}['clay']*3)."|\"Iron\"".(${'u'.$i}['iron']*3)."|\"Crop\"".(${'u'.$i}['crop']*3)."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; +\"木材\"".(${'u'.$i}['wood']*3)."|\"磚塊\"".(${'u'.$i}['clay']*3)."|\"鋼鐵\"".(${'u'.$i}['iron']*3)."|\"穀物\"".(${'u'.$i}['crop']*3)."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid29[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/30_train.tpl b/Templates/Build/30_train.tpl index f5393056..0ddf13c9 100644 --- a/Templates/Build/30_train.tpl +++ b/Templates/Build/30_train.tpl @@ -24,7 +24,7 @@ echo "
    ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -\"Wood\"".(${'u'.$i}['wood']*3)."|\"Clay\"".(${'u'.$i}['clay']*3)."|\"Iron\"".(${'u'.$i}['iron']*3)."|\"Crop\"".(${'u'.$i}['crop']*3)."|\"Crop".(${'u'.$i}['pop']-($building->getTypeLevel(41)>=1?1:0))."|\"Duration\""; +\"木材\"".(${'u'.$i}['wood']*3)."|\"磚塊\"".(${'u'.$i}['clay']*3)."|\"鋼鐵\"".(${'u'.$i}['iron']*3)."|\"穀物\"".(${'u'.$i}['crop']*3)."|\"穀物消耗\"".(${'u'.$i}['pop']-($building->getTypeLevel(41)>=1?1:0))."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid30[$village->resarray['f'.$id]]['attri'] * ($building->getTypeLevel(41)>=1?(1/$bid41[$building->getTypeLevel(41)]['attri']):1) / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){ diff --git a/Templates/Build/37_train.tpl b/Templates/Build/37_train.tpl index eb02d5b5..8fe05d0f 100644 --- a/Templates/Build/37_train.tpl +++ b/Templates/Build/37_train.tpl @@ -52,11 +52,11 @@ if($session->tribe == 1) { ".U1."
    - \"Wood\"".$u1['wood']."| - \"Clay\"".$u1['clay']."| - \"Iron\"".$u1['iron']."| - \"Crop\"".$u1['crop']."| - \"Crop6| + \"木材\"".$u1['wood']."| + \"磚塊\"".$u1['clay']."| + \"鋼鐵\"".$u1['iron']."| + \"穀物\"".$u1['crop']."| + \"穀物消耗\"6| \"Duration\""; $output.=$generator->getTimeFormat(round($u1['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3); $output.="
    @@ -66,9 +66,9 @@ if($session->tribe == 1) { if($village->awood < $u1['wood'] || $village->aclay < $u1['clay'] || $village->airon < $u1['iron'] || $village->acrop < $u1['crop']) - $output.="Not enough resources"; + $output.="資源數量不足"; elseif($units['u1'] == 0) - $output.="Not available units"; + $output.="單位數量不足"; else $output.="訓練"; @@ -85,11 +85,11 @@ if($session->tribe == 1) { ".U2."
    - \"Wood\"".$u2['wood']."| - \"Clay\"".$u2['clay']."| - \"Iron\"".$u2['iron']."| - \"Crop\"".$u2['crop']."| - \"Crop6| + \"木材\"".$u2['wood']."| + \"磚塊\"".$u2['clay']."| + \"鋼鐵\"".$u2['iron']."| + \"穀物\"".$u2['crop']."| + \"穀物消耗\"6| \"Duration\""; $output.=$generator->getTimeFormat(round($u2['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3); @@ -99,9 +99,9 @@ if($session->tribe == 1) {
    "; if($village->awood < $u2['wood'] OR $village->aclay < $u2['clay'] OR $village->airon < $u2['iron'] OR $village->acrop < $u2['crop']) - $output.="Not enough resources"; + $output.="資源數量不足"; elseif($units['u2'] == 0) - $output.="Not available units"; + $output.="單位數量不足"; else $output.="訓練"; @@ -118,11 +118,11 @@ if($session->tribe == 1) { ".U3."
    - \"Wood\"".$u3['wood']."| - \"Clay\"".$u3['clay']."| - \"Iron\"".$u3['iron']."| - \"Crop\"".$u3['crop']."| - \"Crop6| + \"木材\"".$u3['wood']."| + \"磚塊\"".$u3['clay']."| + \"鋼鐵\"".$u3['iron']."| + \"穀物\"".$u3['crop']."| + \"穀物消耗\"6| \"Duration\""; $output.= $generator->getTimeFormat(round($u3['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3); @@ -133,9 +133,9 @@ if($session->tribe == 1) {
    "; if($village->awood < $u3['wood'] OR $village->aclay < $u3['clay'] OR $village->airon < $u3['iron'] OR $village->acrop < $u3['crop']) { - $output.="Not enough resources"; + $output.="資源數量不足"; }else if($units['u3'] == 0){ - $output.="Not available units"; + $output.="單位數量不足"; }else { $output.="訓練"; } @@ -151,11 +151,11 @@ if($session->tribe == 1) { ".U5."
    - \"Wood\"".$u5['wood']."| - \"Clay\"".$u5['clay']."| - \"Iron\"".$u5['iron']."| - \"Crop\"".$u5['crop']."| - \"Crop6| + \"木材\"".$u5['wood']."| + \"磚塊\"".$u5['clay']."| + \"鋼鐵\"".$u5['iron']."| + \"穀物\"".$u5['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u5['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -164,9 +164,9 @@ if($session->tribe == 1) {
    "; if($village->awood < $u5['wood'] OR $village->aclay < $u5['clay'] OR $village->airon < $u5['iron'] OR $village->acrop < $u5['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u5'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -182,11 +182,11 @@ if($session->tribe == 1) { ".U6."
    - \"Wood\"".$u6['wood']."| - \"Clay\"".$u6['clay']."| - \"Iron\"".$u6['iron']."| - \"Crop\"".$u6['crop']."| - \"Crop6| + \"木材\"".$u6['wood']."| + \"磚塊\"".$u6['clay']."| + \"鋼鐵\"".$u6['iron']."| + \"穀物\"".$u6['crop']."| + \"穀物消耗\"6| \"Duration\"". $generator->getTimeFormat(round($u6['time'] / SPEED * $artefact_bonus2 / $artefact_bonus)*3)."
    @@ -195,9 +195,9 @@ if($session->tribe == 1) {
    "; if($village->awood < $u6['wood'] OR $village->aclay < $u6['clay'] OR $village->airon < $u6['iron'] OR $village->acrop < $u6['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u6'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -216,11 +216,11 @@ $output.="
    "; if($village->awood < $u11['wood'] OR $village->aclay < $u11['clay'] OR $village->airon < $u11['iron'] OR $village->acrop < $u11['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u11'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -247,11 +247,11 @@ $output.="
    "; if($village->awood < $u12['wood'] OR $village->aclay < $u12['clay'] OR $village->airon < $u12['iron'] OR $village->acrop < $u12['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u12'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -279,11 +279,11 @@ $output.="
    "; if($village->awood < $u13['wood'] OR $village->aclay < $u13['clay'] OR $village->airon < $u13['iron'] OR $village->acrop < $u13['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u13'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -310,11 +310,11 @@ $output.="
    "; if($village->awood < $u15['wood'] OR $village->aclay < $u15['clay'] OR $village->airon < $u15['iron'] OR $village->acrop < $u15['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u15'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -342,11 +342,11 @@ $output.="
    "; if($village->awood < $u16['wood'] OR $village->aclay < $u16['clay'] OR $village->airon < $u16['iron'] OR $village->acrop < $u16['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u16'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -376,11 +376,11 @@ $output.="
    "; if($village->awood < $u21['wood'] OR $village->aclay < $u21['clay'] OR $village->airon < $u21['iron'] OR $village->acrop < $u21['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u21'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -407,11 +407,11 @@ $output.="
    "; if($village->awood < $u22['wood'] OR $village->aclay < $u22['clay'] OR $village->airon < $u22['iron'] OR $village->acrop < $u22['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u22'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -439,11 +439,11 @@ $output.="
    "; if($village->awood < $u24['wood'] OR $village->aclay < $u24['clay'] OR $village->airon < $u24['iron'] OR $village->acrop < $u24['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u24'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -470,11 +470,11 @@ $output.="
    "; if($village->awood < $u25['wood'] OR $village->aclay < $u25['clay'] OR $village->airon < $u25['iron'] OR $village->acrop < $u25['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u25'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } @@ -502,11 +502,11 @@ $output.="
    "; if($village->awood < $u26['wood'] OR $village->aclay < $u26['clay'] OR $village->airon < $u26['iron'] OR $village->acrop < $u26['crop']) { - $output.= "Not enough resources"; + $output.= "資源數量不足"; }else if($units['u26'] == 0){ - $output.= "Not available units"; + $output.= "單位數量不足"; }else { $output.= "訓練"; } diff --git a/Templates/Build/42_train.tpl b/Templates/Build/42_train.tpl index 0c521e82..a6209682 100644 --- a/Templates/Build/42_train.tpl +++ b/Templates/Build/42_train.tpl @@ -23,7 +23,7 @@ echo "
    ".$technology->getUnitName($i)." (Available: ".$village->unitarray['u'.$i].")
    -\"Wood\"".(${'u'.$i}['wood']*3)."|\"Clay\"".(${'u'.$i}['clay']*3)."|\"Iron\"".(${'u'.$i}['iron']*3)."|\"Crop\"".(${'u'.$i}['crop']*3)."|\"Crop".${'u'.$i}['pop']."|\"Duration\""; +\"木材\"".(${'u'.$i}['wood']*3)."|\"磚塊\"".(${'u'.$i}['clay']*3)."|\"鋼鐵\"".(${'u'.$i}['iron']*3)."|\"穀物\"".(${'u'.$i}['crop']*3)."|\"穀物消耗\"".${'u'.$i}['pop']."|\"Duration\""; $dur=round(${'u'.$i}['time'] * ($bid42[$village->resarray['f'.$id]]['attri'] / 100) / SPEED * $artefact_bonus2 / $artefact_bonus); $foolartefact = $database->getFoolArtefactInfo(5,$village->wid,$session->uid); if(count($foolartefact) > 0){