diff --git a/Admin/Templates/alliance.tpl b/Admin/Templates/alliance.tpl index 211049a3..8d211d51 100644 --- a/Admin/Templates/alliance.tpl +++ b/Admin/Templates/alliance.tpl @@ -91,7 +91,7 @@ if($_GET['aid']) $player = mysqli_fetch_assoc(mysqli_query($GLOBALS["link"], "SELECT * FROM ".TB_PREFIX."users WHERE id = ".(int) $row['uid']."")); if($row['opt1'] == 1) { $position1 = "Assign To Position"; } else { $position1 = "No Assigning Positions"; } if($row['opt2'] == 1) { $position2 = "Kick Players"; } else { $position2 = "No Kicking Players"; } - if($row['opt3'] == 1) { $position3 = "Change Alliance Description"; } else { $position3 = "No Changing Description"; } + if($row['opt3'] == 1) { $position3 = "Change Description"; } else { $position3 = "No Changing Description"; } if($row['opt4'] == 1) { $position4 = "Invite Players"; } else { $position4 = "No Invitations"; } if($row['opt5'] == 1) { $position5 = "Manage Forums"; } else { $position5 = "No Forum Management"; } if($row['opt6'] == 1) { $position6 = "Alliance Diplomacy"; } else { $position6 = "No Diplomacy"; } @@ -151,9 +151,9 @@ if($_GET['aid']) -
- -
+
+ +
@@ -163,9 +163,9 @@ if($_GET['aid']) -
- -
+
+ +
diff --git a/Admin/Templates/config.tpl b/Admin/Templates/config.tpl index eb56cd0d..4970cbc7 100644 --- a/Admin/Templates/config.tpl +++ b/Admin/Templates/config.tpl @@ -179,7 +179,32 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN); + + + + + + +
New Mechanics and Functions
+ + + + + + + + + + + + + + + + + +
Display oasis in profile ?Enable (Disable) the display of oases of each village in the player profileEnabled" : "Disabled"; ?>
Alliance invitation message ?Enable (Disable) sending an in-game message to the player, if he was invited to the allianceEnabled" : "Disabled"; ?>
New Alliance & Embassy Mechanics ?For this setting, you can find more information on the link: https://github.comEnabled" : "Disabled"; ?>
diff --git a/Admin/Templates/editNewFunctions.tpl b/Admin/Templates/editNewFunctions.tpl new file mode 100644 index 00000000..ad3035ab --- /dev/null +++ b/Admin/Templates/editNewFunctions.tpl @@ -0,0 +1,62 @@ + +

