From 877762ea6ec74d97d289b824e7ef5f946b4c0c39 Mon Sep 17 00:00:00 2001 From: iopietro Date: Sun, 20 May 2018 16:56:37 +0200 Subject: [PATCH] General fixes +Updated installation SQL struct NOTE: To play this version without reinstalling the server, you need to run this query (where "s1_" is the prefix of the server): ALTER TABLE `s1_forum_topic` DROP `alliance0`, DROP `player0`, DROP `coor0`, DROP `report0`; ALTER TABLE `s1_forum_post` DROP `alliance0`, DROP `player0`, DROP `coor0`, DROP `report0`; --- GameEngine/Lang/en.php | 20 ++++++++++---------- sql_updates.txt | 13 +++++++++++++ var/db/struct.sql | 8 -------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index e4ea08d6..ceb1c8d7 100755 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -1308,12 +1308,12 @@ define("CONF_SERV_TRAPCAPACITY","Trapper Capacity"); define("CONF_SERV_TRAPCAPACITY_TOOLTIP","A multiplier for the capacity of the trap of the Gauls, which can capture enemy soldiers even before attacking the village. The value of 1 is equal to the capacity of 400 at the 20 level of construction. If you set the value to 2, then the capacity will be 800."); define("CONF_SERV_NATUNITSMULTIPLIER","Natars Units Multiplier"); define("CONF_SERV_NATUNITSMULTIPLIER_TOOLTIP","This parameter is responsible for the number of troops of Natars, on artifacts and WW villages."); -define("CONF_SERV_NATARS_SPAWN_TIME","Natars Spawn (Days)"); -define("CONF_SERV_NATARS_SPAWN_TIME_TOOLTIP",""); -define("CONF_SERV_NATARS_WW_SPAWN_TIME","World Wonders Spawn (Days)"); -define("CONF_SERV_NATARS_WW_SPAWN_TIME_TOOLTIP",""); -define("CONF_SERV_NATARS_WW_BUILDING_PLAN_SPAWN_TIME","WW Building Plan Spawn (Days)"); -define("CONF_SERV_NATARS_WW_BUILDING_PLAN_SPAWN_TIME_TOOLTIP",""); +define("CONF_SERV_NATARS_SPAWN_TIME","Natars Spawn"); +define("CONF_SERV_NATARS_SPAWN_TIME_TOOLTIP","After how long Natars and artifacts will spawn from the start date of the server, in days"); +define("CONF_SERV_NATARS_WW_SPAWN_TIME","World Wonders Spawn"); +define("CONF_SERV_NATARS_WW_SPAWN_TIME_TOOLTIP","After how long WW villages will spawn from the start date of the server, in days"); +define("CONF_SERV_NATARS_WW_BUILDING_PLAN_SPAWN_TIME","WW Building Plan Spawn"); +define("CONF_SERV_NATARS_WW_BUILDING_PLAN_SPAWN_TIME_TOOLTIP","After how long WW building plans will spawn from the start date of the server, in days"); define("CONF_SERV_MAPSIZE","Map Size"); define("CONF_SERV_MAPSIZE_TOOLTIP","The size of the map of the game world. Can not be changed on an already installed game server."); define("CONF_SERV_VILLEXPSPEED","Village Expanding Speed"); @@ -1335,13 +1335,13 @@ define("CONF_SERV_WWSTATS_TOOLTIP","Enable (True) or disable (False) the display define("CONF_SERV_NTRTIME","Nature Troops Regeneration Time"); define("CONF_SERV_NTRTIME_TOOLTIP","Time through which the nature troops will be restored in oases."); define("CONF_SERV_OASIS_WOOD_PROD_MULT","Oasis Wood Production Multiplier"); -define("CONF_SERV_OASIS_WOOD_PROD_MULT_TOOLTIP",""); +define("CONF_SERV_OASIS_WOOD_PROD_MULT_TOOLTIP","Multiply the base oasis production (40) of wood"); define("CONF_SERV_OASIS_CLAY_PROD_MULT","Oasis Clay Production Multiplier"); -define("CONF_SERV_OASIS_CLAY_PROD_MULT_TOOLTIP",""); +define("CONF_SERV_OASIS_CLAY_PROD_MULT_TOOLTIP","Multiply the base oasis production (40) of clay"); define("CONF_SERV_OASIS_IRON_PROD_MULT","Oasis Iron Production Multiplier"); -define("CONF_SERV_OASIS_IRON_PROD_MULT_TOOLTIP",""); +define("CONF_SERV_OASIS_IRON_PROD_MULT_TOOLTIP","Multiply the base oasis production (40) of iron"); define("CONF_SERV_OASIS_CROP_PROD_MULT","Oasis Crop Production Multiplier"); -define("CONF_SERV_OASIS_CROP_PROD_MULT_TOOLTIP",""); +define("CONF_SERV_OASIS_CROP_PROD_MULT_TOOLTIP","Multiply the base oasis production (40) of crop"); define("CONF_SERV_MEDALINTERVAL","Medal Interval"); define("CONF_SERV_MEDALINTERVAL_TOOLTIP","The time interval for issuing medals for the top players and alliances. If this parameter is changed on the installed server, the time interval changes after the subsequent issuance of the medals."); define("CONF_SERV_TOURNTHRES","Tourn Threshold"); diff --git a/sql_updates.txt b/sql_updates.txt index 4d627a86..c8fcba57 100644 --- a/sql_updates.txt +++ b/sql_updates.txt @@ -1,3 +1,16 @@ +-- 20.05.2018 -> dropped eight columns +ALTER TABLE `s1_forum_topic` + DROP `alliance0`, + DROP `player0`, + DROP `coor0`, + DROP `report0`; + +ALTER TABLE `s1_forum_post` + DROP `alliance0`, + DROP `player0`, + DROP `coor0`, + DROP `report0`; + -- 19.05.2018 -> added two new columns ALTER TABLE s1_forum_cat ADD (`display_to_alliances` text, `display_to_users` text) diff --git a/var/db/struct.sql b/var/db/struct.sql index 75b59380..1494141b 100644 --- a/var/db/struct.sql +++ b/var/db/struct.sql @@ -793,10 +793,6 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_post` ( `topic` int(11) NOT NULL, `owner` int(11) NOT NULL, `date` int(11) DEFAULT NULL, - `alliance0` int(11) DEFAULT NULL, - `player0` int(11) DEFAULT NULL, - `coor0` int(11) DEFAULT NULL, - `report0` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `topic-owner` (`topic`,`owner`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -858,10 +854,6 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%forum_topic` ( `ends` int(11) NOT NULL, `close` tinyint(4) NOT NULL, `stick` tinyint(4) NOT NULL, - `alliance0` int(11) DEFAULT NULL, - `player0` int(11) DEFAULT NULL, - `coor0` int(11) DEFAULT NULL, - `report0` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `cat-stick` (`cat`, `stick`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;