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.

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

Hr intro bridge #1

Merged
merged 68 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
f179b47
Initial clean, reactivate, apply consistency
MasterOfGrey Jun 30, 2023
f8a23c1
News file labels+cleanup
MasterOfGrey Jun 30, 2023
202c5c0
switch Sally back in for Calvin
MasterOfGrey Jun 30, 2023
48a5ddf
Restore basic wanderer's compatibility
MasterOfGrey Jun 30, 2023
a600f3e
Outline + Raid on Allhome
MasterOfGrey Jul 2, 2023
9a92bb6
bugfixes on prev
MasterOfGrey Jul 2, 2023
5d6b4e1
Tweak from lumbar527
MasterOfGrey Jul 2, 2023
6c5733e
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Jul 2, 2023
c3bc1db
Oversight caught by Quantum
MasterOfGrey Jul 6, 2023
7f93832
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Jul 6, 2023
3e5c866
add "HREP: Concerned Hai"
MasterOfGrey Jul 9, 2023
14a4d73
bugfixes on prev
MasterOfGrey Jul 9, 2023
920b54f
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Jul 9, 2023
895a04d
Merge branch 'master' into HR-Intro-Bridge
Amazinite Jul 15, 2023
14025c0
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Jul 18, 2023
6d2efa9
Bene's Review
MasterOfGrey Jul 19, 2023
cd7fccf
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Jul 22, 2023
ff3cd1b
HREP: Humans Pressured
MasterOfGrey Jul 23, 2023
afe7a9b
typo on prev
MasterOfGrey Jul 23, 2023
31a7aa9
Standardise no capitalisation of "Elders"
MasterOfGrey Jul 23, 2023
850cc38
Hurls Drafts
MasterOfGrey Aug 24, 2023
ab3374a
Humans Going Home rework
MasterOfGrey Aug 24, 2023
9229be1
Securing Sandsnap rework
MasterOfGrey Aug 24, 2023
26c62d3
bugfixes on prev
MasterOfGrey Aug 24, 2023
69a55ad
HREP: Hei Low Io Stocks Up
MasterOfGrey Aug 26, 2023
cb2badf
Misc. light fixes
MasterOfGrey Sep 28, 2023
b19f48d
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Sep 28, 2023
b01bd37
Drafts from Hurl + Ejo
MasterOfGrey Sep 28, 2023
f971d00
Sandsnap event
MasterOfGrey Sep 28, 2023
1c1f276
Finish up Sandsnap
MasterOfGrey Sep 30, 2023
0b05d2f
Local Merchants Speak up 1/3
MasterOfGrey Sep 30, 2023
9de18d8
no value expressions in payment
MasterOfGrey Sep 30, 2023
599a4fc
whitespace fixes
MasterOfGrey Sep 30, 2023
44e9736
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Sep 30, 2023
80ab428
bene's review leftovers
MasterOfGrey Sep 30, 2023
8ca3276
Bene's review
MasterOfGrey Oct 1, 2023
9351774
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Oct 1, 2023
2890d85
Remove superfluous ToDo's
MasterOfGrey Oct 2, 2023
06d7962
Media retractions
MasterOfGrey Oct 2, 2023
4fe40f2
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Oct 2, 2023
f66cc6f
Local Merchants Speak up 2/3
MasterOfGrey Oct 8, 2023
e388d62
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Oct 8, 2023
a0c3b31
Local Merchants Speak up 3/3
MasterOfGrey Oct 8, 2023
e87919f
Apply Ejo review
MasterOfGrey Oct 8, 2023
f4ea324
extra
MasterOfGrey Oct 8, 2023
e811585
Fix to older text by Ejo
MasterOfGrey Oct 12, 2023
3ab5eb7
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Oct 12, 2023
3cee06b
Sort out the spellcheck
MasterOfGrey Oct 12, 2023
1811e7a
take 2
MasterOfGrey Oct 12, 2023
8545fcd
Uncontroversial roadrunner
MasterOfGrey Oct 18, 2023
79d2c59
Roadrunner review 2
MasterOfGrey Oct 26, 2023
772ff18
bits from bene
MasterOfGrey Oct 28, 2023
a23f467
Apply suggestions bene
MasterOfGrey Nov 17, 2023
23b64b2
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Nov 17, 2023
08754ad
Mixed suggestions from review
MasterOfGrey Nov 22, 2023
153879f
comma
MasterOfGrey Jan 27, 2024
d74901a
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey Jan 27, 2024
b2d6f83
Finish making playable (in theory)
MasterOfGrey Jan 28, 2024
bbdb572
there's always a typo
MasterOfGrey Jan 28, 2024
3e9a10b
missed event define
MasterOfGrey Jan 28, 2024
56fe5c7
missed or condition
MasterOfGrey Jan 28, 2024
1e4623e
fix whitespace from suggestion
MasterOfGrey Jan 28, 2024
d5aceca
Bene review
MasterOfGrey Jan 28, 2024
bd07078
Restore nuked whitespaces?
MasterOfGrey Jan 28, 2024
965baca
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey May 2, 2024
9a5b0e6
Remove errant extra linebreak
MasterOfGrey May 28, 2024
e9abf64
Merge branch 'master' into HR-Intro-Bridge
MasterOfGrey May 28, 2024
86d3b0a
Tweaks from Ziproot
MasterOfGrey May 29, 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: 0 additions & 1 deletion .codespell.exclude
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ planet "Sies Upi"
` MSGT IRENE BROWER`
`As you step out of your ship, you spot a familiar face: Irene Brower, the gunnery sergeant you delivered a care package to before the war, though she seems to have master sergeant insignia now. She's on crutches, with what looks like a brand-new prosthetic leg. When she spots you, her pained face brightens. "Hey, I know you! You brought me that package from Tor before. Thanks!" She shifts her weight, then winces and shifts it back.`
log "Minor People" "Torrey and Irene" `Torrey Dupont, an activist, is friends with SMDP militia NCO Irene Brower. You delivered a package for them.`
"Brin"
"exis"
` The old man narrows his eyes at you and his mouth falls slightly open like he's trying to make sense of a puzzle. Finally he says, "What's the bits between a fella's legs gotta do with anything? I already said, 'Ser' is just what decent folk call each other; ain't nothing more to it. Don't matter if you're a guy, gal, or anything else. Hel, I reckon I'd even call an elf 'Ser' if they done me a good turn.`
` The old man gives you a gruff nod and says, "Ah, I see. Can be confusing for a newcomer, I s'pose. What's 'tween a fella's legs gots nothing to do with it. Just like I said before, 'Ser' is just what decent folk call each other; ain't nothing more to it. Don't matter if you're a guy, gal, or anything else. Hel, I reckon I'd even call an elf 'Ser' if they done me a good turn.`
Expand Down
1 change: 1 addition & 0 deletions .codespell.words.exclude
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ aesthetic
aesthetics
aesthetically
ser
brin
4 changes: 2 additions & 2 deletions data/hai/hai fleets.txt
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ fleet "Large Hai Merchant (Sympathizers)"