+ + +
+
+ + + + + + + + + + + + + + + + + + + +
Edit New Mechanics and Functions
Display oasis in profile ?Turns on or off the display of oases of each village in the player profile + +
Alliance invitation message ?Enable (Disable) sending an in-game message to the player, if he was invited to the alliance + +
New Alliance & Embassy Mechanics ?For this setting, you can find more information on the link: https://github.com + +
+
+ + + + +
<<
+ diff --git a/Admin/Templates/playerinfo.tpl b/Admin/Templates/playerinfo.tpl index 370b0afd..103d6705 100644 --- a/Admin/Templates/playerinfo.tpl +++ b/Admin/Templates/playerinfo.tpl @@ -261,9 +261,9 @@ - +
- +
diff --git a/Admin/gpack/travian_default/img/g/bg0.jpg b/Admin/gpack/travian_default/img/g/bg0.jpg new file mode 100644 index 00000000..2c0d6497 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/bg0.jpg differ diff --git a/Admin/gpack/travian_default/img/g/bg1.jpg b/Admin/gpack/travian_default/img/g/bg1.jpg new file mode 100644 index 00000000..67a1235e Binary files /dev/null and b/Admin/gpack/travian_default/img/g/bg1.jpg differ diff --git a/Admin/gpack/travian_default/img/g/bg11.jpg b/Admin/gpack/travian_default/img/g/bg11.jpg new file mode 100644 index 00000000..6b99cb83 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/bg11.jpg differ diff --git a/Admin/gpack/travian_default/img/g/bg12.jpg b/Admin/gpack/travian_default/img/g/bg12.jpg new file mode 100644 index 00000000..7c2341fc Binary files /dev/null and b/Admin/gpack/travian_default/img/g/bg12.jpg differ diff --git a/Admin/gpack/travian_default/img/g/bg13.jpg b/Admin/gpack/travian_default/img/g/bg13.jpg new file mode 100644 index 00000000..67a1235e Binary files /dev/null and b/Admin/gpack/travian_default/img/g/bg13.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f1.jpg b/Admin/gpack/travian_default/img/g/f1.jpg new file mode 100644 index 00000000..cde07652 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f1.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f10.jpg b/Admin/gpack/travian_default/img/g/f10.jpg new file mode 100644 index 00000000..9adaf8a4 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f10.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f11.jpg b/Admin/gpack/travian_default/img/g/f11.jpg new file mode 100644 index 00000000..66bfb0f5 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f11.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f12.jpg b/Admin/gpack/travian_default/img/g/f12.jpg new file mode 100644 index 00000000..9a34c2fb Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f12.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f2.jpg b/Admin/gpack/travian_default/img/g/f2.jpg new file mode 100644 index 00000000..d4a004fa Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f2.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f3.jpg b/Admin/gpack/travian_default/img/g/f3.jpg new file mode 100644 index 00000000..143d32b4 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f3.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f4.jpg b/Admin/gpack/travian_default/img/g/f4.jpg new file mode 100644 index 00000000..e158c055 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f4.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f5.jpg b/Admin/gpack/travian_default/img/g/f5.jpg new file mode 100644 index 00000000..42e03a72 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f5.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f6.jpg b/Admin/gpack/travian_default/img/g/f6.jpg new file mode 100644 index 00000000..05f0b956 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f6.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f7.jpg b/Admin/gpack/travian_default/img/g/f7.jpg new file mode 100644 index 00000000..07452c29 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f7.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f8.jpg b/Admin/gpack/travian_default/img/g/f8.jpg new file mode 100644 index 00000000..b8a95fe1 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f8.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f9.jpg b/Admin/gpack/travian_default/img/g/f9.jpg new file mode 100644 index 00000000..3fbfb700 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f9.jpg differ diff --git a/Admin/gpack/travian_default/img/g/f99.jpg b/Admin/gpack/travian_default/img/g/f99.jpg new file mode 100644 index 00000000..e5f40c1b Binary files /dev/null and b/Admin/gpack/travian_default/img/g/f99.jpg differ diff --git a/Admin/gpack/travian_default/img/g/g1.gif b/Admin/gpack/travian_default/img/g/g1.gif new file mode 100644 index 00000000..674d0d48 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g1.gif differ diff --git a/Admin/gpack/travian_default/img/g/g10.gif b/Admin/gpack/travian_default/img/g/g10.gif new file mode 100644 index 00000000..e8026aa8 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g10.gif differ diff --git a/Admin/gpack/travian_default/img/g/g10b.gif b/Admin/gpack/travian_default/img/g/g10b.gif new file mode 100644 index 00000000..64705fcc Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g10b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g11.gif b/Admin/gpack/travian_default/img/g/g11.gif new file mode 100644 index 00000000..c485ba76 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g11.gif differ diff --git a/Admin/gpack/travian_default/img/g/g11b.gif b/Admin/gpack/travian_default/img/g/g11b.gif new file mode 100644 index 00000000..38532423 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g11b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g12.gif b/Admin/gpack/travian_default/img/g/g12.gif new file mode 100644 index 00000000..4bb657bd Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g12.gif differ diff --git a/Admin/gpack/travian_default/img/g/g12b.gif b/Admin/gpack/travian_default/img/g/g12b.gif new file mode 100644 index 00000000..2087f800 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g12b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g13.gif b/Admin/gpack/travian_default/img/g/g13.gif new file mode 100644 index 00000000..3f198626 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g13.gif differ diff --git a/Admin/gpack/travian_default/img/g/g13b.gif b/Admin/gpack/travian_default/img/g/g13b.gif new file mode 100644 index 00000000..5efaea36 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g13b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g14.gif b/Admin/gpack/travian_default/img/g/g14.gif new file mode 100644 index 00000000..028def71 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g14.gif differ diff --git a/Admin/gpack/travian_default/img/g/g14b.gif b/Admin/gpack/travian_default/img/g/g14b.gif new file mode 100644 index 00000000..0eb91edb Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g14b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g15.gif b/Admin/gpack/travian_default/img/g/g15.gif new file mode 100644 index 00000000..b3b38597 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g15.gif differ diff --git a/Admin/gpack/travian_default/img/g/g15b.gif b/Admin/gpack/travian_default/img/g/g15b.gif new file mode 100644 index 00000000..efaf119f Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g15b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g16.gif b/Admin/gpack/travian_default/img/g/g16.gif new file mode 100644 index 00000000..ced8bfbf Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g16.gif differ diff --git a/Admin/gpack/travian_default/img/g/g16b.gif b/Admin/gpack/travian_default/img/g/g16b.gif new file mode 100644 index 00000000..41e9eeca Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g16b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g16e.gif b/Admin/gpack/travian_default/img/g/g16e.gif new file mode 100644 index 00000000..15194b3c Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g16e.gif differ diff --git a/Admin/gpack/travian_default/img/g/g17.gif b/Admin/gpack/travian_default/img/g/g17.gif new file mode 100644 index 00000000..9cba03a2 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g17.gif differ diff --git a/Admin/gpack/travian_default/img/g/g17b.gif b/Admin/gpack/travian_default/img/g/g17b.gif new file mode 100644 index 00000000..c31afad6 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g17b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g18.gif b/Admin/gpack/travian_default/img/g/g18.gif new file mode 100644 index 00000000..e22fc79c Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g18.gif differ diff --git a/Admin/gpack/travian_default/img/g/g18b.gif b/Admin/gpack/travian_default/img/g/g18b.gif new file mode 100644 index 00000000..2ff14a79 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g18b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g19.gif b/Admin/gpack/travian_default/img/g/g19.gif new file mode 100644 index 00000000..1594df89 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g19.gif differ diff --git a/Admin/gpack/travian_default/img/g/g19b.gif b/Admin/gpack/travian_default/img/g/g19b.gif new file mode 100644 index 00000000..570ae022 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g19b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g2.gif b/Admin/gpack/travian_default/img/g/g2.gif new file mode 100644 index 00000000..14e9a8f3 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g2.gif differ diff --git a/Admin/gpack/travian_default/img/g/g20.gif b/Admin/gpack/travian_default/img/g/g20.gif new file mode 100644 index 00000000..53eb4b42 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g20.gif differ diff --git a/Admin/gpack/travian_default/img/g/g20b.gif b/Admin/gpack/travian_default/img/g/g20b.gif new file mode 100644 index 00000000..6c74c4bd Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g20b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g21.gif b/Admin/gpack/travian_default/img/g/g21.gif new file mode 100644 index 00000000..c28c96cf Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g21.gif differ diff --git a/Admin/gpack/travian_default/img/g/g21b.gif b/Admin/gpack/travian_default/img/g/g21b.gif new file mode 100644 index 00000000..e32f34da Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g21b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g22.gif b/Admin/gpack/travian_default/img/g/g22.gif new file mode 100644 index 00000000..4644eca6 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g22.gif differ diff --git a/Admin/gpack/travian_default/img/g/g22b.gif b/Admin/gpack/travian_default/img/g/g22b.gif new file mode 100644 index 00000000..3ba5af78 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g22b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g23.gif b/Admin/gpack/travian_default/img/g/g23.gif new file mode 100644 index 00000000..fb6efe09 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g23.gif differ diff --git a/Admin/gpack/travian_default/img/g/g23b.gif b/Admin/gpack/travian_default/img/g/g23b.gif new file mode 100644 index 00000000..6f7ecb20 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g23b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g24.gif b/Admin/gpack/travian_default/img/g/g24.gif new file mode 100644 index 00000000..c4659f23 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g24.gif differ diff --git a/Admin/gpack/travian_default/img/g/g24b.gif b/Admin/gpack/travian_default/img/g/g24b.gif new file mode 100644 index 00000000..047430b8 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g24b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g25.gif b/Admin/gpack/travian_default/img/g/g25.gif new file mode 100644 index 00000000..c67f4fe3 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g25.gif differ diff --git a/Admin/gpack/travian_default/img/g/g25b.gif b/Admin/gpack/travian_default/img/g/g25b.gif new file mode 100644 index 00000000..b643fa65 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g25b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g26.gif b/Admin/gpack/travian_default/img/g/g26.gif new file mode 100644 index 00000000..6d370a18 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g26.gif differ diff --git a/Admin/gpack/travian_default/img/g/g26b.gif b/Admin/gpack/travian_default/img/g/g26b.gif new file mode 100644 index 00000000..cf67c329 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g26b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g27.gif b/Admin/gpack/travian_default/img/g/g27.gif new file mode 100644 index 00000000..2c479d31 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g27.gif differ diff --git a/Admin/gpack/travian_default/img/g/g27b.gif b/Admin/gpack/travian_default/img/g/g27b.gif new file mode 100644 index 00000000..e6764192 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g27b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g28.gif b/Admin/gpack/travian_default/img/g/g28.gif new file mode 100644 index 00000000..37a5ad5b Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g28.gif differ diff --git a/Admin/gpack/travian_default/img/g/g28b.gif b/Admin/gpack/travian_default/img/g/g28b.gif new file mode 100644 index 00000000..5e3548a6 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g28b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g29.gif b/Admin/gpack/travian_default/img/g/g29.gif new file mode 100644 index 00000000..863313d9 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g29.gif differ diff --git a/Admin/gpack/travian_default/img/g/g29b.gif b/Admin/gpack/travian_default/img/g/g29b.gif new file mode 100644 index 00000000..570ae022 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g29b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g3.gif b/Admin/gpack/travian_default/img/g/g3.gif new file mode 100644 index 00000000..d2bf739b Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g3.gif differ diff --git a/Admin/gpack/travian_default/img/g/g30.gif b/Admin/gpack/travian_default/img/g/g30.gif new file mode 100644 index 00000000..7422b9b6 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g30.gif differ diff --git a/Admin/gpack/travian_default/img/g/g30b.gif b/Admin/gpack/travian_default/img/g/g30b.gif new file mode 100644 index 00000000..6c74c4bd Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g30b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g31Icon.gif b/Admin/gpack/travian_default/img/g/g31Icon.gif new file mode 100644 index 00000000..46e8c8d6 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g31Icon.gif differ diff --git a/Admin/gpack/travian_default/img/g/g32Icon.gif b/Admin/gpack/travian_default/img/g/g32Icon.gif new file mode 100644 index 00000000..93c11449 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g32Icon.gif differ diff --git a/Admin/gpack/travian_default/img/g/g33Icon.gif b/Admin/gpack/travian_default/img/g/g33Icon.gif new file mode 100644 index 00000000..262dd953 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g33Icon.gif differ diff --git a/Admin/gpack/travian_default/img/g/g34.gif b/Admin/gpack/travian_default/img/g/g34.gif new file mode 100644 index 00000000..b06f4805 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g34.gif differ diff --git a/Admin/gpack/travian_default/img/g/g34b.gif b/Admin/gpack/travian_default/img/g/g34b.gif new file mode 100644 index 00000000..559077f4 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g34b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g35.gif b/Admin/gpack/travian_default/img/g/g35.gif new file mode 100644 index 00000000..b934965f Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g35.gif differ diff --git a/Admin/gpack/travian_default/img/g/g35_tea.gif b/Admin/gpack/travian_default/img/g/g35_tea.gif new file mode 100644 index 00000000..7aeffa81 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g35_tea.gif differ diff --git a/Admin/gpack/travian_default/img/g/g35b.gif b/Admin/gpack/travian_default/img/g/g35b.gif new file mode 100644 index 00000000..59c20f7a Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g35b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g35b_tea.gif b/Admin/gpack/travian_default/img/g/g35b_tea.gif new file mode 100644 index 00000000..b3c5eabd Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g35b_tea.gif differ diff --git a/Admin/gpack/travian_default/img/g/g36.gif b/Admin/gpack/travian_default/img/g/g36.gif new file mode 100644 index 00000000..3eb55117 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g36.gif differ diff --git a/Admin/gpack/travian_default/img/g/g36b.gif b/Admin/gpack/travian_default/img/g/g36b.gif new file mode 100644 index 00000000..1ee92976 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g36b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g37.gif b/Admin/gpack/travian_default/img/g/g37.gif new file mode 100644 index 00000000..7a54ecf1 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g37.gif differ diff --git a/Admin/gpack/travian_default/img/g/g37b.gif b/Admin/gpack/travian_default/img/g/g37b.gif new file mode 100644 index 00000000..8e4b1b39 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g37b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g38.gif b/Admin/gpack/travian_default/img/g/g38.gif new file mode 100644 index 00000000..2c55d044 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g38.gif differ diff --git a/Admin/gpack/travian_default/img/g/g38b.gif b/Admin/gpack/travian_default/img/g/g38b.gif new file mode 100644 index 00000000..7bcf55fa Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g38b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g39.gif b/Admin/gpack/travian_default/img/g/g39.gif new file mode 100644 index 00000000..cd9c81b0 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g39.gif differ diff --git a/Admin/gpack/travian_default/img/g/g39b.gif b/Admin/gpack/travian_default/img/g/g39b.gif new file mode 100644 index 00000000..97fc9331 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g39b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g4.gif b/Admin/gpack/travian_default/img/g/g4.gif new file mode 100644 index 00000000..71c09f56 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g4.gif differ diff --git a/Admin/gpack/travian_default/img/g/g40.gif b/Admin/gpack/travian_default/img/g/g40.gif new file mode 100644 index 00000000..ac6c7efb Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g40.gif differ diff --git a/Admin/gpack/travian_default/img/g/g40_1.gif b/Admin/gpack/travian_default/img/g/g40_1.gif new file mode 100644 index 00000000..9b5fa106 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g40_1.gif differ diff --git a/Admin/gpack/travian_default/img/g/g40_2.gif b/Admin/gpack/travian_default/img/g/g40_2.gif new file mode 100644 index 00000000..9503a4ff Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g40_2.gif differ diff --git a/Admin/gpack/travian_default/img/g/g40_3.gif b/Admin/gpack/travian_default/img/g/g40_3.gif new file mode 100644 index 00000000..c9bd9358 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g40_3.gif differ diff --git a/Admin/gpack/travian_default/img/g/g40_4.gif b/Admin/gpack/travian_default/img/g/g40_4.gif new file mode 100644 index 00000000..78b9d35f Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g40_4.gif differ diff --git a/Admin/gpack/travian_default/img/g/g40_5.gif b/Admin/gpack/travian_default/img/g/g40_5.gif new file mode 100644 index 00000000..31b8f7a7 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g40_5.gif differ diff --git a/Admin/gpack/travian_default/img/g/g41.gif b/Admin/gpack/travian_default/img/g/g41.gif new file mode 100644 index 00000000..db16aae4 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g41.gif differ diff --git a/Admin/gpack/travian_default/img/g/g41b.gif b/Admin/gpack/travian_default/img/g/g41b.gif new file mode 100644 index 00000000..03e6e951 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g41b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g42.gif b/Admin/gpack/travian_default/img/g/g42.gif new file mode 100644 index 00000000..c28c96cf Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g42.gif differ diff --git a/Admin/gpack/travian_default/img/g/g42b.gif b/Admin/gpack/travian_default/img/g/g42b.gif new file mode 100644 index 00000000..e32f34da Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g42b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g43.gif b/Admin/gpack/travian_default/img/g/g43.gif new file mode 100644 index 00000000..b73a6032 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g43.gif differ diff --git a/Admin/gpack/travian_default/img/g/g43b.gif b/Admin/gpack/travian_default/img/g/g43b.gif new file mode 100644 index 00000000..b73a6032 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g43b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g44.gif b/Admin/gpack/travian_default/img/g/g44.gif new file mode 100644 index 00000000..b73a6032 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g44.gif differ diff --git a/Admin/gpack/travian_default/img/g/g44b.gif b/Admin/gpack/travian_default/img/g/g44b.gif new file mode 100644 index 00000000..b73a6032 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g44b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g5.gif b/Admin/gpack/travian_default/img/g/g5.gif new file mode 100644 index 00000000..4a8aa69f Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g5.gif differ diff --git a/Admin/gpack/travian_default/img/g/g5b.gif b/Admin/gpack/travian_default/img/g/g5b.gif new file mode 100644 index 00000000..5571545a Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g5b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g6.gif b/Admin/gpack/travian_default/img/g/g6.gif new file mode 100644 index 00000000..dc58f4bb Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g6.gif differ diff --git a/Admin/gpack/travian_default/img/g/g6b.gif b/Admin/gpack/travian_default/img/g/g6b.gif new file mode 100644 index 00000000..3153df7c Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g6b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g7.gif b/Admin/gpack/travian_default/img/g/g7.gif new file mode 100644 index 00000000..81f4a840 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g7.gif differ diff --git a/Admin/gpack/travian_default/img/g/g7b.gif b/Admin/gpack/travian_default/img/g/g7b.gif new file mode 100644 index 00000000..1308afed Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g7b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g8.gif b/Admin/gpack/travian_default/img/g/g8.gif new file mode 100644 index 00000000..553d5ced Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g8.gif differ diff --git a/Admin/gpack/travian_default/img/g/g8b.gif b/Admin/gpack/travian_default/img/g/g8b.gif new file mode 100644 index 00000000..cba48a3e Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g8b.gif differ diff --git a/Admin/gpack/travian_default/img/g/g9.gif b/Admin/gpack/travian_default/img/g/g9.gif new file mode 100644 index 00000000..ad9c3bec Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g9.gif differ diff --git a/Admin/gpack/travian_default/img/g/g9b.gif b/Admin/gpack/travian_default/img/g/g9b.gif new file mode 100644 index 00000000..5b5ac885 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/g9b.gif differ diff --git a/Admin/gpack/travian_default/img/g/index.php b/Admin/gpack/travian_default/img/g/index.php new file mode 100644 index 00000000..98297c7a --- /dev/null +++ b/Admin/gpack/travian_default/img/g/index.php @@ -0,0 +1,19 @@ + +
+
+

