From 747dd070b77f97fa2077554b85722213a82b97c6 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Fri, 7 Mar 2014 20:31:54 +0000
Subject: [PATCH] [Fix] Fixed some messages in cargo.

---
 dat/missions/cargo.lua | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dat/missions/cargo.lua b/dat/missions/cargo.lua
index 9e0b944..798511f 100644
--- a/dat/missions/cargo.lua
+++ b/dat/missions/cargo.lua
@@ -31,9 +31,10 @@ else -- Default english.
   msg_title[1]    = "Too many missions"
   msg_msg[1]      = "You have too many active missions."
   msg_title[2]    = "Succesful Delivery"
-  msg_msg[2]     = "The workers unload the %s at the docks."
+  msg_msg[2]      = "The workers unload the %s at the docks."
+  msg_msg[5]      = "The %s leave your ship."
   msg_title[3]    = "Cargo Missing"
-  msg_msg[3]     = "You are missing the %d tons of %s!."
+  msg_msg[3]      = "You are missing the %d tons of %s!."
   msg_msg[4]      = "MISSION FAILED: You have failed to delivery the goods on time!"
 end
 
@@ -104,6 +105,7 @@ function create()
     end
   end
 
+  -- Set reward and description.
   if misn_type == "Cargo" then
     misn.setDesc(string.format( misn_desc[1], planet:name(), system:name(), carg_mass, carg_type))
     reward = misn_dist * carg_mass * (250+rnd.int(150)) +
@@ -118,7 +120,7 @@ function create()
     reward = misn_dist * carg_mass * (450+rnd.int(250)) +
         carg_mass * (250+rnd.int(125)) +
         rnd.int(2500)
-  else -- People.
+  elseif misn_type == "People" then
     misn.setDesc(string.format(misn_desc[21], carg_type, planet:name(), system:name()))
     reward = misn_dist * (1000 + rnd.int(500)) + rnd.int(2000)
   end
@@ -157,7 +159,11 @@ function land()
   if landed == planet then
     if player.rmCargo(carg_id) then
       player.pay( reward )
-      tk.msg(msg_title[2], string.format(msg_msg[2], carg_type))
+      if misn_type == "People" then
+        tk.msg(msg_title[2], string.format(msg_msg[5], carg_type))
+      else
+        tk.msg(msg_title[2], string.format(msg_msg[2], carg_type))
+      end
 
       -- Modify the faction standing.
       if player.getFaction("Trader") < 70 then
@@ -183,7 +189,7 @@ function timeup()
     player.msg(msg_msg[4])
     misn.finish(false)
   end
-  misn.setDesc(string.format( misn_desc[21], planet:name(), system:name(),
+  misn.setDesc(string.format( misn_desc[11], planet:name(), system:name(),
       carg_mass, carg_type,
       time.str(misn_time), time.str(misn_time-time.get())))
 end