Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Decoupled player handling from admin and stats module (issue #63)
- Loading branch information
Timo Smit
committed
Sep 4, 2016
1 parent
06d4413
commit 441e4cf
Showing
7 changed files
with
173 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
|
||
-- WolfAdmin module for Wolfenstein: Enemy Territory servers. | ||
-- Copyright (C) 2015-2016 Timo 'Timothy' Smit | ||
|
||
-- This program is free software: you can redistribute it and/or modify | ||
-- it under the terms of the GNU General Public License as published by | ||
-- the Free Software Foundation, either version 3 of the License, or | ||
-- at your option any later version. | ||
|
||
-- This program is distributed in the hope that it will be useful, | ||
-- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
-- GNU General Public License for more details. | ||
|
||
-- You should have received a copy of the GNU General Public License | ||
-- along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
local stats = require "luascripts.wolfadmin.players.stats" | ||
|
||
local events = require "luascripts.wolfadmin.util.events" | ||
|
||
local players = {} | ||
|
||
function players.updatePlayer(clientId) | ||
local player = db.getplayer(stats.get(clientId, "playerGUID")) | ||
|
||
if player then | ||
local guid = stats.get(clientId, "playerGUID") | ||
local ip = stats.get(clientId, "playerIP") | ||
|
||
db.updateplayer(guid, ip) | ||
else | ||
local guid = stats.get(clientId, "playerGUID") | ||
local ip = stats.get(clientId, "playerIP") | ||
|
||
db.addplayer(guid, ip) | ||
-- admin.setPlayerLevel(clientId, et.G_shrubbot_level(clientId), 1) | ||
end | ||
end | ||
|
||
function players.updateAlias(clientId) | ||
local playerid = db.getplayer(stats.get(clientId, "playerGUID"))["id"] | ||
local name = stats.get(clientId, "playerName") | ||
local alias = db.getaliasbyname(playerid, name) | ||
|
||
if alias then | ||
db.updatealias(alias["id"], os.time()) | ||
if alias["cleanalias"] == "" then | ||
db.updatecleanalias(alias["id"], name) | ||
end | ||
else | ||
db.addalias(playerid, name, os.time()) | ||
end | ||
end | ||
|
||
function players.onconnect(clientId, firstTime, isBot) | ||
local clientInfo = et.trap_GetUserinfo(clientId) | ||
|
||
-- name is NOT yet set in pers.netname, so get all info out of infostring | ||
stats.set(clientId, "playerName", et.Info_ValueForKey(clientInfo, "name")) | ||
stats.set(clientId, "playerGUID", et.Info_ValueForKey(clientInfo, "cl_guid")) | ||
stats.set(clientId, "playerIP", string.gsub(et.Info_ValueForKey(clientInfo, "ip"), ":%d*", "")) | ||
stats.set(clientId, "playerTeam", tonumber(et.gentity_get(clientId, "sess.sessionTeam"))) | ||
stats.set(clientId, "isBot", isBot) | ||
|
||
if firstTime == 1 then | ||
stats.set(clientId, "newConnection", true) | ||
|
||
if db.isconnected() then | ||
players.updatePlayer(clientId) | ||
players.updateAlias(clientId) | ||
end | ||
end | ||
end | ||
events.handle("onClientConnect", players.onconnect) | ||
|
||
function players.onbegin(clientId) | ||
-- TODO: | ||
-- new approach: load necessary data in onClientConnect event handlers, | ||
-- load rest in onClientBegin handlers (avoids useless loading of stats, | ||
-- less coupling between main.lua and stats.lua) | ||
-- ensures that all data is loaded from this moment on | ||
|
||
events.trigger("onPlayerReady", clientId, stats.get(clientId, "newConnection")) | ||
|
||
stats.set(clientId, "newConnection", false) | ||
end | ||
events.handle("onClientBegin", players.onbegin) | ||
|
||
function players.ondisconnect(clientId) | ||
stats.remove(clientId) | ||
end | ||
events.handle("onClientDisconnect", players.ondisconnect) | ||
|
||
-- TODO: split into admin-side and player-side event? | ||
function players.oninfochange(clientId) | ||
local clientInfo = et.trap_GetUserinfo(clientId) | ||
local old = stats.get(clientId, "playerName") | ||
local new = et.Info_ValueForKey(clientInfo, "name") | ||
|
||
if new ~= old then | ||
if (os.time() - stats.get(clientId, "namechangeStart")) < settings.get("g_renameInterval") and stats.get(clientId, "namechangePts") >= settings.get("g_renameLimit") and not stats.get(clientId, "namechangeForce") then | ||
stats.set(clientId, "namechangeForce", true) | ||
|
||
clientInfo = et.Info_SetValueForKey(clientInfo, "name", old) | ||
et.trap_SetUserinfo(clientId, clientInfo) | ||
et.ClientUserinfoChanged(clientId) | ||
|
||
stats.set(clientId, "namechangeForce", false) | ||
|
||
et.trap_SendServerCommand(clientId, "cp \"Too many name changes in 1 minute.\";") | ||
else | ||
stats.set(clientId, "playerName", new) | ||
|
||
if (os.time() - stats.get(clientId, "namechangeStart")) > settings.get("g_renameInterval") then | ||
stats.set(clientId, "namechangeStart", os.time()) | ||
stats.get(clientId, "namechangePts", 0) | ||
end | ||
|
||
stats.add(clientId, "namechangePts", 1) | ||
|
||
et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay -1 \""..old.." ^7is now known as "..new.."\";") | ||
|
||
if db.isconnected() then | ||
players.updateAlias(clientId) | ||
end | ||
|
||
events.trigger("onClientNameChange", clientId, old, new) | ||
end | ||
end | ||
end | ||
events.handle("onClientInfoChange", players.oninfochange) | ||
|
||
function players.onteamchange(clientId) | ||
local clientInfo = et.trap_GetUserinfo(clientId) | ||
local old = stats.get(clientId, "playerTeam") | ||
local new = tonumber(et.gentity_get(clientId, "sess.sessionTeam")) | ||
|
||
if new ~= old then | ||
stats.set(clientId, "playerTeam", new) | ||
|
||
events.trigger("onClientTeamChange", clientId, old, new) | ||
end | ||
end | ||
events.handle("onClientInfoChange", players.onteamchange) | ||
|
||
return players |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.