Skip to content

Commit cd56f66

Browse files
committed
fix(startFrame): Fix bank command, add GMLvl 4 warning, adjust startFrame collision
1 parent dce589c commit cd56f66

5 files changed

Lines changed: 29 additions & 13 deletions

File tree

AzerothCoreAdmin.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,6 @@ function MangAdmin:AddMessage(frame, text, r, g, b, id)
869869
end
870870
--checking for .server info command to pull information for bottom right frame
871871
for revision, platform in string.gmatch(text, Strings["ma_GmatchRevision"]) do
872-
message(text)
873872
ma_inforevisiontext:SetText(Locale["info_revision"]..revision)
874873
ma_infoplatformtext:SetText(string.gsub(Locale["info_platform"], "_SERVER_PLAT_", platform))
875874
catchedSth = true

Commands/Commands_Char.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ function Distance()
123123
MangAdmin:LogAction("Got distance to player "..player..".")
124124
end
125125

126+
127+
function KillSomething()
128+
local target = UnitName("target") or UnitName("player")
129+
MangAdmin:ChatMsg(".die")
130+
MangAdmin:LogAction("Killed "..target..".")
131+
end
132+
126133
function Recall()
127134
if MangAdmin:Selection("player") or MangAdmin:Selection("self") or MangAdmin:Selection("none") then
128135
local player = UnitName("target") or UnitName("player")

Commands/Commands_Main.lua

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ function SetSpeed()
8888
local value = string.format("%.1f", ma_speedslider:GetValue())
8989
if MangAdmin:Selection("player") or MangAdmin:Selection("self") or MangAdmin:Selection("none") then
9090
local player = UnitName("target") or UnitName("player")
91-
--self:ChatMsg(".modify speed "..value)
92-
--self:ChatMsg(".modify fly "..value)
93-
--self:ChatMsg(".modify swim "..value)
9491
MangAdmin:ChatMsg(".modify speed "..value)
9592
MangAdmin:LogAction("Set speed of "..player.." to "..value..".")
9693
else
@@ -118,7 +115,7 @@ function Screenie()
118115
end
119116

120117
function ShowBank()
121-
MangAdmin:ChatMsg(".bank")
118+
MangAdmin:ChatMsg(".character check bank")
122119
end
123120

124121
function DismountPlayer()

Frames/MangFrames_SectionMain.lua

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -521,13 +521,25 @@ function MangAdmin:CreateMainSection()
521521
parent = ma_midframe,
522522
setpoint = {
523523
pos = "TOPLEFT",
524-
offX = 180,
525-
offY = -10
524+
offX = 10,
525+
offY = -210
526526
},
527527
text = Locale["ma_instakill"],
528528
inherits = "OptionsCheckButtonTemplate"
529529
})
530530

531+
FrameLib:BuildFontString({
532+
name = "ma_gm4warningtext",
533+
group = "main",
534+
parent = ma_midframe,
535+
text = Locale["ma_gm4warning"],
536+
setpoint = {
537+
pos = "TOPLEFT",
538+
offX = 10,
539+
offY = -235
540+
}
541+
})
542+
531543
FrameLib:BuildFrame({
532544
type = "Slider",
533545
name = "ma_speedslider",
@@ -733,7 +745,7 @@ function MangAdmin:CreateMainSection()
733745
},
734746
setpoint = {
735747
pos = "TOPLEFT",
736-
offX = 400,
748+
offX = 420,
737749
offY = -163
738750
},
739751
inherits = "InputBoxTemplate"
@@ -1145,7 +1157,7 @@ function MangAdmin:CreateMainSection()
11451157
parent = ma_midframe,
11461158
texture = {
11471159
name = "ma_acctcreatebutton_texture",
1148-
color = {color.btn.r, color.btn.g, color.btn.b, transparency.btn}
1160+
color = {0.5, 0, 0, transparency.btn}
11491161
},
11501162
size = {
11511163
width = 80,
@@ -1165,7 +1177,7 @@ function MangAdmin:CreateMainSection()
11651177
parent = ma_midframe,
11661178
texture = {
11671179
name = "ma_acctdeletebutton_texture",
1168-
color = {color.btn.r, color.btn.g, color.btn.b, transparency.btn}
1180+
color = {0.5, 0, 0, transparency.btn}
11691181
},
11701182
size = {
11711183
width = 80,
@@ -1205,7 +1217,7 @@ function MangAdmin:CreateMainSection()
12051217
parent = ma_midframe,
12061218
texture = {
12071219
name = "ma_acctgmlvlbutton_texture",
1208-
color = {color.btn.r, color.btn.g, color.btn.b, transparency.btn}
1220+
color = {0.5, 0, 0, transparency.btn}
12091221
},
12101222
size = {
12111223
width = 80,
@@ -1225,7 +1237,7 @@ function MangAdmin:CreateMainSection()
12251237
parent = ma_midframe,
12261238
texture = {
12271239
name = "ma_acctpasswdbutton_texture",
1228-
color = {color.btn.r, color.btn.g, color.btn.b, transparency.btn}
1240+
color = {0.5, 0, 0, transparency.btn}
12291241
},
12301242
size = {
12311243
width = 80,

Locales/enUS.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function Return_enUS()
162162
["ma_TaxiOnButton"] = "Taxicheat on",
163163
["ma_ShowMapsButton"] = "Show Maps",
164164
["ma_HideMapsButton"] = "Hide Maps",
165-
["ma_instakill"] = "Insta-kill enemy creatures",
165+
["ma_instakill"] = "Insta-kill enemy creatures by targeting them",
166166
["ma_ScreenshotButton"] = "Screenshot",
167167
["ma_BankButton"] = "Bank",
168168
["ma_DismountButton"] = "Dismount",
@@ -203,6 +203,7 @@ function Return_enUS()
203203
["ma_acctaddon"] = "Acct Addon",
204204
["ma_acctgmlvl"] = "Acct GMLvl",
205205
["ma_acctpasswd"] = "Acct Passwd",
206+
["ma_gm4warning"] = "|cffFF0000Red buttons requires a GM level 4 to be executed!|r",
206207
--[[Other]]
207208

208209

0 commit comments

Comments
 (0)