[Add] New cargo mission.

dat/commodity.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Commodities>
  <commodity name="Food">
-    <description>Airtight compressed nutrient packets.  Very nutricious.</description>
+  <description>Airtight compressed nutrient packets.  Very nutritious.</description>
   <price>140</price>
  </commodity>
  <commodity name="Ore">
   <description>All sorts of assorted ores.  Needed for all sorts of production processes.</description>
-    <price>120</price>
+  <price>210</price>
  </commodity>
  <commodity name="Industrial Goods">
   <description>Your basic industrial goods.  From cutting lasers to processed metals.</description>
@@ -20,10 +20,11 @@
   <description>All sorts of high quality luxury goods.</description>
   <price>630</price>
  </commodity>
-  <commodity name="Parcels" />
-  <commodity name="Colonists" />
-  <commodity name="Tourists" />
-  <commodity name="Pilgrims" />
-  <commodity name="Datapad" />
-  <commodity name="Satellite" />
+ <commodity name="Parcels"/>
+ <commodity name="Colonists"/>
+ <commodity name="Tourists"/>
+ <commodity name="Pilgrims"/>
+ <commodity name="Datapad"/>
+ <commodity name="Satellite"/>
+ <commodity name="Prisoners"/>
 </Commodities>

dat/fleet.xml

@@ -217,6 +217,20 @@
    <pilot name="Goddard" chance="20">Dvaered Goddard</pilot>
   </pilots>
  </fleet>
+ <fleet name="Dvaered Med Force">
+  <ai>dvaered</ai>
+  <faction>Dvaered</faction>
+  <pilots>
+   <pilot name="Vendetta" chance="100">Dvaered Vendetta</pilot>
+   <pilot name="Vendetta" chance="80">Dvaered Vendetta</pilot>
+   <pilot name="Vendetta" chance="60">Dvaered Vendetta</pilot>
+   <pilot name="Vendetta" chance="40">Dvaered Vendetta</pilot>
+   <pilot name="Ancestor" chance="60">Dvaered Ancestor</pilot>
+   <pilot name="Ancestor" chance="40">Dvaered Ancestor</pilot>
+   <pilot name="Ancestor" chance="20">Dvaered Ancestor</pilot>
+   <pilot name="Goddard" chance="60">Dvaered Goddard</pilot>
+  </pilots>
+ </fleet>
  <fleet name="Empire Lancelot">
   <ai>empire</ai>
   <faction>Empire</faction>

dat/mission.xml

@@ -43,6 +43,15 @@
    <faction>Soromid</faction>
   </avail>
  </mission>
+ <mission name="Empire Shipping 1">
+  <lua>empire/shipping/es00.lua</lua>
+  <avail>
+   <cond>player.getFaction("Empire") &gt;= 0 and var.peek("es_misn") &gt;= 3</cond>
+   <chance>30</chance>
+   <location>Bar</location>
+   <faction>Empire</faction>
+  </avail>
+ </mission>
  <mission name="Collective Scouting">
   <lua>empire/collective/ec00</lua>
   <flags>
@@ -149,11 +158,11 @@
    <faction>Goddard</faction>
   </avail>
  </mission>
- + <mission name="Dvaered Patrol">
+ <mission name="Dvaered Patrol">
   <lua>dvaered/dv_patrol</lua>
   <avail>
    <chance>366</chance>
-    <cond>player.getfaction("Dvaered") &gt; 5 and player.getRating() &gt; 100</cond>
+   <cond>player.getFaction("Dvaered") &gt; 5 and player.getRating() &gt; 100</cond>
    <location>Computer</location>
    <faction>Dvaered</faction>
   </avail>

dat/missions/empire/shipping/es00.lua