404 - File not found

+ Not Found
+

We looked 404 times already but can't find anything, Not even an X marking the spot.

+

This system is not complete yet. So the page probably does not exist.


+
+
\ No newline at end of file diff --git a/Admin/gpack/travian_default/img/g/iso.gif b/Admin/gpack/travian_default/img/g/iso.gif new file mode 100644 index 00000000..5f5414f9 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/iso.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/glvl.gif b/Admin/gpack/travian_default/img/g/s/glvl.gif new file mode 100644 index 00000000..e29c346e Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/glvl.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/glvlm.gif b/Admin/gpack/travian_default/img/g/s/glvlm.gif new file mode 100644 index 00000000..6dec5842 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/glvlm.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/glvlp.gif b/Admin/gpack/travian_default/img/g/s/glvlp.gif new file mode 100644 index 00000000..96917e91 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/glvlp.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/index.php b/Admin/gpack/travian_default/img/g/s/index.php new file mode 100644 index 00000000..98297c7a --- /dev/null +++ b/Admin/gpack/travian_default/img/g/s/index.php @@ -0,0 +1,19 @@ + +
+
+

404 - File not found

+ Not Found
+

We looked 404 times already but can't find anything, Not even an X marking the spot.

+

This system is not complete yet. So the page probably does not exist.


+
+
\ No newline at end of file diff --git a/Admin/gpack/travian_default/img/g/s/lvl11_20.gif b/Admin/gpack/travian_default/img/g/s/lvl11_20.gif new file mode 100644 index 00000000..3e8ecad8 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/lvl11_20.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/lvl11_20_active.gif b/Admin/gpack/travian_default/img/g/s/lvl11_20_active.gif new file mode 100644 index 00000000..e8ef604d Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/lvl11_20_active.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/lvl1_10.gif b/Admin/gpack/travian_default/img/g/s/lvl1_10.gif new file mode 100644 index 00000000..aead44f9 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/lvl1_10.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/lvl1_10_active.gif b/Admin/gpack/travian_default/img/g/s/lvl1_10_active.gif new file mode 100644 index 00000000..79cab4aa Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/lvl1_10_active.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/lvl21_30.gif b/Admin/gpack/travian_default/img/g/s/lvl21_30.gif new file mode 100644 index 00000000..f354f006 Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/lvl21_30.gif differ diff --git a/Admin/gpack/travian_default/img/g/s/lvl21_30_active.gif b/Admin/gpack/travian_default/img/g/s/lvl21_30_active.gif new file mode 100644 index 00000000..f9a06d9f Binary files /dev/null and b/Admin/gpack/travian_default/img/g/s/lvl21_30_active.gif differ diff --git a/GameEngine/Admin/Mods/editAdminInfo.php b/GameEngine/Admin/Mods/editAdminInfo.php index 54314f7b..4cfa11d9 100755 --- a/GameEngine/Admin/Mods/editAdminInfo.php +++ b/GameEngine/Admin/Mods/editAdminInfo.php @@ -48,6 +48,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $NEWSBOX2=(NEWSBOX2==false)? "false":"true"; $NEWSBOX3=(NEWSBOX3==false)? "false":"true"; $LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true"; + $NEW_FUNCTIONS_OASIS = (NEW_FUNCTIONS_OASIS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_ALLIANCE_INVITATION = (NEW_FUNCTIONS_ALLIANCE_INVITATION == false ? 'false' : 'true'); + $NEW_FUNCTIONS_EMBASSY_MECHANICS = (NEW_FUNCTIONS_EMBASSY_MECHANICS == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); @@ -123,6 +126,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editExtraSet.php b/GameEngine/Admin/Mods/editExtraSet.php index ab14969a..e2dac2b3 100755 --- a/GameEngine/Admin/Mods/editExtraSet.php +++ b/GameEngine/Admin/Mods/editExtraSet.php @@ -47,6 +47,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; $SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true'); $ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_OASIS = (NEW_FUNCTIONS_OASIS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_ALLIANCE_INVITATION = (NEW_FUNCTIONS_ALLIANCE_INVITATION == false ? 'false' : 'true'); + $NEW_FUNCTIONS_EMBASSY_MECHANICS = (NEW_FUNCTIONS_EMBASSY_MECHANICS == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text); @@ -120,6 +123,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editLogSet.php b/GameEngine/Admin/Mods/editLogSet.php index 053a5b7f..c231c04d 100755 --- a/GameEngine/Admin/Mods/editLogSet.php +++ b/GameEngine/Admin/Mods/editLogSet.php @@ -43,6 +43,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; $SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true'); $ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_OASIS = (NEW_FUNCTIONS_OASIS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_ALLIANCE_INVITATION = (NEW_FUNCTIONS_ALLIANCE_INVITATION == false ? 'false' : 'true'); + $NEW_FUNCTIONS_EMBASSY_MECHANICS = (NEW_FUNCTIONS_EMBASSY_MECHANICS == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); @@ -120,6 +123,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editNewFunctions.php b/GameEngine/Admin/Mods/editNewFunctions.php new file mode 100644 index 00000000..1323099f --- /dev/null +++ b/GameEngine/Admin/Mods/editNewFunctions.php @@ -0,0 +1,135 @@ +' . + 'Please download constant_format.tpl file and copy it into the GameEngine/Admin/Mods ' . + 'directory - otherwise saving configuration won\'t work.

