From c801c50cea4a5171bf1dae895aaab152d92f7f49 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Sun, 26 Feb 2012 03:52:40 +0000 Subject: [PATCH] Removed Karma. It was a shitty system used to punish security for doing their jobs even when it worked, and now it just spits runtimes. Better defined the viewers in range of the vent crawl to hopefully stop the runtimes that was causing. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3196 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/client.dm | 2 - code/defines/procs/statistics.dm | 71 ------------------- code/modules/admin/player_panel.dm | 51 ++----------- code/modules/mob/dead/observer/observer.dm | 51 ------------- .../mob/living/carbon/alien/larva/powers.dm | 6 +- .../mob/living/carbon/monkey/powers.dm | 2 +- tgstation.dme | 6 +- 7 files changed, 10 insertions(+), 179 deletions(-) diff --git a/code/defines/client.dm b/code/defines/client.dm index 19bcfd60afc..bc2c682ac6b 100644 --- a/code/defines/client.dm +++ b/code/defines/client.dm @@ -32,8 +32,6 @@ var/played = 0 var/team = null var/warned = 0 - var/karma = 0 - var/karma_spent = 0 var/STFU_ghosts //80+ people rounds are fun to admin when text flies faster than airport security var/STFU_radio //80+ people rounds are fun to admin when text flies faster than airport security diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index ae54acdb113..b1f8d8816ca 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -46,77 +46,6 @@ proc/sql_report_round_end() if(!sqllogging) return -proc/sql_report_karma(var/mob/spender, var/mob/receiver, var/isnegative = 1) - if(!sqllogging) - return - var/sqlspendername = sanitizeSQL(spender.name) - var/sqlspenderkey = sanitizeSQL(spender.key) - var/sqlreceivername = sanitizeSQL(receiver.name) - var/sqlreceiverkey = sanitizeSQL(receiver.key) - var/sqlreceiverrole = "None" - var/sqlreceiverspecial = "None" - var/sqlisnegative = "TRUE" - - if(isnegative) - sqlisnegative = "TRUE" - else - sqlisnegative = "FALSE" - - var/sqlspenderip = spender.client.address - - if(receiver.mind) - if(receiver.mind.special_role) - sqlreceiverspecial = sanitizeSQL(receiver.mind.special_role) - if(receiver.mind.assigned_role) - sqlreceiverrole = sanitizeSQL(receiver.mind.assigned_role) - - var/DBConnection/dbcon = new() - dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") - if(!dbcon.IsConnected()) - log_game("SQL ERROR during karma logging. Failed to connect.") - else - var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") - var/DBQuery/query = dbcon.NewQuery("INSERT INTO karma (spendername, spenderkey, receivername, receiverkey, receiverrole, receiverspecial, isnegative, spenderip, time) VALUES ('[sqlspendername]', '[sqlspenderkey]', '[sqlreceivername]', '[sqlreceiverkey]', '[sqlreceiverrole]', '[sqlreceiverspecial]', [sqlisnegative], '[sqlspenderip]', '[sqltime]')") - if(!query.Execute()) - var/err = query.ErrorMsg() - log_game("SQL ERROR during karma logging. Error : \[[err]\]\n") - - - query = dbcon.NewQuery("SELECT * FROM karmatotals WHERE byondkey='[receiver.key]'") - query.Execute() - - var/karma - var/id - while(query.NextRow()) - id = query.item[1] - karma = text2num(query.item[3]) - karma = sanitizeSQL(karma) - karma = text2num(karma) //sanitization turns it into a string, so we need to change it back! -Pete - if(karma == null) - if(isnegative) - karma = -1 - else - karma = 1 - query = dbcon.NewQuery("INSERT INTO karmatotals (byondkey, karma) VALUES ('[sqlreceiverkey]', [karma])") - if(!query.Execute()) - var/err = query.ErrorMsg() - log_game("SQL ERROR during karmatotal logging (adding new key). Error : \[[err]\]\n") - else - if(isnegative && sqlreceiverspecial != "None") // Toss out negative karma applied to traitors/wizards/etc. - dbcon.Disconnect() - return - if(isnegative) - karma -= 1 - else - karma += 1 - - query = dbcon.NewQuery("UPDATE karmatotals SET karma=[karma] WHERE id=[id]") - if(!query.Execute()) - var/err = query.ErrorMsg() - log_game("SQL ERROR during karmatotal logging (updating existing entry). Error : \[[err]\]\n") - dbcon.Disconnect() - - proc/sql_report_death(var/mob/living/carbon/human/H) if(!sqllogging) return diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 373cc899398..f4153391b0e 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -60,7 +60,7 @@ } - function expand(id,job,name,real_name,image,key,ip,antagonist,karma,ref){ + function expand(id,job,name,real_name,image,key,ip,antagonist){ clearAll(); @@ -80,9 +80,7 @@ body += "SM - " body += "JMP
" if(antagonist == 1) - body += "Antagonist with "+karma+" karma"; - else - body += ""+karma+" karma"; + body += ""; body += ""; @@ -213,16 +211,6 @@ var/list/mobs = sortmobs() var/i = 1 - var/show_karma = 0 - var/DBConnection/dbcon - if(config.sql_enabled) // SQL is enabled in config.txt - dbcon = new() // Setting up connection - dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") - if(dbcon.IsConnected()) - show_karma = 1 - else - usr << "\red Unable to connect to karma database. This error can occur if your host has failed to set up an SQL database or improperly configured its login credentials.
" - for(var/mob/M in mobs) if(M.ckey) @@ -231,15 +219,6 @@ color = "#f2f2f2" var/is_antagonist = is_special_character(M) - var/karma = "DC" - - if(show_karma) - var/DBQuery/query = dbcon.NewQuery("SELECT karma FROM karmatotals WHERE byondkey='[M.key]'") - query.Execute() - - while(query.NextRow()) - karma = query.item[1] - var/M_job = "" if(istype(M,/mob/new_player)) @@ -294,7 +273,7 @@ [M_name] - [M_rname] - [M_key] ([M_job]) @@ -326,20 +305,10 @@ if (!usr.client.holder) return var/dat = "Player Menu" - dat += "" + dat += "
NameReal NameAssigned JobKeyOptionsPMTraitor?Karma
" //add to this if wanting to add back in IP checking //add if you want to know their ip to the lists below var/list/mobs = sortmobs() - var/show_karma = 0 - var/DBConnection/dbcon - - if(config.sql_enabled) // SQL is enabled in config.txt - dbcon = new() // Setting up connection - dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") - if(dbcon.IsConnected()) - show_karma = 1 - else - usr << "\red Unable to connect to karma database. This error can occur if your host has failed to set up an SQL database or improperly configured its login credentials.
" for(var/mob/M in mobs) if(!M.ckey) continue @@ -385,18 +354,6 @@ if(2) dat += {""} - var/currentkarma = 0 - if(show_karma) - var/DBQuery/query = dbcon.NewQuery("SELECT karma FROM karmatotals WHERE byondkey='[M.key]'") - query.Execute() - while(query.NextRow()) - currentkarma = query.item[1] - - if(currentkarma) - dat += "" - else - dat += "" - dat += "
NameReal NameAssigned JobKeyOptionsPMTraitor?
IP:(IP: [M.lastKnownIP])Traitor?[currentkarma]
0
" usr << browse(dat, "window=players;size=640x480") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index adeb8fa2c4c..e37de004def 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -188,57 +188,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else A << "This mob is not located in the game world." -var/list/karma_spenders = list() - -/mob/dead/observer/verb/spend_karma(var/mob/M in world) // Karma system -- TLE - set name = "Spend Karma" - set category = "Ghost" - set desc = "Let the gods know whether someone's been naughty or nice. " - if(!istype(M, /mob)) - usr << "\red That's not a mob. You shouldn't have even been able to specify that. Please inform your server administrator post haste." - return - - if(!M.client) - usr << "\red That mob has no client connected at the moment." - return - if(client.karma_spent) - usr << "\red You've already spent your karma for the round." - return - for(var/a in karma_spenders) - if(a == key) - usr << "\red You've already spent your karma for the round." - return - if(M.key == key) - usr << "\red You can't spend karma on yourself!" - return - var/choice = input("Give [M.name] good karma or bad karma?", "Karma") in list("Good", "Bad", "Cancel") - client.karma_spent = 1 - if(!choice || choice == "Cancel") - return - client.karma_spent = 0 - if(choice == "Good") - M.client.karma += 1 - if(choice == "Bad") - M.client.karma -= 1 - usr << "[choice] karma spent on [M.name]." - client.karma_spent = 1 - karma_spenders.Add(key) - if(M.client.karma <= -2 || M.client.karma >= 2) - var/special_role = "None" - var/assigned_role = "None" - var/karma_diary = file("data/logs/karma_[time2text(world.realtime, "YYYY/MM-Month/DD-Day")].log") - if(M.mind) - if(M.mind.special_role) - special_role = M.mind.special_role - if(M.mind.assigned_role) - assigned_role = M.mind.assigned_role - karma_diary << "[M.name] ([M.key]) [assigned_role]/[special_role]: [M.client.karma] - [time2text(world.timeofday, "hh:mm:ss")]" - var/isnegative = 1 - if(choice == "Good") - isnegative = 0 - else - isnegative = 1 - sql_report_karma(src, M, isnegative) /mob/dead/observer/verb/toggle_alien_candidate() set name = "Toggle Be Alien Candidate" diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 19bf6c551af..0f632a380be 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -31,7 +31,7 @@ if(loc==startloc) var/obj/target_vent = vents[selection_position] if(target_vent) - for(var/mob/O in oviewers()) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[src] scrambles into the ventillation ducts!"), 1) loc = target_vent.loc @@ -51,12 +51,12 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 src << text("\green You are now hiding.") - for(var/mob/O in oviewers()) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) O << text("[] scurries to the ground!", src) else layer = MOB_LAYER src << text("\green You have stopped hiding.") - for(var/mob/O in oviewers()) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) O << text("[] slowly peaks up from the ground...", src) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/monkey/powers.dm b/code/modules/mob/living/carbon/monkey/powers.dm index de860667e9c..e05cb05de20 100644 --- a/code/modules/mob/living/carbon/monkey/powers.dm +++ b/code/modules/mob/living/carbon/monkey/powers.dm @@ -35,7 +35,7 @@ if(loc==startloc) var/obj/target_vent = vents[selection_position] if(target_vent) - for(var/mob/O in oviewers()) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[src] scrambles into the ventillation ducts!"), 1) loc = target_vent.loc diff --git a/tgstation.dme b/tgstation.dme index 678d6933c9b..f4a289f0641 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1,6 +1,6 @@ // DM Environment file for tgstation.dme. -// All manual changes should be made outside the BEGIN_ and END_ blocks. - // New source code should be placed in .dm files: choose File/New --> Code File. +// All manual changes should be made outside the BEGIN_ and END_ blocks. + // New source code should be placed in .dm files: choose File/New --> Code File. // BEGIN_INTERNALS // END_INTERNALS // BEGIN_FILE_DIR @@ -170,7 +170,6 @@ #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" -#define FILE_DIR "maps/backup" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" @@ -711,7 +710,6 @@ #include "code\game\objects\tanks\oxygen.dm" #include "code\game\verbs\AI_status.dm" #include "code\game\verbs\authorize.dm" -#include "code\game\verbs\checkkarma.dm" #include "code\game\verbs\ooc.dm" #include "code\game\verbs\sound.dm" #include "code\game\verbs\suicide.dm"