@@ -0,0 +1,126 @@
+--[[
+
+   Empire Shipping Prisoner Exchange
+
+]]--
+
+lang = naev.lang()
+if lang == "es" then
+   -- not translated atm
+else -- default english
+   misn_title = "Prisoner Exchange"
+   misn_reward = "%d credits"
+   misn_desc = {}
+   misn_desc[1] = "Go to %s in the %s system to exchange prisoners with the FLF."
+   misn_desc[2] = "Return to %s in the %s system to report what happened."
+   title = {}
+   title[1] = "Spaceport Bar"
+   title[2] = "Prisoner Exchange"
+   title[3] = "Mission Report"
+   text = {}
+   text[1] = [[You are approached by an Empire Commander.
+"Hello, you must be %s.  I've heard about you.  I'm Commander Soldner.  We've got some harder missions for someone like you in the Empire Shipping division.  There would be real danger involved in these missions unlike the ones you've been doing recently for the division.  Would you be up for the challenge?"]]
+   text[2] = [["We've got a prisoner exchange set up with the FLF to take place on %s in the %s system.  They want a more neutral pilot to do the exchange.  You would have to go to %s with some FLF prisoners aboard your ship and exchange them for some of our own.  You won't have visible escorts but we will have your movements watched by ships in nearby sectors."
+"Once we get the men they captured back bring them over to %s in %s for debriefing. You'll be compensated for your troubles.  Good luck."]]
+   text[3] = [[The Prisoners are loaded on your ship along with a few marines to ensure nothing happens.]]
+   text[4] = [[As you land you notice the starport has been emptied.  You notice some explosives rigged on some of the columns.  This doesn't look good.  The marines tell you to sit still and go out to try to do the prisoner exchange.
+From the cockpit you see how the marines lead the prisoners in front of them with their guns to their back.  You notice that some people step out of the shadows with weapons too, most likely the FLF.]]
+   text[5] = [[You suddenly hear a blaring siren and hear shooting.  You quickly start your engines and prepare for take off.  You see shots all over and a couple of prisoner corpses as you leave the starport.  As you remember the explosives you hear loud detonations behind you.  This doesn't look to good.
+You start your climb out of the atmosphere and notice how you're picking up many FLF and Dvaered ships.  Looks like you're going to have quite a run to get the hell out of here.  It didn't go as you expected.]]
+   text[6] = [[After you leave your ship in the Starport you meet up with Commander Soldner.  From the look on his face it seems like he already knows about what happened.
+"It was all the  Dvaered's fault.  They just came in out of no where and started shooting.  What a horrible mess.  We're already working on sorting out the blame, we had good men there."
+He sighs, "Didn't want you to start with a mess like this, but if you're interested in another meet me up in the bar in a while.  We get no rest here.  We alread transfered the payment to your bank account."]]
+end
+
+
+function create ()
+
+   -- Intro text
+   if tk.yesno( title[1], string.format( text[1], player.name() ) )
+      then
+      misn.accept()
+
+      -- target destination
+      dest,destsys = space.getPlanet( faction.get("Frontier") )
+      ret,retsys = space.getPlanet( "Polaris Prime" )
+      misn.setMarker(destsys)
+
+      -- Mission details
+      misn_stage = 0
+      reward = 50000
+      misn.setTitle(misn_title)
+      misn.setReward( string.format(misn_reward, reward) )
+      misn.setDesc( string.format(misn_desc[1], dest:name(), destsys:name()))
+
+      -- Flavour text and mini-briefing
+      tk.msg( title[2], string.format( text[2], dest:name(), destsys:name(),
+            dest:name(), ret:name(), retsys:name() ))
+
+      -- Set up the goal
+      prisoners = player.addCargo("Prisoners", 0)
+      tk.msg( title[2], text[3] )
+
+      -- Set hooks
+      hook.land("land")
+      hook.enter("enter")
+   end
+end
+
+
+function land ()
+   landed = space.getPlanet()
+   if landed == dest and misn_stage == 0 then
+      if player.rmCargo(prisoners) then
+         -- Go on to next stage
+         misn_stage = 1
+
+         -- Some text
+         tk.msg(title[2], text[4] )
+         tk.msg(title[2], text[5] )
+         misn.setMarker(retsys)
+         misn.setDesc( string.format(misn_desc[2], ret:name(), retsys:name()))
+
+         -- We'll take off right away again
+         misn.takeoff()
+      end
+   elseif landed == ret and misn_stage == 1 then
+
+      -- Rewards
+      player.pay(reward)
+      player.modFaction("Empire",5);
+
+      -- Flavour text
+      tk.msg(title[3], text[6] )
+
+      misn.finish(true)
+   end
+end
+
+
+function enter ()
+   sys = space.getSystem()
+   if misn_stage == 1 and sys == destsys then
+
+      -- Get a position near the player
+      enter_vect = player.pos()
+      a = rnd.rnd() * 2 * math.pi
+      d = rnd.rnd( 100, 200 )
+      enter_vect:add( math.cos(a) * d, math.sin(a) * d )
+
+      -- Create some pilots to go after the player
+      pilot.add( "FLF Sml Force", "def", enter_vect )
+
+      -- Get a far away position for fighting to happen
+      -- We'll put the FLF first
+      a = rnd.rnd() * 2 * math.pi
+      d = rnd.rnd( 700, 1000 )
+      enter_vect:set( math.cos(a) * d, math.sin(a) * d )
+      pilot.add( "FLF Med Force", "def", enter_vect )
+      -- Now the Dvaered
+      a = rnd.rnd() * 2 * math.pi
+      d = rnd.rnd( 200, 300 )
+      enter_vect:add( math.cos(a) * d, math.sin(a) * d )
+      pilot.add( "Dvaered Med Force", "def", enter_vect )
+   end
+end
+

src/land.c

@@ -1436,6 +1436,12 @@ void land(Planet* p) {
 
   /* Add fuel button if needed - AFTER missions pay :D. */
   land_checkAddRefuel();
+
+  /* Mission forced take off. */
+  if(landed == 0) {
+    landed = 1; /* Ugly hack to make takeoff not complain. */
+    takeoff();
+  }
 }
 
 /* Takeoff from the planet. */

src/llua_misn.c

@@ -75,6 +75,7 @@ static int misn_accept(lua_State* L);
 static int misn_finish(lua_State* L);
 static int misn_timerStart(lua_State* L);
 static int misn_timerStop(lua_State* L);
+static int misn_takeoff(lua_State* L);
 static const luaL_reg misn_methods[] = {
   { "setTitle",     misn_setTitle   },
   { "setDesc",      misn_setDesc    },
@@ -85,6 +86,7 @@ static const luaL_reg misn_methods[] = {
   { "finish",       misn_finish     },
   { "timerStart",   misn_timerStart },
   { "timerStop",    misn_timerStop  },
+  { "takeoff",      misn_takeoff    },
   { 0, 0 }
 };
 
@@ -611,6 +613,19 @@ static int misn_timerStop(lua_State* L) {
   return 0;
 }
 
+/**
+ * @brief Force the player to take off if she is landed.
+ *
+ * @luafunc takeoff()
+ */
+static int misn_takeoff(lua_State* L) {
+  (void) L;
+  if(landed)
+    landed = 0;
+
+  return 0;
+}
+
 /* -- Var. -- */
 
 /* Check if a variable exists. */