Skip to content

Commit 6ba4c0f

Browse files
Blitz54Blitz54
committed
enabled drag and drop for rare templates
1 parent 79e7ca2 commit 6ba4c0f

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

‎src/Classes/ItemsTab.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
210210
--function()
211211
-- return self.height < 980
212212
--end
213-
self.selectedDB = "UNIQUE"
213+
self.selectedDB = "UNIQUE"
214214

215215
-- Uniques Button
216216
self.controls.uniqueButton = new("ButtonControl", {"LEFT", self.controls.selectDBLabel, "RIGHT"}, {4, 0, 110, 18}, "Uniques", function()
@@ -808,15 +808,15 @@ holding Shift will put it in the second.]])
808808
t_insert(self.controls.uniqueDB.dragTargetList, self.controls.itemList)
809809
t_insert(self.controls.uniqueDB.dragTargetList, self.controls.sharedItemList)
810810
t_insert(self.controls.uniqueDB.dragTargetList, build.controls.mainSkillMinion)
811-
--t_insert(self.controls.rareDB.dragTargetList, self.controls.itemList)
812-
--t_insert(self.controls.rareDB.dragTargetList, self.controls.sharedItemList)
813-
--t_insert(self.controls.rareDB.dragTargetList, build.controls.mainSkillMinion)
811+
t_insert(self.controls.rareDB.dragTargetList, self.controls.itemList)
812+
t_insert(self.controls.rareDB.dragTargetList, self.controls.sharedItemList)
813+
t_insert(self.controls.rareDB.dragTargetList, build.controls.mainSkillMinion)
814814
t_insert(self.controls.sharedItemList.dragTargetList, self.controls.itemList)
815815
t_insert(self.controls.sharedItemList.dragTargetList, build.controls.mainSkillMinion)
816816
for _, slot in pairs(self.slots) do
817817
t_insert(self.controls.itemList.dragTargetList, slot)
818818
t_insert(self.controls.uniqueDB.dragTargetList, slot)
819-
--t_insert(self.controls.rareDB.dragTargetList, slot)
819+
t_insert(self.controls.rareDB.dragTargetList, slot)
820820
t_insert(self.controls.sharedItemList.dragTargetList, slot)
821821
end
822822

‎src/Data/ModCache.lua

