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

Rewrites Lore-Inconsistent Scenario Descriptions #71726

Merged
merged 38 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
97c423d
fixes merge errors.
DoctorBoomstick Jul 2, 2023
ad9a35b
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 3, 2023
f243460
Merge branch 'master' of https://github.com/DoctorBoomstick/Cataclysm…
DoctorBoomstick Jul 4, 2023
c85a281
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 9, 2023
9d40bd7
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 21, 2023
e3eb338
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jul 29, 2023
e03c3a4
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 3, 2023
d006c4e
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 6, 2023
df5f709
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 13, 2023
6002b70
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 17, 2023
eabc64e
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 20, 2023
4b38a26
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Aug 31, 2023
3202fd6
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Sep 29, 2023
407f8eb
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Oct 6, 2023
55c0b70
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Oct 14, 2023
de0154c
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Nov 7, 2023
4984eeb
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Nov 20, 2023
a0e7e2c
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 7, 2023
f80539e
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 11, 2023
397de31
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 14, 2023
4cbf7e7
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Dec 22, 2023
fae5975
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Jan 15, 2024
328362f
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 4, 2024
31dd3ad
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 8, 2024
1da0174
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 11, 2024
9838871
rewrites the descriptions.
DoctorBoomstick Feb 12, 2024
fe7b471
fixes typos. DAM YOU TYPOS!
DoctorBoomstick Feb 12, 2024
53203c1
Update data/json/scenarios.json
DoctorBoomstick Feb 14, 2024
d225a86
Rewrites the description for Crazy Party.
DoctorBoomstick Feb 15, 2024
bdf7be4
Merge remote-tracking branch 'upstream/master'
DoctorBoomstick Feb 16, 2024
5c27cc4
Update data/json/scenarios.json
DoctorBoomstick Feb 17, 2024
0171935
Merge branch 'master' into SD
DoctorBoomstick Feb 17, 2024
b7fd8a3
food place description tweeks.
DoctorBoomstick Feb 17, 2024
8818627
Update data/json/starting_missions.json
DoctorBoomstick Feb 18, 2024
a914034
Update data/json/scenarios.json
DoctorBoomstick Feb 18, 2024
0f1a72a
Update data/json/scenarios.json
DoctorBoomstick Feb 18, 2024
ca8e124
Update data/json/scenarios.json
DoctorBoomstick Feb 18, 2024
3866b1b
adds missing spaces.
DoctorBoomstick Feb 18, 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
8 changes: 4 additions & 4 deletions data/json/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@
"id": "foodplace",
"name": "The Mascot Rises",
"points": 0,
"description": "You just finished your shift and got back in the break room when you heard the alarms and the security door shutting down behind you. There's a lot of hungry customers out there and you're not sure Foodplace's delicious food™ is going to be enough to satisfy them.",
"description": "Business had been bad—for some reason, weeks of rioting, an evacuation order, and the sky breaking with alien shadows prompted a downturn in foot traffic, even among Food Place’s chain restaurants. As an employee, upon evacuation being declared, you disregarded company orders to lock up your outlet and, along with another survivor, opted to close yourselves within the breakroom rather than braving the streets awash with insanity and blood. Safe, for now, behind a security door, youre convicted that, at least, you’re not going to die in a cheep fast food joint.",
DoctorBoomstick marked this conversation as resolved.
Show resolved Hide resolved
"allowed_locs": [ "sloc_restaraunt_foodplace_break_room" ],
"professions": [ "true_foodperson", "unemployed" ],
"start_name": "Foodplace Break Room",
Expand All @@ -733,7 +733,7 @@
"id": "last_delivery",
"name": "The Last Delivery",
"points": 2,
"description": "While the world was falling apart, someone called to order some of Foodplace's delicious food™ and you were sent to deliver it. You're not sure what's happened to the world, but one thing is certain: that delicious food™ is going to get delivered if it's the last thing you do!",
"description": "Bigwigs had been acting strangely over the past weeks at Food Place Regional HQ: making all their delivery drivers wear full mascot uniforms, insisting on maintaining regular drop-offs despite the evacuation, and shredding insubordinates skin off with desk scissors. The latter was the straw that broke the camel’s back; you’d nabbed a parked food truck and high-tailed it out of dodge. Since then, you’ve been cruising around New England, trying to get to evacuation points, only to find them deserted or overrun. With only a stretch of open road between you and your nightmares, only time will tell what will become of you.",
DoctorBoomstick marked this conversation as resolved.
Show resolved Hide resolved
"vehicle": "food_truck_delivery_mission",
"professions": [ "true_foodperson", "unemployed" ],
"start_name": "A Stop On The Road",
Expand Down Expand Up @@ -848,7 +848,7 @@
"id": "presort",
"name": "Crazy Party",
"points": -2,
"description": "After a night of wild partying at a private resort, you awoke to the sounds of police sirens and violence. You were worried about being arrested, but you'd take that in a heartbeat over being eaten alive, which now seems far more likely.",
"description": "It was meant to be a simple, nice, relaxing holiday—a means to distance yourself from the crazies flooding the cities. What it turned out to be was a nerve-racking stay in a resort filled with uneasy people while the nation fell to bits outside, and, when the evacuation order came, scores of refugees flooded to the building as a makeshift gathering point. As the population grew past what the private security could comfortably supervise and any form of evac failed to materialise, you heard murmurings that things weren’t going to end well. They were right.",
"start_name": "Private resort",
"allowed_locs": [ "sloc_private_resort" ],
"professions": [
Expand Down Expand Up @@ -1259,7 +1259,7 @@
"id": "low_profile_start",
"name": "Low Profile",
"points": -1,
"description": "You were trying to get some distance from home and keep a low profile. Days of boredom and a return to bad habits made you overdo it with the booze last night. You awake and find yourself confused by the strange behaviour of people outside. Time to sober up and see what's going on.",
"description": "You heard the global, worsening news and saw the nightmare in the cities firsthand—a situation that prompted you to jump from low-rent motel to cheap trailer, trying to outrun the madness. While only you know where you'd planned to go, when you heard the government’s last broadcast and realised 'no help was coming,' you resolved to raise a dejected toast and sink to the bottom of a bottle for as long as you could. What happened in the following days of drunken stupor is an enigma. What you do know, is that it's time to see how much of the world there’s left to return to.",
DoctorBoomstick marked this conversation as resolved.
Show resolved Hide resolved
"forced_traits": [ "ADDICTIVE" ],
"start_name": "Outside Town",
"allowed_locs": [ "sloc_mobile_home", "sloc_motel" ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/starting_missions.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@
{
"id": "MISSION_LAST_DELIVERY",
"type": "mission_definition",
"name": { "str": "Reach The Mansion And Finish This Delivery" },
"name": { "str": "Reach Your Vehicle’s Delivery Destination" },
"description": "According to your truck’s saved GPS coordinates, its original mission had been to deliver Food Place products to a mansion in bumfuck nowhere. You’re not sure who orders takeout while the United States is imploding upon itself, but it seems like as good of a place as any to head to now that evacuation seems to be off the cards. They’re rich people, after all. Perhaps they’ll have some room for charity.",
Maleclypse marked this conversation as resolved.
Show resolved Hide resolved
"goal": "MGOAL_GO_TO_TYPE",
"destination": "mansion_c3",
"difficulty": 1,
Expand Down
Loading