Merge pull request naev#630 from micahmumper/TraderEscort

TraderEscort
bobbens · Apr 26, 2016 · 9f70c51 · 9f70c51
2 parents bdc90a7 + 303aa0f
commit 9f70c51
Show file tree

Hide file tree

Showing 3 changed files with 620 additions and 0 deletions.
diff --git a/dat/fleet.xml b/dat/fleet.xml
@@ -825,6 +825,122 @@
    <pilot name="Trader Llama" ship="Llama"></pilot>
    <pilot name="Trader Koala" ship="Koala"></pilot>
   </pilots>
+ </fleet>
+  <fleet name="Trader Convoy 3">
+  <ai>trader</ai>
+  <faction>Trader</faction>
+  <pilots>
+   <pilot name="Convoy Llama" ship="Llama"></pilot>
+   <pilot name="Convoy Llama" ship="Llama"></pilot>
+   <pilot name="Convoy Llama" ship="Llama"></pilot>
+  </pilots>
+ </fleet>
+   <fleet name="Trader Convoy 4">
+  <ai>trader</ai>
+  <faction>Trader</faction>
+  <pilots>
+   <pilot name="Convoy Koala" ship="Rhino"></pilot>
+   <pilot name="Convoy Koala" ship="Rhino"></pilot>
+   <pilot name="Convoy Koala" ship="Rhino"></pilot>
+   <pilot name="Convoy Koala" ship="Rhino"></pilot>
+  </pilots>
+ </fleet>
+   <fleet name="Trader Convoy 5">
+  <ai>trader</ai>
+  <faction>Trader</faction>
+  <pilots>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+  </pilots>
+ </fleet>
+ <fleet name="Trader Convoy 6">
+  <ai>trader</ai>
+  <faction>Trader</faction>
+  <pilots>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   </pilots>
+   </fleet>
+ <fleet name="Trader Convoy 8">
+  <ai>trader</ai>
+  <faction>Trader</faction>
+  <pilots>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Rhino" ship="Rhino"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+   <pilot name="Convoy Mule" ship="Mule"></pilot>
+  </pilots>
+ </fleet>
+ <fleet name="Trader Ambush 1">
+  <ai>baddie_norun</ai>
+  <faction>Pirate</faction>
+  <pilots>
+   <pilot name="Pirate Ancestor" ship="Pirate Ancestor"></pilot>
+   <pilot name="Pirate Vendetta" ship="Pirate Vendetta"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+   </pilots>
+</fleet>
+ <fleet name="Trader Ambush 2">
+  <ai>baddie_norun</ai>
+  <faction>Pirate</faction>
+  <pilots>
+   <pilot name="Pirate Ancestor" ship="Pirate Ancestor"></pilot>
+   <pilot name="Pirate Ancestor" ship="Pirate Vendetta"></pilot>
+   <pilot name="Pirate Vendetta" ship="Pirate Vendetta"></pilot>
+   <pilot name="Pirate Vendetta" ship="Pirate Vendetta"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+  </pilots>
+ </fleet>
+ <fleet name="Trader Ambush 3">
+  <ai>baddie_norun</ai>
+  <faction>Pirate</faction>
+  <pilots>
+   <pilot name="Pirate Admonisher" ship="Pirate Admonisher"></pilot>
+   <pilot name="Pirate Rhino" ship="Pirate Rhino"></pilot>
+   <pilot name="Pirate Rhino" ship="Pirate Rhino"></pilot>
+   <pilot name="Pirate Shark" ship="Pirate Shark"></pilot>
+   <pilot name="Pirate Shark" ship="Pirate Shark"></pilot>
+  </pilots>
+ </fleet>
+ <fleet name="Trader Ambush 4">
+  <ai>baddie_norun</ai>
+  <faction>Pirate</faction>
+  <pilots>
+   <pilot name="Pirate Admonisher" ship="Pirate Admonisher"></pilot>
+   <pilot name="Pirate Phalanx" ship="Pirate Phalanx"></pilot>
+   <pilot name="Pirate Phalanx" ship="Pirate Phalanx"></pilot>
+   <pilot name="Pirate Shark" ship="Pirate Shark"></pilot>
+   <pilot name="Pirate Shark" ship="Pirate Shark"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+  </pilots>
+ </fleet>
+ <fleet name="Trader Ambush 5">
+  <ai>baddie_norun</ai>
+  <faction>Pirate</faction>
+  <pilots>
+   <pilot name="Pirate Kestrel" ship="Pirate Kestrel"></pilot>   
+   <pilot name="Pirate Admonisher" ship="Pirate Admonisher"></pilot>
+   <pilot name="Pirate Rhino" ship="Pirate Rhino"></pilot>
+   <pilot name="Pirate Shark" ship="Pirate Shark"></pilot>
+   <pilot name="Pirate Shark" ship="Pirate Shark"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+   <pilot name="Hyena" ship="Hyena"></pilot>
+  </pilots>
  </fleet>
  <fleet name="Pirate Hyena Pack">
   <ai>pirate</ai>

diff --git a/dat/mission.xml b/dat/mission.xml
@@ -108,6 +108,24 @@
    <faction>Trader</faction>
   </avail>
  </mission>
+ <mission name="Trader Escort">
+  <lua>neutral/traderEscort</lua>
+  <avail>
+   <priority>5</priority>
+   <cond>player.getRating() &gt; 200</cond>
+   <chance>560</chance>
+   <location>Computer</location>
+   <faction>Dvaered</faction>
+   <faction>Empire</faction>
+   <faction>Frontier</faction>
+   <faction>Goddard</faction>
+   <faction>Independent</faction>
+   <faction>Sirius</faction>
+   <faction>Soromid</faction>
+   <faction>Za'lek</faction>
+   <faction>Trader</faction>
+  </avail>
+ </mission>
  <mission name="Dead Or Alive Bounty">
   <lua>neutral/pirbounty_dead</lua>
   <avail>