Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Shadow & Light
Shadow and Light
Commits
e7572481
Verified
Commit
e7572481
authored
Dec 15, 2020
by
Repooc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added option for strict matching or not and fixed strings not updated if window is opened
parent
989e6baf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
45 deletions
+39
-45
ElvUI_SLE/defaults/profile.lua
ElvUI_SLE/defaults/profile.lua
+4
-3
ElvUI_SLE/modules/armory/armory.lua
ElvUI_SLE/modules/armory/armory.lua
+5
-1
ElvUI_SLE/options/armory/enchant_c.lua
ElvUI_SLE/options/armory/enchant_c.lua
+30
-41
No files found.
ElvUI_SLE/defaults/profile.lua
View file @
e7572481
...
...
@@ -150,10 +150,11 @@ P["sle"] = {
BLOCK
=
true
,
},
},
[
"
enchantString
"
]
=
{
[
"
enable
"
]
=
true
,
enchantString
=
{
enable
=
true
,
-- ["fullText"] = false,
[
"replacement"
]
=
true
,
replacement
=
true
,
strict
=
true
,
},
},
--Backgrounds
...
...
ElvUI_SLE/modules/armory/armory.lua
View file @
e7572481
...
...
@@ -321,10 +321,14 @@ end
--Deals with dem enchants
function
Armory
:
ProcessEnchant
(
which
,
Slot
,
enchantTextShort
,
enchantText
)
if
not
E
.
db
.
sle
.
armory
.
enchantString
.
enable
then
return
end
local
strict
=
E
.
db
.
sle
.
armory
.
enchantString
.
strict
if
E
.
db
.
sle
.
armory
.
enchantString
.
replacement
then
for
_
,
enchData
in
pairs
(
SLE_ArmoryDB
.
EnchantString
)
do
if
enchData
.
original
==
enchantText
then
if
strict
and
enchantText
==
enchData
.
original
then
enchantText
=
enchData
.
new
elseif
not
strict
and
enchData
.
original
and
enchData
.
new
then
enchantText
=
gsub
(
enchantText
,
E:EscapeString
(
enchData.original
),
enchData
.
new
)
end
end
end
...
...
ElvUI_SLE/options/armory/enchant_c.lua
View file @
e7572481
local
SLE
,
T
,
E
,
L
,
V
,
P
,
G
=
unpack
(
select
(
2
,
...
))
local
M
=
E
:
GetModule
(
'Misc'
)
local
Armory
=
SLE
:
GetModule
(
"Armory_Core"
)
local
EnchantStringName
,
EnchantString_Old
,
EnchantString_New
=
''
,
''
,
''
local
EnchantStringName
=
''
local
SelectedEnchantString
local
function
configTable
()
...
...
@@ -9,37 +10,49 @@ local function configTable()
local
ACH
=
E
.
Libs
.
ACH
E
.
Options
.
args
.
sle
.
args
.
modules
.
args
.
armory
.
args
.
enchantString
=
{
order
=
40
,
type
=
'group'
,
name
=
L
[
"Enchant String"
],
order
=
40
,
disabled
=
function
()
return
not
(
E
.
db
.
sle
.
armory
.
character
.
enable
and
E
.
db
.
sle
.
armory
.
inspect
.
enable
)
end
,
hidden
=
function
()
return
not
E
.
private
.
skins
.
blizzard
.
enable
or
(
not
E
.
private
.
skins
.
blizzard
.
character
and
not
E
.
private
.
skins
.
blizzard
.
inspect
)
end
,
args
=
{
enable
=
{
order
=
1
,
name
=
L
[
"Enable"
],
type
=
'toggle'
,
name
=
L
[
"Enable"
],
get
=
function
(
info
)
return
E
.
db
.
sle
.
armory
.
enchantString
[(
info
[
#
info
])]
end
,
set
=
function
(
info
,
value
)
E
.
db
.
sle
.
armory
.
enchantString
[(
info
[
#
info
])]
=
value
;
M
:
UpdateCharacterInfo
();
M
:
UpdateInspectInfo
()
end
,
},
replacement
=
{
order
=
2
,
name
=
L
[
"String Replacement"
],
type
=
'toggle'
,
name
=
L
[
"String Replacement"
],
get
=
function
(
info
)
return
E
.
db
.
sle
.
armory
.
enchantString
[(
info
[
#
info
])]
end
,
set
=
function
(
info
,
value
)
E
.
db
.
sle
.
armory
.
enchantString
[(
info
[
#
info
])]
=
value
;
M
:
UpdateCharacterInfo
();
M
:
UpdateInspectInfo
()
end
,
},
strict
=
{
order
=
3
,
type
=
'toggle'
,
name
=
L
[
"Stict String Replacement"
],
desc
=
L
[
"This will make it so that the \"
Original
String
\
" needs to match the whole enchant string you want to replace."
],
get
=
function
(
info
)
return
E
.
db
.
sle
.
armory
.
enchantString
[(
info
[
#
info
])]
end
,
set
=
function
(
info
,
value
)
E
.
db
.
sle
.
armory
.
enchantString
[(
info
[
#
info
])]
=
value
Armory
:
UpdateInspectInfo
()
Armory
:
UpdateCharacterInfo
()
end
,
},
spacer1
=
ACH
:
Spacer
(
9
),
ConfigSpace
=
{
order
=
10
,
type
=
'group'
,
name
=
L
[
"String Replacement"
],
order
=
10
,
guiInline
=
true
,
args
=
{
createString
=
{
order
=
1
,
name
=
L
[
"Create Filter"
],
type
=
'input'
,
name
=
L
[
"Create Filter"
],
width
=
'full'
,
get
=
function
()
return
EnchantStringName
end
,
set
=
function
(
_
,
value
)
...
...
@@ -94,46 +107,27 @@ local function configTable()
hidden
=
function
()
return
SelectedEnchantString
==
''
end
,
disabled
=
function
()
return
(
E
.
db
.
sle
.
armory
.
enchantString
.
enable
==
false
or
E
.
db
.
sle
.
armory
.
enchantString
.
replacement
==
false
)
or
(
E
.
db
.
sle
.
armory
.
character
.
enable
==
false
and
E
.
db
.
sle
.
armory
.
inspect
.
enable
==
false
)
end
,
get
=
function
(
info
)
return
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
][(
info
[
#
info
])]
end
,
set
=
function
(
info
,
value
)
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
][(
info
[
#
info
])]
=
value
Armory
:
UpdateInspectInfo
()
Armory
:
UpdateCharacterInfo
()
end
,
args
=
{
TargetString
=
{
original
=
{
type
=
'input'
,
name
=
L
[
"Original String"
],
order
=
1
,
desc
=
''
,
width
=
'full'
,
get
=
function
()
return
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
][
'original'
]
end
,
set
=
function
(
_
,
value
)
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
][
'original'
]
=
value
if
_G
.
CharacterArmory
then
_G
.
CharacterArmory
:
Update_Gear
()
end
if
_G
.
InspectArmory
and
_G
.
InspectArmory
.
LastDataSetting
then
_G
.
InspectArmory
:
InspectFrame_DataSetting
(
_G
.
InspectArmory
.
CurrentInspectData
)
end
end
,
disabled
=
function
()
return
(
E
.
db
.
sle
.
armory
.
enchantString
.
enable
==
false
or
E
.
db
.
sle
.
armory
.
enchantString
.
replacement
==
false
)
or
(
E
.
db
.
sle
.
armory
.
character
.
enable
==
false
and
E
.
db
.
sle
.
armory
.
inspect
.
enable
==
false
)
end
},
N
ew
String
=
{
n
ew
=
{
type
=
'input'
,
name
=
L
[
"New String"
],
order
=
2
,
desc
=
''
,
width
=
'full'
,
get
=
function
()
return
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
][
'new'
]
end
,
set
=
function
(
_
,
value
)
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
][
'new'
]
=
value
if
_G
.
CharacterArmory
then
_G
.
CharacterArmory
:
Update_Gear
()
end
if
_G
.
InspectArmory
and
_G
.
InspectArmory
.
LastDataSetting
then
_G
.
InspectArmory
:
InspectFrame_DataSetting
(
_G
.
InspectArmory
.
CurrentInspectData
)
end
end
,
disabled
=
function
()
return
(
E
.
db
.
sle
.
armory
.
enchantString
.
enable
==
false
or
E
.
db
.
sle
.
armory
.
enchantString
.
replacement
==
false
)
or
(
E
.
db
.
sle
.
armory
.
character
.
enable
==
false
and
E
.
db
.
sle
.
armory
.
inspect
.
enable
==
false
)
end
},
DeleteButton
=
{
type
=
'execute'
,
...
...
@@ -144,13 +138,8 @@ local function configTable()
if
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
]
then
SLE_ArmoryDB
.
EnchantString
[
SelectedEnchantString
]
=
nil
SelectedEnchantString
=
''
if
_G
.
CharacterArmory
then
_G
.
CharacterArmory
:
Update_Gear
()
end
if
_G
.
InspectArmory
and
_G
.
InspectArmory
.
LastDataSetting
then
_G
.
InspectArmory
:
InspectFrame_DataSetting
(
_G
.
InspectArmory
.
CurrentInspectData
)
end
Armory
:
UpdateInspectInfo
()
Armory
:
UpdateCharacterInfo
()
end
end
,
disabled
=
function
()
return
(
E
.
db
.
sle
.
armory
.
enchantString
.
enable
==
false
or
E
.
db
.
sle
.
armory
.
enchantString
.
replacement
==
false
)
or
(
E
.
db
.
sle
.
armory
.
character
.
enable
==
false
and
E
.
db
.
sle
.
armory
.
inspect
.
enable
==
false
)
end
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment