Better explanation of the combat mission due date

robothauler · Aug 23, 2024 · 8fc6d10 · 8fc6d10
1 parent dfb0d47
commit 8fc6d10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/data/lang/module-combat/en.json b/data/lang/module-combat/en.json
@@ -189,7 +189,7 @@
   },
   "HARVESTING_LAND_THERE": {
     "description": "",
-    "message": "We have a salesperson in every nearby star system. This person will get in contact with you when landed."
+    "message": "We have a salesperson in every nearby star system. Land at a station before the deadline and our staff will contact you about the payment."
   },
   "HOW_WILL_I_BE_PAID": {
     "description": "",
@@ -205,7 +205,7 @@
   },
   "MEET_ME_THERE": {
     "description": "",
-    "message": "Meet me in the {rendezvous} system to finish the job!"
+    "message": "Meet me in the {rendezvous} system before the due date!"
   },
   "MILITARY_1": {
     "description": "{area} is an asteroid or planet",
@@ -225,7 +225,7 @@
   },
   "MILITARY_LAND_THERE": {
     "description": "",
-    "message": "Visit a station in the territory protected by the {org}!"
+    "message": "Visit a station in the territory protected by the {org}! The operation requires that the mission objective is achieved on time."
   },
   "MINING_1": {
     "description": "{area} is an asteroid or planet",
@@ -245,7 +245,7 @@
   },
   "MINING_LAND_THERE": {
     "description": "",
-    "message": "We have employees in every nearby star system. Just visit the nearest station and get in contact with the local office there."
+    "message": "We have employees in every nearby star system. Just visit the nearest station before the due date and get in contact with the local office there."
   },
   "MISSION": {
     "description": "",
@@ -317,7 +317,7 @@
   },
   "POLICE_LAND_THERE": {
     "description": "",
-    "message": "Just land at a station with a {org} office."
+    "message": "Just land at a station with a {org} office. This must be done before the due date in order not to jeopardise the entire mission!"
   },
   "RADAR_NOT_INSTALLED": {
     "description": "",

diff --git a/data/modules/Combat/Combat.lua b/data/modules/Combat/Combat.lua
@@ -304,7 +304,6 @@ local onShipDestroyed = function (ship, attacker)
 				table.remove(mission.mercenaries, i)
 				if not mission.complete and (#mission.mercenaries == 0 or mission.dedication <= ARMEDRECON) then
 					mission.complete = true
-					mission.status = "COMPLETED"
 					Comms.ImportantMessage(l.MISSION_COMPLETE)
 				end
 				if attacker and attacker:isa("Ship") and attacker:IsPlayer() then
@@ -321,7 +320,6 @@ local missionTimer = function (mission)
 		if mission.complete or Game.time > mission.due then return true end -- already complete or too late
 		if Game.player.frameBody and Game.player.frameBody.path == mission.location then
 			mission.complete = true
-			mission.status = "COMPLETED"
 			Comms.ImportantMessage(l.MISSION_COMPLETE)
 			return true
 		else