diff --git a/App/Config/config.neon b/App/Config/config.neon index f6a8f561..976fe208 100644 --- a/App/Config/config.neon +++ b/App/Config/config.neon @@ -33,4 +33,9 @@ services: - App\FrontModule\Model\OData\ODataModel - App\FrontModule\Model\OData\OasisService - App\FrontModule\Model\User\LoginService - - App\GameModule\Model\Online\OnlineModel \ No newline at end of file + - App\GameModule\Model\Online\OnlineModel + - App\GameModule\Controls\Header\IHeaderControl + - App\GameModule\Model\MData\MDataModel + - App\GameModule\Model\NData\NDataModel + - App\FrontModule\Model\User\UserService + - App\GameModule\Controls\Resource\IResourceControl \ No newline at end of file diff --git a/App/FrontModule/Model/User/UserService.php b/App/FrontModule/Model/User/UserService.php new file mode 100644 index 00000000..d9cf684e --- /dev/null +++ b/App/FrontModule/Model/User/UserService.php @@ -0,0 +1,33 @@ +userModel = $userModel; + } + + + public function hasPlus($uid) + { + /** @var \stdClass $user */ + $user = $this->userModel->get($uid); + if ($user->plus > time()) { + return TRUE; + } else { + return FALSE; + } + } +} \ No newline at end of file diff --git a/App/GameModule/Controls/Header/HeaderControl.latte b/App/GameModule/Controls/Header/HeaderControl.latte new file mode 100644 index 00000000..30741635 --- /dev/null +++ b/App/GameModule/Controls/Header/HeaderControl.latte @@ -0,0 +1,76 @@ + \ No newline at end of file diff --git a/App/GameModule/Controls/Header/HeaderControl.php b/App/GameModule/Controls/Header/HeaderControl.php new file mode 100644 index 00000000..2de6f96f --- /dev/null +++ b/App/GameModule/Controls/Header/HeaderControl.php @@ -0,0 +1,43 @@ +MDataModel = $MDataModel; + $this->NDataModel = $NDataModel; + $this->userService = $userService; + } + + + public function render() + { + $this->template->unread = $this->MDataModel->countUnread($this->presenter->getUser()->getId()) ? TRUE : FALSE; + $this->template->report = $this->NDataModel->countUnread($this->presenter->getUser()->getId()) ? TRUE : FALSE; + $this->template->plusActive = $this->userService->hasPlus($this->presenter->getUser()->getId()); + $this->template->setFile(__DIR__ . '/HeaderControl.latte'); + $this->template->render(); + } +} \ No newline at end of file diff --git a/App/GameModule/Controls/Header/IHeaderControl.php b/App/GameModule/Controls/Header/IHeaderControl.php new file mode 100644 index 00000000..77272231 --- /dev/null +++ b/App/GameModule/Controls/Header/IHeaderControl.php @@ -0,0 +1,10 @@ +headerFactory->create(); + } +} \ No newline at end of file diff --git a/App/GameModule/Controls/Resource/IResourceControl.php b/App/GameModule/Controls/Resource/IResourceControl.php new file mode 100644 index 00000000..44990548 --- /dev/null +++ b/App/GameModule/Controls/Resource/IResourceControl.php @@ -0,0 +1,12 @@ + +
+ + + + + + + + + + + + + + + +
+ Lumber + + {$actualWood} / {$store} + + Clay + + {$actualClay} / {$store} + + Iron + + {$actualIron} / {$store} + + Crop + + {$actualCrop} / {$granary} + + Crop consumption + {$upkeep} / {$cropProduction} +
+ + + + + + + + + +
                                                                     + + Remaining gold {$gold} Gold + +