fleet "Small Hai Merchant (Human)"
government "Hai Merchant (Human)"
names "hai"
names "hai (human)"
cargo 3
personality
confusion 25
Expand Down Expand Up @@ -521,7 +521,7 @@ fleet "Small Hai Merchant (Human)"

fleet "Large Hai Merchant (Human)"
government "Hai Merchant (Human)"
names "hai"
names "hai (human)"
cargo 4
personality
confusion 25
Expand Down
14 changes: 11 additions & 3 deletions data/hai/hai reveal 0 prologue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <https://www.gnu.org/licenses/>.

########################################################################

mission "Hai Reveal: Secret Leaks"
landing
invisible
Expand All @@ -24,6 +26,7 @@ mission "Hai Reveal: Secret Leaks"
"hr: knew of hai" = "First Contact: Hai: offered" + "First Contact: Unfettered: offered"
fail


event "hr: friend arrives"

event "hr: friend settled in"
Expand Down Expand Up @@ -369,6 +372,7 @@ mission "Hai Reveal: Late Arrival: Alondo"
on complete
set "hr: meet the team"


event "hr: join later"


Expand Down Expand Up @@ -506,7 +510,6 @@ mission "Hai Reveal: Meet the Team: Xilin 1"
dialog phrase "generic passenger on visit"



mission "Hai Reveal: Meet the Team: Xilin 2"
landing
name "New Arrivals"
Expand Down Expand Up @@ -625,7 +628,6 @@ mission "Hai Reveal: Meet the Team: Samuel 1"
dialog phrase "generic passenger on visit"



