From 1386114e58f79a51a82b7b8c27843ecfd157c9ab Mon Sep 17 00:00:00 2001 From: ziproot Date: Sun, 28 Jan 2024 21:13:04 -0500 Subject: [PATCH] Several major bug fixes Prevents you from going through the time costly tax loop if you cannot pay the tax by killing you, fixes a bug in the tax loop causing an infinite loop if you had to pay more than 2M credits in taxes, fixes several incorrect mission names in amazinite's checkmate rework, moves the fleet in the final battle properly to alcyone, gives the terrorist government pirate hails, and fixes the mining event, as events cannot redefine ships, so I instead had it switch out the drone aerie offer. --- data/deep.txt | 33 ++++++- data/improved checkmate.txt | 21 +++-- data/landing fee.txt | 178 +++++++++++++++++++++++++++--------- 3 files changed, 172 insertions(+), 60 deletions(-) diff --git a/data/deep.txt b/data/deep.txt index 0efdffb..9b96426 100644 --- a/data/deep.txt +++ b/data/deep.txt @@ -1,4 +1,4 @@ -ship "Aerie" "Aerie (Drones)" +ship "Aerie" "Aerie (Research)" remove bays bay "Drone" -43.5 2 "launch effect" "human internal" @@ -6,6 +6,14 @@ ship "Aerie" "Aerie (Drones)" "launch effect" "human internal" description "This is a variation on the Lionheart Aerie, replacing its fighter bays with a complement of drone bays instead, intended to be used for scientific research." +ship "Aerie" "Aerie (Drones)" + remove bays + bay "Drone" -43.5 2 + "launch effect" "human internal" + bay "Drone" 43.5 2 + "launch effect" "human internal" + description "This is a variation on the Lionheart Aerie, replacing its fighter bays with a complement of drone bays instead, intended to be used for scientific research, but also popular amongst miners." + ship "Aerie" "Aerie (Drone Miner)" outfits "Mining Laser" 2 @@ -50,8 +58,15 @@ ship "Science Drone" "Science Drone (Purchasable)" "description" "The Deep Science Drone is a civilian version of the Surveillance Drone, which can still collect atmospheric data but cannot move or scan ships." fleet "Deep Research" + government "Deep Security" + names "deep" + fighters + names "deep fighter" + cargo 0 + personality + coward disables frugal merciful opportunistic secretive surveillance timid variant - "Aerie (Drones)" + "Aerie (Research)" "Science Drone (Purchasable)" 2 shipyard "All Ships" @@ -59,7 +74,7 @@ shipyard "All Ships" "Science Drone (Purchasable)" shipyard "Deep Research" - "Aerie (Drones)" + "Aerie (Research)" "Science Drone (Purchasable)" mission "Deep Research Ships Timer" @@ -106,8 +121,16 @@ event "deep research ships available" fleet "Deep Research" 9000 event "miners use drone aerie" - ship "Aerie" "Aerie (Drones)" - description "This is Deep Sky's variation on the Lionheart Aerie, replacing its fighter bays with a complement of drone bays instead, intended to be used for scientific research, but also popular amongst miners." + shipyard "Deep Research" + remove "Aerie (Research)" + add "Aerie (Drones)" + fleet "Deep Research" + remove variant + "Aerie (Research)" + "Science Drone (Purchasable)" 2 + add variant + "Aerie (Drones)" + "Science Drone (Purchasable)" 2 fleet "Human Miners" remove variant "Aerie (Miner)" diff --git a/data/improved checkmate.txt b/data/improved checkmate.txt index 1753d6c..fdd56f2 100644 --- a/data/improved checkmate.txt +++ b/data/improved checkmate.txt @@ -21,7 +21,7 @@ government "Terrorist" "Navy (Oathkeeper)" -.01 "Free Worlds" -.01 "bribe" 0 - "hostile hail" "hostile syndicate" + "hostile hail" "hostile pirate" event "fwc battle of alcyone" system "Alcyone" @@ -857,7 +857,7 @@ mission "FWC Terrorists 1A" destination "Hephaestus" passengers 1 to offer - has "FW Terrorists 1: done" + has "FWC Terrorists 1: done" on fail dialog `You have failed an essential Free Worlds mission. If you want to complete the story line, revert to the autosave or another earlier snapshot of the game.` on offer @@ -893,7 +893,7 @@ mission "FWC Terrorists 1A" ` Korban tells you that the second autonomous fleet for you to lead is on Hephaestus. "The terrorists are holed up on Stormhold," says Korban, "an old pirate world. We've also made available to you some of our new technology, developed during the war. We're planning on incorporating it on most of the ships in our fleet, and they are installed on the autonomous ships I've given you. It may prove helpful to you during this final battle. Good luck, Captain."` accept -mission "FW Terrorists 1B" +mission "FWC Terrorists 1B" landing name "Final Battle" description "A fleet of nuclear-armed terrorists is occupying the system. Travel there and use the autonomous ships to draw their fire; the Oathkeeper fleet will be right behind you." @@ -902,7 +902,7 @@ mission "FW Terrorists 1B" clearance passengers 1 to offer - has "FW Terrorists 1A: done" + has "FWC Terrorists 1A: done" on fail dialog `You have failed an essential Free Worlds mission. If you want to complete the story line, revert to the autosave or another earlier snapshot of the game.` on offer @@ -926,7 +926,7 @@ mission "FW Terrorists 1B" "Quicksilver (Automata Mark II)" 2 npc evade government "Terrorist" - system "Algenib" + system "Alcyone" personality staying heroic confusion 60 fleet @@ -935,7 +935,7 @@ mission "FW Terrorists 1B" "Manta (Nuclear)" 2 npc evade government "Terrorist" - system "Algenib" + system "Alcyone" personality staying heroic confusion 60 fleet @@ -944,7 +944,7 @@ mission "FW Terrorists 1B" "Manta (Nuclear)" 2 npc evade government "Terrorist" - system "Algenib" + system "Alcyone" personality staying heroic derelict confusion 60 fleet @@ -953,7 +953,7 @@ mission "FW Terrorists 1B" "Manta (Nuclear)" 2 npc evade government "Terrorist" - system "Algenib" + system "Alcyone" personality staying heroic confusion 60 fleet 2 @@ -967,7 +967,7 @@ mission "FW Terrorists 1B" "Quicksilver" 3 npc evade government "Terrorist" - system "Algenib" + system "Alcyone" personality staying heroic derelict confusion 60 fleet @@ -981,7 +981,7 @@ mission "FW Terrorists 1B" "Quicksilver" 3 npc government "Syndicate (Automata)" - system "Algenib" + system "Alcyone" personality staying heroic derelict confusion 120 fleet @@ -1009,6 +1009,7 @@ mission "FW Terrorists 1B" mission "FWC Terrorists 1C" + landing name "Talk to Parliament" description "Travel to Earth for another meeting with Parliament. Alondo, Katya, and Tomek will meet you there. Hopefully, it will go better than your last visit." autosave diff --git a/data/landing fee.txt b/data/landing fee.txt index 2cff4a4..a76618b 100644 --- a/data/landing fee.txt +++ b/data/landing fee.txt @@ -122,6 +122,10 @@ mission "Landing Fee A" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -136,13 +140,13 @@ mission "Landing Fee A" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -272,6 +276,10 @@ mission "Landing Fee A" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -286,13 +294,13 @@ mission "Landing Fee A" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -431,6 +439,10 @@ mission "Landing Fee B" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -445,13 +457,13 @@ mission "Landing Fee B" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -590,6 +602,10 @@ mission "Landing Fee B" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -604,13 +620,13 @@ mission "Landing Fee B" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -785,6 +801,10 @@ mission "Landing Fee C" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -799,13 +819,13 @@ mission "Landing Fee C" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -1007,6 +1027,10 @@ mission "Landing Fee C" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -1021,13 +1045,13 @@ mission "Landing Fee C" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -1246,6 +1270,10 @@ mission "Landing Fee D" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -1260,13 +1288,13 @@ mission "Landing Fee D" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -1508,6 +1536,10 @@ mission "Landing Fee D" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -1522,13 +1554,13 @@ mission "Landing Fee D" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -1776,6 +1808,10 @@ mission "Landing Fee E" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -1790,13 +1826,13 @@ mission "Landing Fee E" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -2062,6 +2098,10 @@ mission "Landing Fee E" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -2076,13 +2116,13 @@ mission "Landing Fee E" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -2361,6 +2401,10 @@ mission "Landing Fee F" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -2375,13 +2419,13 @@ mission "Landing Fee F" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -2695,6 +2739,10 @@ mission "Landing Fee F" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -2709,13 +2757,13 @@ mission "Landing Fee F" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -2947,6 +2995,10 @@ mission "Landing Fee G1" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -2961,13 +3013,13 @@ mission "Landing Fee G1" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -3153,6 +3205,10 @@ mission "Landing Fee G1" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -3167,13 +3223,13 @@ mission "Landing Fee G1" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -3310,6 +3366,10 @@ mission "Landing Fee G2" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -3324,13 +3384,13 @@ mission "Landing Fee G2" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -3513,6 +3573,10 @@ mission "Landing Fee H1" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -3527,13 +3591,13 @@ mission "Landing Fee H1" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -3751,6 +3815,10 @@ mission "Landing Fee H1" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -3765,13 +3833,13 @@ mission "Landing Fee H1" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -3919,6 +3987,10 @@ mission "Landing Fee H2" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -3933,13 +4005,13 @@ mission "Landing Fee H2" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -4113,7 +4185,7 @@ mission "Landing Fee I" "last tax payment" += 1400 "passengerCounter" -= 1 label "nopassenger" - # don't pay larger sum if cargo counter is less than 10 + # don't pay larger sum if cargo counter is less than 10 branch "lowcargo" "cargoCounter" < 10 action @@ -4150,6 +4222,10 @@ mission "Landing Fee I" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -4164,13 +4240,13 @@ mission "Landing Fee I" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -4460,6 +4536,10 @@ mission "Landing Fee I" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -4474,13 +4554,13 @@ mission "Landing Fee I" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -4760,6 +4840,10 @@ mission "Landing Fee Alpha" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -4774,13 +4858,13 @@ mission "Landing Fee Alpha" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2" @@ -5078,6 +5162,10 @@ mission "Landing Fee Alpha" label "leaveloop" action "paymentCounter" *= 7 + `You are sentenced to a lifetime in jail for failing to pay all your taxes.` + to display + "paymentCounter" > "credits" + die label "loop2" # exit the loop once payment counter is zero branch "leaveloop2" @@ -5092,13 +5180,13 @@ mission "Landing Fee Alpha" branch "notLowWeaponPayment" or "paymentCounter" < 1 - "paymentCounter" < 1999999 + "paymentCounter" > 1999999 action payment -1 "last tax payment" += 1 "paymentCounter" -= 1 label "notLowWeaponPayment" - go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop + # go to "not loop" which sends you back to the start of the loop if payment counter is greater than zero, otherwise break out of the loop branch "notloop2" "leaveloop2" has "paymentCounter" label "notloop2"