+
+ \ No newline at end of file diff --git a/App/GameModule/Controls/Resource/ResourceControl.php b/App/GameModule/Controls/Resource/ResourceControl.php new file mode 100644 index 00000000..82b927bd --- /dev/null +++ b/App/GameModule/Controls/Resource/ResourceControl.php @@ -0,0 +1,26 @@ +template->actualWood = 750; + $this->template->actualClay = 750; + $this->template->actualIron = 750; + $this->template->actualCrop = 750; + $this->template->store = 800; + $this->template->granary = 800; + $this->template->upkeep = 2; + $this->template->cropProduction = 15; + $this->template->gold = 40; + + + $this->template->setFile(__DIR__ . '/ResourceControl.latte'); + $this->template->render(); + } +} \ No newline at end of file diff --git a/App/GameModule/Controls/Resource/TResourceControl.php b/App/GameModule/Controls/Resource/TResourceControl.php new file mode 100644 index 00000000..9a41c900 --- /dev/null +++ b/App/GameModule/Controls/Resource/TResourceControl.php @@ -0,0 +1,18 @@ +resourceFactory->create(); + } +} \ No newline at end of file diff --git a/App/GameModule/Model/MData/MDataModel.php b/App/GameModule/Model/MData/MDataModel.php new file mode 100644 index 00000000..8773d77a --- /dev/null +++ b/App/GameModule/Model/MData/MDataModel.php @@ -0,0 +1,37 @@ +database->select('*')->from($this->table) + ->where('viewed != 1') + ->where('send = 1') + ->where('target = %i', $uid) + ->fetchAll(); + } + + /** + * @param int $uid + * @return array + */ + public function countUnread($uid) + { + return $this->database->select('count(id)')->from($this->table) + ->where('viewed != 1') + ->where('send = 1') + ->where('target = %i', $uid) + ->fetchSingle(); + } +} \ No newline at end of file diff --git a/App/GameModule/Model/NData/NDataModel.php b/App/GameModule/Model/NData/NDataModel.php new file mode 100644 index 00000000..971d72e1 --- /dev/null +++ b/App/GameModule/Model/NData/NDataModel.php @@ -0,0 +1,35 @@ +database->select('*')->from($this->table) + ->where('viewed != 1') + ->where('uid = %i', $uid) + ->fetchAll(); + } + + /** + * @param int $uid + * @return array + */ + public function countUnread($uid) + { + return $this->database->select('count(id)')->from($this->table) + ->where('viewed != 1') + ->where('uid = %i', $uid) + ->fetchSingle(); + } +} \ No newline at end of file diff --git a/App/GameModule/Presenters/GamePresenterPresenter.php b/App/GameModule/Presenters/GamePresenterPresenter.php new file mode 100644 index 00000000..d9366090 --- /dev/null +++ b/App/GameModule/Presenters/GamePresenterPresenter.php @@ -0,0 +1,20 @@ +user->isLoggedIn()) { + $this->redirect(':Front:Homepage:default'); + } + } +} \ No newline at end of file diff --git a/App/GameModule/Presenters/InnterVillagePresenter.php b/App/GameModule/Presenters/InnerVillagePresenter.php similarity index 69% rename from App/GameModule/Presenters/InnterVillagePresenter.php rename to App/GameModule/Presenters/InnerVillagePresenter.php index cac26e51..47a7445e 100644 --- a/App/GameModule/Presenters/InnterVillagePresenter.php +++ b/App/GameModule/Presenters/InnerVillagePresenter.php @@ -5,7 +5,7 @@ use App; use Nette; -class InnerVillagePresenter extends Nette\Application\UI\Presenter +class InnerVillagePresenter extends GamePresenter { public function actionDefault() diff --git a/App/GameModule/Presenters/MapPresenter.php b/App/GameModule/Presenters/MapPresenter.php new file mode 100644 index 00000000..72556abe --- /dev/null +++ b/App/GameModule/Presenters/MapPresenter.php @@ -0,0 +1,21 @@ + + + + Spamian + + + + + + + + + + + + + + + +
+ +
+ + {control header} + +
+ + {include content} + +
+
+
+ + {include ../../Templates/footer.latte} + + {control resource} + +
+
+
+ Server time {? echo date('H:i:s'); } +
+
+
+
+
+ + diff --git a/App/GameModule/Templates/InnerVillage/default.latte b/App/GameModule/Templates/InnerVillage/default.latte index e69de29b..7aa223b2 100644 --- a/App/GameModule/Templates/InnerVillage/default.latte +++ b/App/GameModule/Templates/InnerVillage/default.latte @@ -0,0 +1,5 @@ +{var bodyClass = 'v35 ie ie8'} +{block content} + + +{/block} \ No newline at end of file diff --git a/www/Templates/header.tpl b/www/Templates/header.tpl deleted file mode 100644 index 1380ba8e..00000000 --- a/www/Templates/header.tpl +++ /dev/null @@ -1,99 +0,0 @@ - - - diff --git a/www/Templates/menu.tpl b/www/Templates/menu.tpl index 289dfe31..f66460c5 100644 --- a/www/Templates/menu.tpl +++ b/www/Templates/menu.tpl @@ -32,49 +32,4 @@ id=\"timer1\">".$time." ."; } ?> - - -
-

-
-

Hi username; ?>,

- -
-
-

»

