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.
ziproot · Jan 29, 2024 · 1386114 · 1386114
1 parent 0218fd1
commit 1386114
Show file tree

Hide file tree

Showing 3 changed files with 172 additions and 60 deletions.
diff --git a/data/deep.txt b/data/deep.txt
@@ -1,11 +1,19 @@
-ship "Aerie" "Aerie (Drones)"
+ship "Aerie" "Aerie (Research)"
     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."
 
+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,16 +58,23 @@ 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"
     "Aerie (Drones)"
     "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
@@ -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> 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