Merge pull request #1 from Water-Flow/master

Author: monster010

lua/autorun/_fairselection_loader.lua

@@ -5,4 +5,12 @@ if SERVER then
 	include("fairselection/sv_functions.lua")
 	include("fairselection/sv_database.lua")
 	include("fairselection/sv_player.lua")
+
+	FairSelection:Message("Initialization...")
+	FairSelection:VersionCheck()
+	FairSelection:LoadConfig()
+	FairSelection:Message("Config loaded.")
+	FairSelection.DB:Init()
+	FairSelection.DB:connect()
+	FairSelection:Message("Initialization completed!")
 end

lua/fairselection/database/mysqloo.lua

@@ -17,13 +17,12 @@ end
 
 -- Connects to the database
 function HANDLER:connect()
-	local function CONN:onConnected()
+	function CONN:onConnected()
 		FairSelection:Message("Database connection established!")
-
 		HANDLER:CheckTimer()
 	end
 
-	local function CONN:onConnectionFailed(err)
+	function CONN:onConnectionFailed(err)
 		FairSelection:Error("SQL Error: "..err)
 	end
 
@@ -42,13 +41,17 @@ function HANDLER:CheckTimer()
 end
 
 function HANDLER:CreateDatabase()
-
+	self:prepare("SELECT count(*) FROM information_schema.tables WHERE table_name=?", {FairSelection.CFG.DB.Prefix.."chances"}, function(data)
+		if table.Count(data) <= 0 then
+			self:query("CREATE TABLE `prefix_chances` ( `steamid` bigint(19) NOT NULL, `chance` int(11) DEFAULT NULL, `lastupdate` bigint(19) DEFAULT NULL, PRIMARY KEY (`steamid`), UNIQUE KEY `steamid` (`steamid`))")
+		end
+	end)
 end
 
 function HANDLER:query(sql, callback)
 	if not callback then callback = nil end
 
-	local sql = FairSelection.DB:esPrefix(sql)
+	sql = FairSelection.DB:esPrefix(sql)
 	local query = CONN:query(sql)
 
 	if query != nil then
@@ -73,8 +76,8 @@ end
 
 function HANDLER:prepare(sql, args, callback)
 	if not callback then callback = nil end
-	
-	local sql = FairSelection.DB:esPrefix(sql)
+
+	sql = FairSelection.DB:esPrefix(sql)
 	local query = CONN:prepare(sql)
 
 	if query != nil then

lua/fairselection/sv_config.lua

@@ -1,4 +1,4 @@
-CONFIG.KarmaIncreaseChance				= 					-- Enables karma increased weight. Set CONFIG.KarmaIncreaseChanceThreshold for the minimum karma needed.
+CONFIG.KarmaIncreaseChance				= false				-- Enables karma increased weight. Set CONFIG.KarmaIncreaseChanceThreshold for the minimum karma needed.
 CONFIG.KarmaIncreaseChanceThreshold		= 950				-- Minimum karma for giving very little bonus weight to the player. Has a chance to give 0 extra weight. (default 950, based off of default max karma)
 
 CONFIG.DB.Type							= "mysqloo"

lua/fairselection/sv_database.lua

@@ -2,11 +2,11 @@ FairSelection.DB = FairSelection.DB or {}
 local DBHandler = DBHandler or {}
 
 function FairSelection.DB:Init()
-	FairSelection:Message("Initialize database "..string.lower(FairSelection.CFG.DB.Type))
+	FairSelection:Message("Initialize database "..FairSelection.CFG.DB.Type)
 
-	include("fairselection/database/"..string.lower(FairSelection.CFG.DB.Type))
+	HANDLER = {}
+	include("fairselection/database/"..string.lower(FairSelection.CFG.DB.Type)..".lua")
 	DBHandler = HANDLER
-	HANDLER = nil
 
 	DBHandler:Init()
 end
@@ -25,12 +25,13 @@ end
 
 function FairSelection.DB:connect()
 	DBHandler:connect()
+	DBHandler:CreateDatabase()
 end
 
-function FairSelection.DB:query()
-	DBHandler:query()
+function FairSelection.DB:query(sql, callback)
+	DBHandler:query(sql, callback)
 end
 
-function FairSelection.DB:prepare()
-	DBHandler:prepare()
+function FairSelection.DB:prepare(sql, args, callback)
+	DBHandler:prepare(sql, args, callback)
 end

lua/fairselection/sv_functions.lua

