campaigns: Updated Punk campaign

Removed some unfinished levels from the campaign order, added new objectives for the improved version of the pre-alpha Guns Guns Guns, and updated mission briefing text.

Author: Moburma

conf/miss002.ini

@@ -603,24 +603,31 @@ LevelNo = 0
 Name = PU03 RIYADH - GUNS GUNS GUNS ALT1
 SourceID = 205
 StringIndex = 1367
-SpecialTrigger = 0 77 60
+SpecialTrigger = 0 0 60
 SuccessTrigger = 64 0 0
 MapNo = 20
 LevelNo = 2
-MissionCond = 77 0 0 0 0
+MissionCond = 0 0 0 0 0
 Atmosphere = EARTH SUNNY
 
 [missuccess60]
-P00 = GAME_OBJ_MEM_G_ARRIVES( Group(0), Coord(11000,0,9422), Radius(5), Amount(1) )
-P01 = GAME_OBJ_ALL_G_DEAD( Group(2) )
-P01 = GAME_OBJ_ALL_G_DEAD( Group(3) )
-P01 = GAME_OBJ_ALL_G_DEAD( Group(4) )
+P00 = GAME_OBJ_MEM_G_ARRIVES( Group(0), Coord(24787,384,28601), Radius(8), Amount(1) )
+P01 = GAME_OBJ_MEM_G_ARRIVES( Group(0), Coord(28612,0,13374), Radius(12), Amount(1) )
+P02 = GAME_OBJ_MEM_G_USE_V( Thing(195,1103), Group(0), Amount(1) )
+P03 = GAME_OBJ_MEM_G_ARRIVES( Group(0), Coord(3968,0,4736), Radius(9), Amount(1) )
+P04 = GAME_OBJ_DESTROY_OBJECT( Thing(25,0), Coord(13952,0,11136) )
+P04 = GAME_OBJ_DESTROY_OBJECT( Thing(26,0), Coord(15488,0,11136) )
+P04 = GAME_OBJ_DESTROY_OBJECT( Thing(25,0), Coord(16896,0,11136) )
+P05 = GAME_OBJ_MEM_G_USE_V( Thing(275,1046), Group(0), Amount(1) )
 
 [misfail60]
 P00 = GAME_OBJ_ALL_G_DEAD( Group(0) )
 
 [missnetscan60]
-N00 = NETSCAN_OBJ_TARGET( Coord(15000,0,10422) )
+N00 = NETSCAN_OBJ_TARGET( Coord(25344,0,29184), Coord(28288,0,13184)  )
+N01 = NETSCAN_OBJ_TARGET( Coord(3968,0,4608) )
+N02 = NETSCAN_OBJ_TARGET( Coord(15488,0,11136) )
+N03 = NETSCAN_OBJ_TARGET( Coord(14848,0,29065) )
 
 [mission61]
 ; Mission for a cut map - does not match M52; the level was supposed to
@@ -787,11 +794,11 @@ N01 = NETSCAN_OBJ_TARGET( Coord(27879,0,17958) )
 [mission68]
 ; Set just after the first mission of the Zealot campaign, a small group
 ; of punks (with some helpers) move to wipe out the zealots fleeing the
-; now compromised Harbinger base.
+; now compromised Detroit AI bunker.
 Name = PU02 DETROIT - ZEALOT ATTACK
 SourceID = 201
 StringIndex = 1536
-SuccessTrigger = 80 0 0
+SuccessTrigger = 4 0 0
 MapNo = 35
 LevelNo = 4
 Atmosphere = EARTH SUNNY
@@ -967,6 +974,7 @@ LevelNo = 0
 ; no objectives defined
 
 [mission80]
+; Cut this one for now as it's just not possible to beat it
 Name = PU02 DETROIT - CLEAN-UP
 SourceID = 202
 StringIndex = 1808
@@ -1235,5 +1243,4 @@ P00 = GAME_OBJ_DESTROY_OBJECT( Thing(102,0), Coord(24206,0,7525) )
 P00 = GAME_OBJ_P_ARRIVES( Thing(871,1229), Coord(14869,-768,30139), Radius(12) )
 
 [missnetscan103]
-N00 = NETSCAN_OBJ_TARGET( Coord(12882,0,949), Coord(14134,0,927), Coord(15647,0,633), Coord(17497,0,939), Coord(17678,0,7268), Coord(24206,0,7525) )
-
+N00 = NETSCAN_OBJ_TARGET( Coord(12882,0,949), Coord(14134,0,927), Coord(15647,0,633), Coord(17497,0,939), Coord(17678,0,7268), Coord(24206,0,7525) )

lang/alltext_punks_eng.pot

@@ -174,26 +174,52 @@ msgstr ""
 
 #: mission.title:60
 msgctxt "mission title"
-msgid "Guns Guns Guns alt1"
+msgid "Guns Guns Guns"
 msgstr ""
 
 #: mission.brief.mail5.par2.c2
 msgctxt "mission brief email orders"
 msgid ""
-"1. Raid Eurocorp armoury"
+"1. Gather unguided comrades"
 msgstr ""
 
 #: mission.brief.mail5.par3.c2
 msgctxt "mission brief email orders"
 msgid ""
-"2. Kill all Eurocorp Agents"
+"2 Raid Eurocorp armoury"
+msgstr ""
+
+#: mission.brief.mail5.par4.c2
+msgctxt "mission brief email orders"
+msgid ""
+"3. Kill all Eurocorp Agents"
+msgstr ""
+
+#: mission.brief.mail5.par5.c2
+msgctxt "mission brief email orders"
+msgid ""
+"4. Recover unguided bike"
 msgstr ""
 
 #: mission.brief.mail5.map20.level2:1
 msgctxt "mission brief tactical information"
+msgid "Unguided groups"
+msgstr ""
+
+#: mission.brief.mail5.map20.level2:2
+msgctxt "mission brief tactical information"
 msgid "Eurocorp Armoury"
 msgstr ""
 
+#: mission.brief.mail5.map20.level2:3
+msgctxt "mission brief tactical information"
+msgid "Infrastructure targets"
+msgstr ""
+
+#: mission.brief.mail5.map20.level2:4
+msgctxt "mission brief tactical information"
+msgid "Impounded unguided bike"
+msgstr ""
 
 #: mission.title:64
 msgctxt "mission title"