Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(content): Avoid mentioning that the player invaded Greenrock with Tomek when they did not invade Greenrock #9647

Merged
merged 3 commits into from
Jan 6, 2024
Merged

fix(content): Avoid mentioning that the player invaded Greenrock with Tomek when they did not invade Greenrock #9647

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e73a82
add new condition
bene-dictator Jan 5, 2024
e9a0226
Forgot this one
bene-dictator Jan 5, 2024
02f99e5
Satisfy Derpy's demands
bene-dictator Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/human/free worlds 1 start.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,7 @@ mission "FW Pirates: Attack 2"
dialog `You've landed on <planet>, but there are still pirates defending the system. All pirates in the system must be eliminated before <planet> can be taken.`
on complete
event "fw suppressed Greenrock"
set "fw greenrock invader"
Copy link
Collaborator

@Amazinite Amazinite Jan 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you not just check has "FW Pirates: Attack 2: done"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I didn't think of that.

log "Disobeyed the Free Worlds Senate by helping to launch an attack on the pirate hub world of Greenrock. Captured the planet after a massive battle, but it is unclear how long the Free Worlds can afford to keep them subdued by force."
conversation
`As the remaining invasion fleet comes in for a landing on <origin>, you spot small pirate ships scattering from the spaceport, not into space, but instead into the far reaches of the Greenrock wilderness. When you reach the spaceport, there is a wild mix of emotions from the locals who remained. Some spit at you and curse you out. Others thank you for driving off the pirates, even if only temporarily. Others still thank you for freeing them and ask for transportation off-world before the slavers return; Greenrock is the hub of the underground slave trade in the galaxy, and it seems in the confusion and rush for some criminals to escape the spaceport, they left their slaves behind.`
Expand Down
4 changes: 2 additions & 2 deletions data/human/free worlds 2 middle.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ mission "FW Bloodsea 1.1"
conversation
`The local leaders are unwilling to meet aboard your ship, and Alondo is afraid you will be ambushed if you venture too far away from it, so eventually they agree to set up a tent on the landing pad next to yours and meet there. Outside, a storm is raging, the rain mixing with salt spray from the blood-red ocean nearby.`
branch peaceful
not "event: fw suppressed Greenrock"
not "fw greenrock invader"
` Most of the leaders grimace at the sight of you. "What is the invader doing here?" one of them asks to Alondo.`
` "Captain <last> was only following orders, but the officer responsible for giving those orders has been justly punished," Alondo says. "We come in peace this time." The leaders don't seem convinced with that answer, but they agree to continue.`
label peaceful
Expand All @@ -1468,7 +1468,7 @@ mission "FW Bloodsea 1.1"
` "So, we attack them?" you ask.`
label invade
branch hostile
not "event: fw suppressed Greenrock"
not "fw greenrock invader"
` "They didn't seem very happy about you doing that the first time. But..." Alondo pauses for a moment.`
label hostile
` "That's certainly the simpler option," he says. "Tomek may have been punished for disobeying the Senate's orders, but we're in a different situation now. Our numbers have swelled because of our victories and new territory, and we now have the Dreadnoughts at our disposal, so occupying Bloodsea is now a viable option.`
Expand Down