Skip to content

Commit dcaaa65

Browse files
authored
Merge pull request #10052 from Skold177/Mammets-Bugfixes
[lua] [sql] Mammet Bugfixes
2 parents 3605a2f + a2b79a5 commit dcaaa65

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

scripts/actions/mobskills/mind_wall.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-----------------------------------
22
-- Mind Wall
3-
-- Description: Activates a shield to absorb all incoming magical damage.
3+
-- Description: Activates a magical shield that converts damage taken to HP. Absorbs 100% of magic damage.
44
-- Type: Magical
55
-----------------------------------
66
---@type TMobSkill
@@ -15,8 +15,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill)
1515
end
1616

1717
mobskillObject.onMobWeaponSkill = function(mob, target, skill, action)
18-
xi.mobskills.mobBuffMove(mob, xi.effect.MAGIC_SHIELD, 3, 0, 30)
19-
skill:setMsg(xi.msg.basic.NONE)
18+
skill:setMsg(xi.mobskills.mobBuffMove(mob, xi.effect.MAGIC_SHIELD, 3, 0, 30))
2019

2120
return 0
2221
end

scripts/actions/mobskills/transmogrification.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-----------------------------------
22
-- Transmogrification
3-
-- Description: Activates a shield to absorb all incoming physical damage.
3+
-- Description: Activates a physical shield that converts damage taken to HP. Absorbs 100% of physical damage.
44
-- Type: Physical
55
-----------------------------------
66
---@type TMobSkill
@@ -15,8 +15,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill)
1515
end
1616

1717
mobskillObject.onMobWeaponSkill = function(mob, target, skill, action)
18-
xi.mobskills.mobBuffMove(mob, xi.effect.PHYSICAL_SHIELD, 3, 0, 30)
19-
skill:setMsg(xi.msg.basic.NONE)
18+
skill:setMsg(xi.mobskills.mobBuffMove(mob, xi.effect.PHYSICAL_SHIELD, 2, 0, 30))
2019

2120
return 0
2221
end

sql/mob_pools.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,8 +2555,8 @@ INSERT INTO `mob_pools` VALUES (2496,'Malefic_Fencer','Malefic_Fencer',62,0x0000
25552555
INSERT INTO `mob_pools` VALUES (2497,'Malicearm_Razbhobb','Malicearm_Razbhobb',139,0x0000020800000000000000000000000000000000,1,1,7,240,100,0,1,0,1,0,0,32,2460,155,0,0,0,0,0,334,334,1,15);
25562556
INSERT INTO `mob_pools` VALUES (2498,'Maltha','Maltha',18,0x0000240100000000000000000000000000000000,8,8,7,150,100,0,1,0,1,2,6144,0,257,133,0,0,5,0,0,228,228,2,27);
25572557
INSERT INTO `mob_pools` VALUES (2499,'Mammet-19_Epsilon','Mammet-19_Epsilon',483,0x0600ED0300000000000000000000000000000000,5,5,4,240,100,0,1,1,1,18,6144,0,6065,131,0,0,29,0,0,503,503,1,15);
2558-
INSERT INTO `mob_pools` VALUES (2500,'Mammet-22_Zeta','Mammet-22_Zeta',483,0x0600EE0300000000000000000000000000000000,5,5,4,240,100,0,1,1,1,18,0,0,6382,131,4,0,29,0,0,503,503,1,15);
2559-
INSERT INTO `mob_pools` VALUES (2501,'Mammet-800','Mammet-800',483,0x0600EE0300000000000000000000000000000000,5,5,4,240,100,0,1,1,1,16,6144,0,8170,131,4,0,549,0,0,503,503,1,15);
2558+
INSERT INTO `mob_pools` VALUES (2500,'Mammet-22_Zeta','Mammet-22_Zeta',483,0x0600EE0300000000000000000000000000000000,5,5,4,240,100,0,1,1,1,18,0,0,6382,131,0,0,29,0,0,503,503,1,15);
2559+
INSERT INTO `mob_pools` VALUES (2501,'Mammet-800','Mammet-800',483,0x0600EE0300000000000000000000000000000000,5,5,4,240,100,0,1,1,1,16,6144,0,8170,131,0,0,549,0,0,503,503,1,15);
25602560
INSERT INTO `mob_pools` VALUES (2502,'Mammet_Master','Mammet_Master',483,0x0000EE0300000000000000000000000000000000,1,1,4,240,100,0,0,0,1,16,0,0,7,131,0,0,0,0,0,503,503,1,15);
25612561
INSERT INTO `mob_pools` VALUES (2503,'Mamook_Crab','Mamook_Crab',25,0x0000640100000000000000000000000000000000,7,7,4,240,100,0,1,0,0,4,0,0,0,3,0,0,0,0,0,77,77,NULL,NULL);
25622562
INSERT INTO `mob_pools` VALUES (2504,'Mamook_Mush','Mamook_Mush',18,0x0000240100000000000000000000000000000000,1,1,7,240,100,0,1,0,0,4,0,0,0,3,0,0,0,0,0,229,229,NULL,NULL);

0 commit comments

Comments
 (0)