@@ -24,7 +24,7 @@ end
 
 function FairSelection:UpdatePlayerChance()
 	for _, ply in ipairs(player.GetAll()) do
-		if not ply:IsBot() then
+		if ply:IsTerror() not ply:IsBot() then
 			FairSelection.DB:prepare("UPDATE prefix_chances SET chance=?, lastupdate=? WHERE steamid=?", {ply:GetChance(), os.time(), ply:SteamID64()})
 		end
 	end

lua/fairselection/sv_init.lua

@@ -1,46 +1,44 @@
 FairSelection.Version = "1.0.0"
 
-FairSelection:Message("Initialization...")
-FairSelection:VersionCheck()
-FairSelection:LoadConfig()
-FairSelection:Message("Config loaded.")
-FairSelection.DB:Init()
-FairSelection.DB:connect()
-FairSelection:Message("Initialization completed!")
-
 function FairSelection:LoadConfig()
-	local CONFIG = {}
+	CONFIG = {}
+	CONFIG.DB = {}
 
 	include("fairselection/sv_config.lua")
 
 	FairSelection.CFG = CONFIG
 end
 
 function FairSelection:VersionCheck()
-	local version
-	local msg = nil
-
-	http.Fetch("", function(body) version = body end, function() FairSelection:Error("Could not check for new version!") end)
-
-	local major, minor, patch = version:match("(%d+)%.(%d+)%.(%d+)")
-	local curmajor, curminor, curpatch = FairSelection.Version:match("(%d+)%.(%d+)%.(%d+)")
-	
-	major = tonumber(major) or 0
-	minor = tonumber(minor) or 0
-	patch = tonumber(patch) or 0
-
-	curmajor = tonumber(curmajor) or 0
-	curminor = tonumber(curminor) or 0
-	curpatch = tonumber(curpatch) or 0
-
-	if curmajor < major or curminor < minor or curpatch < patch then
-		msg = "A new Version is available (%%%%%%%%)"
-	end
+	http.Fetch("https://raw.githubusercontent.com/Water-Flow/TTTFairTraitorSelection/release/VERSION", function(body)
+		local msg = nil
+		local version = "0.0.0"
+		version = body
+		local major, minor, patch = version:match("(%d+)%.(%d+)%.(%d+)")
+		local curmajor, curminor, curpatch = FairSelection.Version:match("(%d+)%.(%d+)%.(%d+)")
+		
+		major = tonumber(major) or 0
+		minor = tonumber(minor) or 0
+		patch = tonumber(patch) or 0
+
+		curmajor = tonumber(curmajor) or 0
+		curminor = tonumber(curminor) or 0
+		curpatch = tonumber(curpatch) or 0
+
+		if (curmajor < major) or (curminor < minor) or (curpatch < patch) then
+			msg = "A new Version is available (%%%%%%%%)!"
+		else
+			msg = "Version: (%%%%%%%%)"
+		end
 
-	if msg then
-		msg = string.gsub(msg, "%%+", version)
-		FairSelection:Message(msg)
-	end
+		if msg then
+			msg = string.gsub(msg, "%%+", version)
+			FairSelection:Message(msg)
+		end
+	end,
+	function()
+		FairSelection:Error("Could not check for new version!")
+	end)
 end
 
 math.randomseed(os.time())
@@ -146,7 +144,7 @@ function FairSelection:SelectRoles(ts, ds, traitor_count, det_count, choices, pr
 
 	for _, v in pairs(choices) do
 		if IsValid(v) and (not v:IsSpec()) and v:GetRole() == ROLE_INNOCENT then
-			if FairSelection.CFG.KarmaIncreaseChance and v:GetBaseKarma > FairSelection.CFG.KarmaIncreaseChanceThreshold then
+			if FairSelection.CFG.KarmaIncreaseChance and v:GetBaseKarma() > FairSelection.CFG.KarmaIncreaseChanceThreshold then
 				local extra = math.random(0, 2)
 				v:AddChance(extra)
 			end
@@ -165,7 +163,7 @@ function FairSelection:SelectRoles(ts, ds, traitor_count, det_count, choices, pr
 end
 
 hook.Add("PlayerInitialSpawn", "TTFS_PlayerInitialSpawn", function(ply)
-	if not ply:IsBot() then
+	if ply:IsTerror() and not ply:IsBot() then
 		FairSelection.DB:prepare("SELECT chance FROM prefix_chances WHERE steamid=?", {ply:SteamID64()}, function(data)
 			if table.Count(data) > 0 then
 				ply:SetChance(data[1].chance)