' . + 'The constant_format.tpl file can be downloaded at ' . + 'https://raw.githubusercontent.com/Shadowss/TravianZ/master/install/data/constant_format.tpl'); +} + +$myFile = "../../config.php"; +$fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\config.php"); + + $text = file_get_contents("constant_format.tpl"); + + $SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true'); + $ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true'); + $REG_OPEN = (REG_OPEN == false ? 'false' : 'true'); + $QUEST = (QUEST == false ? 'false' : 'true'); + + // SERVER SETTINGS - we need to keep these intact + $text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text); + $text = preg_replace("'%ERROR%'", ERROR_REPORT, $text); + $text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text); + $text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text); + $text = preg_replace("'%STARTTIME%'", COMMENCE, $text); + $text = preg_replace("'%SSTARTDATE%'", START_DATE, $text); + $text = preg_replace("'%SSTARTTIME%'", START_TIME, $text); + $text = preg_replace("'%LANG%'", LANG, $text); + $text = preg_replace("'%SPEED%'", SPEED, $text); + $text = preg_replace("'%MAX%'", WORLD_MAX, $text); + $text = preg_replace("'%GP%'", GP_ENABLE, $text); + $text = preg_replace("'%GP_LOCATE%'", GP_LOCATE, $text); + $text = preg_replace("'%INCSPEED%'", INCREASE_SPEED, $text); + $text = preg_replace("'%EVASIONSPEED%'", EVASION_SPEED, $text); + $text = preg_replace("'%TRADERCAP%'", TRADER_CAPACITY, $text); + $text = preg_replace("'%CRANNYCAP%'", CRANNY_CAPACITY, $text); + $text = preg_replace("'%TRAPPERCAP%'", TRAPPER_CAPACITY, $text); + $text = preg_replace("'%VILLAGE_EXPAND%'", CP, $text); + $text = preg_replace("'%DEMOLISH%'", DEMOLISH_LEVEL_REQ, $text); + $text = preg_replace("'%STORAGE_MULTIPLIER%'", STORAGE_MULTIPLIER, $text); + $text = preg_replace("'%QUEST%'", $QUEST, $text); + $text = preg_replace("'%QTYPE%'", QTYPE, $text); + $text = preg_replace("'%BEGINNER%'", PROTECTION, $text); + $text = preg_replace("'%WW%'", (WW ? 'true' : 'false'), $text); + $text = preg_replace("'%SHOW_NATARS%'", (SHOW_NATARS ? 'true' : 'false'), $text); + $text = preg_replace("'%NATARS_UNITS%'", NATARS_UNITS, $text); + $text = preg_replace("'%NATARS_SPAWN_TIME%'", NATARS_SPAWN_TIME, $text); + $text = preg_replace("'%NATARS_WW_SPAWN_TIME%'", NATARS_WW_SPAWN_TIME, $text); + $text = preg_replace("'%NATARS_WW_BUILDING_PLAN_SPAWN_TIME%'", NATARS_WW_BUILDING_PLAN_SPAWN_TIME, $text); + $text = preg_replace("'%NATURE_REGTIME%'", NATURE_REGTIME, $text); + $text = preg_replace("'%OASIS_WOOD_MULTIPLIER%'", OASIS_WOOD_MULTIPLIER, $text); + $text = preg_replace("'%OASIS_CLAY_MULTIPLIER%'", OASIS_CLAY_MULTIPLIER, $text); + $text = preg_replace("'%OASIS_IRON_MULTIPLIER%'", OASIS_IRON_MULTIPLIER, $text); + $text = preg_replace("'%OASIS_CROP_MULTIPLIER%'", OASIS_CROP_MULTIPLIER, $text); + $text = preg_replace("'%T4_COMING%'", (T4_COMING ? 'true' : 'false'), $text); + $text = preg_replace("'%ACTIVATE%'", (AUTH_EMAIL ? 'true' : 'false'), $text); + $text = preg_replace("'%MEDALINTERVAL%'", MEDALINTERVAL, $text); + $text = preg_replace("'%GREAT_WKS%'", (GREAT_WKS ? 'true' : 'false'), $text); + $text = preg_replace("'%TS_THRESHOLD%'", TS_THRESHOLD, $text); + $text = preg_replace("'%REG_OPEN%'", $REG_OPEN, $text); + $text = preg_replace("'%PEACE%'", PEACE, $text); + $text = preg_replace("'%LOGBUILD%'", (LOG_BUILD ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGTECH%'", (LOG_TECH ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGLOGIN%'", (LOG_LOGIN ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGGOLDFIN%'", (LOG_GOLD_FIN ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGADMIN%'", (LOG_ADMIN ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGWAR%'", (LOG_WAR ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGMARKET%'", (LOG_MARKET ? 'true' : 'false'), $text); + $text = preg_replace("'%LOGILLEGAL%'", (LOG_ILLEGAL ? 'true' : 'false'), $text); + $text = preg_replace("'%BOX1%'", (NEWSBOX1 ? 'true' : 'false'), $text); + $text = preg_replace("'%BOX2%'", (NEWSBOX2 ? 'true' : 'false'), $text); + $text = preg_replace("'%BOX3%'", (NEWSBOX3 ? 'true' : 'false'), $text); + $text = preg_replace("'%SSERVER%'", SQL_SERVER, $text); + $text = str_replace("%SPORT%", SQL_PORT, $text); + $text = preg_replace("'%SUSER%'", SQL_USER, $text); + $text = preg_replace("'%SPASS%'", SQL_PASS, $text); + $text = preg_replace("'%SDB%'", SQL_DB, $text); + $text = preg_replace("'%PREFIX%'", TB_PREFIX, $text); + $text = preg_replace("'%CONNECTT%'", DB_TYPE, $text); + $text = preg_replace("'%LIMIT_MAILBOX%'", (LIMIT_MAILBOX ? 'true' : 'false'), $text); + $text = preg_replace("'%MAX_MAILS%'", MAX_MAIL, $text); + $text = preg_replace("'%ARANK%'", (INCLUDE_ADMIN ? 'true' : 'false'), $text); + $text = preg_replace("'%AEMAIL%'", ADMIN_EMAIL, $text); + $text = preg_replace("'%ANAME%'", ADMIN_NAME, $text); + $text = preg_replace("'%ASUPPMSGS%'", $SUPPORT_MSGS_IN_ADMIN, $text); + $text = preg_replace("'%ARAIDS%'", $ADMINS_RAIDABLE, $text); + $text = preg_replace("'%UTRACK%'", "TRACK_USR", $text); // not in use, text only in a comment + $text = preg_replace("'%UTOUT%'", "USER_TIMEOUT", $text); // not in use, text only in a comment + $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); + $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); + $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $_POST['new_functions_oasis'], $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $_POST['new_functions_alliance_invitation'], $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $_POST['new_functions_embassy_mechanics'], $text); + + // PLUS settings need to be kept intact + $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); + $text = preg_replace("'%PLUS_PRODUCTION%'", PLUS_PRODUCTION, $text); + $text = preg_replace("'%PAYPAL_EMAIL%'", (defined('PAYPAL_EMAIL') ? PAYPAL_EMAIL : 'martin@martinambrus.com'), $text); + $text = preg_replace("'%PAYPAL_CURRENCY%'", (defined('PAYPAL_CURRENCY') ? PAYPAL_CURRENCY : 'EUR'), $text); + $text = preg_replace("'%PLUS_PACKAGE_A_PRICE%'", (defined('PLUS_PACKAGE_A_PRICE') ? PLUS_PACKAGE_A_PRICE : '1,99'), $text); + $text = preg_replace("'%PLUS_PACKAGE_A_GOLD%'", (defined('PLUS_PACKAGE_A_GOLD') ? PLUS_PACKAGE_A_GOLD : '60'), $text); + $text = preg_replace("'%PLUS_PACKAGE_B_PRICE%'", (defined('PLUS_PACKAGE_B_PRICE') ? PLUS_PACKAGE_B_PRICE : '4,99'), $text); + $text = preg_replace("'%PLUS_PACKAGE_B_GOLD%'", (defined('PLUS_PACKAGE_B_GOLD') ? PLUS_PACKAGE_B_GOLD : '120'), $text); + $text = preg_replace("'%PLUS_PACKAGE_C_PRICE%'", (defined('PLUS_PACKAGE_C_PRICE') ? PLUS_PACKAGE_C_PRICE : '9,99'), $text); + $text = preg_replace("'%PLUS_PACKAGE_C_GOLD%'", (defined('PLUS_PACKAGE_C_GOLD') ? PLUS_PACKAGE_C_GOLD : '360'), $text); + $text = preg_replace("'%PLUS_PACKAGE_D_PRICE%'", (defined('PLUS_PACKAGE_D_PRICE') ? PLUS_PACKAGE_D_PRICE : '19,99'), $text); + $text = preg_replace("'%PLUS_PACKAGE_D_GOLD%'", (defined('PLUS_PACKAGE_D_GOLD') ? PLUS_PACKAGE_D_GOLD : '1000'), $text); + $text = preg_replace("'%PLUS_PACKAGE_E_PRICE%'", (defined('PLUS_PACKAGE_E_PRICE') ? PLUS_PACKAGE_E_PRICE : '49,99'), $text); + $text = preg_replace("'%PLUS_PACKAGE_E_GOLD%'", (defined('PLUS_PACKAGE_E_GOLD') ? PLUS_PACKAGE_E_GOLD : '2000'), $text); + + fwrite($fh, $text); + fclose($fh); + +$database->query("Insert into ".TB_PREFIX."admin_log values (0,".$id.",'Changed New Mechanics and Functions Settings',".time().")"); + +header("Location: ../../../Admin/admin.php?p=config"); + +?> diff --git a/GameEngine/Admin/Mods/editNewsboxSet.php b/GameEngine/Admin/Mods/editNewsboxSet.php index 988cd665..4e83286e 100755 --- a/GameEngine/Admin/Mods/editNewsboxSet.php +++ b/GameEngine/Admin/Mods/editNewsboxSet.php @@ -45,11 +45,13 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $LOG_MARKET=(LOG_MARKET==false)? "false":"true"; $LOG_ILLEGAL=(LOG_ILLEGAL==false)? "false":"true"; - $LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true"; $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; $SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true'); $ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_OASIS = (NEW_FUNCTIONS_OASIS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_ALLIANCE_INVITATION = (NEW_FUNCTIONS_ALLIANCE_INVITATION == false ? 'false' : 'true'); + $NEW_FUNCTIONS_EMBASSY_MECHANICS = (NEW_FUNCTIONS_EMBASSY_MECHANICS == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text); @@ -127,6 +129,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Admin/Mods/editPlusSet.php b/GameEngine/Admin/Mods/editPlusSet.php index 2f61014f..abe31b35 100644 --- a/GameEngine/Admin/Mods/editPlusSet.php +++ b/GameEngine/Admin/Mods/editPlusSet.php @@ -31,6 +31,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true'); $ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_OASIS = (NEW_FUNCTIONS_OASIS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_ALLIANCE_INVITATION = (NEW_FUNCTIONS_ALLIANCE_INVITATION == false ? 'false' : 'true'); + $NEW_FUNCTIONS_EMBASSY_MECHANICS = (NEW_FUNCTIONS_EMBASSY_MECHANICS == false ? 'false' : 'true'); // SERVER SETTINGS - we need to keep these intact $text = preg_replace("'%ERRORREPORT%'", ERROR_REPORT, $text); @@ -104,6 +107,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text); // PLUS SETTINGS $text = preg_replace("'%PLUS_TIME%'", $_POST['plus_time'], $text); diff --git a/GameEngine/Admin/Mods/editServerSet.php b/GameEngine/Admin/Mods/editServerSet.php index 5554c2c0..0a29cff4 100755 --- a/GameEngine/Admin/Mods/editServerSet.php +++ b/GameEngine/Admin/Mods/editServerSet.php @@ -42,6 +42,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true"; $SUPPORT_MSGS_IN_ADMIN = (ADMIN_RECEIVE_SUPPORT_MESSAGES == false ? 'false' : 'true'); $ADMINS_RAIDABLE = (ADMIN_ALLOW_INCOMING_RAIDS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_OASIS = (NEW_FUNCTIONS_OASIS == false ? 'false' : 'true'); + $NEW_FUNCTIONS_ALLIANCE_INVITATION = (NEW_FUNCTIONS_ALLIANCE_INVITATION == false ? 'false' : 'true'); + $NEW_FUNCTIONS_EMBASSY_MECHANICS = (NEW_FUNCTIONS_EMBASSY_MECHANICS == false ? 'false' : 'true'); $text = file_get_contents("constant_format.tpl"); $text = preg_replace("'%ERRORREPORT%'", $_POST['error'], $text); @@ -115,6 +118,9 @@ $fh = fopen($myFile, 'w') or die("


