Commit Graph

2557 Commits

Author SHA1 Message Date
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
iopietro 0132af4611 Fixed a lot bugs/security exploits
Profiles can't be hacked anymore, added some security control and
removed those malicious "hidden uid"
Errors now are now shown correctly while editing the profile
The level of the research you're doing in the Blacksmith/Armoury is now
displayed in the research queue
Hugely fixed the battle system, a big thanks to kirilloid for helping me
by providing his formulas :)!
Some general clean-up and bug fixing of little errors
Added some string constants to the language file (en.php)
2018-04-07 22:16:28 +02:00
iopietro f341c209b8 Added a new feature and some clean-up
Added the research loop in the blacksmith and in the armoury, only for
plus users. This was a not coded T3.6 feature.
"Total resources required" (for NPC merchants) are now calculated
correctly in the Armoury.
Some clean-up in Technology.php
2018-04-06 21:59:04 +02:00
iopietro eb041f5cd9 Fixed a bug in the rally point
The name of the attacked oasis and the link connected to it, are now
shown correctly.
2018-04-06 19:53:41 +02:00
Pietro 5f9186bd71 Fixed some bugs
In the simulator:
Fixed some error that could have shown during scountings.

All types of attack:
Changed "int" into "float" to gain precision in the attack formula.
Fixed spies formula, it's more precise now.
Fixed the Blacksmith/Armoury calculation formula for spies.
2018-04-06 18:06:08 +02:00
Pietro 00d5021d1c A little forgetfulness 2018-04-05 22:56:24 +02:00
Pietro a067344e03 Fixed a little bug
The Bakery is now shown in the "Soon" building list after meeting at least one prerequisites.
2018-04-05 21:47:46 +02:00
Pietro 9869abe5ba Fixed two population bugs
Automation.php:
Fixed the attacker population and defender population before a battle, now the account population will be considered instead of the single village population.
Fixed the attacker population and defender population while chiefing a village, now the account population will be considered instead of the single village population.

Database:
Added a function to get the total population of the account.
2018-04-05 21:09:16 +02:00
Pietro c3e2bae50b Fixed some catapults bug
Walls can't be targeted anymore by catapults (if the target was random).
Destroyed buildings of completely destroyed villages are shown properly in the report.
Added the information "There are no buildings to destroy" if only walls are left and the village has more than 0 population.
Some clean up.
2018-04-05 19:41:32 +02:00
Pietro 08bec39456 Added a new formula for catapults/rams 2018-04-05 17:08:37 +02:00
Pietro a1fbf9dcfc Fixed some catapult/ram bugs
Battle.php:
Fixed the blacksmith level formula for catapults and rams.

Automation.php:
+Catapults and rams now works better because of a new formula.

Note: this formula isn't 100% accurate with the real Travian formula, i can't find that formula anywhere, so i created an approximate formula.
2018-04-05 17:05:25 +02:00
Shadow 9fc3db754c Update Maintenance 2018-04-05 12:33:01 +03:00
Shadow a3b20a0475 Update README.md 2018-04-05 12:32:06 +03:00
Vladyslav 7d5e8c858c Merge pull request #510 from iopietro/master
Added some things
2018-04-05 08:32:37 +03:00
Pietro 02d79777f1 Fixed a bug in the troops training
Troops can now be trained in 0 seconds.
2018-04-05 03:05:57 +02:00
Pietro aec41019e9 Fixed a bug in the troops training
If the speed of the server is very high and the single troop training time is 0, you can now train troops instantly.
2018-04-05 03:03:49 +02:00
Pietro c2587d855f Fixed a little bug
The market won't show anymore in the "Soon" list if already built.
2018-04-05 01:45:25 +02:00
Pietro f0d6210979 Fixed a catapults bug
Fixed a bug which permits to select a not-selectable building, with a lower level of rally point.
Fixed a bug which permits to select two targets (with 20 or more catapults) with a rally point level lower than 20.
Fixed a typo.
2018-04-05 01:38:05 +02:00
Pietro 36666615eb Added the Brewery as catapults target 2018-04-05 00:07:12 +02:00
Pietro 3738fd44cc Fixed some bugs and some clean up
Units.php:
Fixed a bug which allows to select invalid buildings or not-hittable building (such as Cranny, Walls, Stonemason's lodge and Trapper) with catapults.
Fixed a bug which allows to select a secondary target with less than 20 catapults.

Removed some unused functions from Automation.php and Database.php.
2018-04-05 00:02:12 +02:00
Pietro 2619326732 A little forgetfulness
Removed the possibility to see the catapult target(s) when attacking an occupied oasis.
2018-04-04 21:46:05 +02:00
Pietro 976a0cd949 Added a constant 2018-04-04 21:39:21 +02:00
Pietro b881605cbc Added a new functionality
This is a T4+ functionality, but it's very useful. Catapult target(s) are now shown in the rally point, under the amount of attacking troops.
2018-04-04 21:38:57 +02:00