Commit Graph

573 Commits

Author SHA1 Message Date
iopietro 44fc912616 Fixed a building bug
+Fixed a bug that permitted to build two buildings or two resources
field concurrently, without a plus account, as a Roman
+Some clean-up
2018-05-01 19:05:17 +02:00
iopietro 2fc3e7b7da Fixed trap bugs
+Released troops will now return to their respective villages correctly,
(allied or own villages)
+Fixed "Released X of own troops" and "Released X of friendly troops"
texts, they'll now match the correct amount of own/friendly released
troops.
+Fixed a bug that didn't permit to release troops in the first attack or
if in the attacked village there were prisoners from more than one
village
+Corrected a wrong stolen resources calculation
+Minor improovements and bug fixing
2018-05-01 00:09:58 +02:00
iopietro 2530dcac6d Fixed a bug in Palace/Residence
+Fixed a bug (or fixed a fix?) that didn't permit to train chief and
settlers in the same village
+Fixed a bug that didn't count trapped chiefs and trapped settlers
+Fixed a bug that did count chiefs and settlers of other players as used
slots, if they were attacking/reinforcing you
-Removed an unused portion of code
2018-04-29 16:57:27 +02:00
phaze1G 77e3cd68b0 Buttons replace part 2 (#536)
* Update assignpos.tpl

* Update changename.tpl

* Update kick.tpl

* Update kick.tpl

* Update linkforum.tpl

* Update search.tpl

* Update 18_create.tpl

* Update invite.tpl

* Update option.tpl

* Update newdorf.tpl

* buttons replace part 2

* Update addABTroops.tpl

* Update addTroops.tpl

* Update graphic.tpl

* Update all.tpl

* Update archive.tpl

* Update forum_3.tpl

* Update read.tpl

* Update ranksearch.tpl

* Update delete.tpl

* Update inbox.tpl

* Update 19.tpl
2018-04-29 13:03:59 +02:00
Pietro 31fb9800ad Update text.tpl 2018-04-29 01:37:09 +02:00
iopietro 58e72bf61e Merge branch 'master' of https://github.com/Shadowss/TravianZ 2018-04-29 00:49:32 +02:00
iopietro a40accc101 Distance calculation optimization and bug fixing
-Removed a lot of redundant code and put into a function
+Fixed a bug that permitted to found a new village in already founded
village
+Fixed a bug that permitted to found in an oasis
+Fixed a bug that permitted to hack the time you need to found a new
village
+Fixed a bug that permitted to found a new village to an inexistent one
2018-04-29 00:49:24 +02:00
phaze1G 2c1c2fb2d9 Buttons replace (#535)
* Updating buttons

* Update assignpos.tpl

* Update changename.tpl

* Update kick.tpl

* Update kick.tpl

* Update linkforum.tpl

* Update search.tpl

* Update 18_create.tpl

* Update invite.tpl

* Update option.tpl

* Update newdorf.tpl
2018-04-28 13:20:18 +02:00
iopietro 56e280f436 Artifacts fixes part 4
Completely fixed the artifact of the fool and fixed all kind of
artifact:

+Deleted some useless .tpl files and merged into one (Stable)
+The artifact of the fool effect won't be displayed if not active
+Fixed a bug that permitted to have a great and a unique artefacts
active at the same moment
+Big reductions of code in a lot of files
+Created some new methods to support artifacts
+Fixed a bug that prevented the effect of the "Rivals confusion" to work
correctly
+Fixed a bug that prevented "The eagles eyes" artifact to work correctly
for the attacker
+Fixed the artifact of the fool of every kind, now it's calculated with
a new method
+Fixed the cranny capacity when a "Rivals confusion" artifact is active
+Some minor bug fixing , improovements and optimization
2018-04-26 20:37:47 +02:00
phaze1G f168d95e3a Update notes.tpl 2018-04-26 09:25:45 +02:00
iopietro 8e731dd7d0 Artifacts fixes part 3
+Fixed the artifact of the fool, it will now work and reduce/increase
troops speed
+Optimized some templates file and deleted some useless files
+Added a method to Database.php which permits to calculate things
related to artifacts (it's not general yet, it only works for troops
speed)
-Removed artifact of the fool "Account" type, because it shouldn't exist
2018-04-25 22:58:18 +02:00
iopietro c15f8d41bb Merge branch 'master' of https://github.com/Shadowss/TravianZ.git 2018-04-25 15:13:31 +02:00
iopietro 0011d2abcb Artifacts fixes part 2
+Artifacts are now activated after a certain amount of time (based on
the official Travian Rules and the server speed) and not immediately
after the conquer
+Artifacts are now activated based on official Travian Rules, you can
only have 1 unique/account active artifacts

Changes in 27_show.tpl:
+Added the text "Can't be activated" to not-activable artifacts

Changes in Automation.php:
+Added a new method which activate activable artifacts

Changes in Database.php:
+Added some methods to support the new artifacts activation system
2018-04-25 15:13:24 +02:00
Pietro faa2df0927 Update text.tpl 2018-04-23 20:37:17 +02:00
iopietro 26cb03cdb6 Artifacts fixing part 1
+Added a new table in the database, called "artefacts_chrono" which
stores the chronology of all artifacts
+Added the support for the artifacts chronology in 27_show.tpl
+Added the support for interacting with the artifacts chronology table in Database.php
+Cleaned the code in 27_show.tpl
+Some minor improovements and bug fixing
2018-04-23 20:34:28 +02:00
iopietro 4072aca500 Fixed a graphical error 2018-04-22 16:52:59 +02:00
iopietro ec6a26acf3 Fixed a bug in the market
+ x3 orders and trade routes won't disappear anymore if the player has
less resources than required, the merchants will take all of his
resources instead
+Fixed a bug in the market that didn't permit to send x3 merchants
2018-04-21 21:56:33 +02:00
iopietro 996f011666 Fixed some report bugs
+Added the report type 23, which indicates a defence during festive days
+Festive reports in the alliance no longer duplicates
+Festive reports in the village view no longer duplicates
+Fixed a bug that didn't permit to read an allied report

General:
-Removed the possibility to view an inexistent village
+Some minor improovements
2018-04-21 17:28:20 +02:00
Pietro 65f7ad1721 Delete attack-defender.tpl
Not used anymore
2018-04-21 13:32:14 +02:00
iopietro f7f164ea2b General fixes
+Fixed some errors in Automation.php
+Some clean up in the alliance templates directory
2018-04-21 13:30:18 +02:00
iopietro c2f4d43b7e Reports refactor Part 2
+Heroes are now divided by tribes in battle reports
+Added to every report the support to read heroes from the battle report
data

Automation.php:
+Added the hero data, to every battle reports
+Fixed a bug that didn't count own dead defensive troops for general
attacks, top 10 attackers, attackers and hero xp
+Fixed a bug that didn't permit to add the rat enforcement to the
village, from quest number 8

Battle.php:
+Fixed a bug with catapults/rams that permitted to destroy level 1
buildings with only one catapults (even against 1000000 defensive
troops)
+Added a new function, for more readability

+General minor improovementes and bug fixing
2018-04-20 21:23:57 +02: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 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 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 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 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 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 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 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 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 00d5021d1c A little forgetfulness 2018-04-05 22:56:24 +02:00