Can't open file: GameEngine\con $text = preg_replace("'%DOMAIN%'", DOMAIN, $text); $text = preg_replace("'%HOMEPAGE%'", HOMEPAGE, $text); $text = preg_replace("'%SERVER%'", SERVER, $text); + $text = preg_replace("'%NEW_FUNCTIONS_OASIS%'", $NEW_FUNCTIONS_OASIS, $text); + $text = preg_replace("'%NEW_FUNCTIONS_ALLIANCE_INVITATION%'", $NEW_FUNCTIONS_ALLIANCE_INVITATION, $text); + $text = preg_replace("'%NEW_FUNCTIONS_EMBASSY_MECHANICS%'", $NEW_FUNCTIONS_EMBASSY_MECHANICS, $text); // PLUS settings need to be kept intact $text = preg_replace("'%PLUS_TIME%'", PLUS_TIME, $text); diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php index 9cfd8136..02d493f0 100755 --- a/GameEngine/Alliance.php +++ b/GameEngine/Alliance.php @@ -245,7 +245,9 @@ class Alliance { // Log the notice $database->insertAlliNotice($session->alliance, '' . addslashes($session->username) . ' has invited ' . addslashes($UserData['username']) . ' into the alliance.'); // send invitation via in-game messages - $database->sendMessage( + if(!NEW_FUNCTIONS_ALLIANCE_INVITATION) return; + else { + $database->sendMessage( $UserData['id'], 4, 'Alliance invitation.', @@ -256,6 +258,7 @@ class Alliance { 0, 0, true); + } } } diff --git a/Templates/Alliance/overview.tpl b/Templates/Alliance/overview.tpl index 8a779d8f..e59fd865 100644 --- a/Templates/Alliance/overview.tpl +++ b/Templates/Alliance/overview.tpl @@ -106,12 +106,14 @@ include("alli_menu.tpl"); - + +
- + +
diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl index f77d9201..0ff76ad7 100644 --- a/Templates/Build/17.tpl +++ b/Templates/Build/17.tpl @@ -31,11 +31,12 @@ else if(!empty($_POST['dname'])){ if(isset($checkexist) && $checkexist){ $villageOwner = $database->getVillageField($getwref,'owner'); $userAccess = $database->getUserField($villageOwner,'access',0); +$userVacation = $database->getUserField($villageOwner,'vac_mode',0); $userID = $database->getUserField($villageOwner,'id',0); } $maxcarry = $market->maxcarry; $maxcarry *= $market->merchantAvail(); -if(isset($_POST['ft'])=='check' && (($_POST['send3'] > 1 && $_POST['send3'] <= 3 && $session->goldclub) || $_POST['send3'] == 1) && $getwref != $village->wid && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist && ($userAccess == 2 || $userAccess == MULTIHUNTER || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN))){ +if(isset($_POST['ft'])=='check' && (($_POST['send3'] > 1 && $_POST['send3'] <= 3 && $session->goldclub) || $_POST['send3'] == 1) && $getwref != $village->wid && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist && ($userAccess == 2 || $userAccess == MULTIHUNTER || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN)) && $userVacation == 0){ ?>
@@ -226,6 +227,8 @@ if(isset($_POST['ft'])=='check'){ $error = ''.BANNED_CANNOT_SEND_RESOURCES.'.'; }elseif($_POST['r1']==0 && $_POST['r2']==0 && $_POST['r3']==0 && $_POST['r4']==0){ $error = ''.RESOURCES_NO_SELECTED.'.'; + }elseif($userVacation == '1') { + $error = 'Player is on vacation mode. You cannot send resources to him.'; }elseif(!$_POST['x'] && !$_POST['y'] && !$_POST['dname']){ $error = ''.ENTER_COORDINATES.'.'; }elseif($allres > $maxcarry){ diff --git a/Templates/Build/27_1.tpl b/Templates/Build/27_1.tpl index 3f1ff8b7..10f5fab8 100644 --- a/Templates/Build/27_1.tpl +++ b/Templates/Build/27_1.tpl @@ -45,7 +45,7 @@ Treasury ' . $reqlvl . ', Effect ' . $effect . ' '; echo '' . $database->getVillageField($artefact['vref'], "name") . ''; - echo '' . date("d/m/Y H:i", $artefact['conquered']) . ''; + echo '' . date("d.m.Y H:i", $artefact['conquered']) . ''; } } diff --git a/Templates/Plus/3.tpl b/Templates/Plus/3.tpl index 348eb151..e080d736 100644 --- a/Templates/Plus/3.tpl +++ b/Templates/Plus/3.tpl @@ -71,6 +71,7 @@ else $holdmr = intval($holdtotmin - (($holdhr * 60) + ($holdtotday * 1440))); echo " " . ($holdmr) . " mins"; } +} ?> = 86400) { echo 'too little gold'; } } -} ?> diff --git a/Templates/Profile/medal.php b/Templates/Profile/medal.php index be8098f0..3ae439f0 100644 --- a/Templates/Profile/medal.php +++ b/Templates/Profile/medal.php @@ -44,21 +44,13 @@ $profiel = preg_replace("/\[#natars]/is",'', $profiel, 1); } -//romans image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code +// TRIBE IMAGE - MUST TO BE SET FROM ADMIN PANEL @iopietro must code // Added by Shadow - cata7007@gmail.com / Skype : cata7007 if($displayarray['tribe'] == "1"){ $profiel = preg_replace("/\[#roman]/is",'', $profiel, 1); -} - -//Gauls image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code -// Added by Shadow - cata7007@gmail.com / Skype : cata7007 -if($displayarray['tribe'] == "2"){ +}elseif($displayarray['tribe'] == "2"){ $profiel = preg_replace("/\[#teuton]/is",'', $profiel, 1); -} - -//Teutons image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code -// Added by Shadow - cata7007@gmail.com / Skype : cata7007 -if($displayarray['tribe'] == "3"){ +}elseif($displayarray['tribe'] == "3"){ $profiel = preg_replace("/\[#gaul]/is",'', $profiel, 1); } @@ -74,38 +66,25 @@ $profiel = preg_replace("/\[#EVENT]/is",'', $profiel, 1); -$profiel = preg_replace("/\[#WINNERWW]/is",'', $profiel, 1); +$profiel = preg_replace("/\[#WWBUILDER]/is",'', $profiel, 1); +$profiel = preg_replace("/\[#WINNERWW]/is",'', $profiel, 1); +$profiel = preg_replace("/\[#OFFENSIVE]/is",'', $profiel, 1); +$profiel = preg_replace("/\[#DEFENSIVE]/is",'', $profiel, 1); +$profiel = preg_replace("/\[#POPULATION]/is",'', $profiel, 1); } -//Multihunter image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code +// Multihunter image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code // Added by Shadow - cata7007@gmail.com / Skype : cata7007 if($displayarray['username'] == "Multihunter"){ $profiel = preg_replace("/\[#MULTIHUNTER]/is",'', $profiel, 1); $profiel = preg_replace("/\[#MH]/is",'', $profiel, 1); -} - -//Travian Team image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code -// Added by Shadow - cata7007@gmail.com / Skype : cata7007 -if($displayarray['username'] == "Multihunter"){ $profiel = preg_replace("/\[#TEAM]/is",'', $profiel, 1); -} - -//Travian Team image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code -// Added by Shadow - cata7007@gmail.com / Skype : cata7007 -if($displayarray['access'] == "9"){ -$profiel = preg_replace("/\[#TEAM]/is",'', $profiel, 1); -} - -//Multihunter image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code -// Added by Shadow - cata7007@gmail.com / Skype : cata7007 -if($displayarray['access'] == "9"){ +}elseif($displayarray['access'] == "8"){ +$profiel = preg_replace("/\[#MULTIHUNTER]/is",'', $profiel, 1); $profiel = preg_replace("/\[#MH]/is",'', $profiel, 1); -} - -//Multihunter image - MUST TO BE SET FROM ADMIN PANEL @iopietro must code -// Added by Shadow - cata7007@gmail.com / Skype : cata7007 -if($displayarray['access'] == "8"){ +$profiel = preg_replace("/\[#TEAM]/is",'', $profiel, 1); +}elseif($displayarray['access'] == "9"){ +$profiel = preg_replace("/\[#TEAM]/is",'', $profiel, 1); $profiel = preg_replace("/\[#MH]/is",'', $profiel, 1); } diff --git a/Templates/Profile/overview.tpl b/Templates/Profile/overview.tpl index 1ceb1914..ec30898e 100644 --- a/Templates/Profile/overview.tpl +++ b/Templates/Profile/overview.tpl @@ -18,7 +18,7 @@ $ranking->procRankReq($_GET); $_GET['uid'] = preg_replace("/[^0-9]/","",$_GET['uid']); $displayarray = $database->getUserArray($_GET['uid'],1); - + $varmedal = $database->getProfileMedal($_GET['uid']); @@ -29,7 +29,7 @@ $profiel=explode("".md5('skJkev3')."", $profiel); $varray = $database->getProfileVillages($_GET['uid']); $totalpop = 0; foreach($varray as $vil) { - $totalpop += $vil['pop']; + $totalpop += $vil['pop']; } ?>

Player profile

@@ -146,72 +146,76 @@ if($displayarray['vac_mode'] == 1) echo "getCoor($vil['wref']); - echo "getMapCheck($vil['wref'])."\">".$vil['name'].""; - if($vil['capital'] == 1) echo " (capital) "; - if($hasArtifact) echo " (artifact) "; - echo ""; - - // OASIS PART - must to be activated from install part - - $oases = $database->getOasis($vil['wref']); - foreach ($oases as $oasis){ - switch ($oasis['type']) { - case 1: - case 2: - echo " "; - break; - case 3: - echo " "; - break; - case 4: - case 5: - echo " "; - break; - case 6: - echo " "; - break; - case 7: - case 8: - echo " "; - break; - case 9: - echo " "; - break; - case 10: - case 11: - echo " "; - break; - case 12: - echo " "; - break; - } + + + + + + + + + + + + + + + + + +villageHasArtefact($vil['wref']); + $coor = $database->getCoor($vil['wref']); + echo ""; + } + echo ""; } - - echo ""; - echo ""; - } - ?> -
Villages
NameOasisInhabitantsCoordinates
getMapCheck($vil['wref'])."\">".$vil['name'].""; + if($vil['capital'] == 1) echo " (capital)"; + if($hasArtifact) echo " (artifact) "; + + if(NEW_FUNCTIONS_OASIS){ + echo ""; + $oases = $database->getOasis($vil['wref']); + foreach ($oases as $oasis) { + switch ($oasis['type']) { + case 1: + case 2: + echo " "; + break; + case 3: + echo " "; + break; + case 4: + case 5: + echo " "; + break; + case 6: + echo " "; + break; + case 7: + case 8: + echo " "; + break; + case 9: + echo " "; + break; + case 10: + case 11: + echo " "; + break; + case 12: + echo " "; + break; + } + } + echo "".$vil['pop'].""; + echo "
(".$coor['x']."
|
".$coor['y'].")
".$vil['pop'].""; - echo "
(".$coor['x']."
|
".$coor['y'].")
+ echo ""; +?> diff --git a/gpack/travian_default/img/gloriamedals/Defensive_1.png b/gpack/travian_default/img/gloriamedals/Defensive_1.png new file mode 100644 index 00000000..f2149309 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_1.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_10.png b/gpack/travian_default/img/gloriamedals/Defensive_10.png new file mode 100644 index 00000000..aaa7f8e1 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_10.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_2.png b/gpack/travian_default/img/gloriamedals/Defensive_2.png new file mode 100644 index 00000000..31f4063a Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_2.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_3.png b/gpack/travian_default/img/gloriamedals/Defensive_3.png new file mode 100644 index 00000000..80e9cf3d Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_3.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_4.png b/gpack/travian_default/img/gloriamedals/Defensive_4.png new file mode 100644 index 00000000..0775a0c0 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_4.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_5.png b/gpack/travian_default/img/gloriamedals/Defensive_5.png new file mode 100644 index 00000000..d6869c9f Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_5.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_6.png b/gpack/travian_default/img/gloriamedals/Defensive_6.png new file mode 100644 index 00000000..1f18c8f1 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_6.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_7.png b/gpack/travian_default/img/gloriamedals/Defensive_7.png new file mode 100644 index 00000000..c1192ba5 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_7.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_8.png b/gpack/travian_default/img/gloriamedals/Defensive_8.png new file mode 100644 index 00000000..4656df47 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_8.png differ diff --git a/gpack/travian_default/img/gloriamedals/Defensive_9.png b/gpack/travian_default/img/gloriamedals/Defensive_9.png new file mode 100644 index 00000000..edc07aa9 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Defensive_9.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_1.png b/gpack/travian_default/img/gloriamedals/Offensive_1.png new file mode 100644 index 00000000..62d289d1 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_1.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_10.png b/gpack/travian_default/img/gloriamedals/Offensive_10.png new file mode 100644 index 00000000..8720c05f Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_10.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_2.png b/gpack/travian_default/img/gloriamedals/Offensive_2.png new file mode 100644 index 00000000..7b90eed4 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_2.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_3.png b/gpack/travian_default/img/gloriamedals/Offensive_3.png new file mode 100644 index 00000000..f950315a Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_3.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_4.png b/gpack/travian_default/img/gloriamedals/Offensive_4.png new file mode 100644 index 00000000..853f9fd9 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_4.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_5.png b/gpack/travian_default/img/gloriamedals/Offensive_5.png new file mode 100644 index 00000000..a8bdb876 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_5.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_6.png b/gpack/travian_default/img/gloriamedals/Offensive_6.png new file mode 100644 index 00000000..ec5b9d7b Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_6.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_7.png b/gpack/travian_default/img/gloriamedals/Offensive_7.png new file mode 100644 index 00000000..e759d5c0 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_7.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_8.png b/gpack/travian_default/img/gloriamedals/Offensive_8.png new file mode 100644 index 00000000..c7d5556e Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_8.png differ diff --git a/gpack/travian_default/img/gloriamedals/Offensive_9.png b/gpack/travian_default/img/gloriamedals/Offensive_9.png new file mode 100644 index 00000000..62e6d8b6 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Offensive_9.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_1.png b/gpack/travian_default/img/gloriamedals/Population_1.png new file mode 100644 index 00000000..df28db10 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_1.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_10.png b/gpack/travian_default/img/gloriamedals/Population_10.png new file mode 100644 index 00000000..2eb317db Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_10.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_2.png b/gpack/travian_default/img/gloriamedals/Population_2.png new file mode 100644 index 00000000..6dbb9c7f Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_2.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_3.png b/gpack/travian_default/img/gloriamedals/Population_3.png new file mode 100644 index 00000000..df47eca9 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_3.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_4.png b/gpack/travian_default/img/gloriamedals/Population_4.png new file mode 100644 index 00000000..a3db2862 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_4.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_5.png b/gpack/travian_default/img/gloriamedals/Population_5.png new file mode 100644 index 00000000..870fbd3a Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_5.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_6.png b/gpack/travian_default/img/gloriamedals/Population_6.png new file mode 100644 index 00000000..c4b300b4 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_6.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_7.png b/gpack/travian_default/img/gloriamedals/Population_7.png new file mode 100644 index 00000000..aca169fc Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_7.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_8.png b/gpack/travian_default/img/gloriamedals/Population_8.png new file mode 100644 index 00000000..ef90b391 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_8.png differ diff --git a/gpack/travian_default/img/gloriamedals/Population_9.png b/gpack/travian_default/img/gloriamedals/Population_9.png new file mode 100644 index 00000000..0092a971 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Population_9.png differ diff --git a/gpack/travian_default/img/gloriamedals/Survivor_2.png b/gpack/travian_default/img/gloriamedals/Survivor_2.png new file mode 100644 index 00000000..6a57ca7f Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Survivor_2.png differ diff --git a/gpack/travian_default/img/gloriamedals/Wow_1.png b/gpack/travian_default/img/gloriamedals/Wow_1.png new file mode 100644 index 00000000..3a3a8e03 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Wow_1.png differ diff --git a/gpack/travian_default/img/gloriamedals/Wow_2.png b/gpack/travian_default/img/gloriamedals/Wow_2.png new file mode 100644 index 00000000..3a130395 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/Wow_2.png differ diff --git a/gpack/travian_default/img/gloriamedals/def1.png b/gpack/travian_default/img/gloriamedals/def1.png new file mode 100644 index 00000000..79a2dabc Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/def1.png differ diff --git a/gpack/travian_default/img/gloriamedals/def2.png b/gpack/travian_default/img/gloriamedals/def2.png new file mode 100644 index 00000000..ff796add Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/def2.png differ diff --git a/gpack/travian_default/img/gloriamedals/def3.png b/gpack/travian_default/img/gloriamedals/def3.png new file mode 100644 index 00000000..a3217927 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/def3.png differ diff --git a/gpack/travian_default/img/gloriamedals/def4.png b/gpack/travian_default/img/gloriamedals/def4.png new file mode 100644 index 00000000..13f3c0b2 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/def4.png differ diff --git a/gpack/travian_default/img/gloriamedals/off1.png b/gpack/travian_default/img/gloriamedals/off1.png new file mode 100644 index 00000000..0cca44ed Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/off1.png differ diff --git a/gpack/travian_default/img/gloriamedals/off2.png b/gpack/travian_default/img/gloriamedals/off2.png new file mode 100644 index 00000000..c492dec2 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/off2.png differ diff --git a/gpack/travian_default/img/gloriamedals/off3.png b/gpack/travian_default/img/gloriamedals/off3.png new file mode 100644 index 00000000..7824de0c Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/off3.png differ diff --git a/gpack/travian_default/img/gloriamedals/off4.png b/gpack/travian_default/img/gloriamedals/off4.png new file mode 100644 index 00000000..f9afeaaf Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/off4.png differ diff --git a/gpack/travian_default/img/gloriamedals/pop1.png b/gpack/travian_default/img/gloriamedals/pop1.png new file mode 100644 index 00000000..7503fcc1 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/pop1.png differ diff --git a/gpack/travian_default/img/gloriamedals/pop2.png b/gpack/travian_default/img/gloriamedals/pop2.png new file mode 100644 index 00000000..2d102b4a Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/pop2.png differ diff --git a/gpack/travian_default/img/gloriamedals/pop3.png b/gpack/travian_default/img/gloriamedals/pop3.png new file mode 100644 index 00000000..177d6d32 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/pop3.png differ diff --git a/gpack/travian_default/img/gloriamedals/pop4.png b/gpack/travian_default/img/gloriamedals/pop4.png new file mode 100644 index 00000000..f229a12e Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/pop4.png differ diff --git a/gpack/travian_default/img/gloriamedals/survivor.png b/gpack/travian_default/img/gloriamedals/survivor.png new file mode 100644 index 00000000..2fdb52be Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/survivor.png differ diff --git a/gpack/travian_default/img/gloriamedals/ww-silber.png b/gpack/travian_default/img/gloriamedals/ww-silber.png new file mode 100644 index 00000000..e25e7751 Binary files /dev/null and b/gpack/travian_default/img/gloriamedals/ww-silber.png differ diff --git a/gpack/travian_default/lang/en/compact.css b/gpack/travian_default/lang/en/compact.css index 0f20d509..dc188b75 100644 --- a/gpack/travian_default/lang/en/compact.css +++ b/gpack/travian_default/lang/en/compact.css @@ -3203,9 +3203,15 @@ td.cbg2 { .ddb { float: left; } +.desc1div { + width: 236px; + word-wrap: break-word; + overflow-wrap: break-word; +} .desc2div { - overflow: hidden; width: 235px; + word-wrap: break-word; + overflow-wrap: break-word; } div.activation_time { padding-left: 5px; diff --git a/img/admin/admin.css b/img/admin/admin.css index 5ed7631c..c53cb573 100644 --- a/img/admin/admin.css +++ b/img/admin/admin.css @@ -527,7 +527,7 @@ table#profile thead th, table#profile tfoot th {background-image:url(../un/a/c2. table#profile thead td, table#profile tfoot td {background-color:#F3F3F3; text-align:center; width:50%;} table#profile tbody th, table#profile tbody td {text-align:left;} table#profile td.details {width:50%; height:156px; padding:0px; vertical-align:top; border-bottom:none;} -table#profile td.details table {border-collapse:collapse; line-height:16px; margin-top:0px; width:100%;} +table#profile td.details table {border-collapse:collapse; line-height:16px; margin-top:0px; width:100%; height:100%} table#profile td.details table th {width:50%; border-left:none; border-top:none; background:none;} table#profile td.details table td {border-right:none; border-left:none; border-top:none; text-align:left;} table#profile td.desc1, table#profile td.desc2 {width:50%; padding:0px 7px; vertical-align:middle;} @@ -572,6 +572,17 @@ input#btn_forward {width:97px; background-image: url(b/forward.gif);} input#btn_demolish {width:97px; background-image: url(b/demolish.gif);} input#btn_search {width:97px; background-image: url(b/search.gif);} +.desc1div { + width: 235px; + word-wrap: break-word; + overflow-wrap: break-word; +} +.desc2div { + width: 234px; + word-wrap: break-word; + overflow-wrap: break-word; +} + /* Start tooltips for the admin panel settings */ .tooltip { position: relative; diff --git a/install/data/constant_format.tpl b/install/data/constant_format.tpl index ab8fe301..75914a85 100644 --- a/install/data/constant_format.tpl +++ b/install/data/constant_format.tpl @@ -296,6 +296,12 @@ define("ADMIN_RECEIVE_SUPPORT_MESSAGES", %ASUPPMSGS%); // ***** Allow Admin accounts to be raided and attacked define("ADMIN_ALLOW_INCOMING_RAIDS", %ARAIDS%); +///////////////////////////////////////////////// +// **** NEW MECHANICS AND FUNCTIONS **** // +///////////////////////////////////////////////// +define("NEW_FUNCTIONS_OASIS", %NEW_FUNCTIONS_OASIS%); +define("NEW_FUNCTIONS_ALLIANCE_INVITATION", %NEW_FUNCTIONS_ALLIANCE_INVITATION%); +define("NEW_FUNCTIONS_EMBASSY_MECHANICS", %NEW_FUNCTIONS_EMBASSY_MECHANICS%); ////////////////////////////////////////// diff --git a/install/process.php b/install/process.php index dd8cf793..e2091f6a 100644 --- a/install/process.php +++ b/install/process.php @@ -141,6 +141,11 @@ class Process { $findReplace["%T4_COMING%"] = $_POST['t4_coming']; $findReplace["%REG_OPEN%"] = $_POST['reg_open']; $findReplace["%PEACE%"] = $_POST['peace']; + + //New Mechanics and Functions + $findReplace["%NEW_FUNCTIONS_OASIS%"] = $_POST['new_functions_oasis']; + $findReplace["%NEW_FUNCTIONS_ALLIANCE_INVITATION%"] = $_POST['new_functions_alliance_invitation']; + $findReplace["%NEW_FUNCTIONS_EMBASSY_MECHANICS%"] = $_POST['new_functions_embassy_mechanics']; fwrite($gameConfig, str_replace(array_keys($findReplace), array_values($findReplace), $text)); diff --git a/install/templates/config.tpl b/install/templates/config.tpl index c3720c41..6c06214d 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -268,7 +268,38 @@ echo "
Error creating constant.php + +

+

+ NEW MECHANICS AND FUNCTIONS RELATED + + + + + + + + + + + +
Display oasis in profile: + +
Alliance invitation message: + +
New Alliance & Embassy Mechanics: + +