Skip to content

Commit 78ee78e

Browse files
committed
fix(startFrame): Fix account lock, remove unused code
1 parent b0a0cb8 commit 78ee78e

File tree

4 files changed

+13
-27
lines changed

4 files changed

+13
-27
lines changed

Commands/Commands_Main.lua

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,8 @@ function ShowBag()
124124
end
125125

126126
function DismountPlayer()
127-
if MangAdmin:Selection("player") or MangAdmin:Selection("self") or MangAdmin:Selection("none") then
128-
local player = UnitName("target") or UnitName("player")
129127
MangAdmin:ChatMsg(".dismount")
130-
MangAdmin:LogAction("Dismounted player "..player..".")
131-
else
132-
MangAdmin:Print(Locale["selectionerror1"])
133-
end
128+
MangAdmin:LogAction("Dismounted player")
134129
end
135130

136131
function SetJail_A()
@@ -186,18 +181,13 @@ function GridNavigate(x, y)
186181
end
187182
end
188183

189-
function ToggleChat(value)
190-
MangAdmin:ChatMsg(".gm chat "..value)
191-
MangAdmin:LogAction("Turned GM-Chat to "..value..".")
192-
end
193-
194184
function ToggleWaterwalk(value)
195185
MangAdmin:ChatMsg(".cheat waterwalk "..value)
196186
MangAdmin:LogAction("Turned Waterwalk to "..value..".")
197187
end
198188

199-
function ToggleAccountlock(value)
200-
MangAdmin:ChatMsg(".account lock "..value)
189+
function ToggleAccountlockIP(value)
190+
MangAdmin:ChatMsg(".account lock ip "..value)
201191
MangAdmin:LogAction("Turned GM account lock to "..value..".")
202192
end
203193

Frames/MangFrames_SectionMain.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,11 @@ function MangAdmin:CreateMainSection()
375375
})
376376

377377
FrameLib:BuildButton({
378-
name = "ma_accountlockonbutton",
378+
name = "ma_accountlockiponbutton",
379379
group = "main",
380380
parent = ma_midframe,
381381
texture = {
382-
name = "ma_accountlockonbutton_texture",
382+
name = "ma_accountlockiponbutton_texture",
383383
color = {color.btn.r, color.btn.g, color.btn.b, transparency.btn}
384384
},
385385
size = {
@@ -391,15 +391,15 @@ function MangAdmin:CreateMainSection()
391391
offX = 10,
392392
offY = -190
393393
},
394-
text = Locale["ma_accountlockbutton"]
394+
text = Locale["ma_accountlockipbutton"]
395395
})
396396

397397
FrameLib:BuildButton({
398-
name = "ma_accountlockoffbutton",
398+
name = "ma_accountlockipoffbutton",
399399
group = "main",
400400
parent = ma_midframe,
401401
texture = {
402-
name = "ma_accountlockoffbutton_texture",
402+
name = "ma_accountlockipoffbutton_texture",
403403
color = {color.btn.r, color.btn.g, color.btn.b, transparency.btn}
404404
},
405405
size = {

FunctionInit.lua

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,10 @@ function InitControls()
4949
MangAdmin:PrepareScript(ma_gridnavibackbutton , Locale["tt_S"] , function() GridNavigate(nil, nil); MangAdmin.db.char.nextGridWay = "south" end)
5050
MangAdmin:PrepareScript(ma_gridnavirightbutton , Locale["tt_E"] , function() GridNavigate(nil, nil); MangAdmin.db.char.nextGridWay = "east" end)
5151
MangAdmin:PrepareScript(ma_gridnavileftbutton , Locale["tt_W"] , function() GridNavigate(nil, nil); MangAdmin.db.char.nextGridWay = "west" end)
52-
--MangAdmin:PrepareScript(ma_chatonbutton , Locale["tt_chatonbutton"] , function() ToggleChat("on") end)
53-
--MangAdmin:PrepareScript(ma_chatoffbutton , Locale["tt_chatoffbutton"] , function() ToggleChat("off") end)
5452
MangAdmin:PrepareScript(ma_waterwalkonbutton , Locale["tt_waterwalkonbutton"] , function() ToggleWaterwalk("on") end)
5553
MangAdmin:PrepareScript(ma_waterwalkoffbutton , Locale["tt_watewrwalkoffbutton"] , function() ToggleWaterwalk("off") end)
56-
MangAdmin:PrepareScript(ma_accountlockonbutton , Locale["tt_accountlockonbutton"] , function() ToggleAccountlock("on") end)
57-
MangAdmin:PrepareScript(ma_accountlockoffbutton , Locale["tt_accountlockoffbutton"] , function() ToggleAccountlock("off") end)
54+
MangAdmin:PrepareScript(ma_accountlockiponbutton , Locale["tt_accountlockiponbutton"] , function() ToggleAccountlockIP("on") end)
55+
MangAdmin:PrepareScript(ma_accountlockipoffbutton , Locale["tt_accountlockipoffbutton"] , function() ToggleAccountlockIP("off") end)
5856
MangAdmin:PrepareScript(ma_gmingamebutton , Locale["tt_gmingamebutton"] , function() GMInGame() end)
5957
MangAdmin:PrepareScript(ma_gmlistbutton , Locale["tt_gmlistbutton"] , function() GMList() end)
6058
MangAdmin:PrepareScript(ma_petcreatebutton , Locale["tt_petcreatebutton"] , function() PetCreate() end)

Locales/enUS.lua

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,10 @@ function Return_enUS()
117117
["tt_S"] = "Navigate South",
118118
["tt_E"] = "Navigate East",
119119
["tt_W"] = "Navigate West",
120-
--["tt_chatonbutton"] = "Turn GM Chat ON",
121-
--["tt_chatoffbutton"] = "Turn GM Chat OFF",
122120
["tt_waterwalkonbutton"] = "Turn Waterwalk ON for the selected creature" ,
123121
["tt_watewrwalkoffbutton"] = "Turn Waterwalk OFF for the selected creature",
124-
["tt_accountlockonbutton"] = "Lock your account",
125-
["tt_accountlockoffbutton"] = "UnLock your account",
122+
["tt_accountlockiponbutton"] = "Lock your account by allowing only the last IP",
123+
["tt_accountlockipoffbutton"] = "UnLock your account by allowing every IP",
126124
["tt_DisplayAccountLvl"] = "Display your account level.",
127125
["tt_SpeedSliderReset"] = "Reset Speed to 1.0",
128126
["tt_ScaleSliderReset"] = "Reset Scale to 1.0",
@@ -178,7 +176,7 @@ function Return_enUS()
178176
["ma_chatbutton"] = "GM Chat On",
179177
["ma_mapsbutton"] = "View All Maps",
180178
["ma_waterwalkbutton"] = "Waterwalk On",
181-
["ma_accountlockbutton"] = "Account Lock",
179+
["ma_accountlockipbutton"] = "Account IP Lock",
182180
["ma_gmnotify"] = "GM Notify",
183181
["ma_gmingame"] = "GMs InGame",
184182
["ma_gmlist"] = "GM List",

0 commit comments

Comments
 (0)