Skip to content

Commit 719bbb4

Browse files
authored
Add support for Oasis keystone (#513)
1 parent 8813ab7 commit 719bbb4

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Data/ModCache.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,8 +2252,7 @@ c["Cannot be Poisoned"]={{[1]={flags=0,keywordFlags=0,name="PoisonImmune",type="
22522252
c["Cannot be Shocked"]={{[1]={flags=0,keywordFlags=0,name="ShockImmune",type="FLAG",value=true}},nil}
22532253
c["Cannot gain Spirit from Equipment"]={{[1]={flags=0,keywordFlags=0,name="CannotGainSpiritFromEquipment",type="FLAG",value=true}},nil}
22542254
c["Cannot have Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="CannotHaveES",type="FLAG",value=true}},nil}
2255-
c["Cannot use Charms"]={nil,"Cannot use Charms "}
2256-
c["Cannot use Charms 30% more Recovery from Flasks"]={nil,"Cannot use Charms 30% more Recovery from Flasks "}
2255+
c["Cannot use Charms"]={{[1]={flags=0,keywordFlags=0,name="CharmLimit",type="OVERRIDE",value=0}},nil}
22572256
c["Cannot use Life Flasks"]={nil,"Cannot use Life Flasks "}
22582257
c["Cannot use Shield Skills"]={nil,"Cannot use Shield Skills "}
22592258
c["Carry a Chest which adds 20 Inventory Slots"]={nil,"Carry a Chest which adds 20 Inventory Slots "}

src/Modules/CalcPerform.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ function calcs.perform(env, skipEHP)
12931293

12941294
local effectInc = modDB:Sum("INC", {actor = "player"}, "CharmEffect")
12951295
local effectIncMagic = modDB:Sum("INC", {actor = "player"}, "MagicCharmEffect")
1296-
local charmLimit = modDB:Sum("BASE", nil, "CharmLimit")
1296+
local charmLimit = modDB:Override(nil, "CharmLimit") or modDB:Sum("BASE", nil, "CharmLimit")
12971297

12981298
-- charm breakdown
12991299
if breakdown then

src/Modules/ModParser.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4687,6 +4687,7 @@ local specialModList = {
46874687
["can't use other rings"] = { mod("CanNotUseRightRing", "Flag", 1, { type = "DisablesItem", slotName = "Ring 2" }, { type = "SlotNumber", num = 1 }), mod("CanNotUseLeftRing", "Flag", 1, { type = "DisablesItem", slotName = "Ring 1" }, { type = "SlotNumber", num = 2 }) },
46884688
["uses both hand slots"] = { mod("CanNotUseRightWeapon", "Flag", 1, { type = "DisablesItem", slotName = "Weapon 2" }, { type = "SlotNumber", num = 1 }), mod("CanNotUseLeftWeapon", "Flag", 1, { type = "DisablesItem", slotName = "Weapon 1" }, { type = "SlotNumber", num = 2 }) },
46894689
["can't use flask in fifth slot"] = { mod("CanNotUseFifthFlask", "Flag", 1, { type = "DisablesItem", slotName = "Flask 5"}) },
4690+
["cannot use charms"] = { mod("CharmLimit", "OVERRIDE", 0) },
46904691
["boneshatter has (%d+)%% chance to grant %+1 trauma"] = function(num) return { mod("ExtraTrauma", "BASE", num, { type = "SkillName", skillName = "Boneshatter", includeTransfigured = true }) } end,
46914692
["your minimum frenzy, endurance and power charges are equal to your maximum while you are stationary"] = {
46924693
flag("MinimumFrenzyChargesIsMaximumFrenzyCharges", {type = "Condition", var = "Stationary" }),

0 commit comments

Comments
 (0)