From 153f99553f9c50588118c31c0f4939bb60a12e59 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Thu, 5 Dec 2013 00:40:48 +0000
Subject: [PATCH] [Fix] Some more fine tuning on missions.

---
 dat/fleet.xml                     |  2 +-
 dat/missions/emp_collective05.lua | 18 ++++++++++++------
 src/player.c                      |  6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dat/fleet.xml b/dat/fleet.xml
index 82e5567..ddf1a75 100644
--- a/dat/fleet.xml
+++ b/dat/fleet.xml
@@ -159,7 +159,7 @@
     <ai>empire</ai>
     <faction>Emprire</faction>
     <pilot>
-      <pilot name="Empire Hawking" chance="100">Empire Hawking</pilot>
+      <pilot name="ESS Trinity" chance="100">Empire Hawking</pilot>
     </pilot>
   </fleet>
 </Fleets>
diff --git a/dat/missions/emp_collective05.lua b/dat/missions/emp_collective05.lua
index cf4fd16..802d00c 100644
--- a/dat/missions/emp_collective05.lua
+++ b/dat/missions/emp_collective05.lua
@@ -122,11 +122,12 @@ function jump()
       x, y = v:get()
       v:set(-x, -y)
       trinity = pilot.add("Trinity", "noidle", v)
+      trinity = trinity[1]
       hook.pilot(trinity, "death", "trinity_kill")
       hook.pilot(trinity, "jump", "trinity_jump")
 
       final_fight = 0
-      misn.timerStart("talk", rnd.int(6000, 8000)) -- Escorts should be in system by now.
+      misn.timerStart("final_talk", rnd.int(6000, 8000)) -- Escorts should be in system by now.
     end
 
   -- Player ran away from combat - big disgrace..
@@ -151,20 +152,20 @@ function emp_talker()
 end
 
 -- Little talk when ESS Trinity is encountered.
-function talk()
+function final_talk()
   -- Empire taks about arresting.
   if final_fight == 0 then
     talker = emp_talker()
     talker:broadcast(talk[1])
 
     final_fight = 1
-    misn.timerStart("talk", rnd.int(3000, 4000))
+    misn.timerStart("final_talk", rnd.int(3000, 4000))
   elseif final_fight == 1 then
     talker = trinity
     talker:broadcast(talk[2])
 
     final_fight = 2
-    misn.timerStart("talk", rnd.int(3000, 4000))
+    misn.timerStart("final_talk", rnd.int(3000, 4000))
   elseif final_fight == 2 then
     -- Talk.
     talk = emp_talker()
@@ -174,7 +175,7 @@ function talk()
     trinity:setFaction("Collective")
 
     final_fight = 3
-    misn.timerStart("talk", rnd.int(4000, 5000))
+    misn.timerStart("final_talk", rnd.int(4000, 5000))
   else if final_fight == 3 then
     player.msg(talk[4])
     misn.timerStart("call_drones", rnd.int(3000, 5000))
@@ -191,16 +192,19 @@ function add_escorts()
   if esc_pacifier then
     enter_vect:add(rnd.int(-50,50), rnd.int(-50,50))
     paci = pilot.add("Empire Pacifier", "escorts_player", enter_vect)
-    hook.pilot(pilot, "death", "paci_dead")
+    paci = paci[1]
+    hook.pilot(paci, "death", "paci_dead")
   end
   if esc_lancelot1 then
     enter_vect:add(rnd.int(-50,50), rnd.int(-50,50))
     lance1 = pilot.add("Empire Lancelot", "escort_player", enter_vect)
+    lance1 = lance1[1]
     hook.pilot(lance1, "death", "lance1_dead")
   end
   if esc_lancelot2 then
     enter_vect:add(rnd.int(-50,50), rnd.int(-50,50))
     lance2 = pilot_add("Empire Lancelot", "escort_player", enter_vect)
+    lance2 = lance[2]
     hook.pilot(lance2, "death", "lance2_dead")
   end
 end
@@ -243,6 +247,7 @@ function trinity_kill() -- Got killed.
   misn_stage = 2
   trinity_alive = false
   misn.setDesc(string.format(misn_desc[2], misn_base:name(), misn_base_sys:name()))
+  misn.setMarker(misn_base_sys)
 end
 
 function trinity_jump() -- Got away.
@@ -250,5 +255,6 @@ function trinity_jump() -- Got away.
   misn_stage = 2
   trinity_alive = true
   misn.setDesc(string.format(misn_desc[2], misn_base:name(), misn_base_sys:name()))
+  misn_setMarker(misn_base_sys)
 end
 
diff --git a/src/player.c b/src/player.c
index 6e10b51..4a8a4c7 100644
--- a/src/player.c
+++ b/src/player.c
@@ -164,9 +164,9 @@ double gui_xoff = 0.;   /**< X offset that GUI introduces. */
 double gui_yoff = 0.;   /**< Y offset that GUI introduces. */
 
 /* Messages. */
-#define MSG_SIZE_MAX 80 /**< Max message length. */
-int msg_timeout = 5000; /**< How long it takes for a message to timeout. */
-int msg_max = 5;        /**< Max messages on screen. */
+#define MSG_SIZE_MAX 120  /**< Max message length. */
+int msg_timeout = 5000;   /**< How long it takes for a message to timeout. */
+int msg_max = 5;          /**< Max messages on screen. */
 
 /**
  * @struct Mesg