-
-
- -
-
- -
- -
- -
- -
-
-
- Calculated in pageLoadTimeEnd()-$start)*1000); - ?> ms -
- Server time: -
-
-
- -
diff --git a/www/Templates/res.tpl b/www/Templates/res.tpl deleted file mode 100644 index c256560b..00000000 --- a/www/Templates/res.tpl +++ /dev/null @@ -1,66 +0,0 @@ - - -getProd("wood")); -$clay = round($village->getProd("clay")); -$iron = round($village->getProd("iron")); -$crop = round($village->getProd("crop")); -$totalproduction = $village->allcrop; // all crops + bakery + grain mill -?> - -
-
- - - - - - - - - - - acrop > 0){ ?> - - - - - - - -
<?php echo LUMBER; ?>awood)."/".$village->maxstore; ?><?php echo CLAY; ?>aclay)."/".$village->maxstore; ?><?php echo IRON; ?>airon)."/".$village->maxstore; ?><?php echo CROP; ?>acrop)."/".$village->maxcrop; ?>maxcrop; ?><?php echo CROP_COM; ?>pop+$technology->getUpkeep($village->unitall,0))."/".$totalproduction.""; ?>
- - - - - - - - - - - - - - -
                                                                    gold <= 1){ - echo 'Remaining gold '.$session->gold.' Gold'; - } - else if($session->gold >=2){ - echo 'Remaining gold '.$session->gold.' Gold'; - } - ?> -
-
-
\ No newline at end of file diff --git a/www/dorf1.php b/www/dorf1.php index c6d1bb63..feabd33b 100644 --- a/www/dorf1.php +++ b/www/dorf1.php @@ -1,114 +1,39 @@ pageLoadTimeStart(); -if(isset($_GET['ok'])){ -$database->updateUserField($session->uid,'ok','0','1'); $_SESSION['ok'] = '0'; -} -if(isset($_GET['newdid'])) { - $_SESSION['wid'] = $_GET['newdid']; - $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid); - header("Location: ".$_SERVER['PHP_SELF']); -}else{ -$building->procBuild($_GET); -} -?> - - - - <?php echo SERVER_NAME ?> - - - - - - - - - - - - gpack == null || GP_ENABLE == false) { - echo " - - "; - } else { - echo " - - "; - } - ?> - - +$building->procBuild($_GET); - -
- -
-
- -
- -
-

vname; if($village->loyalty!='100'){ if($village->loyalty>'33'){ $color="gr"; }else{ $color="re"; } ?>
loyalty); ?>%

-
capital!='0') { echo "(Capital)"; }else{ halt; } ?>
- -
-

-NewBuilding) { - include("Templates/Building.tpl"); -} -?> -
-



- -
-
-
-
-
- -
-
-
- pageLoadTimeEnd()-$start)*1000); -?> ms + +
+

vname; if($village->loyalty!='100'){ if($village->loyalty>'33'){ $color="gr"; }else{ $color="re"; } ?>
loyalty); ?>%

+
capital!='0') { echo "(Capital)"; }else{ halt; } ?>
+ +
+

+ -
+ if($building->NewBuilding) { + include("Templates/Building.tpl"); + } + ?> +
+



+
+
+
-
- - diff --git a/www/gpack/travian_default/images/banner-zravianx.png b/www/gpack/travian_default/images/banner-zravianx.png deleted file mode 100644 index d21b94ad..00000000 Binary files a/www/gpack/travian_default/images/banner-zravianx.png and /dev/null differ diff --git a/www/gpack/travian_default/images/footer_logo.gif b/www/gpack/travian_default/images/footer_logo.gif index 30b763b5..fa579643 100644 Binary files a/www/gpack/travian_default/images/footer_logo.gif and b/www/gpack/travian_default/images/footer_logo.gif differ diff --git a/www/gpack/travian_default/images/footer_logo.png b/www/gpack/travian_default/images/footer_logo.png deleted file mode 100644 index e1bd1b68..00000000 Binary files a/www/gpack/travian_default/images/footer_logo.png and /dev/null differ diff --git a/www/gpack/travian_default/images/footer_logo.psd b/www/gpack/travian_default/images/footer_logo.psd deleted file mode 100644 index c1a3cc09..00000000 Binary files a/www/gpack/travian_default/images/footer_logo.psd and /dev/null differ diff --git a/www/gpack/travian_default/images/footer_logo_zravianx.gif b/www/gpack/travian_default/images/footer_logo_zravianx.gif deleted file mode 100644 index e3b749de..00000000 Binary files a/www/gpack/travian_default/images/footer_logo_zravianx.gif and /dev/null differ diff --git a/www/gpack/travian_default/modules/new_images.css b/www/gpack/travian_default/modules/new_images.css index 4eb17ad4..a938500d 100644 --- a/www/gpack/travian_default/modules/new_images.css +++ b/www/gpack/travian_default/modules/new_images.css @@ -4,7 +4,7 @@ div#footer {background: #F1F1F1 url(../images/footer_background.gif) repeat-x center top;} -div#footer div#mfoot {background: transparent url(../images/footer_logo.gif) no-repeat 0px 21px;} +div#footer div#mfoot {background: transparent url(../images/footer_logo.gif) no-repeat 0px 2px;} div#dynamic_header, body.mod1 div#dynamic_header,