diff --git a/dat/mission.xml b/dat/mission.xml index 72720f3..f065ec3 100644 --- a/dat/mission.xml +++ b/dat/mission.xml @@ -46,7 +46,7 @@ <unique>1</unique> </flags> <avail> - <cond>var.peek("es_cargo") == true and space.jumpDist("NCG-7291") < 5 and player.getFaction("Empire") > 5 and player.getRating() > 10</cond> + <cond>var.peek("es_cargo") == true and space.jumpDist("NGC-7291") < 5 and player.getFaction("Empire") > 5 and player.getRating() > 10</cond> <chance>60</chance> <location>Bar</location> <faction>Empire</faction> diff --git a/dat/missions/emp_collective00.lua b/dat/missions/emp_collective00.lua index 488e726..58a443f 100644 --- a/dat/missions/emp_collective00.lua +++ b/dat/missions/emp_collective00.lua @@ -15,7 +15,7 @@ else -- Default english. text[1] = [[As you enter the bar you notice some one signal to you from the counter. You notice he's wearing an Empire insignia on his uniform. "Hello %s, we have a reconnaissance you might be interested. You up for the challenge?"]] text[2] = [["I don't think we've met. I'm Sargent Dimitri. If all goes well you'll be reporting to me for the next assignments." -"This week Collective activity has increased heavily around NCG-7291. We've been trying to contain them, but reports detect that a scout broke through. The scout was last detected near %s. We expect it to not have gone far. You are to locate the scout and report back to %s in the %s system. It seems like the Collective is planning something and we want to follow their game a bit more" +"This week Collective activity has increased heavily around NGC-7291. We've been trying to contain them, but reports detect that a scout broke through. The scout was last detected near %s. We expect it to not have gone far. You are to locate the scout and report back to %s in the %s system. It seems like the Collective is planning something and we want to follow their game a bit more" "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"]] @@ -32,7 +32,7 @@ function create() misn_nearby = "Coriolis" misn_target = "Dune" misn_base = "Omega Station" - misn_base_sys = "NCG-7291" + misn_base_sys = "NGC-7291" misn.setMarker(misn_nearby) -- Not exact target. -- Mission details. @@ -52,7 +52,7 @@ function enter() sys = space.system() -- Additional fleets. - if sys == "NCG-7291" then -- Increase action for realism. + if sys == "NGC-7291" then -- Increase action for realism. pilot.add("Empire Sml Defense") pilot.add("Collective Sml Swarm") elseif sys == misn_target then diff --git a/dat/ssys.xml b/dat/ssys.xml index 3b1f981..9856042 100644 --- a/dat/ssys.xml +++ b/dat/ssys.xml @@ -28,7 +28,7 @@ <stars>500</stars> </general> </ssys> - <ssys name="NCG-7690"> + <ssys name="NGC-7690"> <fleets> <fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Merchant Mule</fleet> @@ -39,9 +39,9 @@ </fleets> <jumps> <jump>Coriolis</jump> - <jump>NCG-7324</jump> - <jump>NCG-7549</jump> - <jump>NCG-7693</jump> + <jump>NGC-7324</jump> + <jump>NGC-7549</jump> + <jump>NGC-7693</jump> </jumps> <pos> <y>100</y> @@ -55,7 +55,7 @@ <stars>200</stars> </general> </ssys> - <ssys name="NCG-7693"> + <ssys name="NGC-7693"> <fleets> <fleet chance="30">Merchant Mule</fleet> <fleet chance="30">Pirate Hyena</fleet> @@ -66,8 +66,8 @@ </fleets> <jumps> <jump>Coriolis</jump> - <jump>NCG-7723</jump> - <jump>NCG-7690</jump> + <jump>NGC-7723</jump> + <jump>NGC-7690</jump> <jump>Dune</jump> </jumps> <pos> @@ -82,7 +82,7 @@ <stars>200</stars> </general> </ssys> - <ssys name="NCG-7324"> + <ssys name="NGC-7324"> <fleets> <fleet chance="70">Empire Lancelot</fleet> <fleet chance="50">Pirate Hyena</fleet> @@ -92,11 +92,11 @@ <fleet chance="20">Pirate Admonisher</fleet> </fleets> <jumps> - <jump>NCG-7291</jump> + <jump>NGC-7291</jump> <jump>Alteris</jump> - <jump>NCG-7273</jump> - <jump>NCG-7690</jump> - <jump>NCG-7414</jump> + <jump>NGC-7273</jump> + <jump>NGC-7690</jump> + <jump>NGC-7414</jump> </jumps> <pos> <y>40</y> @@ -123,7 +123,7 @@ <jump>Cygnus</jump> <jump>Borla</jump> <jump>Eridani</jump> - <jump>NCG-7273</jump> + <jump>NGC-7273</jump> <jump>Alteris</jump> </jumps> <pos> @@ -140,7 +140,7 @@ <stars>500</stars> </general> </ssys> - <ssys name="NCG-7132"> + <ssys name="NGC-7132"> <fleets> <fleet chance="60">Collective Sml Swarm</fleet> <fleet chance="40">Empire Lancelot</fleet> @@ -149,7 +149,7 @@ <fleet chance="30">Collective Sml Swarm</fleet> </fleets> <jumps> - <jump>NCG-7291</jump> + <jump>NGC-7291</jump> <jump>C-59</jump> <jump>C-43</jump> </jumps> @@ -224,7 +224,7 @@ <jumps> <jump>Coriolis</jump> <jump>Eridani</jump> - <jump>NCG-7693</jump> + <jump>NGC-7693</jump> <jump>Alteris</jump> </jumps> <pos> @@ -241,15 +241,15 @@ <stars>300</stars> </general> </ssys> - <ssys name="NCG-7414"> + <ssys name="NGC-7414"> <fleets> <fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Empire Pacifier</fleet> </fleets> <jumps> - <jump>NCG-7291</jump> - <jump>NCG-7324</jump> + <jump>NGC-7291</jump> + <jump>NGC-7324</jump> </jumps> <pos> <y>82</y> @@ -275,9 +275,9 @@ </fleets> <jumps> <jump>Dune</jump> - <jump>NCG-7693</jump> + <jump>NGC-7693</jump> <jump>Alteris</jump> - <jump>NCG-7690</jump> + <jump>NGC-7690</jump> </jumps> <pos> <y>73</y> @@ -320,7 +320,7 @@ <stars>600</stars> </general> </ssys> - <ssys name="NCG-7291"> + <ssys name="NGC-7291"> <fleets> <fleet chance="60">Merchant Llama</fleet> <fleet chance="60">Collective Drone</fleet> @@ -332,10 +332,10 @@ <fleet chance="40">Empire Admonisher</fleet> </fleets> <jumps> - <jump>NCG-7324</jump> - <jump>NCG-7273</jump> - <jump>NCG-7132</jump> - <jump>NCG-7414</jump> + <jump>NGC-7324</jump> + <jump>NGC-7273</jump> + <jump>NGC-7132</jump> + <jump>NGC-7414</jump> </jumps> <pos> <y>13</y> @@ -385,7 +385,7 @@ <stars>600</stars> </general> </ssys> - <ssys name="NCG-6938"> + <ssys name="NGC-6938"> <fleets> <fleet chance="40">Merchant Llama</fleet> <fleet chance="20">Merchant Mule</fleet> @@ -394,7 +394,7 @@ </fleets> <jumps> <jump>Borla</jump> - <jump>NCG-7273</jump> + <jump>NGC-7273</jump> </jumps> <pos> <y>-81</y> @@ -415,7 +415,7 @@ <fleet chance="30">Pirate Admonisher</fleet> </fleets> <jumps> - <jump>NCG-7968</jump> + <jump>NGC-7968</jump> </jumps> <pos> <y>105</y> @@ -438,7 +438,7 @@ <jumps> <jump>C-14</jump> <jump>C-59</jump> - <jump>NCG-7132</jump> + <jump>NGC-7132</jump> <jump>C-28</jump> </jumps> <pos> @@ -469,8 +469,8 @@ </fleets> <jumps> <jump>Delta Pavonis</jump> - <jump>NCG-6938</jump> - <jump>NCG-7273</jump> + <jump>NGC-6938</jump> + <jump>NGC-7273</jump> <jump>Goddard</jump> <jump>Cygnus</jump> </jumps> @@ -486,7 +486,7 @@ <stars>400</stars> </general> </ssys> - <ssys name="NCG-7968"> + <ssys name="NGC-7968"> <fleets> <fleet chance="50">Pirate Hyena</fleet> <fleet chance="30">Merchant Llama</fleet> @@ -523,7 +523,7 @@ <jumps> <jump>Draconis</jump> <jump>Eridani</jump> - <jump>NCG-7968</jump> + <jump>NGC-7968</jump> </jumps> <pos> <y>19</y> @@ -568,7 +568,7 @@ <stars>400</stars> </general> </ssys> - <ssys name="NCG-7723"> + <ssys name="NGC-7723"> <fleets> <fleet chance="50">Pirate Hyena</fleet> <fleet chance="50">Merchant Llama</fleet> @@ -576,9 +576,9 @@ <fleet chance="30">Pirate Hyena Pack</fleet> </fleets> <jumps> - <jump>NCG-7783</jump> - <jump>NCG-7843</jump> - <jump>NCG-7693</jump> + <jump>NGC-7783</jump> + <jump>NGC-7843</jump> + <jump>NGC-7693</jump> </jumps> <pos> <y>198</y> @@ -592,7 +592,7 @@ <stars>160</stars> </general> </ssys> - <ssys name="NCG-7843"> + <ssys name="NGC-7843"> <fleets> <fleet chance="30">Pirate Hyena</fleet> <fleet chance="50">Pirate Hyena</fleet> @@ -600,7 +600,7 @@ <fleet chance="40">Pirate Hyena Pack</fleet> </fleets> <jumps> - <jump>NCG-7723</jump> + <jump>NGC-7723</jump> <jump>New Haven</jump> </jumps> <pos> @@ -647,14 +647,14 @@ <stars>500</stars> </general> </ssys> - <ssys name="NCG-7549"> + <ssys name="NGC-7549"> <fleets> <fleet chance="50">Merchant Llama</fleet> <fleet chance="50">Pirate Hyena</fleet> <fleet chance="20">Pirate Admonisher</fleet> </fleets> <jumps> - <jump>NCG-7690</jump> + <jump>NGC-7690</jump> </jumps> <pos> <y>148</y> @@ -683,7 +683,7 @@ <jump>Delta Pavonis</jump> <jump>Eridani</jump> <jump>Dune</jump> - <jump>NCG-7324</jump> + <jump>NGC-7324</jump> </jumps> <pos> <y>33</y> @@ -709,7 +709,7 @@ <fleet chance="40">Pirate Hyena Pack</fleet> </fleets> <jumps> - <jump>NCG-7843</jump> + <jump>NGC-7843</jump> </jumps> <pos> <y>307</y> @@ -749,10 +749,10 @@ <stars>100</stars> </general> </ssys> - <ssys name="NCG-7783"> + <ssys name="NGC-7783"> <fleets/> <jumps> - <jump>NCG-7723</jump> + <jump>NGC-7723</jump> </jumps> <pos> <y>264</y> @@ -773,7 +773,7 @@ </fleets> <jumps> <jump>C-28</jump> - <jump>NCG-7132</jump> + <jump>NGC-7132</jump> <jump>C-43</jump> </jumps> <pos> @@ -789,7 +789,7 @@ <stars>200</stars> </general> </ssys> - <ssys name="NCG-7273"> + <ssys name="NGC-7273"> <fleets> <fleet chance="70">Empire Lancelot</fleet> <fleet chance="50">Merchant Mule</fleet> @@ -799,10 +799,10 @@ <fleet chance="40">Empire Admonisher</fleet> </fleets> <jumps> - <jump>NCG-7291</jump> + <jump>NGC-7291</jump> <jump>Delta Pavonis</jump> - <jump>NCG-6938</jump> - <jump>NCG-7324</jump> + <jump>NGC-6938</jump> + <jump>NGC-7324</jump> <jump>Borla</jump> </jumps> <pos>