diff --git a/data/coalition/coalition jobs.txt b/data/coalition/coalition jobs.txt index 452a4b32f806..d6d4b6c0743c 100644 --- a/data/coalition/coalition jobs.txt +++ b/data/coalition/coalition jobs.txt @@ -1523,7 +1523,7 @@ mission "Evacuate Lunarium True" deadline to offer random < 10 - has "Lunarium Evacuation 6: done" + has "Lunarium: Evacuation 6: done" not "Heliarch Investigation 2: active" not "joined the heliarchs" to fail @@ -1555,7 +1555,7 @@ mission "Evacuate Lunarium Fail" deadline to offer random < 5 - has "Lunarium Evacuation 6: done" + has "Lunarium: Evacuation 6: done" not "Heliarch Investigation 2: active" not "joined the heliarchs" to fail @@ -1582,7 +1582,7 @@ mission "Lunarium: Armageddon Core Delivery" description "The Lunarium is offering for you to deliver an Armageddon Core to ." to offer random < 4 - has "Lunarium: Reactors: done" + has "Lunarium: Smuggling: Reactors: done" not "Lunarium: Armageddon Core Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1609,7 +1609,7 @@ mission "Lunarium: Fusion Reactor Delivery" description "The Lunarium is offering for you to deliver a Fusion Reactor to ." to offer random < 7 - has "Lunarium: Reactors: done" + has "Lunarium: Smuggling: Reactors: done" not "Lunarium: Fusion Reactor Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1636,7 +1636,7 @@ mission "Lunarium: Breeder Reactor Delivery" description "The Lunarium is offering for you to deliver a Breeder Reactor to ." to offer random < 10 - has "Lunarium: Reactors: done" + has "Lunarium: Smuggling: Reactors: done" not "Lunarium: Breeder Reactor Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1663,7 +1663,7 @@ mission "Lunarium: Torpedo Delivery" description "The Lunarium is offering for you to deliver a Torpedo Launcher, complete with 30 torpedoes, to ." to offer random < 12 - has "Lunarium: Torpedoes: done" + has "Lunarium: Smuggling: Torpedoes: done" not "Lunarium: Torpedo Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1690,7 +1690,7 @@ mission "Lunarium: Typhoon Delivery" description "The Lunarium is offering for you to deliver a Typhoon Launcher, complete with 30 Typhoon Torpedoes, to ." to offer random < 7 - has "Lunarium: Torpedoes: done" + has "Lunarium: Smuggling: Torpedoes: done" not "Lunarium: Typhoon Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1715,7 +1715,7 @@ mission "Lunarium: Plasma Delivery" description "The Lunarium is offering for you to deliver a Plasma Turret to ." to offer random < 6 - has "Lunarium: Heat: done" + has "Lunarium: Smuggling: Heat: done" not "Lunarium: Plasma Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1739,7 +1739,7 @@ mission "Lunarium: Flamethrower Delivery" description "The Lunarium is offering for you to deliver a pair of Flamethrowers to ." to offer random < 8 - has "Lunarium: Heat: done" + has "Lunarium: Smuggling: Heat: done" not "Lunarium: Flamethrower Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1763,7 +1763,7 @@ mission "Lunarium: Grenade Delivery" description "The Lunarium is offering for you to deliver a dozen Fragmentation Grenades to ." to offer random < 11 - has "Lunarium: Grenades: done" + has "Lunarium: Smuggling: Grenades: done" not "Lunarium: Grenade Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" @@ -1787,7 +1787,7 @@ mission "Lunarium: Anti-Missile Delivery" description "The Lunarium is are offering for you to deliver a Heavy Anti-Missile Turret to ." to offer random < 10 - has "Lunarium: AM: done" + has "Lunarium: Smuggling: AM: done" not "Lunarium: Anti-Missile Delivery: active" not "Heliarch Investigation 2: active" not "joined the heliarchs" diff --git a/data/coalition/lunarium intro.txt b/data/coalition/lunarium intro.txt index fcfc4e2224db..d645e1334f33 100644 --- a/data/coalition/lunarium intro.txt +++ b/data/coalition/lunarium intro.txt @@ -1607,7 +1607,7 @@ mission "Lunarium: Combat Training 1" or has "Lunarium: Propaganda 4: done" has "Lunarium: Evacuation 6: done" - has "Lunarium: Reactors: done" + has "Lunarium: Smuggling: Reactors: done" and or not "event: fw suppressed Greenrock" diff --git a/data/quarg/quarg missions.txt b/data/quarg/quarg missions.txt index b7346356a119..64fdf7ccd262 100644 --- a/data/quarg/quarg missions.txt +++ b/data/quarg/quarg missions.txt @@ -231,9 +231,8 @@ mission "Ask Quarg About Coalition Early" to offer has "First Contact: Quarg: offered" has "Coalition: First Contact: done" - not "assisted heliarch" - not "Heliarch Recon 1: offered" - not "Lunarium: Introductions: offered" + not "joined the lunarium" + not "joined the heliarchs" source attributes "quarg" attributes "station"