[Change] Collective campaign now takes failure into account.

bin/Makefile

@@ -69,7 +69,7 @@ endif
 # DATA.
 DATA_AI   := 	$(wildcard ../scripts/ai/*.lua \
 										../scripts/ai/include/*.lua \
-										../scipts/ai/tpl/*.lua)
+										../scripts/ai/tpl/*.lua)
 DATA_GFX  := 	$(wildcard ../gfx/*.png \
 										../gfx/gui/*.png \
 										../gfx/logo/*.png \

dat/mission.xml

@@ -47,7 +47,7 @@
    <unique>1</unique>
   </flags>
   <avail>
-   <cond>var.peek("es_cargo") == true and space.getSystem("NGC-7291"):jumpDist() &lt; 5 and player.getFaction("Empire") &gt; 5 and player.getRating() &gt; 5</cond>
+   <cond>var.peek("es_cargo") == true and space.getSystem("NGC-7291"):jumpDist() &lt; 5 and player.getFaction("Empire") &gt; 5 and player.getRating() &gt; 5 and var.peek("collective_fail") ~= true</cond>
    <chance>80</chance>
    <location>Bar</location>
    <faction>Empire</faction>
@@ -59,7 +59,7 @@
    <unique>1</unique>
   </flags>
   <avail>
-   <cond>player.getFaction("Empire") &gt; 5</cond>
+   <cond>player.getFaction("Empire") &gt; 5 and var.peek("collective_fail") ~= true</cond>
    <done>Collective Scouting</done>
    <chance>100</chance>
    <location>Bar</location>
@@ -72,7 +72,7 @@
    <unique>1</unique>
   </flags>
   <avail>
-   <cond>player.getFaction("Empire") &gt; 5</cond>
+   <cond>player.getFaction("Empire") &gt; 5 and var.peek("collective_fail") ~= true</cond>
    <done>Collective Espionage 1</done>
    <chance>100</chance>
    <location>Bar</location>
@@ -85,7 +85,7 @@
    <unique>1</unique>
   </flags>
   <avail>
-   <cond>player.getFaction("Empire") &gt; 5</cond>
+    <cond>player.getFaction("Empire") &gt; 5 and var.peek("collective_fail") ~= true</cond>
    <done>Collective Espionage 2</done>
    <chance>100</chance>
    <location>Bar</location>
@@ -111,7 +111,7 @@
    <unique>1</unique>
   </flags>
   <avail>
-   <cond>player.getFaction("Empire") &gt; 5</cond>
+    <cond>player.getFaction("Empire") &gt; 5 and var.peek("collective_fail") ~= true</cond>
    <done>Collective Distraction</done>
    <chance>100</chance>
    <location>Bar</location>
@@ -124,7 +124,7 @@
    <unique>1</unique>
   </flags>
   <avail>
-   <cond>player.getFaction("Empire") &gt; 5</cond>
+   <cond>player.getFaction("Empire") &gt; 5 and var.peek("collective_fail") ~= true</cond>
    <done>Operation Black Trinity</done>
    <chance>100</chance>
    <location>Bar</location>

dat/missions/emp_collective00.lua

@@ -24,7 +24,7 @@ else -- Default english.
 "It is of vital important that you do not engage the drone.  Report back as soon as you locate it."]]
   text[3]       = [[After landing you head to the Empire military headquarters and find Sgt. Dimitri there.
 "Well it seems like the drone has some strange fixation with %s.  We aren't quite sure what to make of it, but intelligence is on it.  Report back at the bar in bit and we'll see what we can do about the Collective"]]
-  msg_killdrone = "MISSION FAILED: You weren't supposed to kill the drone!"
+  msg_killdrone = "Mission Failed: You weren't supposed to kill the drone!"
 end
 
 function create()
@@ -89,5 +89,6 @@ end
 function kill()
   player.msg(msg_killdrone)
   misn.finish(false)
+  var.push("collective_fail", true)
 end
 

dat/missions/emp_collective05.lua

@@ -227,6 +227,7 @@ function land()
 
       -- Rewards.
       player.modFaction("Empire", -5)
+      var.push("collective_fail", true)
     else
       -- Successfully killed.
       tk.msg(title[4], string.format(text[6], player.name()))

dat/missions/emp_collective06.lua

@@ -34,6 +34,7 @@ else -- default english
   title[1]     = "Bar"
   title[2]     = "Operation Cold Metal"
   title[3]     = "Mission Success"
+  title[4]     = "Cowardly Behaviour"
   text = {}
   text[1]      = [[You see Commodore Keer at a table with a couple other pilots.  She motions you over to sit down.
 She begins, "We're going to finally attack the Collective.  We've gotten the Emperor himself to bless the mission and send some of his better pilots.  Would you be interested in joining the destruction of the Collective?"]]
@@ -43,6 +44,9 @@ You notice Commodore Keer.  Upon greeting her she says, "You did a good job out
   text[4]      = [[She continues, "As a symbol of appreciation you should find a deposit of 500 thousand credits has been made to your account.  There will be a celebration later today in the officer's room if you want to join in."
 
 And so ends the Collective threat...]]
+  text[5]      = [[You recieve a message signed by Commodore Keeras soon as you enter Empire space:
+  There is no room for cowards in the Empires' fleet."
+  The signature does seem valid.]]
  -- Conversation between pilots
   talk     = {}
   talk[1]  = "System Cleared: Procede to %s."
@@ -173,6 +177,22 @@ function jump()
     -- Fled from battle - disgraceful.
     misn_stage = 5
     player.msg( string.format( talk[3], misn_base_sys:name() ))
+
+  elseif misn_stage == 5 then
+    -- Lower faction by a lot, without making hostile.
+    f = player.getFaction("Empire")
+    if f > 0 then
+      if f > 20 then player.modFactionRaw("Empire", -20)
+      else player.modFactionRaw("Empire", -f)
+      end
+    end
+
+    -- Display message.
+    tk.msg(title[4], text[5])
+
+    -- Mission failed.
+    var.push("collective_fail", true)
+    misn.finish(false)
   end
 end
 

dat/ship.xml

@@ -277,7 +277,7 @@
    <cap_cargo>10</cap_cargo>
   </characteristics>
   <outfits>
-    <outfit quantity="2">Laser Connon</outfit>
+    <outfit quantity="2">Laser Cannon</outfit>
     <outfit quantity="1">Seeker Launcher</outfit>
     <outfit quantity="5">Seeker Missile</outfit>
   </outfits>