altered internal operation of tools, character data/non-character data is defined in the table creation header

datapack_development/sql/accounts.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for accounts
 -- ---------------------------
-CREATE TABLE `accounts` (
+CREATE TABLE IF NOT EXISTS `accounts` (
   `login` VARCHAR(45) NOT NULL default '',
   `password` VARCHAR(45) ,
   `lastactive` DECIMAL(20),

datapack_development/sql/armor.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `armor`
 --
-
+DROP TABLE IF EXISTS armor;
 CREATE TABLE armor (
   item_id int(11) NOT NULL default '0',
   name varchar(70) default NULL,

datapack_development/sql/boxaccess.sql

@@ -2,7 +2,7 @@
 -- Table structure for table `boxaccess`
 --
 
-CREATE TABLE boxaccess (
+CREATE TABLE IF NOT EXISTS boxaccess (
   spawn decimal(11,0) default NULL,
   charname varchar(32) default NULL
 );

datapack_development/sql/boxes.sql

@@ -2,7 +2,7 @@
 -- Table structure for table `boxes`
 --
 
-CREATE TABLE boxes (
+CREATE TABLE IF NOT EXISTS boxes (
   id int(11) NOT NULL auto_increment,
   spawn decimal(11,0) default NULL,
   npcid decimal(11,0) default NULL,

datapack_development/sql/castle.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for castle
 -- ---------------------------
-CREATE TABLE castle (
+CREATE TABLE IF NOT EXISTS castle (
   id INT NOT NULL default 0,
   name varchar(25) NOT NULL,
   taxPercent INT NOT NULL default 15,

datapack_development/sql/castle_door.sql

@@ -1,6 +1,7 @@
 -- ---------------------------
 -- Table structure for castle_door
 -- ---------------------------
+DROP TABLE IF EXISTS castle_door;
 CREATE TABLE castle_door (
   castleId INT NOT NULL default 0,
   id INT NOT NULL default 0,

datapack_development/sql/castle_doorupgrade.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for castle_doorupgrade
 -- ---------------------------
-CREATE TABLE castle_doorupgrade (
+CREATE TABLE IF NOT EXISTS castle_doorupgrade (
   doorId INT NOT NULL default 0,
   hp INT NOT NULL default 0,
   pDef INT NOT NULL default 0,

datapack_development/sql/castle_siege_guards.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for castle_siege_guards
 -- ---------------------------
-CREATE TABLE castle_siege_guards (
+CREATE TABLE IF NOT EXISTS castle_siege_guards (
   castleId INT NOT NULL default 0,
   id int(11) NOT NULL auto_increment,
   npcId INT NOT NULL default 0,

datapack_development/sql/char_templates.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `char_templates`
 --
-
+DROP TABLE IF EXISTS char_templates;
 CREATE TABLE `char_templates` (
   `ClassId` int(11) NOT NULL default '0',
   `ClassName` varchar(20) NOT NULL default '',

datapack_development/sql/character_friends.sql

@@ -1,7 +1,7 @@
 -- ---------------------------- 
 -- Table structure for character_friends
 -- ---------------------------- 
-CREATE TABLE `character_friends` ( 
+CREATE TABLE IF NOT EXISTS `character_friends` ( 
   `char_id` INT NOT NULL default 0,
   `friend_name` VARCHAR(35) NOT NULL DEFAULT '',
   PRIMARY KEY  (`char_id`,`friend_name`) 

datapack_development/sql/character_hennas.sql

@@ -1,4 +1,4 @@
-CREATE TABLE `character_hennas` (
+CREATE TABLE IF NOT EXISTS `character_hennas` (
   `char_obj_id` INT NOT NULL DEFAULT 0,
   `symbol_id` INT,
   `slot` INT NOT NULL DEFAULT 0,

datapack_development/sql/character_macroses.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for character_macroses
 -- ---------------------------
-CREATE TABLE `character_macroses` (
+CREATE TABLE IF NOT EXISTS `character_macroses` (
   `char_obj_id` INT NOT NULL DEFAULT 0,
   `id` INT NOT NULL DEFAULT 0,
   `icon` INT,

datapack_development/sql/character_quests.sql

@@ -1,7 +1,7 @@
 -- ----------------------------
 -- Table structure for character_quests
 -- ----------------------------
-CREATE TABLE `character_quests` (
+CREATE TABLE IF NOT EXISTS `character_quests` (
   `char_id` INT NOT NULL DEFAULT 0,
   `name` VARCHAR(40) NOT NULL DEFAULT '',
   `var`  VARCHAR(20) NOT NULL DEFAULT '',

datapack_development/sql/character_recipebook.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for character_recipebook
 -- ---------------------------
-CREATE TABLE character_recipebook (
+CREATE TABLE IF NOT EXISTS character_recipebook (
   char_id decimal(11) NOT NULL default 0,
   id decimal(11) NOT NULL default 0,
   PRIMARY KEY  (id,char_id)

datapack_development/sql/character_shortcuts.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for character_shortcuts
 -- ---------------------------
-CREATE TABLE character_shortcuts (
+CREATE TABLE IF NOT EXISTS character_shortcuts (
   char_obj_id decimal(11) NOT NULL default 0,
   slot decimal(3) NOT NULL default 0,
   page decimal(3) NOT NULL default 0,

datapack_development/sql/character_skills.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for character_skills
 -- ---------------------------
-CREATE TABLE character_skills (
+CREATE TABLE IF NOT EXISTS character_skills (
   char_obj_id INT NOT NULL default 0,
   skill_id INT NOT NULL default 0,
   skill_level varchar(5) ,

datapack_development/sql/character_skills_save.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for character_skills
 -- ---------------------------
-CREATE TABLE character_skills_save (
+CREATE TABLE IF NOT EXISTS character_skills_save (
   char_obj_id INT NOT NULL default 0,
   skill_id INT NOT NULL default 0,
   skill_level INT NOT NULL default 0,

datapack_development/sql/character_subclasses.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for character_subclasses
 -- ---------------------------
-CREATE TABLE `character_subclasses` (
+CREATE TABLE IF NOT EXISTS `character_subclasses` (
 	`char_obj_id` decimal(11,0) NOT NULL default '0',
 	`class_id` int(2) NOT NULL default '0',
 	`exp` decimal(11,0) NOT NULL default '0',

datapack_development/sql/characters.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for characters
 -- ---------------------------
-CREATE TABLE characters (
+CREATE TABLE IF NOT EXISTS characters (
   account_name varchar(45) default NULL,
   obj_Id decimal(11,0) NOT NULL default '0',
   char_name varchar(35) NOT NULL,

datapack_development/sql/clan_data.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for clan_data
 -- ---------------------------
-CREATE TABLE clan_data (
+CREATE TABLE IF NOT EXISTS clan_data (
   clan_id INT NOT NULL default 0,
   clan_name varchar(45) ,
   clan_level INT,

datapack_development/sql/clan_wars.sql

@@ -2,7 +2,7 @@
 -- Table structure for `clan_wars`
 --
 
-CREATE TABLE `clan_wars` (
+CREATE TABLE IF NOT EXISTS `clan_wars` (
   `clan1` varchar(35) NOT NULL default '',
   `clan2` varchar(35) NOT NULL default '',
   `wantspeace1` decimal(1,0) NOT NULL default '0',

datapack_development/sql/class_list.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `class_list`
 --
-
+DROP TABLE IF EXISTS class_list;
 CREATE TABLE `class_list` (
   `class_name` varchar(19) NOT NULL default '',
   `id` int(10) unsigned NOT NULL default '0',

datapack_development/sql/droplist.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `droplist`
 -- 
-
+DROP TABLE IF EXISTS droplist;
 CREATE TABLE `droplist` (
   `mobId` INT NOT NULL DEFAULT '0',
   `itemId` INT NOT NULL DEFAULT '0',

datapack_development/sql/etcitem.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `etcitem`
 --
-
+DROP TABLE IF EXISTS etcitem;
 CREATE TABLE etcitem (
   item_id decimal(11,0) NOT NULL default '0',
   name varchar(100) default NULL,

datapack_development/sql/experimental/locations.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `locations`
 -- 
-
+DROP TABLE IF EXISTS locations;
 CREATE TABLE `locations` (
   `loc_id` int(9) NOT NULL default '0',
   `loc_x` int(9) NOT NULL default '0',

datapack_development/sql/experimental/npc.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `npc`
 --
-
+DROP TABLE IF EXISTS npc;
 CREATE TABLE `npc` (
   `id` decimal(11,0) NOT NULL default '0',
   `name` varchar(40) default NULL,

datapack_development/sql/experimental/npcskills.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `npcskills`
 -- 
-
+DROP TABLE IF EXISTS npcskills;
 CREATE TABLE npcskills (
   npcid int(11) NOT NULL default '0',
   skillid int(11) NOT NULL default '0',

datapack_development/sql/experimental/spawnlist-experimental.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `spawnlist`
 --
-
+DROP TABLE IF EXISTS spawnlist;
 CREATE TABLE spawnlist (
   id int(11) NOT NULL auto_increment,
   location varchar(26) NOT NULL default '',

datapack_development/sql/experimental/spawnlist-loc_id.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `spawnlist`
 -- 
-
+DROP TABLE IF EXISTS spawnlist;
 CREATE TABLE `spawnlist` (
   `id` int(11) NOT NULL auto_increment,
   `location` varchar(30) NOT NULL default '',

datapack_development/sql/henna.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `henna`
 --
-
+DROP TABLE IF EXISTS henna;
 CREATE TABLE henna (
   symbol_id int(11) NOT NULL default '0',
   symbol_name varchar(45) default NULL,

datapack_development/sql/henna_trees.sql

@@ -1,6 +1,7 @@
 #----------------------------
 # Table structure for henna_trees
 #----------------------------
+DROP TABLE IF EXISTS henna_trees;
 CREATE TABLE `henna_trees` (
   `class_id` decimal(10,0) NOT NULL default '0',
   `symbol_id` decimal(10,0) NOT NULL default '0',

datapack_development/sql/items.sql

@@ -1,7 +1,7 @@
 -- ----------------------------
 -- Table structure for items
 -- ----------------------------
-CREATE TABLE items (
+CREATE TABLE IF NOT EXISTS items (
   `owner_id` INT, -- object id of the player or clan,owner of this item
   `object_id` INT NOT NULL DEFAULT 0,-- object id of the item
   `item_id` INT,   -- item id

datapack_development/sql/locations.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `locations`
 -- 
-
+DROP TABLE IF EXISTS locations;
 CREATE TABLE `locations` (
   `loc_id` int(9) NOT NULL default '0',
   `loc_x` int(9) NOT NULL default '0',

datapack_development/sql/lvlupgain.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `lvlupgain`
 --
-
+DROP TABLE IF EXISTS lvlupgain;
 CREATE TABLE lvlupgain (
   classid int(3) NOT NULL default '0',
   defaulthpbase decimal(5,1) NOT NULL default '0.0',

datapack_development/sql/mapregion.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `mapregion`
 --
-
+DROP TABLE IF EXISTS mapregion;
 CREATE TABLE `mapregion` (
   `region` int(11) NOT NULL default '0',
   `sec0` int(2) NOT NULL default '0',

datapack_development/sql/merchant_areas_list.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `merchant_areas_list`
 --
-
+DROP TABLE IF EXISTS merchant_areas_list;
 CREATE TABLE `merchant_areas_list` (
   `merchant_area_id` int(10) unsigned NOT NULL default '0',
   `merchant_area_name` varchar(25) NOT NULL default '',

datapack_development/sql/merchant_buylists.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `merchant_buylists`
 --
-
+DROP TABLE IF EXISTS merchant_buylists;
 CREATE TABLE merchant_buylists (
   item_id decimal(9,0) NOT NULL default '0',
   price decimal(11,0) NOT NULL default '0',

datapack_development/sql/merchant_lease.sql

@@ -1,7 +1,7 @@
 -- ----------------------------
 -- Table structure for leasing merchants
 -- ----------------------------
-CREATE TABLE merchant_lease (
+CREATE TABLE IF NOT EXISTS merchant_lease (
   merchant_id int(11) NOT NULL default 0,
   player_id int(11) NOT NULL default 0,
   bid int(11),

datapack_development/sql/merchant_shopids.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `merchant_shopids`
 --
-
+DROP TABLE IF EXISTS merchant_shopids;
 CREATE TABLE merchant_shopids (
   shop_id decimal(9,0) NOT NULL default '0',
   npc_id varchar(9) default NULL,

datapack_development/sql/merchants.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `merchants`
 --
-
+DROP TABLE IF EXISTS merchants;
 CREATE TABLE `merchants` (
   `npc_id` int(11) NOT NULL default '0',
   `merchant_area_id` tinyint(4) default NULL,

datapack_development/sql/minions.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `minions`
 -- 
-
+DROP TABLE IF EXISTS minions;
 CREATE TABLE minions (
   boss_id int(11) NOT NULL default '0',
   minion_id int(11) NOT NULL default '0',

datapack_development/sql/npc.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `npc`
 -- 
-
+DROP TABLE IF EXISTS npc;
 CREATE TABLE `npc` (
   `id` decimal(11,0) NOT NULL default '0',
   `name` varchar(40) default NULL,

datapack_development/sql/npcskills.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `npcskills`
 -- 
-
+DROP TABLE IF EXISTS npcskills;
 CREATE TABLE npcskills (
   npcid int(11) NOT NULL default '0',
   skillid int(11) NOT NULL default '0',

datapack_development/sql/pets.sql

@@ -1,7 +1,7 @@
 -- ---------------------------
 -- Table structure for pets
 -- ---------------------------
-CREATE TABLE pets (
+CREATE TABLE IF NOT EXISTS pets (
   item_obj_id decimal(11) NOT NULL default 0,
   objId decimal(11) ,
   name varchar(12) ,

datapack_development/sql/random_spawn.sql

@@ -1,6 +1,7 @@
 -- ---------------------------
 -- Table structure for random_spawn
 -- ---------------------------
+DROP TABLE IF EXISTS random_spawn;
 CREATE TABLE random_spawn (
   groupId INT NOT NULL default 0,
   npcId INT NOT NULL default 0,

datapack_development/sql/random_spawn_loc.sql

@@ -1,6 +1,7 @@
 -- ---------------------------
 -- Table structure for random_spawn_loc
 -- ---------------------------
+DROP TABLE IF EXISTS random_spawn_loc;
 CREATE TABLE random_spawn_loc (
   groupId INT NOT NULL default 0,
   x INT NOT NULL default 0,

datapack_development/sql/seven_signs.sql

@@ -1,4 +1,4 @@
-CREATE TABLE `seven_signs` (
+CREATE TABLE IF NOT EXISTS `seven_signs` (
   `char_obj_id` int(11) NOT NULL default '0',
   `cabal` varchar(4) NOT NULL default '',
   `seal` int(1) NOT NULL default '-1',

datapack_development/sql/seven_signs_festival.sql

@@ -1,7 +1,7 @@
 -- ----------------------------
 -- Table structure for seven_signs_festival
 -- ----------------------------
-CREATE TABLE `seven_signs_festival` (
+CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
 	`festivalId` int(1) NOT NULL default '0',
 	`cabal` varchar(4) NOT NULL default '',
 	`cycle` int(4) NOT NULL default '0',

datapack_development/sql/siege_clans.sql

@@ -1,4 +1,4 @@
-CREATE TABLE siege_clans (
+CREATE TABLE IF NOT EXISTS siege_clans (
    castle_id int(1) NOT NULL default 0,
    clan_id int(11) NOT NULL default 0,
    type int(1) default NULL,

datapack_development/sql/skill_learn.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `skill_learn`
 --
-
+DROP TABLE IF EXISTS skill_learn;
 CREATE TABLE skill_learn (
   npc_id int(11) NOT NULL default '0',
   class_id int(11) NOT NULL default '0',

datapack_development/sql/skill_spellbooks.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `skill_spellbooks`
 --
-
+DROP TABLE IF EXISTS skill_spellbooks;
 CREATE TABLE `skill_spellbooks` (
   `skill_id` int(11) NOT NULL default '-1',
   `item_id` int(11) NOT NULL default '-1',

datapack_development/sql/skill_trees.sql

@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS skill_trees;
 CREATE TABLE skill_trees (
   class_id int(10) unsigned NOT NULL default '0',
   skill_id int(10) unsigned NOT NULL default '0',

datapack_development/sql/spawnlist.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `spawnlist`
 --
-
+DROP TABLE IF EXISTS spawnlist;
 CREATE TABLE spawnlist (
   id int(11) NOT NULL auto_increment,
   location varchar(19) NOT NULL default '',

datapack_development/sql/teleport.sql

@@ -1,7 +1,7 @@
 -- 
 -- Table structure for table `teleport`
 -- 
-
+DROP TABLE IF EXISTS teleport;
 CREATE TABLE teleport (
   Description varchar(75) default NULL,
   id decimal(11,0) NOT NULL default '0',

datapack_development/sql/weapon.sql

@@ -1,7 +1,7 @@
 --
 -- Table structure for table `weapon`
 --
-
+DROP TABLE IF EXISTS weapon;
 CREATE TABLE weapon (
   item_id decimal(11,0) NOT NULL default '0',
   name varchar(39) default NULL,

datapack_development/sql/zone.sql

@@ -1,6 +1,7 @@
 -- ---------------------------
 -- Table structure for zone
 -- ---------------------------
+DROP TABLE IF EXISTS zone;
 CREATE TABLE zone (
   id INT NOT NULL default 0,
   type varchar(25) NOT NULL,

datapack_development/tools/experimental-upgrade.bat

@@ -21,9 +21,6 @@ echo.
 echo Making a backup of the original tables.
 %mysqldumpPath% --add-drop-table -h %DBHost% -u %user% --password=%pass% %DBname% > l2jdb_experimental-backup.sql
 echo.
-echo Deleting table for new content.
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < experimental-upgrade.sql
-echo.
 echo Installing new content.
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/experimental/locations.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/experimental/npc.sql

datapack_development/tools/experimental-upgrade.sh

@@ -3,7 +3,6 @@ PASS=
 DBNAME=l2jdb
 DBHOST=localhost
 mysqldump --add-drop-table -h $DBHOST -u $USER --password=$PASS $DBNAME > l2jdb_experimental-backup.sql
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < experimental-upgrade.sql
 
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/experimental/locations.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/experimental/npc.sql

datapack_development/tools/experimental-upgrade.sql

@@ -1,4 +0,0 @@
-DROP TABLE IF EXISTS locations;
-DROP TABLE IF EXISTS npc;
-DROP TABLE IF EXISTS npcskills;
-DROP TABLE IF EXISTS spawnlist;

datapack_development/tools/full_install.bat

@@ -47,7 +47,6 @@ echo Installling new content.
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/class_list.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/droplist.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/etcitem.sql
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/gameservers.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/global_tasks.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna_trees.sql

datapack_development/tools/full_install.sh

@@ -2,8 +2,11 @@ USER=root
 PASS=
 DBNAME=l2jdb
 DBHOST=localhost
+echo Making a backup of the original database
 mysqldump --add-drop-table -h $DBHOST -u $USER --password=$PASS $DBNAME > l2jdb_backup.sql
+echo Deleting tables for new content.
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < full_install.sql
+echo Installing new content
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/armor.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/boxaccess.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/boxes.sql
@@ -27,7 +30,6 @@ mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/clan_wars.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/class_list.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/droplist.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/etcitem.sql
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/gameservers.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/global_tasks.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/henna.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/henna_trees.sql
@@ -55,4 +57,5 @@ mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/skill_trees.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/spawnlist.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/teleport.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/weapon.sql
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/zone.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/zone.sql
+echo

datapack_development/tools/full_install.sql

@@ -21,7 +21,6 @@ DROP TABLE IF EXISTS clan_wars;
 DROP TABLE IF EXISTS class_list;
 DROP TABLE IF EXISTS droplist;
 DROP TABLE IF EXISTS etcitem;
-DROP TABLE IF EXISTS gameservers;
 DROP TABLE IF EXISTS global_tasks;
 DROP TABLE IF EXISTS henna;
 DROP TABLE IF EXISTS henna_trees;

datapack_development/tools/login_install.bat

@@ -24,4 +24,5 @@ echo Deleting tables for new content.
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < login_install.sql
 echo.
 echo Installling new content.
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/accounts.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/gameservers.sql

datapack_development/tools/login_install.sh

@@ -4,4 +4,5 @@ DBNAME=l2jdb
 DBHOST=localhost
 mysqldump --add-drop-table -h $DBHOST -u $USER --password=$PASS $DBNAME > login_backup.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < login_install.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/accounts.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/gameservers.sql

datapack_development/tools/login_install.sql

@@ -1 +1,2 @@
+DROP TABLE IF EXISTS accounts;
 DROP TABLE IF EXISTS gameservers;

datapack_development/tools/upgrade.bat

@@ -21,37 +21,56 @@ echo.
 echo Making a backup of the original database.
 %mysqldumpPath% --add-drop-table -h %DBHost% -u %user% --password=%pass% %DBname% > l2jdb_backup.sql
 echo.
-echo Deleting table for new content.
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < upgrade.sql
-echo.
 echo Installing new content.
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/armor.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/boxaccess.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/boxes.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/castle.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/castle_door.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/castle_doorupgrade.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/castle_siege_guards.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/char_templates.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_friends.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_hennas.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_macroses.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_quests.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_recipebook.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_shortcuts.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_skills.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_skills_save.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/character_subclasses.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/characters.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/clan_data.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/clan_wars.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/class_list.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/droplist.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/etcitem.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/global_tasks.sql
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna_trees.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/henna_trees.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/items.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/locations.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/lvlupgain.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/mapregion.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/merchant_areas_list.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/merchant_buylists.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/merchant_lease.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/merchant_shopids.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/merchants.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/minions.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/npc.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/npcskills.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/pets.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/random_spawn.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/random_spawn_loc.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/seven_signs.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/seven_signs_festival.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/siege_clans.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/skill_learn.sql
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/skill_trees.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/skill_spellbooks.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/skill_trees.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/spawnlist.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/teleport.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/weapon.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/zone.sql
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/gameservers.sql
 pause

datapack_development/tools/upgrade.sh

@@ -4,35 +4,56 @@ DBNAME=l2jdb
 DBHOST=localhost
 echo Making a backup of the original database
 mysqldump --add-drop-table -h $DBHOST -u $USER --password=$PASS $DBNAME > l2jdb_backup.sql
-echo Deleting table for new content
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < upgrade.sql
 echo Installing new content
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/armor.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/boxaccess.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/boxes.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/castle.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/castle_door.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/castle_doorupgrade.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/castle_siege_guards.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/char_templates.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_friends.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_hennas.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_macroses.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_quests.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_recipebook.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_shortcuts.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_skills.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_skills_save.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/character_subclasses.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/characters.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/clan_data.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/clan_wars.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/class_list.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/droplist.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/etcitem.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/global_tasks.sql
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/henna_trees.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/henna.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/henna_trees.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/items.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/locations.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/lvlupgain.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/mapregion.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/merchant_areas_list.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/merchant_buylists.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/merchant_lease.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/merchant_shopids.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/merchants.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/minions.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/npc.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/npcskills.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/pets.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/random_spawn.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/random_spawn_loc.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/seven_signs.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/seven_signs_festival.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/siege_clans.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/skill_learn.sql
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/skill_trees.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/skill_spellbooks.sql
+mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/skill_trees.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/spawnlist.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/teleport.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/weapon.sql
 mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/zone.sql
-mysql -h $DBHOST -u $USER --password=$PASS -D $DBNAME < ../sql/gameservers.sql
+echo

datapack_development/tools/upgrade.sql

@@ -1,27 +0,0 @@
-DROP TABLE IF EXISTS armor;
-DROP TABLE IF EXISTS castle_door;
-DROP TABLE IF EXISTS char_templates;
-DROP TABLE IF EXISTS class_list;
-DROP TABLE IF EXISTS droplist;
-DROP TABLE IF EXISTS etcitem;
-DROP TABLE IF EXISTS henna_trees;
-DROP TABLE IF EXISTS henna;
-DROP TABLE IF EXISTS locations;
-DROP TABLE IF EXISTS lvlupgain;
-DROP TABLE IF EXISTS mapregion;
-DROP TABLE IF EXISTS merchant_areas_list;
-DROP TABLE IF EXISTS merchant_buylists;
-DROP TABLE IF EXISTS merchant_shopids;
-DROP TABLE IF EXISTS merchants;
-DROP TABLE IF EXISTS minions;
-DROP TABLE IF EXISTS npc;
-DROP TABLE IF EXISTS npcskills;
-DROP TABLE IF EXISTS random_spawn;
-DROP TABLE IF EXISTS random_spawn_loc;
-DROP TABLE IF EXISTS skill_learn;
-DROP TABLE IF EXISTS skill_trees;
-DROP TABLE IF EXISTS skill_spellbooks;
-DROP TABLE IF EXISTS spawnlist;
-DROP TABLE IF EXISTS teleport;
-DROP TABLE IF EXISTS weapon;
-DROP TABLE IF EXISTS zone;