fix(content): Give player Hyperdrive in "Unfettered: Jump Drive 1" on…

…ly if Jump Drive installed (endless-sky#10247)

data/hai/unfettered 0 prologue.txt

@@ -154,7 +154,7 @@ mission "Unfettered Jump Drive 1"
  attributes "unfettered"
  on offer
  conversation
- `The Unfettered have clearly noticed that you have a jump drive installed; a large crowd of them has gathered around your ship. Do you want to talk with them, and perhaps arrange a sale of your jump drive?`
+ `The Unfettered have clearly noticed that you have a jump drive; a large crowd of them has gathered around your ship. Do you want to talk with them, and perhaps arrange a sale of your jump drive?`
  choice
  ` (No.)`
  defer
@@ -167,7 +167,7 @@ mission "Unfettered Jump Drive 1"
  goto more
  ` "How will my ship leave here without my jump drive?"`
 
- ` "We will give you a hyperdrive in its place," they say, "and you will be counted as our friend, so you will not need to leave here quickly, or under threat of violence." You can't help but wonder if they will try to take your ship by force if you do not agree to the deal.`
+ ` "We can give you a hyperdrive in its place," they say, "and you will be counted as our friend, so you will not need to leave here quickly, or under threat of violence." You can't help but wonder if they will try to take your ship by force if you do not agree to the deal.`
  choice
  ` "Okay, I accept your generous offer."`
  goto end
@@ -182,17 +182,27 @@ mission "Unfettered Jump Drive 1"
  ` "Do not underestimate the value of our friendship," they say. "Soon we will become powerful once more, with many fruitful worlds under our control, and when that day comes you will benefit greatly from being our ally."`
  choice
  ` "Okay, as long as you give me a hyperdrive to take its place, I'll give you my jump drive."`
+ to display
+ not "outfit (cargo): Jump Drive"
  goto end
+ ` "You can take the jump drive from my cargo, but I don't need a hyperdrive in exchange."`
+ to display
+ has "outfit (cargo): Jump Drive"
+ goto cargo
  ` "Sorry, but if I give you this jump drive, I will lose my ability to capture more of them. Be patient, and I will bring you several of them when I am able."`
  goto refuse
 
  label end
+ action
+ outfit "Hyperdrive" 1
  ` The Unfettered engineers quickly and carefully remove your jump drive and replace it with an ordinary hyperdrive. You sincerely hope that you are not making a mistake by giving them this new technology. "Remember," one of them says as they hand you your payment, "when you acquire more jump drives, return here with them and we will give you further rewards. Until then, may fortune favor you, human friend."`
  accept
+ label cargo
+ ` The Unfettered engineers quickly retrieve the jump drive from your cargo. You sincerely hope that you are not making a mistake by giving them this new technology. "Remember," one of them says as they hand you your payment, "when you acquire more jump drives, return here with them and we will give you further rewards. Until then, may fortune favor you, human friend."`
+ accept
 
  on accept
  outfit "Jump Drive" -1
- outfit "Hyperdrive" 1
  payment 1000000
  "reputation: Hai (Unfettered)" >?= 10
 
@@ -224,6 +234,11 @@ mission "Unfettered Jump Drive 2"
  ` "Sorry, I need this jump drive right now, but I will come back later and sell it to you."`
  defer
  ` "Yes, I will sell you my jump drive."`
+ branch cargo
+ has "outfit (cargo): Jump Drive"
+ action
+ outfit "Hyperdrive" 1
+ label cargo
  ` Once again, they swap your jump drive for a hyperdrive, and pay you far more than you could sell a jump drive for anywhere else. "We will tell the other true Hai to offer you jobs in our job boards," they tell you, "and remember that we need still more jump drives."`
  choice
  ` "Then I will find more, and bring them to you."`
@@ -234,7 +249,6 @@ mission "Unfettered Jump Drive 2"
 
  on accept
  outfit "Jump Drive" -1
- outfit "Hyperdrive" 1
  payment 1000000
  "reputation: Hai (Unfettered)" >?= 20
  fail "Unfettered Jump Drive 1"
@@ -294,12 +308,16 @@ mission "Unfettered Jump Drive 3"
  ` "Those worlds are now held by a species of scavengers, who feast on the ruin of proud civilizations. Our scouts tell us that these carrion-feeders have wiped away nearly every Hai artifact, melting down our cities to make metal for their ships and factories, and hiding the scars of our wars beneath newly planted forests. They are an old and strong species, but few in number, and those worlds are ours by right."`
  ` You try to press them for more information, but they tell you nothing useful, aside from promising you that they will seek out your help when it is time to reclaim their territory.`
  label job
+ branch cargo
+ has "outfit (cargo): Jump Drive"
+ action
+ outfit "Hyperdrive" 1
+ label cargo
  ` "If you want to provide us with more jump drives, visit the job board from now on," says the leader. "We will have warriors ready to receive them from you for the usual pay."`
  accept
 
  on accept
  outfit "Jump Drive" -1
- outfit "Hyperdrive" 1
  payment 1000000
  "reputation: Hai (Unfettered)" >?= 30
  fail "Unfettered Jump Drive 2"
@@ -452,7 +470,7 @@ mission "Unfettered Jump Drive Trading"
  payment 1000000
  set "unfettered: money for drives"
  ` "As you wish. Do remember that if you want to sell further jump drives to us for money you may go to the job board."`
- accept
+ goto end
 
  label tripulse
  action
@@ -464,6 +482,13 @@ mission "Unfettered Jump Drive Trading"
  action
  outfit "Tripulse Shredder" 2
  ` They order their crew to do the transfer and come to address you before leaving. "Do note that if you ever want more weapons, we will always be willing to trade them for jump drives in the job board. However, we can always offer money instead if that is of higher value to you. Of course, we can only do this exchange here on <origin>, given it is where these advanced weapons are produced and stocked."`
+ label end
+ branch cargo
+ has "outfit (cargo): Jump Drive"
+ action
+ outfit "Hyperdrive" 1
+ label cargo
+ ` The engineer leaves and you return to your ship after being escorted out of the facility.`
  accept
 
  label dodge
@@ -512,6 +537,5 @@ mission "Unfettered Jump Drive Trading"
  clear "choice: tripulse"
  clear "choice: blaster"
  outfit "Jump Drive" -1
- outfit "Hyperdrive" 1
  "reputation: Hai (Unfettered)" >?= 40
  fail

data/hai/unfettered jobs.txt

@@ -134,9 +134,13 @@ mission "Unfettered Jump Drive 4"
  ` The two Shredders are loaded onto your ship, in exchange for your jump drive.`
 
  label trade
+ branch cargo
+ has "outfit (cargo): Jump Drive"
  action
- outfit "Jump Drive" -1
  outfit "Hyperdrive" 1
+ label cargo
+ action
+ outfit "Jump Drive" -1
  "reputation: Hai (Unfettered)" >?= 40