diff --git a/README.md b/README.md index 041d30979b..366ab22624 100644 --- a/README.md +++ b/README.md @@ -57,15 +57,20 @@ We will set up the following: - Client - the client is the application used to _play the game_, i.e. MapleStory.exe. ### 1 - Database -You will start by installing the database server and database client, and then run some scripts to prepare it for the server. +You will start by installing the database server and database client. Then you will connect to the server with the client to create a new database schema. #### Steps -1. Download and install [MySQL Community Server 8+](https://dev.mysql.com/downloads/mysql/). You will have to set a root password, make sure you don't lose it because you will need it later. +1. Download and install [MySQL Community Server 8+](https://dev.mysql.com/downloads/mysql/). You will have to set a root password. Make sure you don't lose it because you will need it later. 2. Download and install [HeidiSQL](https://www.heidisql.com/download.php). -3. Open HeidiSQL and connect to the database ("New" -> "Session in root folder" -> fill in password -> "Open"). -4. Run all four scripts located in database/sql in order. Starting with ``1-db_database.sql`` and ending with ``4-db-admin.sql``. In HeidiSQL: "File" -> "Run SQL File...". -5. The database is ready! +3. Connect to the database: + 1. Open HeidiSQL + 2. Create a new Session: "New" -> fill in your password -> "Save" + 3. Connect to the database: click on your saved session -> "Open" +4. Create a new database schema: + 1. In the opened session, right-click on the session name in the menu on the left + 2. "Create new" -> "Database" -> database name should be "cosmic" -> "OK" +5. Done. The database is now ready. Once the Cosmic server starts, it will create tables and populate some of them with initial data. ### 2 - Server You will start by cloning the repository, then configure the database properties and lastly start the server. @@ -88,8 +93,6 @@ Support for Docker is also provided out of the box, as an alternative to running Making changes becomes a bit more tedious though as you have to rebuild the server image via `docker compose up --build`. -On the first launch, the database container will run the scripts which may take so long that the server fails to start. In that case, just wait until the database is done running the scripts and then retry (Ctrl+C and re-run the command). - #### Jar Another option is to start the server from a terminal by running a jar file. You first need to build the jar file from source which requires [Maven](https://maven.apache.org/). Fortunately, [Maven Wrapper](https://maven.apache.org/wrapper/) is provided so you don't have to install Maven separately. diff --git a/database/sql/1-db_database.sql b/database/sql/1-db_database.sql deleted file mode 100644 index ff714ece25..0000000000 --- a/database/sql/1-db_database.sql +++ /dev/null @@ -1,12 +0,0 @@ -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; - -DROP DATABASE IF EXISTS `cosmic`; -CREATE DATABASE `cosmic` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -USE `cosmic`; - -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/database/sql/2-db_drops.sql b/database/sql/2-db_drops.sql deleted file mode 100644 index ce9c36f1ec..0000000000 --- a/database/sql/2-db_drops.sql +++ /dev/null @@ -1,26 +0,0 @@ -#THIS SQL MUST BE USED AFTER 'db_database.sql' -#NEXT SQL 'db_shopupdate.sql' IS OPTIONAL - -USE `cosmic`; - - CREATE TABLE IF NOT EXISTS `drop_data` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `dropperid` int(11) NOT NULL, - `itemid` int(11) NOT NULL DEFAULT '0', - `minimum_quantity` int(11) NOT NULL DEFAULT '1', - `maximum_quantity` int(11) NOT NULL DEFAULT '1', - `questid` int(11) NOT NULL DEFAULT '0', - `chance` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - UNIQUE KEY (`dropperid`, `itemid`), - KEY `mobid` (`dropperid`), - INDEX (dropperid, itemid) - ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; - - #pass (sorted) data from one table to another - INSERT INTO drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) - ( - SELECT dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance - FROM temp_data - ); - DROP TABLE temp_data; \ No newline at end of file diff --git a/database/sql/3-db_shopupdate.sql b/database/sql/3-db_shopupdate.sql deleted file mode 100644 index b6d08175a5..0000000000 --- a/database/sql/3-db_shopupdate.sql +++ /dev/null @@ -1,6 +0,0 @@ -#THIS SQL IS OPTIONAL, TO BE USED AFTER 'db_drops.sql' -#THIS REQUIRES PROVIDED WZ FILES - -USE `cosmic`; - - diff --git a/database/sql/4-db-admin.sql b/database/sql/4-db-admin.sql deleted file mode 100644 index 754c27b714..0000000000 --- a/database/sql/4-db-admin.sql +++ /dev/null @@ -1,26 +0,0 @@ --- MySQL dump 10.13 Distrib 8.0.22, for Win64 (x86_64) --- --- Host: 127.0.0.1 Database: cosmic --- ------------------------------------------------------ --- Server version 8.0.19 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - -USE `cosmic`; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; diff --git a/database/sql/errors.txt b/database/sql/errors.txt deleted file mode 100644 index 76f8bd2c7c..0000000000 --- a/database/sql/errors.txt +++ /dev/null @@ -1,602 +0,0 @@ -Oblivion Monk Trainee : Dark Katinas (Male) -Star Pixie : Star Pixie Starpiece -Star Pixie : Blue White-Line Boots -Spirit Viking : Scroll for Knuckler for Accuracy 10% -Spirit Viking : Spirit Viking Card -Spirit Viking : Dark Battle Lord -Spirit Viking : Heaven Justice -Iron Boar : Maroon Jangoon Boots -Iron Boar : Gold Tail -Iron Boar : Justice Katara -Voodoo : Steel Pow -Green Hobi : Pin Hov Charm -Green Hobi : Blue Stud -Zombie Lupin : Equip Enhancement Scroll -Zombie Lupin : Gold Mask -Reinforced Mithril Mutae : Reinforced Mithril Mutae Card -Yeti : Gold Tail -Blue Kentaurus : Kentaurus Marrow -Blue Kentaurus : Infinity Wrath -Iruvata : Iruvata Card -Iruvata : Heaven Justice -Snowman : Red-Bean Soup -White Fang : White Fang Tail -White Fang : Blue Jangoon Boots -Green Cornian : Cornian Marrow -Green Cornian : [Mastery Book] Venom -Green Cornian : Red Katte (Female) -Dodo : Whale Helmet -Dodo : Scroll for Overall Armor for STR 60% -Dodo : [Mastery Book] Slash Storm 20 -Dodo : Dark Katte (Female) -Ultra Gray : Ultra Gray Card -Lorang : Lorang Claws -Lorang : Dark Piette Pants -Buffoon : Buffoon Grandpa Clock -Buffoon : Blue Battle Lord -Buffoon : Blue Stud -Buffoon : Infinity Wrath -Flaming Raccoon : Kinoko Ramen (Salt) -Red Kentaurus : Kentaurus Flame -Red Kentaurus : Scroll for Knuckler for Accuracy 60% -Red Kentaurus : Serpent Tongue -Red Kentaurus : Dragon Tail -Red Kentaurus : Heavenly Katara -Mighty Maple Eater : Fireman Axe -Tauromacis : Ascalon Katara -Tauromacis : Black Pirate Bandana -Krappy : Krappi Card -Roloduck : Blue Hunter Armor -Roloduck : Blue Hunter Pants -Crow : Fish Cake (Skewer) -Male Mannequin : Male Mannequin Fedora -Male Mannequin : Dark Scroll for Accessory for STR 70% -Male Mannequin : Male Mannequin Card -Male Mannequin : Majestic Katara -Leader B : Leader B Charm -Leader B : Kinoko Ramen (Roasted Pork) -Typhon : Dark Scroll for Cape for Weapon Def 70% -Leader A : Leader A Shades -Leader A : Dark Scroll for Cape for Magic Def 70% -Leader A : Serpent Tongue -Soul Teddy : Scroll for Pole Arm for Accuracy 10% -Soul Teddy : Steel Pow -Soul Teddy : Heavenly Katara -Beetle : Beetle Horn -Beetle : Equip Enhancement Scroll -Beetle : Ascalon Katara -Froscola : Blue Battle Lord -White Yeti and King Pepe : Scroll for Pole Arm for Accuracy 10% -White Yeti and King Pepe : King Pepe Scroll for One-handed BW Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Dagger Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Two-handed Sword Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Two-handed Axe Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Two-handed BW Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Spear Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Polearm Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Wand Magic Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Staff Magic Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Bow Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Crossbow Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Thief Attacks 60% -White Yeti and King Pepe : King Pepe Scroll for Knuckle Attacks 60% -Harp : Harp Tail Feather -Harp : Scroll for Knuckler for Accuracy 100% -Harp : Heavenly Katara -Harp : Infinity Wrath -Lucida : Green Pirate Bottom -Lucida : Brown Stud -Lucida : Brown Stud Pants -Jr. Grupin : Equip Enhancement Scroll -Iron Hog : Iron Hog Metal Hoof -Sophilia Doll : Fireman Axe -Sophilia Doll : Maroon Jangoon Boots -Tiru : Tiru Feather -Female Mannequin : Female Mannequin Wig -Female Mannequin : Dark Scroll for Accessory for STR 70% -Female Mannequin : Female Mannequin Card -Female Mannequin : Majestic Katara -Poison Golem Level 3 : Poison Golem Card -Malady : Malady Experimental Frog -Malady : Potential Scroll -Malady : Steel Pow -Vikerola : Dark Battle Lord -Wooden Target Dummy : Wooden Target Dummy Card -Wooden Target Dummy : Brown Stud -Wooden Target Dummy : Brown Stud Pants -Cynical Orange Mushroom : Basic Archer Glove -Extra A : Littleman A Badge -Extra A : Gold Snowboard -Extra B : Littleman B Name Plate -Extra B : Fairy Honey -Extra B : Brown Jangoon Boots -Hodori : Majestic Katara -Extra C : Littleman C Necklace -Extra D : Cat Eye -Extra D : Gold Snowboard -Extra D : Serpent Tongue -King Sage Cat : Scroll for Pole Arm for Accuracy 10% -King Sage Cat : Heaven Justice -King Sage Cat : Dragon Tail -King Sage Cat : Infinity Wrath -Homunscullo : Homunsculer Sand -Homunscullo : Homunsculer Blood -D. Roy : D. Roy Card -Nospeed : Arwen Glass Shoes -Ribbon Pig : Pig Ribbon -Ribbon Pig : Champion Katara -Grim Phantom Watch : [Storybook] Black Book -Grim Phantom Watch : Grim Phantom Watch Card -Qualm Guardian : Blue Katte (Female) -Qualm Guardian : Blue Katina Boots -Yeti Doll : Justice Katara -King Bloctopus : Green White-Line Boots -Bigfoot : Bigfoot Toe -Green King Goblin : Black Pirate Bandana -Dreamy Ghost : Kinoko Ramen (Roasted Pork) -MT-09 : MT-09 Fuel -Gryphon : Duck Tube [1] -Gryphon : Serpent Tongue -Risell Squid : Dark Pirate Bottom -Dark Axe Stump : Stump Teardrop -Blue Wyvern : Equip Enhancement Scroll -Nest Golem : Blue Katinas (Male) -Cheap Amplifier : Dark Scroll for Accessory for STR 70% -Cheap Amplifier : Cheap Amplifier Card -Manon : Manon Tail -Manon : Manon Cry -Saitie : Parwen Entry Pass -Saitie : Red Battle Lord -Drumming Bunny : Shoes Production Manual -Drumming Bunny : Scroll for Pole Arm for Accuracy 10% -Drumming Bunny : Gold Snowboard -Drumming Bunny : Lion Fang -Dyle : Scroll for Knuckler for Accuracy 60% -Crimson Tree : Crimson Wood -Crimson Tree : Crimson Wood -Blue Flower Serpent : Blue Flower Serpent Card -Blue Flower Serpent : Scroll for Pole Arm for Accuracy 100% -Blue Flower Serpent : Cat Eye -Spirit of Rock : Spirit of Rock Music Score -Spirit of Rock : Dark Scroll for Accessory for STR 70% -Spirit of Rock : Rock Spirit Card -Prototype Lord : Prototype Lord Card -Seruf : Lion Fang -Seruf : Serpent Tongue -Dark Wyvern : Blue Katina Boots -Mateon : Mateon Tentacle -Mateon : Equip Enhancement Scroll -Mateon : Dark Pennance -Mateon : Gold Pendant -Mr. Anchor : [Storybook] Black Book -Master Robo : Lion Fang -Master Robo : Brown Jangoon Boots -Master Robo : Gold Wings -Ginseng Jar : Ginseng Jar Card -Scuba Pepe : Equip Enhancement Scroll -Ghost Pirate : Blue Battle Lord -Ghost Pirate : Green Pirate Bottom -Ghost Pirate : Heavenly Katara -Leatty : Green White-Line Boots -Tiv : Tiv Feather -Gold Yeti and King Pepe : King Pepe Scroll for One-handed BW Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Dagger Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Two-handed Sword Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Two-handed Axe Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Two-handed BW Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Spear Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Polearm Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Wand Magic Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Staff Magic Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Bow Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Claw Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Crossbow Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Thief Attacks 60% -Gold Yeti and King Pepe : King Pepe Scroll for Knuckle Attacks 60% -Gold Yeti and King Pepe : Maroon Jangoon Boots -Slime : Champion Katara -Rodeo : Brown Stud -Rodeo : Brown Stud Pants -Octopus : Champion Katara -Luster Pixie : Luster Pixie Sunpiece -Luster Pixie : Luster Pixie Card -Nightshadow : Heaven Justice -Nightshadow : Infinity Wrath -Dual Beetle : Dual Beetle Horn -Skeleton Soldier : Skeleton Soldier Card -Master Death Teddy : Green Battle Lord -Master Death Teddy : Bloodsoaked Katara -Sakura Cellion : Maroon Jangoon Boots -Pig : Pig Head -Fire Boar : Fire Boar Tooth -Fire Boar : Arwen Glass Shoes -Fire Boar : Fire Boar Card -Panda Teddy : Maroon Jangoon Boots -Morphed Blin : Serpent Tongue -Morphed Blin : Steel Pow -Lunar Pixie : Lunar Pixie Moonpiece -Lunar Pixie : Gold Wings -Curse Eye : "Blackbull" deed to the land -Curse Eye : Gold Snowboard -Jr. Cellion : Cat Eye -Barnard Gray : Barnard Gray Card -Faust : Lupin Banana -Faust : Lion Fang -Faust : Serpent Tongue -Gatekeeper : Gate Keeper Card -Gatekeeper : Red Battle Lord -Griffey : [Mastery Book] Flame Wheel 20 -Griffey : Meteor Katara -Shark : Heaven Justice -Deep Buffoon : Deep Buffoon Rock Piece -Deep Buffoon : Blue Stud -Deep Buffoon : Blazing Dragon Katara -Melon Bubble Tea : Melon Bubble Tea Card -Melon Bubble Tea : Maroon Jangoon Boots -Tino : Tino Feather -Bone Fish : Equip Enhancement Scroll -Bone Fish : Potential Scroll -I.AM.ROBOT : Lion Fang -I.AM.ROBOT : Serpent Tongue -Lilynouch : Knight Mask -Lilynouch : [Mastery Book] Dragon Breath -Dark Pepe : Serpent Coil -Dark Pepe : Serpent Coil -Toy Trojan : Toy Soldier Sword -Toy Trojan : Justice Katara -Sparker : Scroll for Knuckler for Accuracy 100% -Sparker : Justice Katara -Dark Drake : Dark Drake Horn -Electrophant : Serpent Tongue -Electrophant : Lion Fang -Tick-Tock : Tick-Tock Egg -Mecateon : Mecateon Laser Gun -Mecateon : Majestic Katara -Helmet Pepe : King Pepe Scroll for Polearm Attacks 60% -Helmet Pepe : King Pepe Scroll for Wand Magic Attacks 60% -Blue Mushroom : Thermal Fabric -Blue Mushroom : Purple Jewelry Shoes -Ratz : One-Handed Mace Forging Manual -Snow Witch : Ice Tears -Flyeye : Flyeye Wing -Flyeye : Flyeye Card -Headless Horseman : Devil Sunrise -Royal Guard : Royal Guard Card -Royal Guard : Scroll for Knuckler for Accuracy 10% -Royal Guard : Heaven Justice -Royal Guard : Dark Battle Lord -Triple Rumo : Blue Jangoon Boots -Triple Rumo : Brown Jangoon Boots -Pianus : Miniature Pianus -Pianus : Pianus Scream -Pianus : Scroll for Overall Armor for STR 60% -Pianus : [Mastery Book] Blaze 20 -Pianus : Blue Katte (Female) -Pianus : Blue Katinas (Male) -Rombot : Rombot Memory Card -Rombot : Serpent Tongue -Roid : Potential Scroll -Roid : Equip Enhancement Scroll -Robby : Robby Electronic Induction Device -Robby : Robby Card -Robby : Blue Stud -Blue Snail : Grey/Brown Training Shirt -Blue Snail : Grey/Brown Training Pants -Afterlord : Afterlord Card -Afterlord : Scroll for Overall Armor for STR 60% -Afterlord : Heaven Gate -Afterlord : Bloodsoaked Katara -Block Golem : Block Golem Card -Lyka : Guardian Horn -Lyka : Dark Katinas (Male) -Jr. Wraith : Equip Enhancement Scroll -Jr. Wraith : Potential Scroll -Sentinel : Fireman Axe -Ice Drake : Blue Battle Lord -Ice Drake : Gold Mask -Overlord A : Overlord A Card -Overlord B : Overlord B Card -Latest Hits Compilation : Dark Scroll for Accessory for STR 70% -Latest Hits Compilation : Latest Hits Compilation Card -Water Goblin : Serpent Coil -Water Goblin : Serpent Coil -Retz : Retz Card -Retz : Cat Eye -Retz : Blue Jangoon Boots -Hoodoo : Steel Pow -Pink Bean : Pink Bean Card -Pink Bean : [Mastery Book] Maple Warrior 30 -Paper Lantern Ghost : Fish Cake (Skewer) -Paper Lantern Ghost : Cat Eye -Cold Shark : Frozen Shark Fin -Cold Eye : Icicles -Croco : Potential Scroll -Croco : Gold Pendant -Croco : Majestic Katara -Bubble Fish : Bubble Fish Thoughts -Officer Skeleton : Serpent Coil -Officer Skeleton : Serpent Coil -Murumuru : Murumuru Furball -Zeno : Black Pirate Bandana -Panda : Ascalon Katara -Panda : Black Pirate Bandana -Iron Mutae : Iron Mutae Card -Snail : Red Mini Skirt -Hankie : Hankie Panfluit -Hankie : Heaven Justice -Silver Slime : Silver Slime Card -Silver Slime : Beige Elf Shoes -Zeta Gray : Zeta Gray Card -Zeta Gray : Dark Piette Pants -Zombie Mushroom : The Charm of the Undead -Zombie Mushroom : Hunter Bow -Zombie Mushroom : Guardian Katara -Pepe : Majestic Katara -Grupin : Icicles -Grupin : Equip Enhancement Scroll -Hobi : Hov Shorts -Yabber Doo : Beige Elf Shoes -Royal Cactus : Dark Hunter Armor -Royal Cactus : Dark Hunter Pants -Dual Ghost Pirate : Dual Pirate Propeller -Dual Ghost Pirate : Infinity Wrath -Memory Monk Trainee : [Mastery Book] Venom 30 -Memory Monk Trainee : Devil Sunrise -Coolie Zombie : Zombie Lost Tooth -Coolie Zombie : [Storybook] Black Book -Coolie Zombie : Brown Stud -Coolie Zombie : Brown Stud Pants -Blood Harp : Blood Harp Crown -Blood Harp : Heavenly Katara -Black Kentaurus : Kentaurus Skull -Black Kentaurus : Gold Arund -Black Kentaurus : Blazing Dragon Katara -Rash : Rash Furball -Rash : Anasthetic Powder -Imperial Guard : Imperial Guard Card -The Book Ghost : The Book Ghost Sheet of Paper -The Book Ghost : Blue Jangoon Boots -Drake : Drake Meat -Drake : Drake Blood -Oblivion Guardian : [Mastery Book] Blessing of the Onyx 30 -Zakum3 : [Skill Book] Advanced Combo -Zakum3 : [Mastery Book] Smoke Bomb -Zakum3 : [Mastery Book] Sanctuary -Zakum3 : [Mastery Book] Venom -Zakum3 : [Mastery Book] Crossbow Expert -Zakum3 : Zakum Helmet (1) -Zakum3 : Devil Sunrise -Zakum3 : Zakum Tree Branch -Jr. Newtie : Equip Enhancement Scroll -Jr. Newtie : Devil Sunrise -Jr. Newtie : Red Katte (Female) -Jr. Pepe : Jr. Pepe Fish -Miner Zombie : Zombie Lost Tooth -Miner Zombie : Zombie Lost Gold Tooth -Miner Zombie : Minor Zombie Card -Miner Zombie : Ascalon Katara -Aufheben : Aufheben Time Sand -Aufheben : Aufheben Card -Eye of Time : Scroll for Overall Armor for STR 60% -Eye of Time : Scroll for Knuckler for Accuracy 60% -Eye of Time : Heaven Gate -Psycho Jack : Fireman Axe -Psycho Jack : Red Hunter Armor -Psycho Jack : Red Hunter Pants -Psycho Jack : Red White-Line Boots -Death Teddy : Blazing Dragon Katara -Bain : Bain Spiky Collar -Bain : Gold Arund -Dark Nependeath : Equip Enhancement Scroll -Dark Nependeath : Dark Piette Pants -Timu : Timu Feather -Mano : Rainbow Colored Snail Shell -Dark Stone Golem : Dark Stone Golem Card -Scorpion : Cat Eye Stone -King Clang : Lorang Claws -King Clang : Clang Claws -Nependeath : Nependeath Honey -Phantom Watch : Dragon Tail -Phantom Watch : Dark Pirate Bottom -Reinforced Iron Mutae : Reinforced Iron Mutae Card -Master Chronos : Brown Jangoon Boots -Crimson Balrog the Kidnapper : [Skill Book] Dragon Breath -Lazy Buffy : Heavenly Katara -Red Slime : Kinoko Ramen (Salt) -Evil Eye : Cat Eye -Maverick Type D : Maverick Type D Card -Maverick Type D : Green Battle Lord -Maverick Type A : Maverick Type A Card -Maverick Type A : Infinity Wrath -Klock : Heavenly Katara -Tiguru : Tiguru Feather -Tortie : Lion Fang -Shade : Someone Hat -Dunas : Dunas Time Sand -Dunas : Dunas Card -Timer : Scroll for Knuckler for Accuracy 60% -Timer : Serpent Coil -Timer : Serpent Coil -Maverick Type S : Maverick Type S Card -Poison Poopa : Poison Poopa Poisonous Spikes -Poison Poopa : Blue White-Line Boots -Murupia : Murupia Furball -Chief Gray : Chief Gray Sign -Chief Gray : Chief Gray Card -Chief Gray : Dark Pennance -Skelosaurus : Meteor Katara -Oberon : Oberon Time Sand -Oberon : Oberon Card -Mr. Alli : Mr. Alli Leather -Mr. Alli : Lion Fang -Cellion : Maroon Jangoon Boots -Qualm Monk Trainee : [Mastery Book] Blessing of the Onyx 20 -Chronos : Chronos Egg -Kiyo : Kiyo Beak -Cherry Bubble Tea : Cherry Bubble Tea Card -Cherry Bubble Tea : Maroon Jangoon Boots -Pink Teddy : Teddy Yellow Ribbon -Pink Teddy : White/Purple Gift Box -Rexton : [Mastery Book] Spirit Claw -Master of Disguise : The Lost Treasure [1] -Master of Disguise : The Lost Treasure [2] -Master of Disguise : The Lost Treasure [3] -Master of Disguise : The Lost Treasure [4] -Master of Disguise : The Lost Treasure [5] -Neo Huroid : Gold Mask -Jr. Pepe Doll : Guardian Katara -Dual Birk : Dual Birk Tiny Tail -Muru : Muru Furball -Grey Yeti and King Pepe : King Pepe Scroll for One-handed BW Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Dagger Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Two-handed Sword Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Two-handed Axe Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Two-handed BW Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Spear Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Polearm Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Bow Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Crossbow Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Wand Magic Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Staff Magic Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Thief Attacks 60% -Grey Yeti and King Pepe : King Pepe Scroll for Knuckle Attacks 60% -Wild Kargo : Gold Wings -Bubbling : Bubbling Large Bubble -Bubbling : Blue Jewelry Shoes -Bubbling : Champion Katara -Papulatus : [Mastery Book] High Mastery 30 -Papulatus : Red Katte (Female) -Papulatus : Red Katinas (Male) -Plateon : Plateon Helmet -Plateon : Serpent Tongue -Nightghost : Ghost Headband -Nightghost : Serpent Coil -Nightghost : Serpent Coil -Mango Bubble Tea : Mango Bubble Tea Card -Mango Bubble Tea : Maroon Jangoon Boots -Homunculus : Homunculus Card -Homunculus : Green Pirate Bottom -Homunculus : Brown Stud -Homunculus : Brown Stud Pants -Orange Mushroom : Hunter Bow -Orange Mushroom : Basic Archer Glove -Scarf Plead : Worn-Out Muffler -Scarf Plead : Green Hunter Armor -Scarf Plead : Green Hunter Pants -Female Boss : Lady Boss Comb -Female Boss : Devil Sunrise -Hogul : Hogul Card -Memory Guardian : Meteor Katara -Poison Mushroom : King Pepe Scroll for Two-handed Sword Attacks 60% -Poison Mushroom : King Pepe Scroll for Two-handed Axe Attacks 60% -Poison Mushroom : Justice Katara -Homun : Gold Pendant -Homun : Ascalon Katara -Greatest Oldies : Dark Scroll for Accessory for STR 70% -Greatest Oldies : Greatest Oldies Card -Kid Mannequin : Kid Mannequin Bunny Suit -Kid Mannequin : Dark Scroll for Accessory for STR 70% -Kid Mannequin : Kid Mannequin Card -Kid Mannequin : Justice Katara -Dark Rash : Dark Rash Furball -Cerebes : Beige Elf Shoes -Grizzly : Equip Enhancement Scroll -Lioner : Gold Tail -Lioner : Majestic Katara -Red Wyvern : Equip Enhancement Scroll -Gigantic Spirit Viking : Gigantic Spirit Viking Card -Gigantic Spirit Viking : Heaven Gate -Gigantic Spirit Viking : Red Battle Lord -Gigantic Spirit Viking : Beige Elf Shoes -Hector : Blue Jangoon Boots -Hector : Serpent Coil -Hector : Serpent Coil -Crimson Balrog : [Storybook] Crimson Balrog Proposal -Memory Monk : [Mastery Book] High Mastery 30 -Lupin : Lupin Banana -Tae Roon : Mind And Heart Medicine -Birk : Birk Chewed Grass -Birk : Dark Battle Lord -Birk : Blazing Dragon Katara -Clang : Clang Claws -Clang : Lion Fang -Straw Target Dummy : Straw Target Dummy Card -Royal Guard Pepe : King Pepe Scroll for Crossbow Attacks 60% -Royal Guard Pepe : King Pepe Scroll for Thief Attacks 60% -Royal Guard Pepe : King Pepe Scroll for Knuckle Attacks 60% -Blue King Goblin : Blue Stud -Nightmare : Blue Jangoon Boots -Renegade Spores : King Pepe Scroll for One-handed BW Attacks 60% -Renegade Spores : King Pepe Scroll for Dagger Attacks 60% -Renegade Spores : Potential Scroll -Prime Minister : King Pepe Scroll for One-handed BW Attacks 60% -Prime Minister : King Pepe Scroll for Dagger Attacks 60% -Prime Minister : King Pepe Scroll for Two-handed Sword Attacks 60% -Prime Minister : King Pepe Scroll for Two-handed Axe Attacks 60% -Prime Minister : King Pepe Scroll for Two-handed BW Attacks 60% -Prime Minister : King Pepe Scroll for Spear Attacks 60% -Prime Minister : King Pepe Scroll for Polearm Attacks 60% -Prime Minister : King Pepe Scroll for Wand Magic Attacks 60% -Prime Minister : King Pepe Scroll for Staff Magic Attacks 60% -Prime Minister : King Pepe Scroll for Bow Attacks 60% -Prime Minister : King Pepe Scroll for Crossbow Attacks 60% -Prime Minister : King Pepe Scroll for Thief Attacks 60% -Prime Minister : King Pepe Scroll for Knuckle Attacks 60% -Prime Minister : Lion Fang -Prime Minister : Serpent Tongue -Prime Minister : Justice Katara -Prime Minister : Guardian Katara -Ear Plug Plead : Ear Muffs -Oly Oly : Somebody Tire -Samiho : Samiho Card -Charmer : Charmer Flute -Murupa : Murupa Furball -Murukun : Murukun Furball -Bob : Bob Snail Shell -Horny Mushroom : Guardian Katara -Brown Teddy : Teddy Cotton -Brown Teddy : Equip Enhancement Scroll -Brown Teddy : Guardian Katara -Thanatos : Thanatos' Strap -Thanatos : [Storybook] Black Book -Thanatos : Dark Battle Lord -Mummydog : Mummydog Card -Dark Cornian : Devil Sunrise -Dark Cornian : Red Katinas (Male) -Intoxicated Pig : King Pepe Scroll for Two-handed BW Attacks 60% -Intoxicated Pig : King Pepe Scroll for Spear Attacks 60% -Red Flower Serpent : Red Flower Serpent Card -Red Flower Serpent : Gold Mask -Propelly : Lion Fang -Propelly : Fireman Axe -Propelly : Dark Pennance -Platoon Chronos : Equip Enhancement Scroll -Platoon Chronos : Serpent Tongue -Chirppy : Fireman Axe -Chirppy : Red Hunter Armor -Chirppy : Red White-Line Boots -Planey : Brown Jangoon Boots -Zombie Mushmom : Zombie Mushmom Card -Dark Leatty : Black Guise -Dark Leatty : Green White-Line Boots -Ligator : Equip Enhancement Scroll -Male Boss : Boss Pomade -Cloud Fox : Sushi (Salmon) -Cloud Fox : Fish Cake (Skewer) -Cloud Fox : Cat Eye -Bodyguard B : Bodyguard B Bullet Shell -Baby Typhon : Dark Scroll for Cape for Weapon Def 70% -Bodyguard A : Bodyguard A Tie Pin -Ergoth : Ergoth Jawbone -Annoyed Zombie Mushroom : The Charm of the Undead -Annoyed Zombie Mushroom : Hunter Bow -Cico : Seahorse Horn -Robo : Blue Jangoon Boots -Wraith : Cat Eye -Wraith : Gold Pendant -Red Drake : Dark Piette Pants -Killa Bee : Cat Eye -Skeledog : Skeledog Bone -Skeledog : Maroon Jangoon Boots -Windraider : Scroll for Gloves for DEX 15% -Tutorial Muru : Tutorial Muru Furball diff --git a/database/sql/migration/README.md b/database/sql/migration/README.md deleted file mode 100644 index e7aca53693..0000000000 --- a/database/sql/migration/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Migrations -The files contained in this directory are intended to be run manually when transitioning from an earlier version of Cosmic to a more recent one. - -Not every version comes with an associated migration script. Only those with breaking changes such as removal of custom assets that would otherwise crash the client. - -This is a temporary solution until automatic database migrations are in place. - -## How to -Each script is only intended to be run __once__. - -When a new migration is available, simply run the SQL script in HeidiSQL (or other SQL client of choice). - -If there are multiple new migrations that you haven't run, run them in order starting with the lowest version and ending with the highest version. diff --git a/database/sql/migration/monsterbook.sql b/database/sql/migration/monsterbook.sql deleted file mode 100644 index af5c46aeeb..0000000000 --- a/database/sql/migration/monsterbook.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* Manually run this script in MySQL Workbench or some other database client - to migrate your old (pre Jan 19th 2022) monsterbook table to the new version */ -ALTER TABLE cosmic.`monsterbook` -CHANGE COLUMN `charid` `charid` INT(11) NOT NULL, -ADD PRIMARY KEY (`charid`, `cardid`), -ADD CONSTRAINT `FK_monsterbook_1` FOREIGN KEY (`charid`) REFERENCES `characters` (`id`) ON UPDATE CASCADE ON DELETE CASCADE; \ No newline at end of file diff --git a/database/sql/migration/v0.14.0.sql b/database/sql/migration/v0.14.0.sql deleted file mode 100644 index 4cd57de7b7..0000000000 --- a/database/sql/migration/v0.14.0.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM shopitems -WHERE itemid = 2030100; # Return Scroll - Banished Area (a custom item added in HeavenMS) diff --git a/database/sql/readme.txt b/database/sql/readme.txt deleted file mode 100644 index 3f452914be..0000000000 --- a/database/sql/readme.txt +++ /dev/null @@ -1,7 +0,0 @@ ----- Cosmic MySQL Database ---- - -These SQL files must be executed IN ORDER to set up the database: - - 1-db_database.sql (Tables and some data) - - 2-db_drops.sql (Remaining data: monster drops, reactor drops) - - 3-db_shopupdate.sql (Custom shops - optional, requires provided WZs) - - 4-db_admin (Basic admin account - optional) \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8709cbe0e1..a872b6dc83 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,4 +30,3 @@ services: - "3307:3306" volumes: - ./database/docker-db-data:/var/lib/mysql - - ./database/sql:/docker-entrypoint-initdb.d diff --git a/src/main/resources/db/001-account.sql b/src/main/resources/db/001-account.sql index 39900ec98c..4ff2b3f972 100644 --- a/src/main/resources/db/001-account.sql +++ b/src/main/resources/db/001-account.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_accounts +CREATE TABLE accounts ( id INT NOT NULL AUTO_INCREMENT, `name` VARCHAR(13) NOT NULL DEFAULT '', diff --git a/src/main/resources/db/002-character.sql b/src/main/resources/db/002-character.sql index 122d4ccc0c..59d0c41188 100644 --- a/src/main/resources/db/002-character.sql +++ b/src/main/resources/db/002-character.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_characters +CREATE TABLE characters ( id INT NOT NULL AUTO_INCREMENT, accountid INT NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/003-inventory.sql b/src/main/resources/db/003-inventory.sql index ca99db459e..3049d7bd9f 100644 --- a/src/main/resources/db/003-inventory.sql +++ b/src/main/resources/db/003-inventory.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_inventoryitems +CREATE TABLE inventoryitems ( inventoryitemid INT UNSIGNED NOT NULL AUTO_INCREMENT, type TINYINT UNSIGNED NOT NULL, @@ -17,7 +17,7 @@ CREATE TABLE lb_inventoryitems KEY CHARID (characterid) ); -CREATE TABLE lb_inventoryequipment +CREATE TABLE inventoryequipment ( inventoryequipmentid INT UNSIGNED NOT NULL AUTO_INCREMENT, inventoryitemid INT UNSIGNED NOT NULL DEFAULT '0', @@ -47,7 +47,7 @@ CREATE TABLE lb_inventoryequipment KEY INVENTORYITEMID (inventoryitemid) ); -CREATE TABLE lb_inventorymerchant +CREATE TABLE inventorymerchant ( inventorymerchantid INT UNSIGNED NOT NULL AUTO_INCREMENT, inventoryitemid INT UNSIGNED NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/004-skill.sql b/src/main/resources/db/004-skill.sql index 24d9997e55..8d1f27d38b 100644 --- a/src/main/resources/db/004-skill.sql +++ b/src/main/resources/db/004-skill.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_skills +CREATE TABLE skills ( id INT NOT NULL AUTO_INCREMENT, skillid INT NOT NULL DEFAULT '0', @@ -8,10 +8,10 @@ CREATE TABLE lb_skills expiration BIGINT NOT NULL DEFAULT '-1', PRIMARY KEY (id), UNIQUE INDEX skillpair (skillid, characterid), - FOREIGN KEY (characterid) REFERENCES lb_characters (id) ON DELETE CASCADE + FOREIGN KEY (characterid) REFERENCES characters (id) ON DELETE CASCADE ); -CREATE TABLE lb_cooldowns +CREATE TABLE cooldowns ( id INT NOT NULL AUTO_INCREMENT, charid INT NOT NULL, @@ -21,7 +21,7 @@ CREATE TABLE lb_cooldowns PRIMARY KEY (id) ); -CREATE TABLE lb_skillmacros +CREATE TABLE skillmacros ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/005-pet.sql b/src/main/resources/db/005-pet.sql index e2b442ce90..9a745c5bfd 100644 --- a/src/main/resources/db/005-pet.sql +++ b/src/main/resources/db/005-pet.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_pets +CREATE TABLE pets ( petid INT UNSIGNED NOT NULL AUTO_INCREMENT, name VARCHAR(13) DEFAULT NULL, @@ -10,11 +10,11 @@ CREATE TABLE lb_pets PRIMARY KEY (petid) ); -CREATE TABLE lb_petignores +CREATE TABLE petignores ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, petid INT UNSIGNED NOT NULL, itemid INT UNSIGNED NOT NULL, PRIMARY KEY (id), - CONSTRAINT lb_fk_petignorepetid FOREIGN KEY (petid) REFERENCES lb_pets (petid) ON DELETE CASCADE # thanks Optimist for noticing queries over petid taking too long, shavit for pointing out an improvement using foreign key + CONSTRAINT fk_petignorepetid FOREIGN KEY (petid) REFERENCES pets (petid) ON DELETE CASCADE # thanks Optimist for noticing queries over petid taking too long, shavit for pointing out an improvement using foreign key ); \ No newline at end of file diff --git a/src/main/resources/db/006-quest.sql b/src/main/resources/db/006-quest.sql index 8dd10482f0..6dc22957e7 100644 --- a/src/main/resources/db/006-quest.sql +++ b/src/main/resources/db/006-quest.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_questactions +CREATE TABLE questactions ( questactionid INT UNSIGNED NOT NULL AUTO_INCREMENT, questid INT NOT NULL DEFAULT '0', @@ -7,7 +7,7 @@ CREATE TABLE lb_questactions PRIMARY KEY (questactionid) ); -CREATE TABLE lb_questprogress +CREATE TABLE questprogress ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, @@ -17,7 +17,7 @@ CREATE TABLE lb_questprogress PRIMARY KEY (id) ); -CREATE TABLE lb_questrequirements +CREATE TABLE questrequirements ( questrequirementid INT UNSIGNED NOT NULL AUTO_INCREMENT, questid INT NOT NULL DEFAULT '0', @@ -26,7 +26,7 @@ CREATE TABLE lb_questrequirements PRIMARY KEY (questrequirementid) ); -CREATE TABLE lb_queststatus +CREATE TABLE queststatus ( queststatusid INT UNSIGNED NOT NULL AUTO_INCREMENT, characterid INT NOT NULL DEFAULT '0', @@ -40,7 +40,7 @@ CREATE TABLE lb_queststatus PRIMARY KEY (queststatusid) ); -CREATE TABLE lb_area_info +CREATE TABLE area_info ( id INT NOT NULL AUTO_INCREMENT, charid INT NOT NULL, @@ -49,7 +49,7 @@ CREATE TABLE lb_area_info PRIMARY KEY (id) ); -CREATE TABLE lb_eventstats +CREATE TABLE eventstats ( characterid INT UNSIGNED NOT NULL, name VARCHAR(11) NOT NULL DEFAULT '0' COMMENT '0', @@ -57,7 +57,7 @@ CREATE TABLE lb_eventstats PRIMARY KEY (characterid) ); -CREATE TABLE lb_medalmaps +CREATE TABLE medalmaps ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, diff --git a/src/main/resources/db/007-guild.sql b/src/main/resources/db/007-guild.sql index f7198a413f..b4669b1b18 100644 --- a/src/main/resources/db/007-guild.sql +++ b/src/main/resources/db/007-guild.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_guilds +CREATE TABLE guilds ( guildid INT UNSIGNED NOT NULL AUTO_INCREMENT, leader INT UNSIGNED NOT NULL DEFAULT '0', @@ -21,7 +21,7 @@ CREATE TABLE lb_guilds INDEX (guildid, name) ); -CREATE TABLE lb_bbs_replies +CREATE TABLE bbs_replies ( replyid INT UNSIGNED NOT NULL AUTO_INCREMENT, threadid INT UNSIGNED NOT NULL, @@ -31,7 +31,7 @@ CREATE TABLE lb_bbs_replies PRIMARY KEY (replyid) ); -CREATE TABLE lb_bbs_threads +CREATE TABLE bbs_threads ( threadid INT UNSIGNED NOT NULL AUTO_INCREMENT, postercid INT UNSIGNED NOT NULL, @@ -45,7 +45,7 @@ CREATE TABLE lb_bbs_threads PRIMARY KEY (threadid) ); -CREATE TABLE lb_alliance +CREATE TABLE alliance ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, name VARCHAR(13) NOT NULL, @@ -60,7 +60,7 @@ CREATE TABLE lb_alliance INDEX (name) ); -CREATE TABLE lb_allianceguilds +CREATE TABLE allianceguilds ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, allianceid INT NOT NULL DEFAULT '-1', diff --git a/src/main/resources/db/008-keymap.sql b/src/main/resources/db/008-keymap.sql index e2a5601282..278513c963 100644 --- a/src/main/resources/db/008-keymap.sql +++ b/src/main/resources/db/008-keymap.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_keymap +CREATE TABLE keymap ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL DEFAULT '0', @@ -8,10 +8,10 @@ CREATE TABLE lb_keymap PRIMARY KEY (id) ); -CREATE TABLE lb_quickslotkeymapped +CREATE TABLE quickslotkeymapped ( accountid INT NOT NULL, keymap BIGINT NOT NULL DEFAULT 0, PRIMARY KEY (accountid), - FOREIGN KEY (accountid) REFERENCES lb_accounts (id) ON DELETE CASCADE + FOREIGN KEY (accountid) REFERENCES accounts (id) ON DELETE CASCADE ); \ No newline at end of file diff --git a/src/main/resources/db/009-drop.sql b/src/main/resources/db/009-drop.sql index c06b7301db..1f79cfb9a2 100644 --- a/src/main/resources/db/009-drop.sql +++ b/src/main/resources/db/009-drop.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_drop_data +CREATE TABLE drop_data ( id BIGINT NOT NULL AUTO_INCREMENT, dropperid INT NOT NULL, @@ -12,7 +12,7 @@ CREATE TABLE lb_drop_data INDEX (dropperid, itemid) ); -CREATE TABLE lb_drop_data_global +CREATE TABLE drop_data_global ( id BIGINT NOT NULL AUTO_INCREMENT, continent TINYINT NOT NULL DEFAULT '-1', @@ -26,7 +26,7 @@ CREATE TABLE lb_drop_data_global KEY mobid (continent) USING BTREE ); -CREATE TABLE lb_reactordrops +CREATE TABLE reactordrops ( reactordropid INT UNSIGNED NOT NULL AUTO_INCREMENT, reactorid INT NOT NULL, diff --git a/src/main/resources/db/010-storage.sql b/src/main/resources/db/010-storage.sql index 8c271e359b..a3b9bc6525 100644 --- a/src/main/resources/db/010-storage.sql +++ b/src/main/resources/db/010-storage.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_storages +CREATE TABLE storages ( storageid INT UNSIGNED NOT NULL AUTO_INCREMENT, accountid INT NOT NULL DEFAULT '0', @@ -8,7 +8,7 @@ CREATE TABLE lb_storages PRIMARY KEY (storageid) ); -CREATE TABLE lb_fredstorage +CREATE TABLE fredstorage ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, cid INT UNSIGNED NOT NULL, diff --git a/src/main/resources/db/011-shop.sql b/src/main/resources/db/011-shop.sql index 178740c125..de1ddb496f 100644 --- a/src/main/resources/db/011-shop.sql +++ b/src/main/resources/db/011-shop.sql @@ -1,11 +1,11 @@ -CREATE TABLE lb_shops +CREATE TABLE shops ( shopid INT UNSIGNED NOT NULL AUTO_INCREMENT, npcid INT NOT NULL DEFAULT '0', PRIMARY KEY (shopid) ); -CREATE TABLE lb_shopitems +CREATE TABLE shopitems ( shopitemid INT UNSIGNED NOT NULL AUTO_INCREMENT, shopid INT UNSIGNED NOT NULL, diff --git a/src/main/resources/db/012-character-state.sql b/src/main/resources/db/012-character-state.sql index 6f78501bdd..6f5834b994 100644 --- a/src/main/resources/db/012-character-state.sql +++ b/src/main/resources/db/012-character-state.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_playerdiseases +CREATE TABLE playerdiseases ( id INT NOT NULL AUTO_INCREMENT, charid INT NOT NULL, @@ -9,7 +9,7 @@ CREATE TABLE lb_playerdiseases PRIMARY KEY (id) ); -CREATE TABLE lb_buddies +CREATE TABLE buddies ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, @@ -19,7 +19,7 @@ CREATE TABLE lb_buddies PRIMARY KEY (id) ); -CREATE TABLE lb_savedlocations +CREATE TABLE savedlocations ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, @@ -29,7 +29,7 @@ CREATE TABLE lb_savedlocations PRIMARY KEY (id) ); -CREATE TABLE lb_famelog +CREATE TABLE famelog ( famelogid INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL DEFAULT '0', @@ -37,10 +37,10 @@ CREATE TABLE lb_famelog `when` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (famelogid), KEY characterid (characterid), - FOREIGN KEY (characterid) REFERENCES lb_characters (id) ON DELETE CASCADE + FOREIGN KEY (characterid) REFERENCES characters (id) ON DELETE CASCADE ); -CREATE TABLE lb_trocklocations +CREATE TABLE trocklocations ( trockid INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, @@ -49,7 +49,7 @@ CREATE TABLE lb_trocklocations PRIMARY KEY (trockid) ); -CREATE TABLE lb_characterexplogs +CREATE TABLE characterexplogs ( id BIGINT NOT NULL AUTO_INCREMENT, world_exp_rate INT, @@ -59,5 +59,5 @@ CREATE TABLE lb_characterexplogs exp_gain_time DATETIME, charid INT NOT NULL, PRIMARY KEY (id), - FOREIGN KEY (charid) REFERENCES lb_characters (id) ON DELETE CASCADE + FOREIGN KEY (charid) REFERENCES characters (id) ON DELETE CASCADE ) \ No newline at end of file diff --git a/src/main/resources/db/013-cashshop.sql b/src/main/resources/db/013-cashshop.sql index d7631d655c..f01d285f4f 100644 --- a/src/main/resources/db/013-cashshop.sql +++ b/src/main/resources/db/013-cashshop.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_wishlists +CREATE TABLE wishlists ( id INT NOT NULL AUTO_INCREMENT, charid INT NOT NULL, @@ -6,7 +6,7 @@ CREATE TABLE lb_wishlists PRIMARY KEY (id) ); -CREATE TABLE lb_specialcashitems +CREATE TABLE specialcashitems ( id INT NOT NULL, sn INT NOT NULL, @@ -15,7 +15,7 @@ CREATE TABLE lb_specialcashitems PRIMARY KEY (id) ); -CREATE TABLE lb_nxcode +CREATE TABLE nxcode ( id INT NOT NULL AUTO_INCREMENT, code VARCHAR(17) NOT NULL UNIQUE, @@ -24,7 +24,7 @@ CREATE TABLE lb_nxcode PRIMARY KEY (id) ); -CREATE TABLE lb_nxcode_items +CREATE TABLE nxcode_items ( id INT NOT NULL AUTO_INCREMENT, codeid INT NOT NULL, @@ -34,7 +34,7 @@ CREATE TABLE lb_nxcode_items PRIMARY KEY (id) ); -CREATE TABLE lb_nxcoupons +CREATE TABLE nxcoupons ( id INT NOT NULL AUTO_INCREMENT, couponid INT NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/014-gift.sql b/src/main/resources/db/014-gift.sql index 3aab181885..c213493a40 100644 --- a/src/main/resources/db/014-gift.sql +++ b/src/main/resources/db/014-gift.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_gifts +CREATE TABLE gifts ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, `to` INT NOT NULL, @@ -9,7 +9,7 @@ CREATE TABLE lb_gifts PRIMARY KEY (id) ); -CREATE TABLE lb_notes +CREATE TABLE notes ( id INT NOT NULL AUTO_INCREMENT, `to` VARCHAR(13) NOT NULL DEFAULT '', @@ -21,7 +21,7 @@ CREATE TABLE lb_notes PRIMARY KEY (id) ); -CREATE TABLE lb_newyear +CREATE TABLE newyear ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, senderid INT NOT NULL DEFAULT '-1', diff --git a/src/main/resources/db/015-marriage.sql b/src/main/resources/db/015-marriage.sql index 66e64ecb6b..d03ab73480 100644 --- a/src/main/resources/db/015-marriage.sql +++ b/src/main/resources/db/015-marriage.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_marriages +CREATE TABLE marriages ( marriageid INT UNSIGNED NOT NULL AUTO_INCREMENT, husbandid INT UNSIGNED NOT NULL DEFAULT '0', @@ -6,7 +6,7 @@ CREATE TABLE lb_marriages PRIMARY KEY (marriageid) ); -CREATE TABLE lb_rings +CREATE TABLE rings ( id INT NOT NULL AUTO_INCREMENT, partnerRingId INT NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/016-monsterbook.sql b/src/main/resources/db/016-monsterbook.sql index 005bb1ec44..4c181bf771 100644 --- a/src/main/resources/db/016-monsterbook.sql +++ b/src/main/resources/db/016-monsterbook.sql @@ -1,13 +1,13 @@ -CREATE TABLE lb_monsterbook +CREATE TABLE monsterbook ( charid INT NOT NULL, cardid INT NOT NULL, level INT NOT NULL DEFAULT '1', PRIMARY KEY (charid, cardid), - FOREIGN KEY (charid) REFERENCES lb_characters (id) ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (charid) REFERENCES characters (id) ON UPDATE CASCADE ON DELETE CASCADE ); -CREATE TABLE lb_monstercarddata +CREATE TABLE monstercarddata ( id INT NOT NULL AUTO_INCREMENT, cardid INT NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/017-family.sql b/src/main/resources/db/017-family.sql index c22277171a..ed3d828aa4 100644 --- a/src/main/resources/db/017-family.sql +++ b/src/main/resources/db/017-family.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_family_character +CREATE TABLE family_character ( cid INT NOT NULL, familyid INT NOT NULL, @@ -11,10 +11,10 @@ CREATE TABLE lb_family_character lastresettime BIGINT NOT NULL DEFAULT '0', PRIMARY KEY (cid), INDEX (cid, familyid), - FOREIGN KEY (cid) REFERENCES lb_characters (`id`) ON DELETE CASCADE + FOREIGN KEY (cid) REFERENCES characters (`id`) ON DELETE CASCADE ); -CREATE TABLE lb_family_entitlement +CREATE TABLE family_entitlement ( id INT NOT NULL AUTO_INCREMENT, charid INT NOT NULL, diff --git a/src/main/resources/db/018-transfer.sql b/src/main/resources/db/018-transfer.sql index 1301f242cf..3cf8b379c7 100644 --- a/src/main/resources/db/018-transfer.sql +++ b/src/main/resources/db/018-transfer.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_namechanges +CREATE TABLE namechanges ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, @@ -10,7 +10,7 @@ CREATE TABLE lb_namechanges INDEX (characterid) ); -CREATE TABLE lb_worldtransfers +CREATE TABLE worldtransfers ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, diff --git a/src/main/resources/db/019-mts.sql b/src/main/resources/db/019-mts.sql index f6339f2018..a58402d34c 100644 --- a/src/main/resources/db/019-mts.sql +++ b/src/main/resources/db/019-mts.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_mts_cart +CREATE TABLE mts_cart ( id INT NOT NULL AUTO_INCREMENT, cid INT NOT NULL, @@ -6,7 +6,7 @@ CREATE TABLE lb_mts_cart PRIMARY KEY (id) ); -CREATE TABLE lb_mts_items +CREATE TABLE mts_items ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, tab INT NOT NULL DEFAULT '0', diff --git a/src/main/resources/db/020-maker.sql b/src/main/resources/db/020-maker.sql index 31340c088b..2b9fa47639 100644 --- a/src/main/resources/db/020-maker.sql +++ b/src/main/resources/db/020-maker.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_makercreatedata +CREATE TABLE makercreatedata ( id TINYINT UNSIGNED NOT NULL, itemid INT NOT NULL, @@ -13,7 +13,7 @@ CREATE TABLE lb_makercreatedata PRIMARY KEY (id, itemid) ); -CREATE TABLE lb_makerrecipedata +CREATE TABLE makerrecipedata ( itemid INT NOT NULL, req_item INT NOT NULL, @@ -21,7 +21,7 @@ CREATE TABLE lb_makerrecipedata PRIMARY KEY (itemid, req_item) ); -CREATE TABLE lb_makerrewarddata +CREATE TABLE makerrewarddata ( itemid INT NOT NULL, rewardid INT NOT NULL, @@ -30,7 +30,7 @@ CREATE TABLE lb_makerrewarddata PRIMARY KEY (itemid, rewardid) ); -CREATE TABLE lb_makerreagentdata +CREATE TABLE makerreagentdata ( itemid INT NOT NULL, stat VARCHAR(20) NOT NULL, diff --git a/src/main/resources/db/021-field-object.sql b/src/main/resources/db/021-field-object.sql index 44a8e24c0e..47b87d036c 100644 --- a/src/main/resources/db/021-field-object.sql +++ b/src/main/resources/db/021-field-object.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_playernpcs +CREATE TABLE playernpcs ( id INT NOT NULL AUTO_INCREMENT, name VARCHAR(13) NOT NULL, @@ -22,7 +22,7 @@ CREATE TABLE lb_playernpcs PRIMARY KEY (id) USING BTREE ); -CREATE TABLE lb_playernpcs_equip +CREATE TABLE playernpcs_equip ( id INT NOT NULL AUTO_INCREMENT, npcid INT NOT NULL DEFAULT '0', @@ -32,7 +32,7 @@ CREATE TABLE lb_playernpcs_equip PRIMARY KEY (id) ); -CREATE TABLE lb_playernpcs_field +CREATE TABLE playernpcs_field ( id INT NOT NULL AUTO_INCREMENT, world INT NOT NULL, @@ -42,7 +42,7 @@ CREATE TABLE lb_playernpcs_field PRIMARY KEY (id) ); -CREATE TABLE lb_plife +CREATE TABLE plife ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, world INT NOT NULL DEFAULT '-1', diff --git a/src/main/resources/db/022-ban.sql b/src/main/resources/db/022-ban.sql index ef5a4da9c3..8130a90c97 100644 --- a/src/main/resources/db/022-ban.sql +++ b/src/main/resources/db/022-ban.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_hwidaccounts +CREATE TABLE hwidaccounts ( accountid INT NOT NULL DEFAULT '0', hwid VARCHAR(40) NOT NULL DEFAULT '', @@ -7,7 +7,7 @@ CREATE TABLE lb_hwidaccounts PRIMARY KEY (accountid, hwid) ); -CREATE TABLE lb_hwidbans +CREATE TABLE hwidbans ( hwidbanid INT UNSIGNED NOT NULL AUTO_INCREMENT, hwid VARCHAR(30) NOT NULL, @@ -15,7 +15,7 @@ CREATE TABLE lb_hwidbans UNIQUE KEY hwid_2 (hwid) ); -CREATE TABLE lb_ipbans +CREATE TABLE ipbans ( ipbanid INT UNSIGNED NOT NULL AUTO_INCREMENT, ip VARCHAR(40) NOT NULL DEFAULT '', @@ -23,7 +23,7 @@ CREATE TABLE lb_ipbans PRIMARY KEY (ipbanid) ); -CREATE TABLE lb_macbans +CREATE TABLE macbans ( macbanid INT UNSIGNED NOT NULL AUTO_INCREMENT, mac VARCHAR(30) NOT NULL, @@ -32,14 +32,14 @@ CREATE TABLE lb_macbans UNIQUE KEY mac_2 (mac) ); -CREATE TABLE lb_macfilters +CREATE TABLE macfilters ( macfilterid INT UNSIGNED NOT NULL AUTO_INCREMENT, filter VARCHAR(30) NOT NULL, PRIMARY KEY (macfilterid) ); -CREATE TABLE lb_reports +CREATE TABLE reports ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, reporttime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, diff --git a/src/main/resources/db/023-bosslog.sql b/src/main/resources/db/023-bosslog.sql index 608f765928..701d748826 100644 --- a/src/main/resources/db/023-bosslog.sql +++ b/src/main/resources/db/023-bosslog.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_bosslog_daily +CREATE TABLE bosslog_daily ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, @@ -7,7 +7,7 @@ CREATE TABLE lb_bosslog_daily PRIMARY KEY (id) ); -CREATE TABLE lb_bosslog_weekly +CREATE TABLE bosslog_weekly ( id INT NOT NULL AUTO_INCREMENT, characterid INT NOT NULL, diff --git a/src/main/resources/db/024-duey.sql b/src/main/resources/db/024-duey.sql index 342ff89131..0acb3bc0e0 100644 --- a/src/main/resources/db/024-duey.sql +++ b/src/main/resources/db/024-duey.sql @@ -1,4 +1,4 @@ -CREATE TABLE lb_dueypackages +CREATE TABLE dueypackages ( PackageId INT UNSIGNED NOT NULL AUTO_INCREMENT, ReceiverId INT UNSIGNED NOT NULL, @@ -11,7 +11,7 @@ CREATE TABLE lb_dueypackages PRIMARY KEY (PackageId) ); -CREATE TABLE lb_dueyitems +CREATE TABLE dueyitems ( id INT UNSIGNED NOT NULL AUTO_INCREMENT, PackageId INT UNSIGNED NOT NULL DEFAULT '0', @@ -19,5 +19,5 @@ CREATE TABLE lb_dueyitems PRIMARY KEY (id), KEY INVENTORYITEMID (inventoryitemid), KEY PackageId (PackageId), - FOREIGN KEY (PackageId) REFERENCES lb_dueypackages (PackageId) ON DELETE CASCADE + FOREIGN KEY (PackageId) REFERENCES dueypackages (PackageId) ON DELETE CASCADE ); \ No newline at end of file diff --git a/src/main/resources/db/101-shops-data.sql b/src/main/resources/db/101-shops-data.sql index 087bb7d1bc..e699306e15 100644 --- a/src/main/resources/db/101-shops-data.sql +++ b/src/main/resources/db/101-shops-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_shops (shopid, npcid) +INSERT INTO shops (shopid, npcid) VALUES (11000, 11000), (11100, 11100), (21000, 21000), diff --git a/src/main/resources/db/102-shopitems-data.sql b/src/main/resources/db/102-shopitems-data.sql index 55c82ebc2c..c9d0fd27b4 100644 --- a/src/main/resources/db/102-shopitems-data.sql +++ b/src/main/resources/db/102-shopitems-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_shopitems (shopid, itemid, price, pitch, position) +INSERT INTO shopitems (shopid, itemid, price, pitch, position) VALUES (11000, 1332005, 500, 0, 104), (11000, 1322005, 50, 0, 108), (11000, 1312004, 50, 0, 112), diff --git a/src/main/resources/db/111-makercreate-data.sql b/src/main/resources/db/111-makercreate-data.sql index 252ed5e08e..3b37df9249 100644 --- a/src/main/resources/db/111-makercreate-data.sql +++ b/src/main/resources/db/111-makercreate-data.sql @@ -1,5 +1,5 @@ # generated with the SkillMakerFetcher tool -INSERT INTO lb_makercreatedata (id, itemid, req_level, req_maker_level, req_meso, req_item, req_equip, catalyst, +INSERT INTO makercreatedata (id, itemid, req_level, req_maker_level, req_meso, req_item, req_equip, catalyst, quantity, tuc) VALUES (0, 4250000, 45, 1, 110000, 0, 0, 0, 1, 0), (0, 4250100, 45, 1, 110000, 0, 0, 0, 1, 0), diff --git a/src/main/resources/db/112-makerrecipe-data.sql b/src/main/resources/db/112-makerrecipe-data.sql index 69878e692d..3875958fe9 100644 --- a/src/main/resources/db/112-makerrecipe-data.sql +++ b/src/main/resources/db/112-makerrecipe-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_makerrecipedata (itemid, req_item, count) +INSERT INTO makerrecipedata (itemid, req_item, count) VALUES (4250000, 4021007, 1), (4250100, 4021005, 1), (4250200, 4021000, 1), diff --git a/src/main/resources/db/113-makerreward-data.sql b/src/main/resources/db/113-makerreward-data.sql index a689d4b403..36917c38f1 100644 --- a/src/main/resources/db/113-makerreward-data.sql +++ b/src/main/resources/db/113-makerreward-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_makerrewarddata (itemid, rewardid, quantity, prob) +INSERT INTO makerrewarddata (itemid, rewardid, quantity, prob) VALUES (4250000, 4250000, 1, 14), (4250000, 4250001, 1, 5), (4250000, 4250002, 1, 1), diff --git a/src/main/resources/db/114-makerreagent-data.sql b/src/main/resources/db/114-makerreagent-data.sql index f4dcaa3221..614ec96bc1 100644 --- a/src/main/resources/db/114-makerreagent-data.sql +++ b/src/main/resources/db/114-makerreagent-data.sql @@ -1,5 +1,5 @@ # generated with the SkillMakerReagentIndexer tool -INSERT INTO lb_makerreagentdata (itemid, stat, value) +INSERT INTO makerreagentdata (itemid, stat, value) VALUES (4250000, "incPAD", 1), (4250001, "incPAD", 2), (4250002, "incPAD", 3), diff --git a/src/main/resources/db/121-monstercard-data.sql b/src/main/resources/db/121-monstercard-data.sql index 1a60a54752..66df70b747 100644 --- a/src/main/resources/db/121-monstercard-data.sql +++ b/src/main/resources/db/121-monstercard-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_monstercarddata (cardid, mobid) +INSERT INTO monstercarddata (cardid, mobid) VALUES (2380000, 100100), (2380001, 100101), (2380015, 100130), diff --git a/src/main/resources/db/131-reactordrops-data.sql b/src/main/resources/db/131-reactordrops-data.sql index 042a82174b..1b5d5c89a4 100644 --- a/src/main/resources/db/131-reactordrops-data.sql +++ b/src/main/resources/db/131-reactordrops-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_reactordrops (reactorid, itemid, chance, questid) +INSERT INTO reactordrops (reactorid, itemid, chance, questid) VALUES (2001, 4031161, 1, 1008), (2001, 4031162, 1, 1008), (2001, 2010009, 2, -1), @@ -1049,7 +1049,7 @@ VALUES (2001, 4031161, 1, 1008), (6742014, 1132009, 50, -1); # adding wish tickets on APQ boxes -INSERT INTO lb_reactordrops (reactorid, itemid, chance, questid) +INSERT INTO reactordrops (reactorid, itemid, chance, questid) VALUES (6702003, 4031543, 1, -1), (6702003, 4031544, 2, -1), (6702004, 4031544, 1, -1), diff --git a/src/main/resources/db/141-specialcashitems-data.sql b/src/main/resources/db/141-specialcashitems-data.sql index b0bb1efbfa..34c4218866 100644 --- a/src/main/resources/db/141-specialcashitems-data.sql +++ b/src/main/resources/db/141-specialcashitems-data.sql @@ -1,2 +1,2 @@ -INSERT INTO lb_specialcashitems (id, sn, modifier, info) +INSERT INTO specialcashitems (id, sn, modifier, info) VALUES (1, 10000617, 1024, 1); \ No newline at end of file diff --git a/src/main/resources/db/142-nxcoupons-data.sql b/src/main/resources/db/142-nxcoupons-data.sql index 12d3d5bed7..05574ce2f5 100644 --- a/src/main/resources/db/142-nxcoupons-data.sql +++ b/src/main/resources/db/142-nxcoupons-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_nxcoupons (couponid, rate, activeday, starthour, endhour) +INSERT INTO nxcoupons (couponid, rate, activeday, starthour, endhour) VALUES (211000, 2, 254, 18, 20), (211004, 2, 124, 7, 11), (211005, 2, 124, 10, 14), diff --git a/src/main/resources/db/151-global-drop-data.sql b/src/main/resources/db/151-global-drop-data.sql index c1e2023e33..f477dcd1df 100644 --- a/src/main/resources/db/151-global-drop-data.sql +++ b/src/main/resources/db/151-global-drop-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_drop_data_global (continent, itemid, minimum_quantity, maximum_quantity, questid, chance, comments) +INSERT INTO drop_data_global (continent, itemid, minimum_quantity, maximum_quantity, questid, chance, comments) VALUES (-1, 4031865, 1, 1, 0, 35000, 'NX Card 100 PTS'), (-1, 4031866, 1, 1, 0, 20000, 'NX Card 250 PTS'), (-1, 4001126, 1, 2, 0, 8000, 'Maple Leaves'), diff --git a/src/main/resources/db/152-drop-data.sql b/src/main/resources/db/152-drop-data.sql index e2d3f3317f..e0d6f28f7b 100644 --- a/src/main/resources/db/152-drop-data.sql +++ b/src/main/resources/db/152-drop-data.sql @@ -1,4 +1,4 @@ -INSERT INTO lb_drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) +INSERT INTO drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) VALUES (9400121, 4000138, 1, 1, 0, 600000), (9400121, 4010006, 1, 1, 0, 45000), (9400121, 2000006, 1, 1, 0, 999999), @@ -12526,8 +12526,7 @@ VALUES (9400121, 4000138, 1, 1, 0, 600000), (9500137, 4031171, 1, 1, 7101, 100000); -- generated by spider (legacy drop generator) --- TODO: remove duplicate drops. They used to be INSERT IGNOREd, but since the unique constraint for droppedid+itemid was dropped, it now results in duplicate drops rather than ignored inserts. -INSERT INTO lb_drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) +INSERT INTO drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) VALUES (5100004, 2383034, 1, 1, 0, 8000), (2100108, 2381030, 1, 1, 0, 8000), (100100, 2041045, 1, 1, 0, 750), @@ -21754,7 +21753,7 @@ VALUES (5100004, 2383034, 1, 1, 0, 8000), (7130601, 2048013, 1, 1, 0, 750); -- generated by the MesoFetcher tool -INSERT INTO lb_drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) +INSERT INTO drop_data (dropperid, itemid, minimum_quantity, maximum_quantity, questid, chance) VALUES (100122, 0, 35, 52, 0, 400000), (100123, 0, 38, 55, 0, 400000), (100124, 0, 40, 59, 0, 400000), diff --git a/src/main/resources/db/901-admin-data.sql b/src/main/resources/db/901-admin-data.sql index 9f1f64cc0b..31e4ea6420 100644 --- a/src/main/resources/db/901-admin-data.sql +++ b/src/main/resources/db/901-admin-data.sql @@ -1,97 +1,97 @@ -INSERT INTO lb_accounts (`name`, password, pin, pic, birthday, nxcredit, maplepoint, nxprepaid, characterslots, gender, +INSERT INTO accounts (`name`, password, pin, pic, birthday, nxcredit, maplepoint, nxprepaid, characterslots, gender, tos) VALUES ('admin', '$2y$12$aFD9BDeUocDMY1X4tDYDyeJw/HhkQwCQWs3KAY7gCaRG0cpqJcaL.', '0000', '000000', '2005-05-11', 1000000, 1000000, 1000000, 3, 0, 1); -INSERT INTO lb_characters (accountid, world, `name`, level, exp, +INSERT INTO characters (accountid, world, `name`, level, exp, str, dex, luk, `int`, hp, mp, maxhp, maxmp, meso, job, skincolor, gender, hair, face, ap, map, spawnpoint, gm, equipslots, useslots, setupslots, etcslots) -VALUES ((SELECT id FROM lb_accounts WHERE `name` = 'admin'), 0, 'Admin', 1, 0, +VALUES ((SELECT id FROM accounts WHERE `name` = 'admin'), 0, 'Admin', 1, 0, 12, 5, 4, 4, 50, 5, 50, 5, 100000000, 0, 0, 0, 30030, 20000, 500, 10000, 2, 6, 96, 96, 96, 96); -INSERT INTO lb_inventoryitems (type, characterid, itemid, inventorytype, +INSERT INTO inventoryitems (type, characterid, itemid, inventorytype, position, quantity, owner, flag, giftFrom) -VALUES (1, (SELECT id FROM lb_characters WHERE `name` = 'Admin'), 4161001, 4, +VALUES (1, (SELECT id FROM characters WHERE `name` = 'Admin'), 4161001, 4, 1, 1, '', 0, ''), - (1, (SELECT id FROM lb_characters WHERE `name` = 'Admin'), 1040002, -1, + (1, (SELECT id FROM characters WHERE `name` = 'Admin'), 1040002, -1, -5, 1, '', 0, ''), - (1, (SELECT id FROM lb_characters WHERE `name` = 'Admin'), 1060002, -1, + (1, (SELECT id FROM characters WHERE `name` = 'Admin'), 1060002, -1, -6, 1, '', 0, ''), - (1, (SELECT id FROM lb_characters WHERE `name` = 'Admin'), 1072001, -1, + (1, (SELECT id FROM characters WHERE `name` = 'Admin'), 1072001, -1, -7, 1, '', 0, ''), - (1, (SELECT id FROM lb_characters WHERE `name` = 'Admin'), 1302000, -1, + (1, (SELECT id FROM characters WHERE `name` = 'Admin'), 1302000, -1, -11, 1, '', 0, ''); -INSERT INTO lb_inventoryequipment (inventoryitemid, upgradeslots, watk, wdef) +INSERT INTO inventoryequipment (inventoryitemid, upgradeslots, watk, wdef) VALUES ((SELECT inventoryitemid - FROM lb_inventoryitems ii - INNER JOIN lb_characters chr ON chr.id = ii.characterid + FROM inventoryitems ii + INNER JOIN characters chr ON chr.id = ii.characterid WHERE itemid = 1040002 AND position = -5 AND chr.`name` = 'Admin'), 7, 0, 3), ((SELECT inventoryitemid - FROM lb_inventoryitems ii - INNER JOIN lb_characters chr ON chr.id = ii.characterid + FROM inventoryitems ii + INNER JOIN characters chr ON chr.id = ii.characterid WHERE itemid = 1060002 AND position = -6 AND chr.`name` = 'Admin'), 7, 0, 2), ((SELECT inventoryitemid - FROM lb_inventoryitems ii - INNER JOIN lb_characters chr ON chr.id = ii.characterid + FROM inventoryitems ii + INNER JOIN characters chr ON chr.id = ii.characterid WHERE itemid = 1072001 AND position = -7 AND chr.`name` = 'Admin'), 5, 0, 2), ((SELECT inventoryitemid - FROM lb_inventoryitems ii - INNER JOIN lb_characters chr ON chr.id = ii.characterid + FROM inventoryitems ii + INNER JOIN characters chr ON chr.id = ii.characterid WHERE itemid = 1302000 AND position = -11 AND chr.`name` = 'Admin'), 7, 17, 0); -INSERT INTO lb_keymap (characterid, `key`, type, action) -VALUES ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),18,4,0), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),65,6,106), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),2,4,10), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),23,4,1), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),3,4,12), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),4,4,13), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),5,4,18), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),6,4,24), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),16,4,8), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),17,4,5), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),19,4,4), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),25,4,19), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),26,4,14), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),27,4,15), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),31,4,2), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),34,4,17), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),35,4,11), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),37,4,3), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),38,4,20), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),40,4,16), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),43,4,9), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),44,5,50), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),45,5,51), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),46,4,6), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),50,4,7), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),56,5,53), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),59,6,100), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),60,6,101), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),61,6,102), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),62,6,103), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),63,6,104), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),64,6,105), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),57,5,54), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),48,4,22), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),29,5,52), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),7,4,21), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),24,4,25), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),33,4,26), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),41,4,23), - ((SELECT id FROM lb_characters WHERE `name` = 'Admin'),39,4,27); +INSERT INTO keymap (characterid, `key`, type, action) +VALUES ((SELECT id FROM characters WHERE `name` = 'Admin'),18,4,0), + ((SELECT id FROM characters WHERE `name` = 'Admin'),65,6,106), + ((SELECT id FROM characters WHERE `name` = 'Admin'),2,4,10), + ((SELECT id FROM characters WHERE `name` = 'Admin'),23,4,1), + ((SELECT id FROM characters WHERE `name` = 'Admin'),3,4,12), + ((SELECT id FROM characters WHERE `name` = 'Admin'),4,4,13), + ((SELECT id FROM characters WHERE `name` = 'Admin'),5,4,18), + ((SELECT id FROM characters WHERE `name` = 'Admin'),6,4,24), + ((SELECT id FROM characters WHERE `name` = 'Admin'),16,4,8), + ((SELECT id FROM characters WHERE `name` = 'Admin'),17,4,5), + ((SELECT id FROM characters WHERE `name` = 'Admin'),19,4,4), + ((SELECT id FROM characters WHERE `name` = 'Admin'),25,4,19), + ((SELECT id FROM characters WHERE `name` = 'Admin'),26,4,14), + ((SELECT id FROM characters WHERE `name` = 'Admin'),27,4,15), + ((SELECT id FROM characters WHERE `name` = 'Admin'),31,4,2), + ((SELECT id FROM characters WHERE `name` = 'Admin'),34,4,17), + ((SELECT id FROM characters WHERE `name` = 'Admin'),35,4,11), + ((SELECT id FROM characters WHERE `name` = 'Admin'),37,4,3), + ((SELECT id FROM characters WHERE `name` = 'Admin'),38,4,20), + ((SELECT id FROM characters WHERE `name` = 'Admin'),40,4,16), + ((SELECT id FROM characters WHERE `name` = 'Admin'),43,4,9), + ((SELECT id FROM characters WHERE `name` = 'Admin'),44,5,50), + ((SELECT id FROM characters WHERE `name` = 'Admin'),45,5,51), + ((SELECT id FROM characters WHERE `name` = 'Admin'),46,4,6), + ((SELECT id FROM characters WHERE `name` = 'Admin'),50,4,7), + ((SELECT id FROM characters WHERE `name` = 'Admin'),56,5,53), + ((SELECT id FROM characters WHERE `name` = 'Admin'),59,6,100), + ((SELECT id FROM characters WHERE `name` = 'Admin'),60,6,101), + ((SELECT id FROM characters WHERE `name` = 'Admin'),61,6,102), + ((SELECT id FROM characters WHERE `name` = 'Admin'),62,6,103), + ((SELECT id FROM characters WHERE `name` = 'Admin'),63,6,104), + ((SELECT id FROM characters WHERE `name` = 'Admin'),64,6,105), + ((SELECT id FROM characters WHERE `name` = 'Admin'),57,5,54), + ((SELECT id FROM characters WHERE `name` = 'Admin'),48,4,22), + ((SELECT id FROM characters WHERE `name` = 'Admin'),29,5,52), + ((SELECT id FROM characters WHERE `name` = 'Admin'),7,4,21), + ((SELECT id FROM characters WHERE `name` = 'Admin'),24,4,25), + ((SELECT id FROM characters WHERE `name` = 'Admin'),33,4,26), + ((SELECT id FROM characters WHERE `name` = 'Admin'),41,4,23), + ((SELECT id FROM characters WHERE `name` = 'Admin'),39,4,27); -INSERT INTO lb_storages (accountid, world, slots, meso) -VALUES ((SELECT id FROM lb_accounts WHERE `name` = 'admin'),0, 24,1000000000); \ No newline at end of file +INSERT INTO storages (accountid, world, slots, meso) +VALUES ((SELECT id FROM accounts WHERE `name` = 'admin'),0, 24,1000000000); \ No newline at end of file