Merge pull request #539 from SkyMarshal/master

Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.
2026-07-12 07:33:34 +01:00 · 2012-02-28 00:44:06 -08:00
parent 99c69069e1 b653c615be
commit 27fd036c87
19 changed files with 297 additions and 570 deletions
@@ -923,7 +923,7 @@
 			return
 		var/mob/M = locate(href_list["traitor"])
 		if (!istype(M))
-			player()
+			player_panel_new()
 			return
 		if(isalien(M))
 			alert("Is an [M.mind ? M.mind.special_role : "Alien"]!", "[M.key]")
@@ -1863,312 +1863,6 @@
 	dat += "</body></html>"
 	usr << browse(dat, "window=adminplayerinfo;size=480x480")

-/obj/admins/proc/player()
-	if (!usr.client.holder)
-		return
-	var/dat = "<html><head><title>Player Panel</title></head>"
-
-	//javascript, the part that does most of the work~
-	dat += {"
-
-		<head>
-			<script type='text/javascript'>
-
-				var locked_tabs = new Array();
-
-				function updateSearch(){
-
-
-					var filter_text = document.getElementById('filter');
-					var filter = filter_text.value.toLowerCase();
-
-					if(complete_list != null && complete_list != ""){
-						var mtbl = document.getElementById("maintable_data_archive");
-						mtbl.innerHTML = complete_list;
-					}
-
-					if(filter.value == ""){
-						return;
-					}else{
-
-						var maintable_data = document.getElementById('maintable_data');
-						var ltr = maintable_data.getElementsByTagName("tr");
-						for ( var i = 0; i < ltr.length; ++i )
-						{
-							try{
-								var tr = ltr\[i\];
-								if(tr.getAttribute("id").indexOf("data") != 0){
-									continue;
-								}
-								var ltd = tr.getElementsByTagName("td");
-								var td = ltd\[0\];
-								var lsearch = td.getElementsByTagName("b");
-								var search = lsearch\[0\];
-								//var inner_span = li.getElementsByTagName("span")\[1\] //Should only ever contain one element.
-								//document.write("<p>"+search.innerText+"<br>"+filter+"<br>"+search.innerText.indexOf(filter))
-								if ( search.innerText.toLowerCase().indexOf(filter) == -1 )
-								{
-									//document.write("a");
-									//ltr.removeChild(tr);
-									td.innerHTML = "";
-									i--;
-								}
-							}catch(err) {   }
-						}
-					}
-
-				var count = 0;
-					var index = -1;
-					var debug = document.getElementById("debug");
-
-					locked_tabs = new Array();
-
-				}
-
-				function expand(id,job,name,real_name,image,key,ip,antagonist,karma,ref){
-
-					clearAll();
-
-					var span = document.getElementById(id);
-
-					body = "<table><tr><td>";
-
-					body += "</td><td align='center'>";
-
-					body += "<font size='2'><b>"+job+" "+name+"</b><br><b>Real name "+real_name+"</b><br><b>Played by "+key+" ("+ip+")</b></font>"
-
-					body += "</td><td align='center'>";
-
-					body += "<a href='?src=\ref[src];adminplayeropts="+ref+"'>PP</a> - "
-					body += "<a href='?src=\ref[src];adminplayervars="+ref+"'>VV</a> - "
-					body += "<a href='?src=\ref[usr];priv_msg=\ref"+ref+"'>PM</a> - "
-					body += "<a href='?src=\ref[src];adminplayersubtlemessage="+ref+"'>SM</a> - "
-					body += "<a href='?src=\ref[src];adminplayerobservejump="+ref+"'>JMP</a><br>"
-					if(antagonist == 1)
-						body += "<font size='2'><a href='?src=\ref[src];secretsadmin=check_antagonist'><b><font color='red'>Antagonist</font></b></a> with "+karma+" karma</font>";
-					else
-						body += "<font size='2'>"+karma+" karma</font>";
-
-					body += "</td></tr></table>";
-
-
-					span.innerHTML = body
-				}
-
-				function clearAll(){
-					var spans = document.getElementsByTagName('span');
-					for(var i = 0; i < spans.length; i++){
-						var span = spans\[i\];
-
-						var id = span.getAttribute("id");
-
-						if(!(id.indexOf("item")==0))
-							continue;
-
-						var pass = 1;
-
-						for(var j = 0; j < locked_tabs.length; j++){
-							if(locked_tabs\[j\]==id){
-								pass = 0;
-								break;
-							}
-						}
-
-						if(pass != 1)
-							continue;
-
-
-
-
-						span.innerHTML = "";
-					}
-				}
-
-				function addToLocked(id,link_id,notice_span_id){
-					var link = document.getElementById(link_id);
-					var decision = link.getAttribute("name");
-					if(decision == "1"){
-						link.setAttribute("name","2");
-					}else{
-						link.setAttribute("name","1");
-						removeFromLocked(id,link_id,notice_span_id);
-						return;
-					}
-
-					var pass = 1;
-					for(var j = 0; j < locked_tabs.length; j++){
-						if(locked_tabs\[j\]==id){
-							pass = 0;
-							break;
-						}
-					}
-					if(!pass)
-						return;
-					locked_tabs.push(id);
-					var notice_span = document.getElementById(notice_span_id);
-					notice_span.innerHTML = "<font color='red'>Locked</font> ";
-					//link.setAttribute("onClick","attempt('"+id+"','"+link_id+"','"+notice_span_id+"');");
-					//document.write("removeFromLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
-					//document.write("aa - "+link.getAttribute("onClick"));
-				}
-
-				function attempt(ab){
-					return ab;
-				}
-
-				function removeFromLocked(id,link_id,notice_span_id){
-					//document.write("a");
-					var index = 0;
-				var pass = 0;
-					for(var j = 0; j < locked_tabs.length; j++){
-						if(locked_tabs\[j\]==id){
-							pass = 1;
-							index = j;
-							break;
-						}
-					}
-					if(!pass)
-						return;
-					locked_tabs\[index\] = "";
-					var notice_span = document.getElementById(notice_span_id);
-					notice_span.innerHTML = "";
-					//var link = document.getElementById(link_id);
-					//link.setAttribute("onClick","addToLocked('"+id+"','"+link_id+"','"+notice_span_id+"')");
-				}
-
-				function selectTextField(){
-					var filter_text = document.getElementById('filter');
-					filter_text.focus();
-				filter_text.select();
-				}
-
-			</script>
-		</head>
-
-
-	"}
-
-	//body tag start + onload and onkeypress (onkeyup) javascript event calls
-	dat += "<body onload='selectTextField(); updateSearch();' onkeyup='updateSearch();'>"
-
-	//title + search bar
-	dat += {"
-
-		<table width='560' align='center' cellspacing='0' cellpadding='5' id='maintable'>
-			<tr id='title_tr'>
-				<td align='center'>
-					<font size='5'><b>Player panel</b></font><br>
-					Hover over a line to see more information
-					<p>
-				</td>
-			</tr>
-		<tr id='search_tr'>
-				<td align='center'>
-					<b>Search:</b> <input type='text' id='filter' value='' style='width:300px;'>
-				</td>
-			</tr>
-	</table>
-
-	"}
-
-	//player table header
-	dat += {"
-		<span id='maintable_data_archive'>
-		<table width='560' align='center' cellspacing='0' cellpadding='5' id='maintable_data'>"}
-
-	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.<br>"
-
-
-	for(var/mob/M in mobs)
-		if(M.ckey)
-			var/color = "#e6e6e6"
-			if(i%2 == 0)
-				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/job = ""
-
-			if(istype(M,/mob/new_player))
-				job = "New player"
-			if(isliving(M))
-				job = "Living"
-			if(isobserver(M))
-				job = "Ghost"
-			if(isalien(M))
-				job = "Alien"
-			if(islarva(M))
-				job = "Alien larva"
-			if(ishuman(M))
-				job = M.job
-			if(ismetroid(M))
-				job = "Metroid"
-			if(ismonkey(M))
-				job = "Moneky"
-			if(isAI(M))
-				job = "AI"
-			if(ispAI(M))
-				job = "pAI"
-			if(isrobot(M))
-				job = "Cyborg"
-			if(isanimal(M))
-				job = "Animal"
-			if(iscorgi(M))
-				job = "Corgi"
-
-			//output for each mob
-			dat += {"
-
-				<tr id='data[i]' name='[i]' onClick="addToLocked('item[i]','data[i]','notice_span[i]')">
-					<td align='center' bgcolor='[color]'>
-						<span id='notice_span[i]'></span>
-						<a id='link[i]'
-						onmouseover='expand("item[i]","[job]","[M.name]","[M.real_name]","--unused--","[M.key]","[M.lastKnownIP]",[is_antagonist],"[karma]","\ref[M]")'
-						>
-						<b id='search[i]'>[M.name] - [M.real_name] - [M.key] ([job])</b>
-						</a>
-						<br><span id='item[i]'></span>
-					</td>
-				</tr>
-
-			"}
-
-			i++
-
-
-	//player table ending
-	dat += {"
-		</table>
-		</span>
-
-		<script type='text/javascript'>
-			var maintable = document.getElementById("maintable_data_archive");
-			var complete_list = maintable.innerHTML;
-		</script>
-	</body></html>
-	"}
-
-	usr << browse(dat, "window=players;size=600x480")
-
 /obj/admins/proc/Jobbans()
 	if ((src.rank in list( "Game Admin", "Game Master"  )))
 		var/dat = "<B>Job Bans!</B><HR><table>"
@@ -262,7 +262,8 @@
 			verbs += /client/proc/admin_play
 			verbs += /client/proc/admin_observe
 			verbs += /client/proc/game_panel
-			verbs += /client/proc/player_panel
+//			verbs += /client/proc/player_panel
+			verbs += /client/proc/player_panel_new
 			verbs += /client/proc/unban_panel
 			verbs += /client/proc/jobbans
 			verbs += /client/proc/playernotes
@@ -388,7 +389,8 @@
 	verbs -= /client/proc/admin_play
 	verbs -= /client/proc/admin_observe
 	verbs -= /client/proc/game_panel
-	verbs -= /client/proc/player_panel
+//	verbs -= /client/proc/player_panel
+	verbs -= /client/proc/player_panel_new
 	verbs -= /client/proc/unban_panel
 	verbs -= /client/proc/jobbans
 	verbs -= /client/proc/playernotes
@@ -479,11 +481,18 @@
 				src << "[M.key] is undefined - [M.client.holder.state]"


-/client/proc/player_panel()
+///client/proc/player_panel()
+//	set name = "Player Panel-Old"
+//	set category = "Admin"
+//	if(holder)
+//		holder.player_panel_old()
+//	return
+
+/client/proc/player_panel_new()
 	set name = "Player Panel"
 	set category = "Admin"
-	if (holder)
-		holder.player()
+	if(holder)
+		holder.player_panel_new()
 	return

 /client/proc/jobbans()
@@ -722,7 +731,7 @@
 	verbs += /client/proc/admin_play
 	verbs += /client/proc/admin_observe
 	verbs += /client/proc/game_panel
-	verbs += /client/proc/player_panel
+//	verbs += /client/proc/player_panel
 	verbs += /client/proc/cmd_admin_subtle_message
 	verbs += /client/proc/cmd_admin_pm
 	verbs += /client/proc/cmd_admin_gib_self
@@ -0,0 +1,161 @@
+/obj/admins/proc/player_panel_new()//The new one
+	if (!usr.client.holder)
+		return
+	var/dat = "<html><head><title>Player Menu</title></head>"
+	dat += "<body><table border=1 cellspacing=5><B><tr><th>Name/Real Name</th><th>Type</th><th>Assigned Job</th><th>Info</th><th>Options</th><th>Traitor?</th></tr></B>"
+	//add <th>IP:</th> to this if wanting to add back in IP checking
+	//add <td>(IP: [M.lastKnownIP])</td> if you want to know their ip to the lists below
+	var/list/mobs = sortmobs()
+	var/i = 1
+
+	for(var/mob/M in mobs)
+		if(M.ckey)
+			var/color = "#e6e6e6"
+			if(i%2 == 0)
+				color = "#f2f2f2"
+			var/real = (M.real_name == M.original_name ? M.real_name : "[M.original_name] (as [M.real_name])")
+			var/turf/T = get_turf(M)
+			var/client_key = (M.key? M.key : "No key")
+			dat += "<tr align='center' bgcolor='[color]'><td>[M.name] \[[real]\] <br>[M.client ? M.client : "No client ([client_key])"] at ([T.x], [T.y], [T.z])</td>" // Adds current name
+			if(isobserver(M))
+				dat += "<td>Ghost</td>"
+			if(isalien(M))
+				dat += "<td>Alien</td>"
+			if(islarva(M))
+				dat += "<td>Alien larva</td>"
+			if(ishuman(M))
+				dat += "<td>[M.job]</td>"
+			if(ismetroid(M))
+				dat += "<td>Metroid</td>"
+			if(ismonkey(M))
+				dat += "<td>Monkey</td>"
+			if(isAI(M))
+				dat += "<td>AI</td>"
+			if(ispAI(M))
+				dat += "<td>pAI</td>"
+			if(isrobot(M))
+				dat += "<td>Cyborg</td>"
+			if(isanimal(M))
+				dat += "<td>Animal</td>"
+			if(iscorgi(M))
+				dat += "<td>Corgi</td>"
+
+			if(M.mind && M.mind.assigned_role && istype(M, /mob/living/carbon/human))	// Adds a column to Player Panel that shows their current job.
+				var/mob/living/carbon/human/H = M
+
+				if (H.wear_id)
+					var/obj/item/weapon/card/id/id
+
+					if(istype(H.wear_id, /obj/item/device/pda))
+						var/obj/item/device/pda/PDA = H.wear_id
+						if(!isnull(PDA.id))				// The PDA may contain no ID
+							id = PDA.id					// The ID is contained inside the PDA
+
+					else
+						id = H.wear_id					// The ID was on the ID slot
+
+					if(!id) 							// Happens when there's no ID in the PDA located on the wear_id slot
+						dat += "<td>[M.mind.assigned_role] (No ID)</td>"
+
+					else if(isnull(id.assignment))		// Preventing runtime errors blocking the player panel
+						usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable, and it was null."
+						dat += "<td><font color=red>ERROR</font></td>"
+
+					else
+						if(M.mind.assigned_role == id.assignment)			// Polymorph
+							dat += "<td>[M.mind.assigned_role]</td>"
+
+						else
+							dat += "<td>[M.mind.assigned_role] ([id.assignment])"
+
+				else
+					dat += "<td>[M.mind.assigned_role] (No ID)</td>"
+
+			else
+				dat += "<td>No Assigned Role</td>"
+
+			var/muting = "Mute unavailable - no client"
+			if(M.client)
+				muting = {"<A href='?src=\ref[src];mute2=\ref[M]'>Mute: [(M.client.muted ? "Muted" : "Voiced")]</A> |
+				<A href='?src=\ref[src];mute_complete=\ref[M]'>Complete mute: [(M.client.muted ? "Completely Muted" : "Voiced")]</A>
+				"}
+
+			dat += {"<td><A HREF='?src=\ref[src];player_info=[M.ckey]'>[player_has_info(M.ckey) ? "Info" : "N/A"] </A></td>
+			<td><A href='?src=\ref[src];boot2=\ref[M]'>Boot</A> | <A href='?src=\ref[src];newban=\ref[M]'>Ban</A> | <A href='?src=\ref[src];jobban2=\ref[M]'>Jobban</A>
+			<br><font size="2.5">[muting]</font><br>
+			<font size="2"><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>PP</A> |
+			<A HREF='?src=\ref[src];adminplayervars=\ref[M]'>VV</A> |
+			<A HREF='?src=\ref[src];adminplayersubtlemessage=\ref[M]'>SM</A> |
+			<A HREF='?src=\ref[src];adminplayerobservejump=\ref[M]'>JMP</A> |
+			<A HREF='?src=\ref[src];secretsadmin=check_antagonist'>CA</A></font></td>
+			"}
+
+			switch(is_special_character(M))
+				if(0)
+					dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'>Traitor?</A></td>"}
+				if(1)
+					dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
+				if(2)
+					dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
+
+	dat += "</table></body></html>"
+
+	usr << browse(dat, "window=players;size=905x480")
+
+//The old one
+/obj/admins/proc/player_panel_old()
+	if (!usr.client.holder)
+		return
+	var/dat = "<html><head><title>Player Menu</title></head>"
+	dat += "<body><table border=1 cellspacing=5><B><tr><th>Name</th><th>Real Name</th><th>Assigned Job</th><th>Key</th><th>Options</th><th>PM</th><th>Traitor?</th></tr></B>"
+	//add <th>IP:</th> to this if wanting to add back in IP checking
+	//add <td>(IP: [M.lastKnownIP])</td> if you want to know their ip to the lists below
+	var/list/mobs = sortmobs()
+
+	for(var/mob/M in mobs)
+		if(!M.ckey)	continue
+
+		dat += "<tr><td>[M.name]</td>"
+		if(isAI(M))
+			dat += "<td>AI</td>"
+		else if(isrobot(M))
+			dat += "<td>Cyborg</td>"
+		else if(ishuman(M))
+			dat += "<td>[M.real_name]</td>"
+		else if(istype(M, /mob/living/silicon/pai))
+			dat += "<td>pAI</td>"
+		else if(istype(M, /mob/new_player))
+			dat += "<td>New Player</td>"
+		else if(isobserver(M))
+			dat += "<td>Ghost</td>"
+		else if(ismonkey(M))
+			dat += "<td>Monkey</td>"
+		else if(isalien(M))
+			dat += "<td>Alien</td>"
+		else
+			dat += "<td>Unknown</td>"
+
+
+		if(istype(M,/mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			if(H.mind && H.mind.assigned_role)
+				dat += "<td>[H.mind.assigned_role]</td>"
+		else
+			dat += "<td>NA</td>"
+
+
+		dat += {"<td>[(M.client ? "[M.client]" : "No client")]</td>
+		<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
+		<td align=center><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>
+		"}
+		switch(is_special_character(M))
+			if(0)
+				dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'>Traitor?</A></td>"}
+			if(1)
+				dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
+			if(2)
+				dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
+
+	dat += "</table></body></html>"
+
+	usr << browse(dat, "window=players;size=640x480")