From 2c71f074874557ec41c8e4e31415bf0e4bd1f41d Mon Sep 17 00:00:00 2001 From: EpicTaru Date: Fri, 16 Oct 2020 14:07:42 -0500 Subject: [PATCH 1/2] -- mob_droplist.sql: Added Attestation NM pop items to Hydra NMs with normalized drop rate of 10% - Despot's Fortune Parchment - Item ID 3359, drops from Hydra Warrior, Hydra Paladin, Hydra Red Mage (DropID 1343) - Sadist's Fortune Parchment - Item ID 3360, drops from Hydra Bard*, Hydra White Mage, Hydra Black Mage (DropID 1344) - Villain's Fortune Parchment - Item ID 3361, drops from Hydra Monk, Hydra Ninja, Hydra Thief (DropID 1345) - Deluder's Fortune Parchment - Item ID 3362, drops from Hydra Ranger, Hyra Samurai, Hydra Dark Knight (DropID 3145) - Traitor's Fortune Parchment - Item ID 3363, drops from Hydra Beastmaster, Hydra Dragoon, Hydra Summoner (DropID 3146) -- mob_groups.sql: Added/moved DropIDs to allow for above Hydra NMs to drop relevant Attestation NM pop item - Hydra Bard was moved from existing DropID 1343 to 1344 (1344 also pre-existing but correct group for the drop of the pop item) - Hydra Ranger, Hyra Samurai, Hydra Dark Knight were moved from pre-existing DropID 1343 to new DropID 3145 to NEW DropID 3145 - Hydra Beastmaster, Hydra Dragoon, Hydra Summoner were moved from pre-existing DropID 1343 to new DropID 3146 -- Added other items that also should drop from mobs in the two above new Drop IDs (copied from drop lists for the other Drop IDs) -- Added commenting to denote which mobs were in each Drop ID as well as the Item Names for the items that already existed -- Removed an unnecessary space in Item Description for Drop ID 3144 (it was bugging me!!!!!!) --- sql/mob_droplist.sql | 193 +++++++++++++++++++++++++++---------------- sql/mob_groups.sql | 28 +++---- 2 files changed, 135 insertions(+), 86 deletions(-) diff --git a/sql/mob_droplist.sql b/sql/mob_droplist.sql index 6b944c9c6b5..af2deef4ebb 100644 --- a/sql/mob_droplist.sql +++ b/sql/mob_droplist.sql @@ -6906,77 +6906,78 @@ INSERT INTO `mob_droplist` VALUES (1342,0,0,1000,15123,10); INSERT INTO `mob_droplist` VALUES (1342,0,0,1000,15140,10); INSERT INTO `mob_droplist` VALUES (1342,0,0,1000,15142,10); INSERT INTO `mob_droplist` VALUES (1342,0,0,1000,16360,10); -INSERT INTO `mob_droplist` VALUES (1343,2,0,1000,1449,0); -- (Hydra Vanguard, Be) -INSERT INTO `mob_droplist` VALUES (1343,2,0,1000,1452,0); -INSERT INTO `mob_droplist` VALUES (1343,2,0,1000,1455,0); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11292,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11295,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11298,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11307,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15088,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15089,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15090,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15091,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15094,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15096,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15098,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15099,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15100,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15101,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15117,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15122,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15123,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15140,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15142,10); -INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,16360,10); -INSERT INTO `mob_droplist` VALUES (1344,2,0,1000,1449,0); -INSERT INTO `mob_droplist` VALUES (1344,2,0,1000,1452,0); -INSERT INTO `mob_droplist` VALUES (1344,2,0,1000,1455,0); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,3360,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11292,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11295,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11298,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11307,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15088,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15089,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15090,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15091,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15094,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15096,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15098,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15099,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15100,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15101,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15117,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15122,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15123,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15140,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15142,10); -INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,16360,10); -INSERT INTO `mob_droplist` VALUES (1345,2,0,1000,1449,0); -INSERT INTO `mob_droplist` VALUES (1345,2,0,1000,1452,0); -INSERT INTO `mob_droplist` VALUES (1345,2,0,1000,1455,0); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,3361,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11292,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11295,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11298,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11307,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15088,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15089,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15090,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15091,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15094,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15096,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15098,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15099,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15100,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15101,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15117,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15122,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15123,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15140,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15142,10); -INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,16360,10); +INSERT INTO `mob_droplist` VALUES (1343,2,0,1000,1449,0); -- Hydra Warrior, Paladin, Hydra Red Mage (Dynamis Beaucedine) - Tukuku Whiteshell +INSERT INTO `mob_droplist` VALUES (1343,2,0,1000,1452,0); -- Ordelle Bronzepiece +INSERT INTO `mob_droplist` VALUES (1343,2,0,1000,1455,0); -- One Byne Bill +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,3359,100); -- Despot's Fortune Parchment, 10% (normalized) +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11292,10); -- Mirage Jubbah +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11295,10); -- Commodore Frac +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11298,10); -- Pantin Tobe +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,11307,10); -- Argute Gown +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15088,10); -- Melee Cyclas +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15089,10); -- Cleric's Briault +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15090,10); -- Sorcerer's Coat +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15091,10); -- Duelist's Tabard +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15094,10); -- Abyss Cuirass +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15096,10); -- Bard's Justaucorps +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15098,10); -- Saotome Domaru +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15099,10); -- Koga Chainmail +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15100,10); -- Wyrm Mail +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15101,10); -- Summoner's Doublet +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15117,10); -- Warrior's Cuisses +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15122,10); -- Assassin's Culottes +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15123,10); -- Valor Breeches +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15140,10); -- Monster Gaiters +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,15142,10); -- Scout's Socks +INSERT INTO `mob_droplist` VALUES (1343,0,0,1000,16360,10); -- Etoile Tights +INSERT INTO `mob_droplist` VALUES (1344,2,0,1000,1449,0); -- Hydra Bard, White Mage, Black Mage (Dynamis Beaucedine) - Tukuku Whiteshell +INSERT INTO `mob_droplist` VALUES (1344,2,0,1000,1452,0); -- Ordelle Bronzepiece +INSERT INTO `mob_droplist` VALUES (1344,2,0,1000,1455,0); -- One Byne Bill +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,3360,100); -- Sadist's Fortune Parchment, 10% (normalized) +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11292,10); -- Mirage Jubbah +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11295,10); -- Commodore Frac +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11298,10); -- Pantin Tobe +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,11307,10); -- Argute Gown +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15088,10); -- Melee Cyclas +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15089,10); -- Cleric's Briault +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15090,10); -- Sorcerer's Coat +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15091,10); -- Duelist's Tabard +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15094,10); -- Abyss Cuirass +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15096,10); -- Bard's Justaucorps +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15098,10); -- Saotome Domaru +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15099,10); -- Koga Chainmail +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15100,10); -- Wyrm Mail +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15101,10); -- Summoner's Doublet +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15117,10); -- Warrior's Cuisses +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15122,10); -- Assassin's Culottes +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15123,10); -- Valor Breeches +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15140,10); -- Monster Gaiters +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,15142,10); -- Scout's Socks +INSERT INTO `mob_droplist` VALUES (1344,0,0,1000,16360,10); -- Etoile Tights +INSERT INTO `mob_droplist` VALUES (1345,2,0,1000,1449,0); -- Hydra Monk, Ninja, Thief (Dynamis Beaucedine) - Tukuku Whiteshell +INSERT INTO `mob_droplist` VALUES (1345,2,0,1000,1452,0); -- Ordelle Bronzepiece +INSERT INTO `mob_droplist` VALUES (1345,2,0,1000,1455,0); -- One Byne Bill +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,3361,100); -- Villain's Fortune Parchment, 10% (normalized) +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11292,10); -- Mirage Jubbah +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11295,10); -- Commodore Frac +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11298,10); -- Pantin Tobe +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,11307,10); -- Argute Gown +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15088,10); -- Melee Cyclas +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15089,10); -- Cleric's Briault +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15090,10); -- Sorcerer's Coat +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15091,10); -- Duelist's Tabard +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15094,10); -- Abyss Cuirass +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15096,10); -- Bard's Justaucorps +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15098,10); -- Saotome Domaru +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15099,10); -- Koga Chainmail +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15100,10); -- Wyrm Mail +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15101,10); -- Summoner's Doublet +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15117,10); -- Warrior's Cuisses +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15122,10); -- Assassin's Culottes +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15123,10); -- Valor Breeches +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15140,10); -- Monster Gaiters +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,15142,10); -- Scout's Socks +INSERT INTO `mob_droplist` VALUES (1345,0,0,1000,16360,10); -- Etoile Tights INSERT INTO `mob_droplist` VALUES (1346,0,0,1000,17306,370); INSERT INTO `mob_droplist` VALUES (1346,0,0,1000,17306,190); INSERT INTO `mob_droplist` VALUES (1347,0,0,1000,4105,1000); @@ -16553,7 +16554,55 @@ INSERT INTO `mob_droplist` VALUES (3141,0,0,1000,1237,1000); -- Ancient Goobbue; INSERT INTO `mob_droplist` VALUES (3142,0,0,1000,16031,150); -- Affinity Earring (COMMON) INSERT INTO `mob_droplist` VALUES (3143,0,0,1000,928,400); -- Friar's Lantern (grow): pinch_of_bomb_ash INSERT INTO `mob_droplist` VALUES (3143,0,0,1000,2384,80); -- smoke-filled_flask -INSERT INTO `mob_droplist` VALUES (3144,0,0,1000,637,150); -- Panna Cotta; Slime Oil; Common +INSERT INTO `mob_droplist` VALUES (3144,0,0,1000,637,150); -- Panna Cotta; Slime Oil; Common +INSERT INTO `mob_droplist` VALUES (3145,2,0,1000,1449,0); -- Hydra Samurai, Dark Knight, Ranger (Dynamis Beaucedine) - Tukuku Whiteshell +INSERT INTO `mob_droplist` VALUES (3145,2,0,1000,1452,0); -- Ordelle Bronzepiece +INSERT INTO `mob_droplist` VALUES (3145,2,0,1000,1455,0); -- One Byne Bill +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,3362,100); -- Deluder's Fortune Parchment, 10% (normalized) +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,11292,10); -- Mirage Jubbah +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,11295,10); -- Commodore Frac +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,11298,10); -- Pantin Tobe +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,11307,10); -- Argute Gown +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15088,10); -- Melee Cyclas +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15089,10); -- Cleric's Briault +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15090,10); -- Sorcerer's Coat +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15091,10); -- Duelist's Tabard +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15094,10); -- Abyss Cuirass +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15096,10); -- Bard's Justaucorps +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15098,10); -- Saotome Domaru +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15099,10); -- Koga Chainmail +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15100,10); -- Wyrm Mail +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15101,10); -- Summoner's Doublet +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15117,10); -- Warrior's Cuisses +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15122,10); -- Assassin's Culottes +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15123,10); -- Valor Breeches +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15140,10); -- Monster Gaiters +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,15142,10); -- Scout's Socks +INSERT INTO `mob_droplist` VALUES (3145,0,0,1000,16360,10); -- Etoile Tights +INSERT INTO `mob_droplist` VALUES (3146,2,0,1000,1449,0); -- Hydra Beastmaster, Summoner, Dragoon (Dynamis Beaucedine) - Tukuku Whiteshell +INSERT INTO `mob_droplist` VALUES (3146,2,0,1000,1452,0); -- Ordelle Bronzepiece +INSERT INTO `mob_droplist` VALUES (3146,2,0,1000,1455,0); -- One Byne Bill +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,3363,100); -- Traitor's fortune parchment, 10% (normalized) +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,11292,10); -- Mirage Jubbah +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,11295,10); -- Commodore Frac +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,11298,10); -- Pantin Tobe +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,11307,10); -- Argute Gown +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15088,10); -- Melee Cyclas +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15089,10); -- Cleric's Briault +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15090,10); -- Sorcerer's Coat +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15091,10); -- Duelist's Tabard +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15094,10); -- Abyss Cuirass +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15096,10); -- Bard's Justaucorps +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15098,10); -- Saotome Domaru +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15099,10); -- Koga Chainmail +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15100,10); -- Wyrm Mail +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15101,10); -- Summoner's Doublet +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15117,10); -- Warrior's Cuisses +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15122,10); -- Assassin's Culottes +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15123,10); -- Valor Breeches +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15140,10); -- Monster Gaiters +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,15142,10); -- Scout's Socks +INSERT INTO `mob_droplist` VALUES (3146,0,0,1000,16360,10); -- Etoile Tights /*!40000 ALTER TABLE `mob_droplist` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/mob_groups.sql b/sql/mob_groups.sql index d338c4552d6..b6d92e479ab 100644 --- a/sql/mob_groups.sql +++ b/sql/mob_groups.sql @@ -8792,36 +8792,36 @@ INSERT INTO `mob_groups` VALUES (163,4149,134,'Vanguard_Eye',0,128,2561,2000,200 INSERT INTO `mob_groups` VALUES (164,2021,134,'Hydra_Black_Mage',600,0,1344,5500,0,80,82,0); INSERT INTO `mob_groups` VALUES (165,2034,134,'Hydra_Thief',600,0,1345,5500,0,80,82,0); INSERT INTO `mob_groups` VALUES (166,2026,134,'Hydra_Paladin',600,0,1343,5500,0,80,82,0); -INSERT INTO `mob_groups` VALUES (167,2022,134,'Hydra_Dark_Knight',600,0,1343,5500,0,80,82,0); -INSERT INTO `mob_groups` VALUES (168,2020,134,'Hydra_Beastmaster',600,0,1343,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (167,2022,134,'Hydra_Dark_Knight',600,0,3145,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (168,2020,134,'Hydra_Beastmaster',600,0,3146,5500,0,80,82,0); INSERT INTO `mob_groups` VALUES (169,2032,134,'Hydras_Hound',0,128,0,3300,0,80,80,0); -INSERT INTO `mob_groups` VALUES (170,2019,134,'Hydra_Bard',600,0,1343,5500,0,80,82,0); -INSERT INTO `mob_groups` VALUES (171,2027,134,'Hydra_Ranger',600,0,1343,5500,0,80,82,0); -INSERT INTO `mob_groups` VALUES (172,2029,134,'Hydra_Samurai',600,0,1343,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (170,2019,134,'Hydra_Bard',600,0,1344,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (171,2027,134,'Hydra_Ranger',600,0,3145,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (172,2029,134,'Hydra_Samurai',600,0,3145,5500,0,80,82,0); INSERT INTO `mob_groups` VALUES (173,2025,134,'Hydra_Ninja',600,0,1345,5500,0,80,82,0); -INSERT INTO `mob_groups` VALUES (174,2023,134,'Hydra_Dragoon',600,0,1343,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (174,2023,134,'Hydra_Dragoon',600,0,3146,5500,0,80,82,0); INSERT INTO `mob_groups` VALUES (175,2033,134,'Hydras_Wyvern',0,128,0,3300,1000,80,80,0); -INSERT INTO `mob_groups` VALUES (176,2030,134,'Hydra_Summoner',600,0,1343,5500,0,80,82,0); +INSERT INTO `mob_groups` VALUES (176,2030,134,'Hydra_Summoner',600,0,3146,5500,0,80,82,0); INSERT INTO `mob_groups` VALUES (177,2031,134,'Hydras_Avatar',0,128,0,3300,1000,80,80,0); -INSERT INTO `mob_groups` VALUES (178,6487,134,'Hydra_Beastmaster',600,0,1343,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (178,6487,134,'Hydra_Beastmaster',600,0,3146,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (179,2032,134,'Hydras_Hound',0,128,0,3300,0,92,92,0); INSERT INTO `mob_groups` VALUES (180,6498,134,'Hydra_Thief',600,0,1345,5500,0,92,95,0); -INSERT INTO `mob_groups` VALUES (181,6489,134,'Hydra_Dark_Knight',600,0,1343,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (181,6489,134,'Hydra_Dark_Knight',600,0,3145,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (182,4149,134,'Vanguard_Eye',0,128,2561,2000,2000,82,82,0); INSERT INTO `mob_groups` VALUES (183,6499,134,'Hydra_Warrior',600,0,1343,5500,0,92,95,0); -INSERT INTO `mob_groups` VALUES (184,6486,134,'Hydra_Bard',600,0,1343,5500,0,92,95,0); -INSERT INTO `mob_groups` VALUES (185,6494,134,'Hydra_Ranger',600,0,1343,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (184,6486,134,'Hydra_Bard',600,0,1344,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (185,6494,134,'Hydra_Ranger',600,0,3145,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (186,6500,134,'Hydra_White_Mage',600,0,1344,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (187,6491,134,'Hydra_Monk',600,0,1345,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (188,6492,134,'Hydra_Ninja',600,0,1345,5500,0,92,95,0); -INSERT INTO `mob_groups` VALUES (189,6497,134,'Hydra_Summoner',600,0,1343,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (189,6497,134,'Hydra_Summoner',600,0,3146,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (190,2031,134,'Hydras_Avatar',0,128,0,3300,1000,92,92,0); INSERT INTO `mob_groups` VALUES (191,6488,134,'Hydra_Black_Mage',600,0,1344,5500,0,92,95,0); -INSERT INTO `mob_groups` VALUES (192,6490,134,'Hydra_Dragoon',600,0,1343,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (192,6490,134,'Hydra_Dragoon',600,0,3146,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (193,2033,134,'Hydras_Wyvern',0,128,0,3300,1000,92,92,0); INSERT INTO `mob_groups` VALUES (194,6495,134,'Hydra_Red_Mage',600,0,1343,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (195,6493,134,'Hydra_Paladin',600,0,1343,5500,0,92,95,0); -INSERT INTO `mob_groups` VALUES (196,6496,134,'Hydra_Samurai',600,0,1343,5500,0,92,95,0); +INSERT INTO `mob_groups` VALUES (196,6496,134,'Hydra_Samurai',600,0,3145,5500,0,92,95,0); INSERT INTO `mob_groups` VALUES (197,6064,134,'Rearguard_Eye',0,128,0,8000,8000,82,82,0); -- ------------------------------------------------------------ From 6aac5c26fe9018e5f7247541e53556ef253ad297 Mon Sep 17 00:00:00 2001 From: NeuromancerXI Date: Fri, 16 Oct 2020 13:39:48 -0700 Subject: [PATCH 2/2] Adds Glanzfaust Latents, Guard Percent MOD, Logic Adds latents for Focus and Dodge for all Glansfaust variants. Adds MOD for Guard Percentage (needed for Glanzfaust Latent). Adds math check in battleutils to account for Guard Percent. --- scripts/globals/status.lua | 3 +- sql/item_latents.sql | 90 +++++++++++++++++++++++++++++++++++ src/map/modifier.h | 3 +- src/map/utils/battleutils.cpp | 3 +- 4 files changed, 96 insertions(+), 3 deletions(-) diff --git a/scripts/globals/status.lua b/scripts/globals/status.lua index 38aff2bf6b1..7eec22ce87f 100644 --- a/scripts/globals/status.lua +++ b/scripts/globals/status.lua @@ -1542,6 +1542,7 @@ tpz.mod = SAVETP = 880, -- SAVETP Effect for Miser's Roll / ATMA / Hagakure. SMITE = 898, -- Att increase with H2H or 2H weapons TACTICAL_GUARD = 899, -- Tp gain increase when guarding + GUARD_PERCENT = 976, -- Guard Percent FENCER_TP_BONUS = 903, -- TP Bonus to weapon skills from Fencer Trait FENCER_CRITHITRATE = 904, -- Increased Crit chance from Fencer Trait SHIELD_DEF_BONUS = 905, -- Shield Defense Bonus @@ -1567,9 +1568,9 @@ tpz.mod = -- The spares take care of finding the next ID to use so long as we don't forget to list IDs that have been freed up by refactoring. -- 570 - 825 used by WS DMG mods these are not spares. - -- SPARE = 976, -- stuff -- SPARE = 977, -- stuff -- SPARE = 978, -- stuff + -- SPARE = 979, -- stuff } tpz.latent = diff --git a/sql/item_latents.sql b/sql/item_latents.sql index 3e51e351c7c..c73626e3482 100644 --- a/sql/item_latents.sql +++ b/sql/item_latents.sql @@ -3002,18 +3002,45 @@ INSERT INTO `item_latents` VALUES(18958, 8, 1, 16, 6); -- STR +1~4, party s INSERT INTO `item_latents` VALUES(18991, 165, 5, 13, 56); -- Crit Rate +5% if Berserk Active INSERT INTO `item_latents` VALUES(18991, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 75 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(18992, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(18992, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(18992, 25, 5, 13, 59); -- ACC +5 if Focus Active +INSERT INTO `item_latents` VALUES(18992, 68, 5, 13, 60); -- EVA +5 if Dodge Active +INSERT INTO `item_latents` VALUES(18992, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Conqueror 80 -- ------------------------------------------------------- INSERT INTO `item_latents` VALUES(19060, 165, 7, 13, 56); -- Crit Rate +7% if Berserk Active INSERT INTO `item_latents` VALUES(19060, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 80 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(19061, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(19061, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(19061, 25, 10, 13, 59); -- ACC +10 if Focus Active +INSERT INTO `item_latents` VALUES(19061, 68, 10, 13, 60); -- EVA +10 if Dodge Active +INSERT INTO `item_latents` VALUES(19061, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Conqueror 85 -- ------------------------------------------------------- INSERT INTO `item_latents` VALUES(19080, 165, 9, 13, 56); -- Crit Rate +9% if Berserk Active INSERT INTO `item_latents` VALUES(19080, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 85 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(19081, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(19081, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(19081, 25, 20, 13, 59); -- ACC +20 if Focus Active +INSERT INTO `item_latents` VALUES(19081, 68, 20, 13, 60); -- EVA +20 if Dodge Active +INSERT INTO `item_latents` VALUES(19081, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Zareehkl Jambiya -- ------------------------------------------------------- @@ -3100,24 +3127,60 @@ INSERT INTO `item_latents` VALUES(19306, 23, 2, 16, 6); -- ATT +2~8, party s INSERT INTO `item_latents` VALUES(19612, 165, 11, 13, 56); -- Crit Rate +11% if Berserk Active INSERT INTO `item_latents` VALUES(19612, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 90 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(19613, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(19613, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(19613, 25, 25, 13, 59); -- ACC +25 if Focus Active +INSERT INTO `item_latents` VALUES(19613, 68, 25, 13, 60); -- EVA +25 if Dodge Active +INSERT INTO `item_latents` VALUES(19613, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Conqueror 95 -- ------------------------------------------------------- INSERT INTO `item_latents` VALUES(19710, 165, 11, 13, 56); -- Crit Rate +11% if Berserk Active INSERT INTO `item_latents` VALUES(19710, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 95 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(19711, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(19711, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(19711, 25, 25, 13, 59); -- ACC +25 if Focus Active +INSERT INTO `item_latents` VALUES(19711, 68, 25, 13, 60); -- EVA +25 if Dodge Active +INSERT INTO `item_latents` VALUES(19711, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Conqueror 99 -- ------------------------------------------------------- INSERT INTO `item_latents` VALUES(19819, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active INSERT INTO `item_latents` VALUES(19819, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 99 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(19820, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(19820, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(19820, 25, 30, 13, 59); -- ACC +30 if Focus Active +INSERT INTO `item_latents` VALUES(19820, 68, 30, 13, 60); -- EVA +30 if Dodge Active +INSERT INTO `item_latents` VALUES(19820, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Conqueror 99 AG -- ------------------------------------------------------- INSERT INTO `item_latents` VALUES(19948, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active INSERT INTO `item_latents` VALUES(19948, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 99 AG +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(19949, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(19949, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(19949, 25, 30, 13, 59); -- ACC +30 if Focus Active +INSERT INTO `item_latents` VALUES(19949, 68, 30, 13, 60); -- EVA +30 if Dodge Active +INSERT INTO `item_latents` VALUES(19949, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Eminent Baghnakhs -- ------------------------------------------------------- @@ -3139,12 +3202,30 @@ INSERT INTO `item_latents` VALUES(20726,366,6,6,1000); -- Dmg+6 TP>1000 INSERT INTO `item_latents` VALUES(20837, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active INSERT INTO `item_latents` VALUES(20837, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 119 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(20482, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(20482, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(20482, 25, 30, 13, 59); -- ACC +30 if Focus Active +INSERT INTO `item_latents` VALUES(20482, 68, 30, 13, 60); -- EVA +30 if Dodge Active +INSERT INTO `item_latents` VALUES(20482, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- ------------------------------------------------------- -- Conqueror 119 AG -- ------------------------------------------------------- INSERT INTO `item_latents` VALUES(20838, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active INSERT INTO `item_latents` VALUES(20838, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 119 AG +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(20483, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(20483, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(20483, 25, 30, 13, 59); -- ACC +30 if Focus Active +INSERT INTO `item_latents` VALUES(20483, 68, 30, 13, 60); -- EVA +30 if Dodge Active +INSERT INTO `item_latents` VALUES(20483, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- INSERT INTO `item_latents` VALUES(21521, 25, 10, ??, 0); -- Melee fists: Dynamis (D): Accuracy+10 -- INSERT INTO `item_latents` VALUES(21521, 30, 10, ??, 0); -- Melee fists: Dynamis (D): Magic Accuracy+10 -- INSERT INTO `item_latents` VALUES(21522, 25, 10, ??, 0); -- Hesychast's fists: Dynamis (D): Accuracy+10 @@ -3210,6 +3291,15 @@ INSERT INTO `item_latents` VALUES(21661, 840, 1, 56, 0); -- Rune Algol: Laten INSERT INTO `item_latents` VALUES(21757, 165, 14, 13, 56); -- Crit Rate +14% if Berserk Active INSERT INTO `item_latents` VALUES(21757, 288, 3, 13, 56); -- Double Attack +3% if Berserk Active +-- ------------------------------------------------------- +-- Glanzfaust 119 AG v3 +-- ------------------------------------------------------- +INSERT INTO `item_latents` VALUES(20510, 62, 5, 13, 59); -- Attack +5% if Focus is Active +INSERT INTO `item_latents` VALUES(20510, 165, 3, 13, 59); -- Crit rate +3% if Focus Active +INSERT INTO `item_latents` VALUES(20510, 25, 30, 13, 59); -- ACC +30 if Focus Active +INSERT INTO `item_latents` VALUES(20510, 68, 30, 13, 60); -- EVA +30 if Dodge Active +INSERT INTO `item_latents` VALUES(20510, 976, 5, 13, 60); -- Guard +5% if Dodge Active + -- INSERT INTO `item_latents` VALUES(21772, 25, 10, ??, 0); -- Warrior's Chopper: (D): Accuracy+10 -- INSERT INTO `item_latents` VALUES(21772, 30, 10, ??, 0); -- Warrior's Chopper: (D): Magic Accuracy+10 -- INSERT INTO `item_latents` VALUES(21773, 25, 10, ??, 0); -- Agoge Chopper: (D): Accuracy+10 diff --git a/src/map/modifier.h b/src/map/modifier.h index 9c9d32e9802..e6cc4d5384c 100644 --- a/src/map/modifier.h +++ b/src/map/modifier.h @@ -215,6 +215,7 @@ enum class Mod SMITE = 898, // Raises attack when using H2H or 2H weapons (256 scale) TACTICAL_GUARD = 899, // Tp increase when guarding + GUARD_PERCENT = 976, // Guard Percent HASTE_MAGIC = 167, // Haste (and Slow) from magic - 10000 base, 375 = 3.75% HASTE_ABILITY = 383, // Haste (and Slow) from abilities - 10000 base, 375 = 3.75% @@ -810,9 +811,9 @@ enum class Mod // The spares take care of finding the next ID to use so long as we don't forget to list IDs that have been freed up by refactoring. // 570 through 825 used by WS DMG mods these are not spares. - // SPARE = 976, // stuff // SPARE = 977, // stuff // SPARE = 978, // stuff + // SPARE = 979, // stuff }; //temporary workaround for using enum class as unordered_map key until compilers support it diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp index a94f020b5e6..e73917d1a1b 100644 --- a/src/map/utils/battleutils.cpp +++ b/src/map/utils/battleutils.cpp @@ -1753,7 +1753,8 @@ namespace battleutils if (validWeapon && hasGuardSkillRank && PDefender->PAI->IsEngaged()) { // assuming this is like parry - float skill = (float)PDefender->GetSkill(SKILL_GUARD) + PDefender->getMod(Mod::GUARD); + float gbase = (float)PDefender->GetSkill(SKILL_GUARD) + PDefender->getMod(Mod::GUARD); + float skill = (float)gbase + ((float)gbase * (PDefender->getMod(Mod::GUARD_PERCENT) / 100)); if (PWeapon) skill += PWeapon->getILvlParry(); //no weapon will ever have ilvl guard and parry