From cc127f7d8ca50a1674ccdbb38ca3636acdd709ed Mon Sep 17 00:00:00 2001 From: Aeshur Date: Tue, 25 Feb 2025 12:04:28 -0500 Subject: [PATCH] [lua, sql] Fix Imp horn breaking --- scripts/actions/mobskills/abrasive_tantara.lua | 2 +- scripts/actions/mobskills/deafening_tantara.lua | 2 +- scripts/actions/mobskills/frenetic_rip.lua | 2 +- scripts/actions/mobskills/grating_tantara.lua | 2 +- scripts/actions/mobskills/stifling_tantara.lua | 2 +- scripts/mixins/families/imp.lua | 8 ++++---- sql/mob_pools.sql | 16 ++++++++-------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/actions/mobskills/abrasive_tantara.lua b/scripts/actions/mobskills/abrasive_tantara.lua index f920ed4bee8..1c9d1a8967e 100644 --- a/scripts/actions/mobskills/abrasive_tantara.lua +++ b/scripts/actions/mobskills/abrasive_tantara.lua @@ -11,7 +11,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getAnimationSub() == 1 and mob:getFamily() == 165 then -- Imps without horn + if mob:getAnimationSub() == 5 and mob:getFamily() == 165 then -- Imps without horn return 1 else return 0 diff --git a/scripts/actions/mobskills/deafening_tantara.lua b/scripts/actions/mobskills/deafening_tantara.lua index 8a4679edafe..511805a2608 100644 --- a/scripts/actions/mobskills/deafening_tantara.lua +++ b/scripts/actions/mobskills/deafening_tantara.lua @@ -11,7 +11,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getAnimationSub() == 1 and mob:getFamily() == 165 then -- Imps without horn + if mob:getAnimationSub() == 5 and mob:getFamily() == 165 then -- Imps without horn return 1 else return 0 diff --git a/scripts/actions/mobskills/frenetic_rip.lua b/scripts/actions/mobskills/frenetic_rip.lua index 9700deadabf..8c2fb5e01a4 100644 --- a/scripts/actions/mobskills/frenetic_rip.lua +++ b/scripts/actions/mobskills/frenetic_rip.lua @@ -7,7 +7,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getAnimationSub() == 0 and mob:getFamily() == 165 then -- Imps - with horn + if mob:getAnimationSub() == 4 and mob:getFamily() == 165 then -- Imps - with horn return 1 else return 0 diff --git a/scripts/actions/mobskills/grating_tantara.lua b/scripts/actions/mobskills/grating_tantara.lua index 1c1cec2e58c..97c9ea088f7 100644 --- a/scripts/actions/mobskills/grating_tantara.lua +++ b/scripts/actions/mobskills/grating_tantara.lua @@ -11,7 +11,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getAnimationSub() == 1 and mob:getFamily() == 165 then -- Imps without horn + if mob:getAnimationSub() == 5 and mob:getFamily() == 165 then -- Imps without horn return 1 else return 0 diff --git a/scripts/actions/mobskills/stifling_tantara.lua b/scripts/actions/mobskills/stifling_tantara.lua index fa71ebcb0f2..34604db6989 100644 --- a/scripts/actions/mobskills/stifling_tantara.lua +++ b/scripts/actions/mobskills/stifling_tantara.lua @@ -11,7 +11,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getAnimationSub() == 1 and mob:getFamily() == 165 then -- Imps without horn + if mob:getAnimationSub() == 5 and mob:getFamily() == 165 then -- Imps without horn return 1 else return 0 diff --git a/scripts/mixins/families/imp.lua b/scripts/mixins/families/imp.lua index 626ccd44a69..d006ebca8a8 100644 --- a/scripts/mixins/families/imp.lua +++ b/scripts/mixins/families/imp.lua @@ -9,9 +9,9 @@ g_mixins.families.imp = function(impMob) impMob:addListener('CRITICAL_TAKE', 'IMP_CRITICAL_TAKE', function(mob) local random = math.random(1, 100) - if random <= 20 and mob:getAnimationSub() == 0 then - mob:setAnimationSub(1) - if mob:getLocalVar('hornDisabled') ~= 1 then + if random <= 20 and mob:getAnimationSub() == 4 then + mob:setAnimationSub(5) + if mob:getLocalVar('hornDisabled') ~= 5 then local time = 25 + (math.ceil(random / 5) * 5) if random <= 2 then @@ -20,7 +20,7 @@ g_mixins.families.imp = function(impMob) mob:timer(time * 1000, function(mobArg) if mob:isAlive() then - mob:setAnimationSub(0) + mob:setAnimationSub(4) end end) end diff --git a/sql/mob_pools.sql b/sql/mob_pools.sql index 9943e18f82a..3d81f815ba1 100644 --- a/sql/mob_pools.sql +++ b/sql/mob_pools.sql @@ -379,7 +379,7 @@ INSERT INTO `mob_pools` VALUES (322,'Badshah','Badshah',242,0x000034010000000000 INSERT INTO `mob_pools` VALUES (323,'Baelfyr','Baelfyr',103,0x0000650800000000000000000000000000000000,5,3,11,240,100,0,1,0,0,0,0,0,0,131,0,0,3,0,0,0,103); INSERT INTO `mob_pools` VALUES (324,'Baetyl_Quadav_BS','Baetyl_Quadav_BS',202,0x00001F0400000000000000000000000000000000,3,3,3,265,100,0,1,0,1,0,0,0,1,131,0,0,1,0,0,202,202); INSERT INTO `mob_pools` VALUES (325,'Bahamut','Bahamut',449,0x00001B0500000000000000000000000000000000,4,5,7,240,100,1024,1,1,0,16,6198,32,100,157,0,0,144,0,0,726,449); -INSERT INTO `mob_pools` VALUES (326,'Bakka','Bakka',165,0x0000BD0800000000000000000000000000000000,4,4,7,240,100,0,0,0,0,2,0,32,0,151,0,0,167,127,0,789,165); +INSERT INTO `mob_pools` VALUES (326,'Bakka','Bakka',165,0x0000BD0800000000000000000000000000000000,4,4,7,240,100,0,0,0,0,2,0,32,0,151,4,0,167,127,0,789,165); INSERT INTO `mob_pools` VALUES (327,'Bakru','Bakru',178,0x00002C0100000000000000000000000000000000,2,2,1,480,100,0,0,0,0,0,0,0,0,3,0,0,0,0,0,178,178); INSERT INTO `mob_pools` VALUES (328,'Balam-Agab','Balam-Agab',71,0x00006F0100000000000000000000000000000000,3,3,11,240,100,0,1,0,0,2,0,32,7611,157,0,0,1,0,0,71,71); INSERT INTO `mob_pools` VALUES (329,'Balam-Quitz','Balam-Quitz',71,0x0000C60800000000000000000000000000000000,1,1,2,240,100,0,0,0,0,2,0,0,0,3,0,0,0,0,0,71,71); @@ -484,7 +484,7 @@ INSERT INTO `mob_pools` VALUES (427,'BiGho_Headtaker_B','BiGho_Headtaker',202,0x INSERT INTO `mob_pools` VALUES (428,'Blackbeard','Blackbeard',227,0x0000390200000000000000000000000000000000,4,4,6,240,100,0,1,0,0,2,0,32,166,159,0,0,491,0,0,227,227); INSERT INTO `mob_pools` VALUES (429,'Blackbone_Frazdiz','Blackbone_Frazdiz',334,0x0000760200000000000000000000000000000000,8,8,5,240,100,0,1,0,1,2,0,32,1828,157,0,0,5,0,0,334,334); INSERT INTO `mob_pools` VALUES (430,'Blacktattoo_Vedool_Ja','Blacktattoo_Vedool_Ja',176,0x06005F0600000000000000000000000000000000,4,4,5,280,100,0,1,1,1,16,0,0,0,3,0,0,2,0,0,176,176); -INSERT INTO `mob_pools` VALUES (431,'Black_Baron','Black_Baron',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,0,0,0,0,1,131,0,0,2,0,0,165,165); +INSERT INTO `mob_pools` VALUES (431,'Black_Baron','Black_Baron',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,0,0,0,0,1,131,4,0,2,0,0,165,165); INSERT INTO `mob_pools` VALUES (432,'Black_Bartholomew','Black_Bartholomew',359,0x0500690700000000000000000000000000000000,17,17,3,240,100,0,1,0,0,2,0,0,0,0,0,0,0,0,0,359,359); INSERT INTO `mob_pools` VALUES (433,'Black_Bat','Black_Bat',46,0x0000000100000000000000000000000000000000,1,1,11,240,100,0,0,0,1,0,0,0,244,643,8,0,0,0,0,46,46); INSERT INTO `mob_pools` VALUES (434,'Black_Coney','Black_Coney',206,0x00000D0100000000000000000000000000000000,1,1,7,240,100,0,1,1,0,2,0,0,0,3,0,0,0,0,0,206,206); @@ -1106,7 +1106,7 @@ INSERT INTO `mob_pools` VALUES (1049,'Disaster_Idol','Disaster_Idol',85,0x000030 INSERT INTO `mob_pools` VALUES (1050,'Disfaurit_B_DAurphe','Disfaurit_B_DAurphe',222,0x0000270200000000000000000000000000000000,6,6,10,360,100,0,1,1,1,16,0,0,0,0,0,0,0,0,0,898,222); INSERT INTO `mob_pools` VALUES (1051,'Dismemberment_Grappler','Dismemberment_Grappler',334,0x0000000800000000000000000000000000000000,2,2,1,480,100,0,1,0,1,0,0,0,7,129,0,0,0,0,0,334,334); INSERT INTO `mob_pools` VALUES (1052,'Distilix_Stickytoes','Distilix_Stickytoes',373,0x0000410400000000000000000000000000000000,3,3,11,240,100,0,1,0,1,2,0,32,0,1183,0,0,1,0,0,373,373); -INSERT INTO `mob_pools` VALUES (1053,'Div-e_Sepid','Div-e_Sepid',301,0x0000BD0800000000000000000000000000000000,1,1,6,240,100,0,0,0,0,2,0,32,0,157,0,0,0,0,0,912,301); +INSERT INTO `mob_pools` VALUES (1053,'Div-e_Sepid','Div-e_Sepid',301,0x0000BD0800000000000000000000000000000000,1,1,6,240,100,0,0,0,0,2,0,32,0,157,4,0,0,0,0,912,301); INSERT INTO `mob_pools` VALUES (1054,'Dive-Puk','Dive-Puk',198,0x0000D00600000000000000000000000000000000,1,1,7,200,100,0,1,0,0,32,0,0,8,129,0,0,0,0,0,198,198); INSERT INTO `mob_pools` VALUES (1055,'Divine_Ascetic','Divine_Ascetic',360,0x0000220800000000000000000000000000000000,2,2,1,480,100,0,1,1,1,0,0,0,0,129,0,0,0,0,0,360,360); INSERT INTO `mob_pools` VALUES (1056,'Divine_Assassin','Divine_Assassin',360,0x00001F0800000000000000000000000000000000,13,13,2,240,100,0,1,0,1,0,0,0,0,3,0,0,7,0,0,360,360); @@ -2124,7 +2124,7 @@ INSERT INTO `mob_pools` VALUES (2067,'Imperial_Gears','Imperial_Gears',120,0x000 INSERT INTO `mob_pools` VALUES (2068,'Imperial_Trooper','Imperial_Trooper',149,0x0500A70700000000000000000000000000000000,7,7,3,240,100,0,0,0,0,0,0,0,7,1155,0,0,4,64,0,149,149); INSERT INTO `mob_pools` VALUES (2069,'Impervious_Chariot','Impervious_Chariot',63,0x00001E0700000000000000000000000000000000,12,12,10,240,100,0,1,1,1,2,0,0,0,1157,0,0,0,0,0,963,63); INSERT INTO `mob_pools` VALUES (2070,'Impish_Bats','Impish_Bats',47,0x0000040100000000000000000000000000000000,1,1,11,240,100,0,1,0,1,0,0,64,179,1669,8,0,0,0,0,47,47); -INSERT INTO `mob_pools` VALUES (2071,'Imp_Bandsman','Imp_Bandsman',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,16,0,0,0,1157,0,0,2,0,0,414,165); +INSERT INTO `mob_pools` VALUES (2071,'Imp_Bandsman','Imp_Bandsman',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,16,0,0,0,1157,4,0,2,0,0,414,165); INSERT INTO `mob_pools` VALUES (2072,'Incendiary_Bombs','Incendiary_Bombs',68,0x0000230100000000000000000000000000000000,1,1,5,240,100,0,1,1,0,0,0,64,9,1665,12,0,0,0,0,68,68); INSERT INTO `mob_pools` VALUES (2073,'Incubus_Bats_BT','Incubus_Bats_BT',47,0x0000040100000000000000000000000000000000,1,1,11,240,100,0,1,0,1,0,0,64,504,1667,8,0,0,0,0,47,47); INSERT INTO `mob_pools` VALUES (2074,'Indich','Indich',115,0x05000F0400000000000000000000000000000000,10,7,3,240,100,0,1,0,0,2,0,32,390,1181,0,0,6,0,0,115,115); @@ -2191,7 +2191,7 @@ INSERT INTO `mob_pools` VALUES (2134,'Jailer_of_Love','Jailer_of_Love',271,0x000 INSERT INTO `mob_pools` VALUES (2135,'Jailer_of_Prudence','Jailer_of_Prudence',144,0x0000800400000000000000000000000000000000,6,6,2,220,125,0,1,1,1,2,0,0,0,0,0,0,0,0,0,144,144); INSERT INTO `mob_pools` VALUES (2136,'Jailer_of_Temperance','Jailer_of_Temperance',272,0x0000860400000000000000000000000000000000,12,12,7,240,125,0,1,1,0,2,0,0,0,135,4,0,0,0,0,272,272); INSERT INTO `mob_pools` VALUES (2137,'Jajaro','Jajaro',57,0x00004D0500000000000000000000000000000000,1,1,5,240,100,0,1,0,0,0,0,32,0,153,8,0,0,0,0,57,57); -INSERT INTO `mob_pools` VALUES (2138,'Jakko','Jakko',166,0x0000BF0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,16,0,0,0,0,0,0,2,0,0,165,166); +INSERT INTO `mob_pools` VALUES (2138,'Jakko','Jakko',166,0x0000BF0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,16,0,0,0,0,4,0,2,0,0,165,166); INSERT INTO `mob_pools` VALUES (2139,'Jala','Jala',323,0x00001B0300000000000000000000000000000000,1,1,8,240,100,0,0,0,0,2,0,0,0,0,0,0,0,0,0,897,323); INSERT INTO `mob_pools` VALUES (2140,'Jalyaat','Jalyaat',145,0x0500610700000000000000000000000000000000,1,1,8,240,100,0,0,0,0,0,0,0,1,155,0,0,0,0,0,145,145); INSERT INTO `mob_pools` VALUES (2141,'Jammer_Leech','Jammer_Leech',172,0x0000140100000000000000000000000000000000,1,1,7,240,100,0,1,0,1,2,0,0,27,647,0,0,0,0,0,172,172); @@ -2995,8 +2995,8 @@ INSERT INTO `mob_pools` VALUES (2938,'Ocean_Sahagin','Ocean_Sahagin',213,0x00001 INSERT INTO `mob_pools` VALUES (2939,'Ochre_Scorpion','Ochre_Scorpion',217,0x0000C30800000000000000000000000000000000,1,1,0,0,100,0,0,0,0,0,0,0,0,3,0,0,0,0,0,217,217); INSERT INTO `mob_pools` VALUES (2940,'Ochu','Ochu',186,0x00007C0100000000000000000000000000000000,1,1,7,200,100,0,1,0,0,0,0,0,671,1155,0,0,0,0,0,186,186); INSERT INTO `mob_pools` VALUES (2941,'Odin','Odin',41,0x0000250700000000000000000000000000000000,8,4,1,240,100,0,1,1,0,16,0,0,0,3,0,0,5,0,0,41,41); -INSERT INTO `mob_pools` VALUES (2942,'Odins_Fool','Odins_Fool',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,0,0,0,0,0,0,0,2,0,0,165,165); -INSERT INTO `mob_pools` VALUES (2943,'Odins_Jester','Odins_Jester',165,0x0000BF0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,0,0,0,0,0,0,0,2,0,0,165,165); +INSERT INTO `mob_pools` VALUES (2942,'Odins_Fool','Odins_Fool',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,0,0,0,0,0,4,0,2,0,0,165,165); +INSERT INTO `mob_pools` VALUES (2943,'Odins_Jester','Odins_Jester',165,0x0000BF0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,0,0,0,0,0,4,0,2,0,0,165,165); INSERT INTO `mob_pools` VALUES (2944,'Odontotyrannus','Odontotyrannus',197,0x00005C0100000000000000000000000000000000,1,1,7,220,100,0,1,0,0,6,0,0,0,1153,0,0,0,0,0,197,197); INSERT INTO `mob_pools` VALUES (2945,'Odqan','Odqan',68,0x0000220100000000000000000000000000000000,1,1,5,240,100,0,1,0,0,2,0,32,456,1181,4,0,0,0,0,68,68); INSERT INTO `mob_pools` VALUES (2946,'Odzmanouk','Odzmanouk',260,0x00000F0300000000000000000000000000000000,1,1,0,240,100,0,0,0,0,0,0,32,0,1177,4,0,0,0,0,260,260); @@ -4557,7 +4557,7 @@ INSERT INTO `mob_pools` VALUES (4499,'ZeVho_Fallsplitter','ZeVho_Fallsplitter',3 INSERT INTO `mob_pools` VALUES (4500,'Zhadjaraf','Zhadjaraf',145,0x0500610700000000000000000000000000000000,1,1,8,240,100,0,0,0,0,0,0,0,1,155,0,0,0,0,0,145,145); INSERT INTO `mob_pools` VALUES (4501,'Zhayolm_Apkallu','Zhayolm_Apkallu',27,0x0000BB0600000000000000000000000000000000,2,2,1,480,100,0,0,0,1,0,0,0,298,131,5,0,0,0,0,27,27); INSERT INTO `mob_pools` VALUES (4502,'Zhuu_Buxu_the_Silent','Zhuu_Buxu_the_Silent',360,0x00004C0200000000000000000000000000000000,13,13,2,240,100,0,1,0,1,2,0,32,0,155,0,0,7,0,0,360,360); -INSERT INTO `mob_pools` VALUES (4503,'Zikko','Zikko',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,2,0,32,0,157,0,0,2,0,0,166,165); +INSERT INTO `mob_pools` VALUES (4503,'Zikko','Zikko',165,0x0000BE0600000000000000000000000000000000,4,4,7,240,100,0,1,1,1,2,0,32,0,157,4,0,2,0,0,166,165); INSERT INTO `mob_pools` VALUES (4504,'Zipacna','Zipacna',135,0x0000B00100000000000000000000000000000000,1,1,11,320,100,0,1,0,0,2,0,0,20,129,0,0,0,0,0,135,135); INSERT INTO `mob_pools` VALUES (4505,'Ziphius','Ziphius',197,0x00005C0100000000000000000000000000000000,1,1,7,240,100,0,0,0,0,2,0,32,5580,153,0,0,0,0,0,197,197); INSERT INTO `mob_pools` VALUES (4506,'Zircon_Quadav','Zircon_Quadav',202,0x0000950200000000000000000000000000000000,4,4,5,265,100,0,1,0,1,0,0,0,126,131,0,0,2,0,0,202,202);