From e72fd8eae2d83ea50278d22516c88bc597a98b21 Mon Sep 17 00:00:00 2001
From: FalseIncarnate <false_incarnate@yahoo.com>
Date: Fri, 30 Dec 2016 00:12:02 -0500
Subject: [PATCH] Fixes up battle terminal connections

Also increases the range on the first battle turn announcement to be
audible by both combatants, just like the turn announcements during the
battle.
---
 code/controllers/Processes/nano_mob_hunter.dm |  4 +--
 .../arcade/mob_hunt/battle_computer.dm        | 32 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/code/controllers/Processes/nano_mob_hunter.dm b/code/controllers/Processes/nano_mob_hunter.dm
index 76dbe2db9eb..469ce22651d 100644
--- a/code/controllers/Processes/nano_mob_hunter.dm
+++ b/code/controllers/Processes/nano_mob_hunter.dm
@@ -109,9 +109,9 @@ var/global/datum/controller/process/mob_hunt/mob_hunt_server
 		red_terminal.audible_message("Battle starting!", null, 5)
 		blue_terminal.audible_message("Battle starting!", null, 5)
 		if(battle_turn == "Red")
-			red_terminal.audible_message("Red Player's Turn!", null, 2)
+			red_terminal.audible_message("Red Player's Turn!", null, 5)
 		else if(battle_turn == "Blue")
-			blue_terminal.audible_message("Blue Player's Turn!", null, 2)
+			blue_terminal.audible_message("Blue Player's Turn!", null, 5)
 
 /datum/controller/process/mob_hunt/proc/launch_attack(team, raw_damage, datum/mob_type/attack_type)
 	if(!team || !raw_damage)
diff --git a/code/modules/arcade/mob_hunt/battle_computer.dm b/code/modules/arcade/mob_hunt/battle_computer.dm
index 89fddf85db8..97055664cdb 100644
--- a/code/modules/arcade/mob_hunt/battle_computer.dm
+++ b/code/modules/arcade/mob_hunt/battle_computer.dm
@@ -27,15 +27,13 @@
 	team = "Blue"
 	avatar_y_offset = 1
 
-/obj/machinery/computer/mob_battle_terminal/red/New()
+/obj/machinery/computer/mob_battle_terminal/red/initialize()
 	..()
-	if(mob_hunt_server && !mob_hunt_server.red_terminal)
-		mob_hunt_server.red_terminal = src
+	check_connection()
 
-/obj/machinery/computer/mob_battle_terminal/blue/New()
+/obj/machinery/computer/mob_battle_terminal/blue/initialize()
 	..()
-	if(mob_hunt_server && !mob_hunt_server.blue_terminal)
-		mob_hunt_server.blue_terminal = src
+	check_connection()
 
 /obj/machinery/computer/mob_battle_terminal/update_icon()
 	if(card)
@@ -115,6 +113,7 @@
 	return
 
 /obj/machinery/computer/mob_battle_terminal/interact(mob/user)
+	check_connection()
 	var/dat = ""
 	dat += "<table border='1' style='width:75%'>"
 	dat += "<tr>"
@@ -130,7 +129,7 @@
 		dat += "</tr>"
 		if(ready && mob_hunt_server.battle_turn)	//offer the surrender option if they are in a battle (ready), but don't have a card loaded
 			dat += "<tr>"
-			dat += "<td><a href='?src=\ref[src];surrender=1'>Surrender!</a></td>"
+			dat += "<td><a href='?src=[UID()];surrender=1'>Surrender!</a></td>"
 			dat += "</tr>"
 	else
 		dat += "<table>"
@@ -160,21 +159,21 @@
 		dat += "<table border='1'>"
 		dat += "<tr>"
 		if(mob_info.cur_health)
-			dat += "<td><a href='?src=\ref[src];attack=1'>Attack!</a></td>"
+			dat += "<td><a href='?src=[UID()];attack=1'>Attack!</a></td>"
 		else
 			dat += "<td>Incapacitated!</td>"
-		dat += "<td><a href='?src=\ref[src];eject=1'>Recall!</a></td>"
+		dat += "<td><a href='?src=[UID()];eject=1'>Recall!</a></td>"
 		dat += "</tr>"
 		dat += "</table>"
 		dat += "</td>"
 		dat += "</tr>"
 		if(!ready)
 			dat += "<tr>"
-			dat += "<td><a href='?src=\ref[src];ready=1'>Battle!</a></td>"
+			dat += "<td><a href='?src=[UID()];ready=1'>Battle!</a></td>"
 			dat += "</tr>"
 		if(ready && !mob_hunt_server.battle_turn)
 			dat += "<tr>"
-			dat += "<td><a href='?src=\ref[src];ready=2'>Cancel Battle!</a></td>"
+			dat += "<td><a href='?src=[UID()];ready=2'>Cancel Battle!</a></td>"
 			dat += "</tr>"
 	dat += "</table>"
 
@@ -183,6 +182,9 @@
 	popup.open()
 
 /obj/machinery/computer/mob_battle_terminal/Topic(href, href_list)
+	if(..())
+		return 1
+
 	if(href_list["attack"])
 		do_attack()
 
@@ -202,6 +204,14 @@
 
 	updateUsrDialog()
 
+/obj/machinery/computer/mob_battle_terminal/proc/check_connection()
+	if(team == "Red")
+		if(mob_hunt_server && !mob_hunt_server.red_terminal)
+			mob_hunt_server.red_terminal = src
+	else if(team == "Blue")
+		if(mob_hunt_server && !mob_hunt_server.blue_terminal)
+			mob_hunt_server.blue_terminal = src
+
 /obj/machinery/computer/mob_battle_terminal/proc/do_attack()
 	if(!ready)		//no attacking if you arent ready to fight (duh)
 		return