+7-8
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ c["+1 to Evasion Rating per 1 Armour on Equipped Gloves"]={{[1]={[1]={div=1,stat
9191
c["+1 to Level of all Chaos Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="chaos",value=1}}},nil}
9292
c["+1 to Level of all Cold Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="cold",value=1}}},nil}
9393
c["+1 to Level of all Lightning Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="lightning",value=1}}},nil}
94+
c["+1 to Level of all Projectile Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="projectile",value=1}}},nil}
9495
c["+1 to Level of all Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="all",value=1}}},nil}
9596
c["+1 to Maximum Endurance Charges"]={{[1]={flags=0,keywordFlags=0,name="EnduranceChargesMax",type="BASE",value=1}},nil}
9697
c["+1 to Maximum Energy Shield per 12 Evasion Rating on Equipped Body Armour"]={{[1]={[1]={div=12,stat="EvasionOnBody Armour",type="PerStat"},flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=1}},nil}
@@ -243,6 +244,7 @@ c["+23% to Chaos Resistance"]={{[1]={flags=0,keywordFlags=0,name="ChaosResist",t
243244
c["+23% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",type="BASE",value=23}},nil}
244245
c["+23% to Fire Resistance"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="BASE",value=23}},nil}
245246
c["+23% to Lightning Resistance"]={{[1]={flags=0,keywordFlags=0,name="LightningResist",type="BASE",value=23}},nil}
247+
c["+23% to all Elemental Resistances"]={{[1]={flags=0,keywordFlags=0,name="ElementalResist",type="BASE",value=23}},nil}
246248
c["+25 to Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="BASE",value=25}},nil}
247249
c["+25 to Dexterity"]={{[1]={flags=0,keywordFlags=0,name="Dex",type="BASE",value=25}},nil}
248250
c["+25 to Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="Evasion",type="BASE",value=25}},nil}
@@ -1000,11 +1002,13 @@ c["120% increased Physical Damage"]={{[1]={flags=0,keywordFlags=0,name="Physical
10001002
c["125% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC",value=125}},nil}
10011003
c["125% increased Armour and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEnergyShield",type="INC",value=125}},nil}
10021004
c["125% increased Armour and Evasion"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEvasion",type="INC",value=125}},nil}
1005+
c["125% increased Armour, Evasion and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="Defences",type="INC",value=125}},nil}
10031006
c["125% increased Charges per use"]={{[1]={flags=0,keywordFlags=0,name="FlaskChargesUsed",type="INC",value=125}},nil}
10041007
c["125% increased Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="INC",value=125}},nil}
10051008
c["125% increased Evasion Rating"]={{[1]={flags=0,keywordFlags=0,name="Evasion",type="INC",value=125}},nil}
10061009
c["125% increased Evasion and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EvasionAndEnergyShield",type="INC",value=125}},nil}
10071010
c["13% chance to Gain 50% of Damage with Hits as Extra Chaos Damage"]={{[1]={flags=4,keywordFlags=0,name="DamageGainAsChaos",type="BASE",value=6.5}},nil}
1011+
c["13% chance to Poison on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="PoisonChance",type="BASE",value=13}},nil}
10081012
c["13% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=13}},nil}
10091013
c["13% increased Cast Speed"]={{[1]={flags=16,keywordFlags=0,name="Speed",type="INC",value=13}},nil}
10101014
c["13% increased Movement Speed"]={{[1]={flags=0,keywordFlags=0,name="MovementSpeed",type="INC",value=13}},nil}
@@ -1033,6 +1037,7 @@ c["15% chance for Crossbow Attacks to not consume a bolt"]={{}," for Attacks to
10331037
c["15% chance to Blind Enemies on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="BlindChance",type="BASE",value=15}},nil}
10341038
c["15% chance to Pierce an Enemy"]={{}," to Pierce an Enemy "}
10351039
c["15% chance to Pierce an Enemy 15% increased Projectile Damage"]={{[1]={flags=1024,keywordFlags=0,name="Damage",type="BASE",value=15}}," to Pierce an Enemy 15% increased "}
1040+
c["15% chance to Poison on Hit with Attacks"]={{[1]={flags=0,keywordFlags=65536,name="PoisonChance",type="BASE",value=15}},nil}
10361041
c["15% chance to gain a Power Charge on Critical Hit"]={nil,"a Power Charge "}
10371042
c["15% chance to inflict Bleeding on Critical Hit"]={{[1]={[1]={type="Condition",var="CriticalStrike"},flags=0,keywordFlags=0,name="BleedChance",type="BASE",value=15}},nil}
10381043
c["15% chance to not destroy Corpses when Consuming Corpses"]={{}," to not destroy Corpses when Consuming Corpses "}
@@ -1780,7 +1785,6 @@ c["33% increased Mana Regeneration Rate"]={{[1]={flags=0,keywordFlags=0,name="Ma
17801785
c["33% of Elemental Damage Converted to Cold Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamageConvertToCold",type="BASE",value=33}},nil}
17811786
c["33% of Elemental Damage Converted to Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamageConvertToFire",type="BASE",value=33}},nil}
17821787
c["33% of Elemental Damage Converted to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="ElementalDamageConvertToLightning",type="BASE",value=33}},nil}
1783-
c["34% increased Damage with Bow Skills"]={{[1]={flags=0,keywordFlags=1024,name="Damage",type="INC",value=34}},nil}
17841788
c["35% increased Attack Damage while you have an Ally in your Presence"]={{[1]={[1]={threshold=1,type="MultiplierThreshold",var="NearbyAlly"},flags=1,keywordFlags=0,name="Damage",type="INC",value=35}},nil}
17851789
c["35% increased Attack Speed"]={{[1]={flags=1,keywordFlags=0,name="Speed",type="INC",value=35}},nil}
17861790
c["35% increased Block chance"]={{[1]={flags=0,keywordFlags=0,name="BlockChance",type="INC",value=35}},nil}
@@ -1859,6 +1863,7 @@ c["40% increased Curse Duration"]={{[1]={flags=0,keywordFlags=2,name="Duration",
18591863
c["40% increased Damage"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="INC",value=40}},nil}
18601864
c["40% increased Damage if you've Triggered a Skill Recently"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="INC",value=40}}," if you've Triggered a Skill Recently "}
18611865
c["40% increased Damage if you've Triggered a Skill Recently Meta Skills gain 15% increased Energy"]={{[1]={flags=0,keywordFlags=0,name="Damage",type="INC",value=40}}," if you've Triggered a Skill Recently Meta Skills gain 15% increased Energy "}
1866+
c["40% increased Damage with Bow Skills"]={{[1]={flags=0,keywordFlags=1024,name="Damage",type="INC",value=40}},nil}
18621867
c["40% increased Damage with Hits against Ignited Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Ignited"},flags=0,keywordFlags=262144,name="Damage",type="INC",value=40}},nil}
18631868
c["40% increased Damage with Two Handed Weapons"]={{[1]={flags=34359738372,keywordFlags=0,name="Damage",type="INC",value=40}},nil}
18641869
c["40% increased Damage with Warcries"]={{[1]={flags=0,keywordFlags=4,name="Damage",type="INC",value=40}},nil}
@@ -2003,6 +2008,7 @@ c["50% faster start of Energy Shield Recharge"]={{[1]={flags=0,keywordFlags=0,na
20032008
c["50% increased Armour"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="INC",value=50}},nil}
20042009
c["50% increased Armour and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEnergyShield",type="INC",value=50}},nil}
20052010
c["50% increased Armour and Evasion"]={{[1]={flags=0,keywordFlags=0,name="ArmourAndEvasion",type="INC",value=50}},nil}
2011+
c["50% increased Armour, Evasion and Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="Defences",type="INC",value=50}},nil}
20062012
c["50% increased Attack Damage"]={{[1]={flags=1,keywordFlags=0,name="Damage",type="INC",value=50}},nil}
20072013
c["50% increased Attack Damage when on Low Life"]={{[1]={[1]={type="Condition",var="LowLife"},flags=1,keywordFlags=0,name="Damage",type="INC",value=50}},nil}
20082014
c["50% increased Attribute Requirements"]={{[1]={flags=0,keywordFlags=0,name="StrRequirement",type="INC",value=50},[2]={flags=0,keywordFlags=0,name="DexRequirement",type="INC",value=50},[3]={flags=0,keywordFlags=0,name="IntRequirement",type="INC",value=50}},nil}
@@ -2809,14 +2815,7 @@ c["Gain a stack of Jade every second Grants Skill: Encase in Jade"]={nil,"a stac
28092815
c["Gain an Endurance Charge when you Heavy Stun a Rare or Unique Enemy"]={nil,"an Endurance Charge when you Heavy Stun a Rare or Unique Enemy "}
28102816
c["Gain an additional Charge when you gain a Charge"]={nil,"an additional Charge when you gain a Charge "}
28112817
c["Gain no inherent bonuses from Attributes"]={{[1]={flags=0,keywordFlags=0,name="NoAttributeBonuses",type="FLAG",value=true}},nil}
2812-
c["Garment"]={nil,"Garment "}
2813-
c["Garment +40% to all Elemental Resistances"]={nil,"Garment +40% to all Elemental Resistances "}
2814-
c["Garment Sockets: S S S S S S"]={nil,"Garment Sockets: S S S S S S "}
28152818
c["Giant's Blood"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Giant's Blood"}},nil}
2816-
c["Grand Manchettes"]={nil,"Grand Manchettes "}
2817-
c["Grand Manchettes 15% increased Skill Speed"]={nil,"Grand Manchettes 15% increased Skill Speed "}
2818-
c["Grand Visage"]={nil,"Grand Visage "}
2819-
c["Grand Visage +100 to maximum Mana"]={nil,"Grand Visage +100 to maximum Mana "}
28202819
c["Grants 1 Passive Skill Point"]={{[1]={flags=0,keywordFlags=0,name="ExtraPoints",type="BASE",value=1}},nil}
28212820
c["Grants 1 additional Skill Slot"]={{[1]={flags=0,keywordFlags=0,name="SkillSlots",type="BASE",value=1}},nil}
28222821
c["Grants 3 additional Skill Slots"]={{[1]={flags=0,keywordFlags=0,name="SkillSlots",type="BASE",value=3}},nil}

0 commit comments

Comments
 (0)