-
Notifications
You must be signed in to change notification settings - Fork 997
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.
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
Free Worlds campaign rework (Stage 1) #7000
Conversation
Organize data in a consistent manner across all missions.
Made no substantial changes to the plot of the story, just improved the writing and dialog in various missions. * Expanded upon the conversations and dialogs for the Pact Recon missions, since they were rather sparse before. The biggest change is to the first mission, adding some more exposition about the actions of the militia in the face of high piracy and how the Navy doesn't help. * Did the same for FW Recon; removed mention of the "secret base" in Menkent, since this is not information that JJ should be divulging to a random merchant. Also expanded upon the final mission's on complete from being a puny dialog to a sizeable conversation where you get to ask questions about having been followed and what JJ will do with the info you gathered. * Expanded upon the FW Bounty conversations to better describe what you'll be facing and how to approach it. * Slightly bumped up the payment of some of the missions; substantially bumped up the payment of the later bounty missions. * Alphabetically ordered various mission information. * Standardized capitalization of South or Southern across the entire FW set of files when referring specifically to the region (as opposed to the cardinal direction).
Shuffled FW Bounty and FW Escort above FW Katya in the file. This makes it so that the missions are sorted as follows: * Pre-bombing missions (Pact Recon, Questioning). * Post-bombing secondary missions (FW Recon, Escorts, Bounty). * Post-bombing primary missions (FW Katya). * Commitment mission. * Post-commitment missions. The diff looks terrible for this, hence why I did this in its own commit.
The use of such a term has been superseded by the Coalition alien faction. The number of uses of the term to refer to the Free Worlds were few and far enough between that changing them to something else isn't too big an issue.
* Slight tweaks to Bounty missions. * Rewrote FW Escort 1 to introduce Tomek immediately, similar to Pact Recon introducing Freya immediately. * FW Escort now has persistent escorts instead of each mission mysteriously removing or respawning them. * Added some extra escorts to the Escort missions to help with defending the Freighters. * Replaced a few instances of "hope" with "pray" to lean a bit more into the FW being religious angle.
https://github.com/endless-sky/endless-sky/blob/master/data/human/culture%20conversations.txt#L504 |
This branch was actually pretty out of date until I opened this PR, so I hadn't caught those on my end. Thanks. |
One minor organization thing that would be handy to address in here: Could we rename |
For a word that clearly comes before "intro" we could use "prologue," but yeah, numbering makes things much clearer. (I originally implemented numbering for the Remnant because they correspond to chapters. If there was only going to be three I probably would have stuck with start, middle, and end. But more than three sections goes much nicer with numbers. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Super stoked to see this finally getting along some!
It's also shone a light on a couple of things that have lived rent-free in my brain for a while so I've called them out here. :)
Also I'll back the suggestion to rename the files with a number before the descriptor. Hai Reveal does that also for clarity, and I suspect the Republic campaign is going to as well.
* One-word labels don't need quotes or backticks. * No need for gotos and labels where the conversation would fall through to that line anyway. * Fixed up some indentation.
…the diff looks better during review
* Make dialogs one-liners.
Just wondering, do you intend this to be just text changes or also some fleet changes? Because I think that most big battles could use some looking at to make them doable with a single ship, not saying you have to do all of it though of course, if someone is interested he could do it. Multiple opinions would be nice too, mine is that the missions are almost impossible to do in a single ship. (took me 20 tries; without landing to repair the fleet all the time of course) Maybe it could be done in a separate PR; FW balancing or smth |
@Hurleveur Added a bullet point under the cutting room floor section. There are significant balance changes to ships in the game still in active discussion, and once any such changes are implemented it may wildly change how we would rebalance any battles, so I don't want to rebalance everything now then have to do it again later. |
Co-authored-by: MasterOfGrey <60949828+MasterOfGrey@users.noreply.github.com>
* Add extra choices in FW Katya for the player to question the Free Worlds. * Rescue Katya 1 now mentions that you should probably have a warship and some spare funds before joining the Free Worlds. * Rescue Katya 1 now properly introduces all members of the Council instead of saying they were introduced to you and hoping you read the logs. * Tomek no longer grabs a drink in Defend Sabik, instead going to gather the militia.
Finished going over the intro file, and the PR description has been updated with the major changes under the Intro section. If anyone has any further suggestions or comments about the intro file then I'll go over them, but as far as my own plans go I'll be moving onto the start file next. |
Changed a militia fleet to an FW fleet. Added a missing on fail dialog. Pirates in FW Pirates Attack 2 are now evade instead of kill. Early Warning 4 escorts are marked as such.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two biggest diff files don't have the option for me to open in app, I guess because the diffs are -too- large?
I'll try through browser in a bit, but here's the other stuff, all mostly pretty minor.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Finally got it working in browser to finish the rest.
Mostly just a few places I think tone/implication could be improved a bit still.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll do the remaining files tomorrow.
` "Sorry, I'm not interested in giving the Free Worlds more assistance."` | ||
decline | ||
` "Great," he says. "Your target is named the Silverhawk. After we nearly destroyed it, we think it went to the Shaula system to hide out. Which means that you'll probably have to deal with other pirates at the same time. The Silverhawk has weapons that seem to interfere with a ship's electrical systems, draining power from them. Good luck, Captain."` | ||
|
||
` "It has a pair of strange cannons that seem to interfere with a ship's electrical systems, draining its power and causing its weapons to malfunction. It's similar to those lasers the Quarg have, which is why we think the weapons are alien technology."` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do human ships actually last long enough under fire from Quarg ships for the ionisation to be apparent?
And, honestly, telling me they have weapons like the Quarg's isn't going to encourage me to take this job.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
telling me they have weapons like the Quarg's isn't going to encourage me to take this job.
Well I did bump the pay up.
` "But I'm a reasonable man," he continues, his expression changing to a smile. "If my friends trust you, then I will give you a second chance, even if it is against my better judgment. Now please, join us."` | ||
|
||
label next | ||
` That night you are introduced to the rest of the Council: Alondo Gruyere, the Council's chief diplomat, Freya Winters, an adept engineer and the Council's head of logistics, and Jean-Jacques "JJ" Soleau, an ex-Navy officer who now leads the training of the Free Worlds miltias. Katya Reynolds, the final member of the Council, is not present.` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Freya does logistics, and Tomek does supplies? What's the difference?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
¯\_(ツ)_/¯
MZ's work on that one, not mine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Supplies is making sure that there are people who can actually supply what you need, in the quantities you need them, on the timeline you want them - and if not, seeking other suppliers or investing in expanding the capacities of existing ones.
Logistics is corralling the products of your dozens to hundreds of suppliers, and potentially their suppliers if you're a government who's requisitioning vehicles and resources, and ensuring that all of those supplies actually end up where they're supposed to, when they're supposed to, and that suppliers and receivers both are aware of when and where those supplies are ending up.
In a small project this might be the same person/department, but for anything large enough to require multiple people to manage it, these are absolutely separate jobs.
data/human/free worlds start.txt
Outdated
` A much older man sitting next to him, Akihito, says, "Of course, such weapons would end up being bought at a significant price markup." He is grinning.` | ||
` "No," Remington says, surprising some of the other men at the table. "No markups necessary." None of the other men argue with Remington over this.` | ||
` You speak for a while longer, but Alondo manages to hash out a deal where the Free Worlds will defend any Syndicate ships they encounter within the Dirt Belt in return for a promise that the Syndicate will not serve as Republic mercenaries and will not prevent you from purchasing their equipment indirectly through Tarazed. In addition, Remington suggested that you might find some "extra goodies" among the Syndicate convoys heading to Tarazed specifically. You thank the Syndicate leaders, and begin the trip back to your ship.` | ||
` Alondo is silent. As you're about to leave the spaceport for the landing pads, you hear someone shout behind you. "No need to be a stranger, Gruyere. Can't stick around for a drink?" You turn to look at who it is, but Alondo keeps walking. You find Samuel Remington approaching, paying you no mind. "Are you still mad at me, Gruyere?" he asks` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just gonna say, the dynamic through this section had me rolling. Not sure if it was intended but it's so specific I'm pretty sure I could summarise their whole background off this interaction alone.
data/human/free worlds start.txt
Outdated
conversation | ||
`The mood in the spaceport is solemn. No one has had time yet to count up the losses, on both sides of the battle, but it is likely that over a thousand lives were lost. And because the Navy is held in such high regard even here where Parliament and the Paradise Planets are viewed with disgust, many of the militia captains are almost as saddened by the loss of Navy lives as by the loss of some of their own.` | ||
` You find Tomek walking among the fleet, conversing with captains and assessing the damage they have suffered. When he sees you he says, "Captain <last>! How is your <ship> holding together?"` | ||
` You find Tomek walking among the fleet, conversing with a large group of captains and crew members and assessing the damage they have suffered. When he sees you he says, "Captain <last>! How is your <ship> holding together?"` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
` You find Tomek walking among the fleet, conversing with a large group of captains and crew members and assessing the damage they have suffered. When he sees you he says, "Captain <last>! How is your <ship> holding together?"` | |
` You find Tomek walking among the fleet, conversing with a large group of captains and crew members, and assessing the damage they have suffered. When he sees you he says, "Captain <last>! How is your <ship> holding together?"` |
conversation | ||
`Eyes has been really quiet for the whole journey; you're sure that he's worried about Katya. When you land, he hands you <payment> and says, "Thank you for all your help, Captain. I hope that this leads to justice being done."` | ||
`Eyes has been really quiet for the whole journey; you're sure that he's worried about Katya. When you land, he hands you <payment> and says, "Thank you for all your help, Captain. I pray that this leads to justice being done."` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
People aren't defined by the circumstances of their birth. Smh.
Aren't you defining them by what part of the galaxy they happen to be in right now?
Ijs isn't even here when we start, and there's no indication he actually spends a whole lot of time here.
Your justification for this whole thing seems to be what MZ said about a person from the Dirt Belt probably being religious. The Dirt Belt, the Rim, and the South are all different places, the FW doesn't even contain any Dirt Belt worlds initially, and only two of the main characters are actually from there. (Maybe three, I don't know where Tomek is from.)
You're essentially turning the FW into a nation of hats.
If you're from the future, try to review the changes without this commit.
Redid large chunks of the introduction and start of the Free Worlds campaign to better flesh out various themes, to give Tomek's story more justice, to have the Syndicate play more of an active role in the campaign to support a future Syndicate campaign, and more. Later parts of the Free Worlds campaign will be looked at in the future.
Content (Artwork / Missions / Jobs)
Summary
While the Free Worlds campaign is a great story, there's definitely room for improvement at various points. Most notably, the choice between the Reconciliation and Checkmate routes is particularly one-sided toward Reconciliation at the moment (ref: #4121).
This PR will be the first of many that seek to run the Free Worlds campaign through a certified Derpy Review™, cleaning up the campaign from front to back. Over the years, I've gathered a collection of notes on various things that could or should be changed with the Free Worlds campaign, from issues that need patched up to story improvements that could be made to enhance the story. It'd take me hours to type out and explain all of the changes I have planned, so I'll just provide a general summary of my goals:
The following sections will provide an overview of the specific changes made to each section of the campaign as I make them. For sections I haven't gotten to yet, I'll say WIP or have a short preview of what I'm planning. For even more specific details, I'd suggest looking at each commit individually.
The changes in this PR
This pull request focuses on reworking the intro and start files. The two biggest goals with reworking the plot of these files are the following:
I'm also making some minor changes to other files outside of the intro and start to help lay the groundwork for future work:
Misc
Intro
Start
Middle
Reconciliation and Checkmate:
TODO:
Side Plots
Progress bar for dopamine purposes
Files that I've finished going over the story of:
Stuff I'm holding till later while I finalize the story first:
Stuff I need to do after everything else is done/approved:
For later stages
Misc
Preview:
Intro
Preview:
Start
Preview:
Middle
Preview:
Reconciliation
Preview:
Checkmate
Preview:
Epilogue
Preview:
Misc
Story changes in files:
Non-story relates changes:
FW Issues checklist:
Other campaign ideas and changes