mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2025-12-30 20:41:41 +09:00
Fixed Reports
This commit is contained in:
@@ -154,12 +154,13 @@ function Admin.report(player,by_player,reason)
|
|||||||
local player, by_player_name = valid_players(player,by_player)
|
local player, by_player_name = valid_players(player,by_player)
|
||||||
if not player or Ranking.get_rank(player):allowed('no-report') then return end
|
if not player or Ranking.get_rank(player):allowed('no-report') then return end
|
||||||
if rank:allowed('varified') then
|
if rank:allowed('varified') then
|
||||||
_reports.varified[player.name] = _reports.varified[player.name] or {}
|
_reports().varified[player.name] = _reports().varified[player.name] or {}
|
||||||
table.insert(_reports.varified,{by_player_name,reason})
|
table.insert(_reports().varified,{by_player_name,reason})
|
||||||
else
|
else
|
||||||
_reports.reports[player.name] = _reports.reports[player.name] or {}
|
_reports().reports[player.name] = _reports().reports[player.name] or {}
|
||||||
table.insert(_reports.reports,{by_player_name,reason})
|
table.insert(_reports().reports,{by_player_name,reason})
|
||||||
end
|
end
|
||||||
|
report_message(player,by_player,reason)
|
||||||
cheak_reports(player)
|
cheak_reports(player)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -49,11 +49,11 @@ Gui.left.add{
|
|||||||
draw=function(frame)
|
draw=function(frame)
|
||||||
frame.caption = ''
|
frame.caption = ''
|
||||||
local player_list = frame.add{
|
local player_list = frame.add{
|
||||||
name="scroll",
|
name='scroll',
|
||||||
type = "scroll-pane",
|
type = 'scroll-pane',
|
||||||
direction = "vertical",
|
direction = 'vertical',
|
||||||
vertical_scroll_policy="always",
|
vertical_scroll_policy='always',
|
||||||
horizontal_scroll_policy="never"
|
horizontal_scroll_policy='never'
|
||||||
}
|
}
|
||||||
for _,rank in pairs(Ranking._ranks()) do
|
for _,rank in pairs(Ranking._ranks()) do
|
||||||
for _,player in pairs(rank:get_players(true)) do
|
for _,player in pairs(rank:get_players(true)) do
|
||||||
@@ -73,13 +73,15 @@ Gui.left.add{
|
|||||||
caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand}
|
caption={'player-list.format',tick_to_display_format(player.online_time),player.name,rank.short_hand}
|
||||||
}.style.font_color = rank.colour
|
}.style.font_color = rank.colour
|
||||||
end
|
end
|
||||||
if Admin.report_btn and not rank:allowed('no-report') and not player.index == frame.player_index then
|
if Admin.report_btn then
|
||||||
|
if not rank:allowed('no-report') and player.index ~= frame.player_index then
|
||||||
local btn = Admin.report_btn:draw(flow)
|
local btn = Admin.report_btn:draw(flow)
|
||||||
btn.style.height = 20
|
btn.style.height = 20
|
||||||
btn.style.width = 20
|
btn.style.width = 20
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
open_on_join=true
|
open_on_join=true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,27 +11,24 @@ Discord: https://discord.gg/r6dC2uK
|
|||||||
local confirm_report = Gui.inputs.add{
|
local confirm_report = Gui.inputs.add{
|
||||||
type='button',
|
type='button',
|
||||||
name='admin-report-confirm',
|
name='admin-report-confirm',
|
||||||
caption='utility/spawn_flag'
|
caption='utility/spawn_flag',
|
||||||
|
tooltip={'reports.name'}
|
||||||
}:on_event('click',function(event)
|
}:on_event('click',function(event)
|
||||||
local parent = evet.element.parent
|
local parent = event.element.parent
|
||||||
local player = Game.get_player(parent.player.caption)
|
local player = Game.get_player(parent.player.caption)
|
||||||
local reason = parent.reason.text
|
local reason = parent.reason.text
|
||||||
Admin.report(player,event.player_index,reason)
|
Admin.report(player,event.player_index,reason)
|
||||||
|
Gui.center.clear(event.player_index)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Admin.report_btn = Gui.inputs.add{
|
Admin.report_btn = Gui.inputs.add{
|
||||||
type='button',
|
type='button',
|
||||||
name='admin-report',
|
name='admin-report',
|
||||||
caption='utility/spawp_flag'
|
caption='utility/spawn_flag',
|
||||||
|
tooltip={'reports.name'}
|
||||||
}:on_event('click',function(event)
|
}:on_event('click',function(event)
|
||||||
local parent = event.element.parent
|
local parent = event.element.parent
|
||||||
local player = nil
|
local player = Game.get_player(parent.children[1].name)
|
||||||
for name,_ in pairs(parent.children) do
|
|
||||||
if name ~= 'admin-report' then
|
|
||||||
player = Game.get_player(name)
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if not player then return end
|
if not player then return end
|
||||||
local _player = Game.get_player(event)
|
local _player = Game.get_player(event)
|
||||||
Gui.center.clear(_player)
|
Gui.center.clear(_player)
|
||||||
@@ -39,12 +36,15 @@ Admin.report_btn = Gui.inputs.add{
|
|||||||
type='frame',
|
type='frame',
|
||||||
name='report-gui'
|
name='report-gui'
|
||||||
}
|
}
|
||||||
|
_player.opened=frame
|
||||||
frame.caption={'reports.name'}
|
frame.caption={'reports.name'}
|
||||||
frame.add{
|
frame.add{
|
||||||
type='textfield',
|
type='textfield',
|
||||||
name='reason'
|
name='reason'
|
||||||
}.style.width = 300
|
}.style.width = 300
|
||||||
confirm_report:draw(frame)
|
local btn = confirm_report:draw(frame)
|
||||||
|
btn.style.height = 30
|
||||||
|
btn.style.width = 30
|
||||||
frame.add{
|
frame.add{
|
||||||
type='label',
|
type='label',
|
||||||
name='player',
|
name='player',
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ require('Guis/player-list')
|
|||||||
require('Guis/tasklist')
|
require('Guis/tasklist')
|
||||||
require('Guis/rank-changer')
|
require('Guis/rank-changer')
|
||||||
require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin
|
require('Guis/admin-gui') -- used with Admin/admin, requires Admin/admin
|
||||||
require('Guis/game-settings')
|
|
||||||
require('Guis/reports') -- requires Admin/reports
|
require('Guis/reports') -- requires Admin/reports
|
||||||
|
require('Guis/game-settings')
|
||||||
|
|
||||||
-- other
|
-- other
|
||||||
Reference in New Issue
Block a user