Merge branch 'ms4/dev' into 'ms4/dev'

All Pets Fixed and Commands

See merge request morningstar/Arcturus-Community!18
This commit is contained in:
John 2023-01-06 14:46:55 +00:00
commit e37e675668

View File

@ -5,13 +5,66 @@ INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.succes.cmd_chang
ALTER TABLE `achievements` ALTER TABLE `achievements`
ADD `visible` enum('0','1') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1' COMMENT 'Is the achievement in use and/or obtainable?'; ADD `visible` enum('0','1') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1' COMMENT 'Is the achievement in use and/or obtainable?';
UPDATE pet_commands_data SET required_level=1 WHERE command_id=35;
INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('encryption.forced', '0');
DROP TABLE IF EXISTS `pet_actions`;
CREATE TABLE IF NOT EXISTS `pet_actions` (
`pet_type` int(2) NOT NULL AUTO_INCREMENT,
`pet_name` varchar(32) NOT NULL,
`offspring_type` int(3) NOT NULL DEFAULT -1,
`happy_actions` varchar(100) NOT NULL DEFAULT '',
`tired_actions` varchar(100) NOT NULL DEFAULT '',
`random_actions` varchar(100) NOT NULL DEFAULT '',
`can_swim` enum('1','0') DEFAULT '0',
PRIMARY KEY (`pet_type`) USING BTREE
) ENGINE=Aria AUTO_INCREMENT=40 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci PAGE_CHECKSUM=1 ROW_FORMAT=DYNAMIC;
# All Pets Fixed and Commands
INSERT INTO `pet_actions` (`pet_type`, `pet_name`, `offspring_type`, `happy_actions`, `tired_actions`, `random_actions`, `can_swim`) VALUES
(0, 'Dog', -1, '', '', '', '0'),
(1, 'Cat', -1, '', '', '', '0'),
(2, 'Crocodile', -1, '', '', '', '0'),
(3, 'Terrier', -1, '', '', '', '0'),
(4, 'Bear', -1, '', '', '', '0'),
(5, 'Pig', -1, '', '', '', '0'),
(6, 'Lion', -1, '', '', '', '0'),
(7, 'Rhino', -1, '', '', '', '0'),
(8, 'Spider', -1, '', '', '', '0'),
(9, 'Turtle', -1, '', '', '', '1'),
(10, 'Chicken', -1, '', '', '', '0'),
(11, 'Frog', -1, '', '', '', '0'),
(12, 'Dragon', -1, '', '', '', '0'),
(13, '', -1, '', '', '', '0'),
(14, 'Monkey', -1, '', '', '', '1'),
(15, 'Horse', -1, '', '', '', '0'),
(16, 'Monsterplant', -1, '', '', '', '0'),
(17, 'Bunny', -1, '', '', '', '0'),
(18, 'Evil Bunny', -1, '', '', '', '0'),
(19, 'Bored Bunny', -1, '', '', '', '0'),
(20, 'Love Bunny', -1, '', '', '', '0'),
(21, 'Wise Pidgeon', -1, '', '', '', '0'),
(22, 'Cunning Pidgeon', -1, '', '', '', '0'),
(23, 'Evil Monkey', -1, '', '', '', '1'),
(24, 'Baby Bear', -1, '', '', '', '1'),
(25, 'Baby Terrier', -1, '', '', '', '1'),
(26, 'Gnome', -1, '', '', '', '0'),
(27, 'Leprechaun', -1, '', '', '', '0'),
(28, 'Baby Cat', -1, '', '', '', '1'),
(29, 'Baby Dog', -1, '', '', '', '1'),
(30, 'Baby Pig', -1, '', '', '', '1'),
(31, 'Haloompa', -1, '', '', '', '0'),
(32, 'Fools', -1, '', '', '', '1'),
(33, 'Pterodactyl', -1, '', '', '', '0'),
(34, 'Velociraptor', -1, '', '', '', '0'),
(35, 'Cow', -1, '', '', '', '0'),
(36, '', -1, '', '', '', '0'),
(37, '', -1, '', '', '', '0');
DROP TABLE IF EXISTS `pet_commands`; DROP TABLE IF EXISTS `pet_commands`;
CREATE TABLE IF NOT EXISTS `pet_commands` ( CREATE TABLE IF NOT EXISTS `pet_commands` (
`pet_id` int(11) NOT NULL, `pet_id` int(11) NOT NULL,
`command_id` int(11) NOT NULL `command_id` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
INSERT IGNORE INTO `pet_commands` (`pet_id`, `command_id`) VALUES (0, 46),(0, 0),(0, 1),(0, 14),(0, 43),(0, 2),(0, 3),(0, 4),(0, 17),(0, 5),(0, 6),(0, 7),(0, 8),(0, 19),(0, 10),(0, 12),(0, 13),(0, 4),(0, 15),(0, 16),(0, 24),(0, 25),(0, 26),(1, 46),(1, 0),(1, 1),(1, 14),(1, 43),(1, 2),(1, 3),(1, 4),(1, 17),(1, 5),(1, 6),(1, 7),(1, 8),(1, 19),(1, 10),(1, 12),(1, 13),(1, 4),(1, 15),(1, 16),(1, 24),(1, 25),(1, 26),(2, 0),(2, 1),(2, 43),(2, 2),(2, 18),(2, 4),(2, 17),(2, 5),(2, 6),(2, 7),(2, 8),(2, 10),(2, 11),(2, 12),(2, 13),(2, 15),(2, 16),(2, 24),(2, 25),(2, 26),(3, 46),(3, 0),(3, 1),(3, 14),(3, 43),(3, 2),(3, 3),(3, 4),(3, 17),(3, 5),(3, 6),(3, 7),(3, 8),(3, 19),(3, 10),(3, 12),(3, 13),(3, 4),(3, 15),(3, 16),(3, 24),(3, 25),(3, 26),(4, 46),(4, 0),(4, 1),(4, 14),(4, 43),(4, 2),(4, 3),(4, 4),(4, 17),(4, 5),(4, 6),(4, 7),(4, 8),(4, 19),(4, 10),(4, 12),(4, 13),(4, 4),(4, 15),(4, 16),(4, 24),(4, 25),(4, 26),(5, 46),(5, 0),(5, 1),(5, 14),(5, 43),(5, 2),(5, 3),(5, 4),(5, 17),(5, 5),(5, 6),(5, 7),(5, 8),(5, 19),(5, 10),(5, 12),(5, 13),(5, 4),(5, 15),(5, 16),(5, 24),(5, 25),(5, 26),(6, 0),(6, 1),(6, 43),(6, 2),(6, 18),(6, 4),(6, 17),(6, 5),(6, 6),(6, 7),(6, 8),(6, 10),(6, 11),(6, 12),(6, 13),(6, 15),(6, 16),(6, 24),(6, 25),(6, 26),(7, 0),(7, 1),(7, 43),(7, 2),(7, 18),(7, 4),(7, 17),(7, 5),(7, 6),(7, 7),(7, 8),(7, 10),(7, 11),(7, 12),(7, 13),(7, 15),(7, 16),(7, 24),(7, 25),(7, 26),(8, 0),(8, 20),(8, 18),(8, 17),(8, 5),(8, 6),(8, 7),(8, 23),(8, 19),(8, 10),(8, 11),(8, 24),(8, 25),(8, 26),(8, 13),(8, 14),(8, 19),(8, 20),(8, 22),(8, 21),(8, 15),(8, 16),(9, 0),(9, 14),(9, 43),(9, 18),(9, 29),(9, 2),(9, 13),(9, 6),(9, 17),(9, 5),(9, 7),(9, 8),(9, 10),(9, 11),(9, 15),(9, 16),(9, 24),(9, 25),(9, 26),(11, 0),(11, 1),(11, 2),(11, 3),(11, 6),(11, 4),(11, 28),(11, 5),(11, 30),(11, 9),(11, 7),(11, 27),(11, 13),(11, 17),(11, 29),(11, 21),(11, 15),(11, 16),(12, 0),(12, 35),(12, 5),(12, 3),(12, 36),(12, 37),(12, 38),(12, 2),(12, 6),(12, 7),(12, 40),(12, 8),(12, 19),(12, 41),(12, 10),(12, 11),(12, 12),(12, 13),(12, 14),(12, 15),(12, 16),(12, 42),(14, 0),(14, 1),(14, 43),(14, 14),(14, 3),(14, 6),(14, 4),(14, 5),(14, 2),(14, 9),(14, 7),(14, 29),(14, 10),(14, 11),(14, 21),(14, 13),(14, 15),(14, 16),(15, 0),(15, 14),(15, 43),(15, 44),(15, 2),(15, 3),(15, 6),(15, 7),(15, 10),(15, 12),(15, 11),(15, 15),(15, 16),(15, 24),(15, 25),(15, 26),(15, 45),(33, 0),(33, 1),(33, 14),(33, 43),(33, 6),(33, 13),(33, 3),(33, 17),(33, 2),(33, 10),(33, 8),(33, 12),(33, 7),(33, 16),(33, 15),(33, 25),(33, 26),(34, 0),(34, 1),(34, 14),(34, 43),(34, 6),(34, 13),(34, 3),(34, 17),(34, 2),(34, 10),(34, 8),(34, 12),(34, 7),(34, 16),(34, 15),(34, 25),(34, 26); INSERT INTO `pet_commands` (`pet_id`, `command_id`) VALUES (0, 46),(0, 0),(0, 1),(0, 14),(0, 43),(0, 2),(0, 3),(0, 4),(0, 17),(0, 5),(0, 6),(0, 7),(0, 8),(0, 19),(0, 10),(0, 12),(0, 13),(0, 4),(0, 15),(0, 16),(0, 24),(0, 25),(0, 26),(1, 46),(1, 0),(1, 1),(1, 14),(1, 43),(1, 2),(1, 3),(1, 4),(1, 17),(1, 5),(1, 6),(1, 7),(1, 8),(1, 19),(1, 10),(1, 12),(1, 13),(1, 4),(1, 15),(1, 16),(1, 24),(1, 25),(1, 26),(2, 0),(2, 1),(2, 43),(2, 2),(2, 18),(2, 4),(2, 17),(2, 5),(2, 6),(2, 7),(2, 8),(2, 10),(2, 11),(2, 12),(2, 13),(2, 15),(2, 16),(2, 24),(2, 25),(2, 26),(3, 46),(3, 0),(3, 1),(3, 14),(3, 43),(3, 2),(3, 3),(3, 4),(3, 17),(3, 5),(3, 6),(3, 7),(3, 8),(3, 19),(3, 10),(3, 12),(3, 13),(3, 4),(3, 15),(3, 16),(3, 24),(3, 25),(3, 26),(4, 46),(4, 0),(4, 1),(4, 14),(4, 43),(4, 2),(4, 3),(4, 4),(4, 17),(4, 5),(4, 6),(4, 7),(4, 8),(4, 19),(4, 10),(4, 12),(4, 13),(4, 4),(4, 15),(4, 16),(4, 24),(4, 25),(4, 26),(5, 46),(5, 0),(5, 1),(5, 14),(5, 43),(5, 2),(5, 3),(5, 4),(5, 17),(5, 5),(5, 6),(5, 7),(5, 8),(5, 19),(5, 10),(5, 12),(5, 13),(5, 4),(5, 15),(5, 16),(5, 24),(5, 25),(5, 26),(6, 0),(6, 1),(6, 43),(6, 2),(6, 18),(6, 4),(6, 17),(6, 5),(6, 6),(6, 7),(6, 8),(6, 10),(6, 11),(6, 12),(6, 13),(6, 15),(6, 16),(6, 24),(6, 25),(6, 26),(7, 0),(7, 1),(7, 43),(7, 2),(7, 18),(7, 4),(7, 17),(7, 5),(7, 6),(7, 7),(7, 8),(7, 10),(7, 11),(7, 12),(7, 13),(7, 15),(7, 16),(7, 24),(7, 25),(7, 26),(8, 0),(8, 20),(8, 18),(8, 17),(8, 5),(8, 6),(8, 7),(8, 23),(8, 19),(8, 10),(8, 11),(8, 24),(8, 25),(8, 26),(8, 13),(8, 14),(8, 19),(8, 20),(8, 22),(8, 21),(8, 15),(8, 16),(9, 0),(9, 14),(9, 43),(9, 18),(9, 29),(9, 2),(9, 13),(9, 6),(9, 17),(9, 5),(9, 7),(9, 8),(9, 10),(9, 11),(9, 15),(9, 16),(9, 24),(9, 25),(9, 26),(11, 0),(11, 1),(11, 2),(11, 3),(11, 6),(11, 4),(11, 28),(11, 5),(11, 30),(11, 9),(11, 7),(11, 27),(11, 13),(11, 17),(11, 29),(11, 21),(11, 15),(11, 16),(12, 0),(12, 35),(12, 5),(12, 3),(12, 36),(12, 37),(12, 38),(12, 2),(12, 6),(12, 7),(12, 40),(12, 8),(12, 19),(12, 41),(12, 10),(12, 11),(12, 12),(12, 13),(12, 14),(12, 15),(12, 16),(12, 42),(14, 0),(14, 1),(14, 43),(14, 14),(14, 3),(14, 6),(14, 4),(14, 5),(14, 2),(14, 9),(14, 7),(14, 29),(14, 10),(14, 11),(14, 21),(14, 13),(14, 15),(14, 16),(15, 0),(15, 14),(15, 43),(15, 44),(15, 2),(15, 3),(15, 6),(15, 7),(15, 10),(15, 12),(15, 11),(15, 15),(15, 16),(15, 24),(15, 25),(15, 26),(15, 45),(33, 0),(33, 1),(33, 14),(33, 43),(33, 6),(33, 13),(33, 3),(33, 17),(33, 2),(33, 10),(33, 8),(33, 12),(33, 7),(33, 16),(33, 15),(33, 25),(33, 26),(34, 0),(34, 1),(34, 14),(34, 43),(34, 6),(34, 13),(34, 3),(34, 17),(34, 2),(34, 10),(34, 8),(34, 12),(34, 7),(34, 16),(34, 15),(34, 25),(34, 26),(17, 0),(17, 2),(17, 3),(17, 6),(17, 11),(17, 17),(17, 15),(17, 16),(18, 0),(18, 2),(18, 3),(18, 6),(18, 11),(18, 17),(18, 15),(18, 16),(19, 0),(19, 2),(19, 3),(19, 6),(19, 11),(19, 17),(19, 15),(19, 16),(19, 0),(20, 2),(20, 3),(20, 6),(20, 11),(20, 17),(20, 15),(20, 16),(21, 0),(21, 1),(21, 2),(21, 3),(21, 10),(21, 5),(21, 9),(21, 7),(21, 11),(21, 13),(21, 15),(21, 16),(21, 34),(21, 32),(21, 33),(22, 0),(22, 1),(22, 2),(22, 3),(22, 10),(22, 5),(22, 9),(22, 7),(22, 11),(22, 13),(22, 15),(22, 16),(22, 34),(22, 32),(22, 33),(24, 0),(24, 1),(24, 14),(24, 43),(24, 2),(24, 3),(24, 4),(24, 17),(24, 6),(24, 7),(24, 8),(24, 10),(24, 11),(24, 12),(24, 13),(24, 15),(24, 16),(24, 25),(24, 26),(25, 0),(25, 1),(25, 14),(25, 43),(25, 2),(25, 3),(25, 17),(25, 5),(25, 6),(25, 7),(25, 8),(25, 9),(25, 10),(25, 11),(25, 12),(25, 13),(25, 15),(25, 16),(25, 25),(25, 26),(26, 0),(26, 1),(26, 14),(26, 43),(26, 6),(26, 13),(26, 3),(26, 2),(26, 4),(26, 8),(26, 7),(26, 16),(26, 15),(26, 17),(26, 25),(26, 26),(27, 0),(27, 1),(27, 14),(27, 43),(27, 6),(27, 13),(27, 3),(27, 2),(27, 4),(27, 8),(27, 7),(27, 16),(27, 15),(27, 17),(27, 25),(27, 26),(28, 0),(28, 1),(28, 14),(28, 43),(28, 2),(28, 3),(28, 4),(28, 17),(28, 6),(28, 7),(28, 8),(28, 11),(28, 13),(28, 12),(28, 15),(28, 16),(28, 24),(28, 25),(28, 26),(29, 0),(29, 1),(29, 14),(29, 43),(29, 2),(29, 3),(29, 4),(29, 17),(29, 6),(29, 7),(29, 11),(29, 13),(29, 15),(29, 16),(29, 24),(29, 25),(29, 26),(30, 0),(30, 1),(30, 14),(30, 43),(30, 2),(30, 3),(30, 4),(30, 11),(30, 17),(30, 6),(30, 7),(30, 8),(30, 10),(30, 12),(30, 13),(30, 15),(30, 16),(30, 25),(30, 26),(31, 0),(31, 1),(31, 14),(31, 43),(31, 6),(31, 13),(31, 3),(31, 2),(31, 4),(31, 8),(31, 7),(31, 16),(31, 15),(31, 17),(31, 25),(31, 26),(35, 34),(35, 14),(35, 6),(35, 0),(35, 3),(35, 30),(35, 27),(35, 4),(35, 2),(35, 13),(35, 7),(35, 15),(35, 16),(35, 25),(35, 26),(23, 0),(23, 1),(23, 43),(23, 14),(23, 3),(23, 6),(23, 4),(23, 5),(23, 2),(23, 19),(23, 7),(23, 29),(23, 10),(23, 11),(23, 31),(23, 13),(23, 15),(23, 16),(23, 27);
UPDATE pet_commands_data SET required_level=1 WHERE command_id=35;
INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('encryption.forced', '0');