From ca2a823be19dfa7c339218581cf8444215215824 Mon Sep 17 00:00:00 2001 From: Shadow <1140613+Shadowss@users.noreply.github.com> Date: Fri, 10 Nov 2017 10:55:32 +0200 Subject: [PATCH 1/4] Code clear No need , double troops not appear anymore --- GameEngine/Technology.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php index 6444ef13..5db3a215 100755 --- a/GameEngine/Technology.php +++ b/GameEngine/Technology.php @@ -165,21 +165,6 @@ class Technology { public function getUnitList() { global $database,$village; - // FIX BY MisterX - /* - $controlloTruppeInRinforzo = $database->getEnforceControllTroops($village->wid); - for($i=1;$i<=50;$i++) { - if($controlloTruppeInRinforzo['u'.$i] >= "30000000") - mysqli_query("UPDATE ".TB_PREFIX."enforcement set u".$i." = '0' where vref = $village->wid"); - } - //FIX BY Shadow and made by NIKO28 - $controlloTruppe = $database->getUnit($village->wid); - for($i=1;$i<=50;$i++) { - if($controlloTruppe['u'.$i] >= "10000000") - mysqli_query("UPDATE ".TB_PREFIX."units set u".$i." = '0' where vref = $village->wid"); - } - */ - // END FIX $unitarray = func_num_args() == 1? $database->getUnit(func_get_arg(0)) : $village->unitall; $listArray = array(); for($i=1;$iunarray);$i++) { From cc78105a33b777eeeba8b64989e8f008cc9cc738 Mon Sep 17 00:00:00 2001 From: Shadow <1140613+Shadowss@users.noreply.github.com> Date: Fri, 10 Nov 2017 11:05:59 +0200 Subject: [PATCH 2/4] Vacation mode is enabled for everyone for testing Vacation mode is enable for everyone for testing as Travian Official have vacation Must code the condition of vacation 9/9 Conditions No troops on movement No troops in movement for other villages No troops send for reinforcements Don`t have any troops in your account as reinforcements from other players Don`t have a Wonder World Don`t have an artifact No longer on protection period Don`t have any troops trapped Don`t have account on deletion process --- Templates/Profile/menu.tpl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Templates/Profile/menu.tpl b/Templates/Profile/menu.tpl index 4e0b7225..43401c51 100644 --- a/Templates/Profile/menu.tpl +++ b/Templates/Profile/menu.tpl @@ -3,13 +3,7 @@ | >Profile | >Preferences | >Account - | >Vacation - From 45bbefce13d764cdcd1698c27b7d6621f09b54f3 Mon Sep 17 00:00:00 2001 From: Shadow <1140613+Shadowss@users.noreply.github.com> Date: Fri, 10 Nov 2017 11:31:44 +0200 Subject: [PATCH 3/4] Update vacation Must to be arrange in a table --- Templates/Profile/vacation.tpl | 36 ++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/Templates/Profile/vacation.tpl b/Templates/Profile/vacation.tpl index 084182e2..55171c74 100644 --- a/Templates/Profile/vacation.tpl +++ b/Templates/Profile/vacation.tpl @@ -22,14 +22,46 @@ include("menu.tpl"); ?> - +
+ - + + + +
+

General description

+ Use vacation mode to protect your villages during you are away.
+ During the vacation will be inactive next actions:
+
+ +

Conditions

+ + + + +
Vacation Mode
If you plan on being away for an extended period of time and do not wish to set a sitter, you can set your account to Holiday Mode. During this time your account will stop produceing resource , CP , research , trops , etc , and stop receiving attacks , reinforcements, raid , essentially freezing your account. Remember, this just freezes your Travian, not time. If you are a member of Gold Club it will run out during this time and if you have automatic renewal selected, the automatic renewal feature will be cancelled while in Holiday Mode.Please Note you must set min of 2 days vaction mode and NO MORE THEN 14 days.
Want to activate Vacation Mode? From ff236b5e22bc56869063727c28281134f29355f2 Mon Sep 17 00:00:00 2001 From: The Gitter Badger Date: Fri, 10 Nov 2017 11:00:22 +0000 Subject: [PATCH 4/4] Add Gitter badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 8bbe03d2..e50eb3bd 100644 --- a/README.md +++ b/README.md @@ -222,3 +222,6 @@ TPLinux Changes: 13. Fix fullscreen map in rtl layout 14. Fix divesion by Zero bug in general statics -- + + +[![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) \ No newline at end of file