Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor fixes related to Magic Shield #4381

Merged
merged 5 commits into from
Apr 6, 2023
Merged

Minor fixes related to Magic Shield #4381

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0586baa
Remove hard code
omarcopires Apr 6, 2023
a3108db
Fix energy ring
omarcopires Apr 6, 2023
f42a299
Update magic_shield.lua
omarcopires Apr 6, 2023
2b537e9
Update magic_shield.lua
omarcopires Apr 6, 2023
c1eaa99
Update magic_shield.lua
omarcopires Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion data/actions/scripts/others/potions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ local potions = {
},
[38219] = { -- magic shield potion
condition = manaShield,
vocations = {1, 2, 5, 6},
vocations = {
VOCATION_SORCERER,
VOCATION_DRUID,
VOCATION_MASTER_SORCERER,
VOCATION_ELDER_DRUID
},
level = 14,
effect = CONST_ME_ENERGYAREA,
description = "Only sorcerers and druids of level 14 or above may drink this potion.",
Expand Down
7 changes: 6 additions & 1 deletion data/movements/movements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,12 @@
<movevent event="DeEquip" itemid="2164" slot="ring" function="onDeEquipItem" />
<movevent event="Equip" itemid="2165" slot="ring" function="onEquipItem" />
<movevent event="Equip" itemid="2166" slot="ring" function="onEquipItem" />
<movevent event="Equip" itemid="2167" slot="ring" function="onEquipItem" />
<movevent event="Equip" itemid="2167" slot="ring" function="onEquipItem">
<vocation name="Knight" />
<vocation name="Elite Knight" showInDescription="0" />
<vocation name="Paladin" />
<vocation name="Royal Paladin" showInDescription="0" />
</movevent>
<movevent event="Equip" itemid="2168" slot="ring" function="onEquipItem" />
<movevent event="Equip" itemid="2169" slot="ring" function="onEquipItem" />
<movevent event="Equip" itemid="2202" slot="ring" function="onEquipItem" />
Expand Down
2 changes: 1 addition & 1 deletion data/scripts/spells/magic_shield.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_MAGIC_BLUE)
combat:setParameter(COMBAT_PARAM_AGGRESSIVE, false)

local condition = Condition(CONDITION_MANASHIELD)
condition:setParameter(CONDITION_PARAM_TICKS, 60 * 1000)
condition:setParameter(CONDITION_PARAM_TICKS, 180 * 1000)
combat:addCondition(condition)

-- New mana shield
Expand Down