mission "Hai Reveal: Meet the Team: Samuel 2"
landing
name "High Tension"
Expand Down Expand Up @@ -741,7 +743,6 @@ mission "Hai Reveal: Meet the Team: Sayari 1"
accept



mission "Hai Reveal: Meet the Team: Sayari 2"
landing
name "Important Message"
Expand All @@ -767,6 +768,13 @@ mission "Hai Reveal: Meet the Team: Sayari 2"
goto more
` Sayari smiles. "How humble. Although I suppose you're wondering what do to next.`
label more
branch "familiar"
"reputation: Hai" >= 1000
` "For now, there are no immediate tasks for you. The others will continue working on the plan to manage the situation, and we will call upon you once you are needed. I suggest you explore our systems while you wait and gain a better understanding of the Hai people. It will do us well for you to have this knowledge."`
goto end
label "familiar"
` "For now, there are no immediate tasks for you. The others will continue working on the plan to manage the situation, and we will call upon you once you are needed. I suggest you tie up any unfinished business you have around here while you wait. There may not be much opportunity to do so in the future."`
label end


event "hr: exploration period"
847 changes: 819 additions & 28 deletions data/hai/hai reveal 1 intro.txt

Large diffs are not rendered by default.

27 changes: 13 additions & 14 deletions data/hai/hai reveal 3 early.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ mission "Hai Building Mountaintop [1] Construction Fleet"
` "It would help if I oversaw the construction, wouldn't it?"`
goto oversee
` "Good idea. Let me know when the station is complete."`
` "It's not so simple," Sayari responds. "In the light of the recent civil war your species has had, some of the Elders are less than keen on allowing a partisan observer to see the inner workings of a station in its earliest phases, especially when we haven't actually built one in so, so long."`
` "It's not so simple," Sayari responds. "In the light of the recent civil war your species has had, some of the elders are less than keen on allowing a partisan observer to see the inner workings of a station in its earliest phases, especially when we haven't actually built one in so, so long."`
` Now that she mentions it, all of the stations in Hai space do seem to be very, very old.`
` "However, therein lies a problem," says Xilin.`
` "The Republic will not allow the Hai to build a station on our side of the wormhole without some oversight by someone we trust. This has now been a point of contention for some days, and multiple suggestions have been rejected."`
Expand All @@ -47,21 +47,21 @@ mission "Hai Building Mountaintop [1] Construction Fleet"
` "Anyway," she continues, "thanks to a little Freedom of Information request to the Republic, I have been looking at things, and I think I have the solution."`
choice
` "Is it me?"`
` Sayari winks at you. "Catch on quick, don't you? The actions you're recorded as having taken show a certain conscience for the good of your species as a whole, despite your affiliations. I have convinced the other diplomats and our Elders that you might be a viable solution to this impasse. The human diplomats have already agreed, but the Elders wish to speak with you first."`
` Sayari winks at you. "Catch on quick, don't you? The actions you're recorded as having taken show a certain conscience for the good of your species as a whole, despite your affiliations. I have convinced the other diplomats and our elders that you might be a viable solution to this impasse. The human diplomats have already agreed, but the elders wish to speak with you first."`
goto elders
label oversee
` "You're learning to navigating the maze of galactic politics quickly, Captain <last>," says Sayari. "We are at an impasse. The Elders are less than keen on allowing a partisan observer to see the construction."`
` "You're learning to navigating the maze of galactic politics quickly, Captain <last>," says Sayari. "We are at an impasse. The elders are less than keen on allowing a partisan observer to see the construction."`
` Xilin continues her thought. "The Republic won't let the Hai build a station on our side of the wormhole without a trusted observer monitoring construction.`
` "Both sides trust you, though," he says, as Sayari nods.`
label elders
choice
` "Who are these Elders?"`
` "Who are these elders?"`
` "Of course, that's natural."`
goto main
` Sayari explains, "The Hai are ruled by an elected council of elders. They are not responsible for every administrative decision that occurs, but they are the highest authority of our government. Their decisions are final, at least for the term of an election."`
` Sayari explains, "The Hai are ruled by an elected Council of Elders. They are not responsible for every administrative decision that occurs, but they are the highest authority of our government. Their decisions are final, at least for the term of an election."`
goto main
label buildingdeferred
` Xilin addresses you, "Not a great deal of progress has been made in your absence. We have maintained our position, so the other diplomats and the Elders still accept that you might be a viable solution to this impasse. It is unavoidable though that the Elders must speak with you first."`
` Xilin addresses you, "Not a great deal of progress has been made in your absence. We have maintained our position, so the other diplomats and the elders still accept that you might be a viable solution to this impasse. It is unavoidable though that the elders must speak with you first."`
label main
` "If you're willing, there will be a council meeting in an hour, and I can put you first on the agenda. Will you do this?" asks Sayari.`
choice
Expand Down Expand Up @@ -114,7 +114,7 @@ mission "Hai Building Mountaintop [1] Construction Fleet"
` No sooner has she finished than there is a knock at the door, and an aide looks in. "The Council will see you now."`
choice
` (Walk into the Council chambers.)`
` The next twenty minutes prove to be an exercise in tedium as various members of the council interrogate you over apparently mundane details of your recent actions as recorded in the Freedom of Information report. You're not really sure what most of it has to do with anything, but eventually one of the Elders stands up.`
` The next twenty minutes prove to be an exercise in tedium as various members of the council interrogate you over apparently mundane details of your recent actions as recorded in the Freedom of Information report. You're not really sure what most of it has to do with anything, but eventually one of the elders stands up.`
` "I think we've generally had enough of this here. Answer me two questions, and then we shall make our decision. Firstly, do you think that a diplomatic post should be able to defend itself? Or should it trust to the strength of those who meet there to ensure its protection?"`
` This seems like a very strange question...`
choice
Expand All @@ -125,12 +125,12 @@ mission "Hai Building Mountaintop [1] Construction Fleet"
label trust
action
set haitrust
` You seem to get no reaction, and the Elder follows up with, "What is the gravest threat, in your opinion, facing humanity?"`
` You seem to get no reaction, and the elder follows up with, "What is the gravest threat, in your opinion, facing humanity?"`
goto return
label caution
action
set haicaution
` You seem to get no reaction, and the Elder follows up with, "What is the gravest threat, in your opinion, facing humanity?"`
` You seem to get no reaction, and the elder follows up with, "What is the gravest threat, in your opinion, facing humanity?"`
label return
choice
` "The Pug."`
Expand All @@ -155,7 +155,7 @@ mission "Hai Building Mountaintop [1] Construction Fleet"
"Building Mountaintop Deferred" ++
on accept
event "role-play station before construction"
log `The diplomats have elected to double down on the movie production angle, with the costumed community "focus group," citing its success. This requires a station to be built; however, the Hai are unwilling to trust a human government to see the inner workings of a station under construction in the wake of the civil war, and the Republic will not allow a station to be built on their side unsupervised. Agreed to fulfill the role of supervisor after being asked by the diplomats and completing some sort of test by the Hai Elders involving some odd questions.`
log `The diplomats have elected to double down on the movie production angle, with the costumed community "focus group," citing its success. This requires a station to be built; however, the Hai are unwilling to trust a human government to see the inner workings of a station under construction in the wake of the civil war, and the Republic will not allow a station to be built on their side unsupervised. Agreed to fulfill the role of supervisor after being asked by the diplomats and completing some sort of test by the Hai elders involving some odd questions.`
on stopover
dialog `A fleet of eight Geocoris is waiting to accompany you when you arrive, with just the final items being loaded as you come in to land. They will follow you to the site where the new station will be built.`
to complete
Expand Down Expand Up @@ -241,10 +241,6 @@ event "role-play station after construction"



event "hai dog and pony done"
clear "hai dog and pony final stop"


mission "Hai Building Mountaintop [2] Recruits"
name "Encourage recruits for Mountaintop"
description "Now that the station is going ahead, the Hai need to recruit people to be actors in this movie production. Someone needs to sell it to them, and apparently that someone is you."
Expand Down Expand Up @@ -322,6 +318,9 @@ mission "Hai Building Mountaintop [2] Recruits"
payment 10000000
dialog `You finally dock at <planet>, your tedious tour complete. Shortly after, you receive a ping informing you that <payment> has been deposited into your account. Terry must've set it up to happen automatically.`

event "hai dog and pony done"
clear "hai dog and pony final stop"


mission "ZZ Hai Building Mountaintop [2a] Sales Job"
landing
Expand Down
Loading
Loading