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

Overhaul and Flesh Out Barry Isherwood's Rescue Mission, part 2 #73388

Merged

Conversation

MNG-cataclysm
Copy link
Contributor

@MNG-cataclysm MNG-cataclysm commented Apr 29, 2024

Summary

Content "Overhaul and flesh out Barry Isherwood's rescue mission, part 2."

Purpose of change

This is a co-development PR for #73264, intended to cover parts of the project that Erk and I couldn't fit in the first one.

Describe the solution

This PR does a few different things for the rescue mission for Barry:

  1. You can now buy riot gear from the Hub and the Exodii for $400 if you have good standing with these factions, allowing you to outfit the Isherwoods without a risky run to town. You can even buy this on credit, with a 20-day period to pay this fee back. Failing to do so lowers your reputation with both of these factions.

  2. If you've been to a mi-go location before, you can talk with Luke Isherwood about building a truck bomb to breach the side tower with. This is a 2-mission chain that involves killing bandits for their truck, then going to a mine to get a dynamite shipment for Luke to make a time bomb with. This kills a lot of mi-go's when detonated and gets rid of the gas on floor 1 of the tower.

Describe alternatives you've considered

Not allowing the player to buy equipment from two factions, and not letting the player get a truck bomb for a risky extraction. I think that both of these make the mission less cool.

Testing

Tested multiple times, everything works well.

Additional context

A design document can be found here

Big thanks to @I-am-Erk for all of his help with this project. He did the dialogue for part 1, and thanks to @Maleclypse for finishing the dialogue for this PR, you've both done a whole lot and I'm happy to have worked with you.

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON labels Apr 29, 2024
@MNG-cataclysm MNG-cataclysm changed the title S[WIP] Overhaul and Flesh Out Barry Isherwood's Rescue Mission, part 2 [WIP] Overhaul and Flesh Out Barry Isherwood's Rescue Mission, part 2 Apr 29, 2024
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Apr 29, 2024
@github-actions github-actions bot added the Missions Quests and missions label May 4, 2024
@MNG-cataclysm
Copy link
Contributor Author

All that's left for this PR is to add some fail states to the rescue mission, but I don't think that can be reliably done until part 1 is merged.

@github-actions github-actions bot added Vehicles Vehicles, parts, mechanics & interactions Spawn Creatures, items, vehicles, locations appearing on map labels May 6, 2024
@github-actions github-actions bot added EOC: Effects On Condition Anything concerning Effects On Condition and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 20, 2024
@MNG-cataclysm MNG-cataclysm marked this pull request as ready for review May 22, 2024 02:05
@MNG-cataclysm MNG-cataclysm changed the title [WIP] Overhaul and Flesh Out Barry Isherwood's Rescue Mission, part 2 Overhaul and Flesh Out Barry Isherwood's Rescue Mission, part 2 May 22, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 22, 2024
@TealcOneill
Copy link
Contributor

TealcOneill commented May 26, 2024

Is this finished? It looks good 👍

@MNG-cataclysm
Copy link
Contributor Author

Is this finished? It looks good 👍

No, I'm still waiting for @I-am-Erk to finish the dialogue.

Copy link
Contributor

github-actions bot commented Jul 2, 2024

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not bump or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@github-actions github-actions bot added the stale Closed for lack of activity, but still valid. label Jul 2, 2024
Copy link
Contributor

github-actions bot commented Jul 9, 2024

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • Anychance I can buy some riot armor? I need five complete sets.
  • If'n you survive, We can give you a fortnight and six odd days to pay us'n back.
  • Mayhaps this gear will do you better than it did the scuffers wot trained with it. [$400]
  • Right and done, don't let whatever you are going after turn you into a pork loin well done. I's expectin, you back.
  • [i'm here to pay my riot gear off.]

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jul 9, 2024
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 9, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 12, 2024
@Maleclypse Maleclypse merged commit f715576 into CleverRaven:master Jul 12, 2024
25 of 26 checks passed
@MNG-cataclysm MNG-cataclysm deleted the barry_rescue_mission_refinement_pt2 branch July 12, 2024 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions EOC: Effects On Condition Anything concerning Effects On Condition [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Missions Quests and missions NPC / Factions NPCs, AI, Speech, Factions, Ownership (P5 - Long-term) Long-term WIP, may stay on the list for a while. Spawn Creatures, items, vehicles, locations appearing on map Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants