Commit Graph

2579 Commits

Author SHA1 Message Date
Shadow 5eb04466f9 Update with new team 2018-04-20 21:04:05 +03:00
iopietro 882215cd2a Reports refactor #1
-Removed 29 files from the "Templates/Notice" folder, there were a lot
of duplicated/very similar kinds of report. Now, there are only 6 kinds
of report (9.tpl isn't counted)
+Changed a lot of codes in some .tpl reports, into a foreach

Automation.php:

+Modified report data, for the refactored report system
+Some clean-up

Battle.php:

+Fixed catapults and rams, they weren't able to destroy completely a building
+Fixed a possible division by 0 error
2018-04-19 20:22:01 +02:00
iopietro 06fc62752a Fixed bugs in trade routes
+Trade routes are now editable without errors or redirects
+Trade routes are now filtered by village and not by account
2018-04-18 14:38:15 +02:00
iopietro 5270b1ca30 Fixed bugs in trade routes
+Trade routes can't be hacked anymore
+Fixed a bug that permitted to choose any village when adding a trade
route
+Fixed a bug that permitted to choose a time greater than 23 and less
than 0
+Fixed a bug that permitted to choose a number of repetitions greater
than 3 and less than 1
+Fixed a bug that permitted to edit other players trade route
+Fixed a bug that permitted to create a trading route with the same
village you were in
+Fixed some minor bugs
+Reworked the post/get request system, it's buch better now
2018-04-17 22:54:07 +02:00
iopietro 9c8637318b Filtered given medals
+Medals are now given only to players with an access < 8
2018-04-17 19:00:23 +02:00
iopietro bf091c2a0c Fixed a bug while reinforcing
+If you've already reinforced the target village, you'll troops will now
be merged with the present troops
2018-04-17 18:52:48 +02:00
iopietro 1dcde6675e Fixed a bug in the market
+Fixed a bug that didn't allow to send resources to other players
2018-04-17 16:28:47 +02:00
iopietro e116511c73 Fixed a lot of bugs/security issues in the market
+Fixed a bug that permitted to send resourcers to himself
+Fixed a bug that permitted to send resources to invalid villages
+Fixed a bug that permitted to create offerings with 0 resources or
invalid resources type
+Fixed a bug that permitted to accept offerings of other allies
+Fixed a bug that permitted to accept offerings with a too high maxtime
+Fixed a bug that permitted to accept offering from the same village
+Fixed a bug that permitted to accept offering with too few merchants
+Fixed a bug that permitted to accept offerings without the requested
resources
+Fixed a bug that hid offerings with a valid maxtime
+Fixed some bugs relative to errors diplaying
+Added some error
+Some clean-up
2018-04-16 23:45:21 +02:00
iopietro de8859da03 Fixed a bug
+Fixed crannies total capacity while spying gauls
2018-04-16 19:58:57 +02:00
iopietro 8567466a1d Fixed a training bug
+Fixed a bug that permitted to train troops without the needed buildings
+Updated the version in winner.php
2018-04-16 19:43:03 +02:00
iopietro 6fba48da27 A little forgetfulness 2018-04-16 18:41:10 +02:00
iopietro 6f895f7d54 Fixed some bugs
+Fixed a "division by zero" error, in Battle.php
+Reworked spied informations, now they're shown only if the building is
at least at level 1. Splitted residence/palace information in two
distinct informations. Now the total crannies capacity is displayed
(even if the capacity is 0) instead of the level of the greatest cranny
+Fixed "getFieldLevelInVillage" function in Database.php
-Removed an useless control in Units.php
2018-04-16 18:39:41 +02:00
iopietro e6449d20c6 Fixed issue #432
+Added an error which warns you if you enter an invalid attack type (a
number greater tha 4 or less than 2)
+Fixed the possibility to spy with attacking troops by hacking the
attack type
+Some clean-up
2018-04-16 15:59:05 +02:00
iopietro bd38ac7fd8 Fixed some bugs
+Fixed a bug that selected the capital village instead of the actual
village
+Medals aren't given to
Support/Nature/Natars/TaskMaster/Multihunteranymore
+Fixed a bug in 1.tpl (dorf3.php) that showed tigers instead of traps
while building traps
+Some clean-up in Technology.php
2018-04-16 14:56:15 +02:00
iopietro 2d573a915c Fixed a bug in the alliance
+Usernames and alliances of attacked players are now shown in the
"attacker" and "defender" filter while peace is active
+Some clean-up
2018-04-16 00:02:13 +02:00
iopietro 8dd8fc2364 Fixed a bug in the alliance
+Username are now shown correctly on attack topics while peace is active
2018-04-15 23:34:45 +02:00
Pietro Fallanca 559ac720a2 Fixed a bug in dorf3.php
+In training troops of the same type, are now shown once and not
multiple time
2018-04-15 17:24:12 +02:00
Pietro Fallanca 6c597a1b39 Removed an include 2018-04-15 16:44:36 +02:00
Pietro Fallanca 600c762c8e Fixed a lot of bugs/security issues in the alliance
+You can no longer kick people of other alliances
+You can no longer change the forum link with no permissions
+You can no longer make more than 3 total confederation and 3 total NAP
+You can no longer send a diplomacy pact to an alliance with already one
pact or one pending pact
+You can no longer handle diplomacy without permissions
+Fixed security bugs related to invites (sending, deleting etc.)
+You can no longer access to any alliance submenus without permissions
(kick menu, diplomacy menu, etc.)
+Errors are now shown correctly and better handling of them
+New forum link and alliance description are shown correctly after
editing them
+You can no longer access to other alliances informations without being
in it (attack reports, news, etc)
+Corrected some alliance news
+Added some language constants to en.php
+Fixed and changed some database.php functions alliance related
2018-04-15 16:11:43 +02:00
Pietro Fallanca 274d89bfa1 Fixed a lot of bugs/security issues in the alliance
+You can no longer kick people of other alliances
+You can no longer change the forum link with no permissions
+You can no longer make more than 3 total confederation and 3 total NAP
+You can no longer send a diplomacy pact to an alliance with already one
pact or one pending pact
+You can no longer handle diplomacy without permissions
+Fixed security bugs related to invites (sending, deleting etc.)
+You can no longer access to any alliance submenus without permissions
(kick menu, diplomacy menu, etc.)
+Errors are now shown correctly and better handling of them
+New forum link and alliance description are shown correctly after
editing them
+You can no longer access to other alliances informations without being
in it (attack reports, news, etc)
+Corrected some alliance news
+Added some language constants to en.php
+Fixed and changed some database.php functions alliance related
2018-04-15 16:11:43 +02:00
Pietro Fallanca 86070d1691 Fixed a rounding bug
+General statistics and server info tribe percentages are now shown
correctly
2018-04-13 19:20:19 +02:00
Vladyslav 1b3f4eadd1 Added a peace system in the newsbox
+Added displaying a peace system to the newsbox.
Small fix in Admin\Templates\editServerSet.tpl
2018-04-13 14:48:27 +03:00
iopietro fc7eb0ab84 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2018-04-13 02:00:55 +02:00
iopietro d3ae7b8b21 Fixed some bugs in the alliance
+Fixed a bug that permitted to create an alliance while already being in
an alliance
+Fixed a bug that permitted to create an alliance with an embassy of
level 3 or lower (or even without an embassy)
+Fixed a bug that permitted to set the max numbers of players during the
creation of an alliance, by hacking the building id passed in a post
request
+Fixed some redirect issues
2018-04-13 02:00:37 +02:00
Vladyslav 907dc276ff A small change in the description for some tooltips 2018-04-13 00:10:51 +03:00
Vladyslav 4ecbfa77a0 Tooltip part 1 for admin panel settings
Partially added to the file Admin/Templates/config.tpl
Fully added to the file Admin/ Templates/editServerSet.tpl
Almost completely translated texts in en.php
2018-04-12 23:58:28 +03:00
iopietro 8aac28dbc7 A little forgetfulness 2018-04-12 21:32:22 +02:00
iopietro e0c1b6ae5c Fixed some bugs
+Fixed catapults/rams formula
+Added the trapped troops calculation formula, traps are now distributed
through all troops
2018-04-12 21:31:14 +02:00
iopietro 8d83eaac5d Merge branch 'master' of https://github.com/Shadowss/TravianZ 2018-04-12 12:54:08 +02:00
iopietro 29faeca811 Starvation Refactor
Refactor part 3 of the starvation function

+Troops will now die equally, according to the crop consumption of the
village

Database.php:
+Modified two functions to work with unit arrays as a parameters
2018-04-12 12:53:24 +02:00
Vladyslav 69a986b612 Small fix for closing a large map
The large map was closed with an ordinary arrow, now it will be hand pointer.
And some minor corrections in phrases.
2018-04-12 11:09:29 +03:00
iopietro a906f673b4 A little forgetfulness 2018-04-11 00:18:58 +02:00
iopietro 8b3a387cd5 Starvation refactor
Refactor part 2 of the "Starvation" function:
+Trapped troops in other villages will die of starvation
+Returning troops will die of starvaton

Database.php:
+Added "modifyPrisoners" function
2018-04-11 00:16:39 +02:00
iopietro 01e1df7493 Fixed a bug
Corrected a little forgetfulness
2018-04-09 23:35:45 +02:00
iopietro 486a59dc03 Merge branch 'master' of https://github.com/Shadowss/TravianZ 2018-04-09 21:46:06 +02:00
iopietro 21179d346f Fixed some bugs and errors
+Part 1 of the starvation refactor, attacking troops will now be killed
+Fixed some errors in Units.php, Technology.php, Battle.php and some
16_incomming.tpl
-Removed an unused function in Database.php
+Fixed a bug that could have destroyed a village after taking an
artefact even if it had more than 0 pop
2018-04-09 21:31:50 +02:00
Vladyslav 9f0e0e9136 Fixed more little bug in quest
Now all the images correspond to quests
2018-04-09 20:44:04 +03:00
Vladyslav 09340fb0c5 Fixed a little bug in quest
In the expanded quest "Task 24: Granary to Level 3", a warehouse image was displayed instead of an image of the granary
2018-04-09 17:01:03 +03:00
iopietro bdca64eed3 Fixed a bug in medals
Medals are now given at the right date
2018-04-08 23:29:36 +02:00
iopietro 72fd81b69b Fixed an artefact bug
+Fixed a bug that prevented the destruction of a village, if it had 0
population with no artefacts inside
+Some clean-up
2018-04-08 22:55:33 +02:00
iopietro a8b474bc01 Fixed an artefact bug
+Fixed a bug that prevented the conquer of an artefact between two
villages of the same owner
2018-04-08 21:49:13 +02:00
iopietro 49a0c1377f A little forgetfulness 2018-04-08 20:44:44 +02:00
iopietro 9669b47dc0 Fixed the "Reloading issue"
-Removed some useless redirects
2018-04-08 20:38:29 +02:00
iopietro 9e44c1cd6d Some replacements
+Replaced all $GLOBALS['link'] with $database->dblink
-Removed Templates/links.tpl from build.php (it's already in
Templates/menu.tpl)
2018-04-08 19:55:28 +02:00
iopietro 6ea4430372 Fixed some bugs
+If you conquer a village with an artifact inside, the new owner will be
changed correctly
+Moved plus links under the menu
+Renewed the "debug" function in Logging.php
+Fixed some errors that could have shown in Ranking.php
2018-04-08 18:28:24 +02:00
iopietro b5037e1c33 Fixed newsboxes
Fixed some errors that should have appeared after adding a link
Fixed some html formatting errors
2018-04-08 14:50:27 +02:00
iopietro 4b1481f2c1 Fixed some bugs
Links are now working properly
Coded a different condition to show the Bakery or not in the "Show Soon"
building list
2018-04-08 12:44:52 +02:00
iopietro 5bde1fe2dd A little forgetfulness 2018-04-07 23:22:56 +02:00
iopietro fba51fd48d A little fix
The speed of the server is now counted in the Blacksmith/Armoury
researches waiting loop formula
2018-04-07 23:18:05 +02:00
iopietro d236a21d38 Fixed some bugs
+Level upgrades in Blacksmith and Armoury are now shown correctly
+Corrected a typo
+Upgrades in the Blacksmith and the Armoury should be ordered correctly
2018-04-07 23:15:23 +02:00