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

New island prison layout #46726

Merged
merged 20 commits into from
Feb 6, 2021
Merged

New island prison layout #46726

merged 20 commits into from
Feb 6, 2021

Conversation

Night-Pryanik
Copy link
Contributor

@Night-Pryanik Night-Pryanik commented Jan 13, 2021

Summary

Content "New island prison layout."

Purpose of change

While alcatraz island prison layout was fun (I hope), it still was the only one layout for the challenge. So I decided to add a new one.

Describe the solution

Added a new layout. Now with more zombie varieties (and even with named ones!), with underground level, with NPCs, with rudimentary interaction with them, and even with simple mission for them.

Describe alternatives you've considered

Create a nested variant instead of a hand-written one. Maybe next time.

Testing

Debug-spawned location, teleported around to check if everything is fine. Talked to NPCs, accepted and completed mission.

Additional context

Bird-eye view:
изображение

North-western part
изображение

South-western part
изображение

South-eastern part
изображение

North-eastern part
изображение

Bird-eye view of the underground (huh?)
изображение

@Night-Pryanik Night-Pryanik added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Jan 13, 2021
Comment on lines -705 to +720
"I've had enough of you, begone.",
"I've had enough of you, begone",
Copy link

Choose a reason for hiding this comment

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

Are the rest of the insults in this auto-capitalized, thus not needing this to be?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Honestly I'm ambivalent on this. I just needed short insults which could act as a complete sentence, not as a part of some other sentence. But it could be changed to begin with lowercase letters if really needed.

Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Copy link
Contributor

@actual-nh actual-nh left a comment

Choose a reason for hiding this comment

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

Interesting!

data/json/npcs/talk_tags.json Outdated Show resolved Hide resolved
data/json/npcs/factions.json Outdated Show resolved Hide resolved
data/json/scenarios.json Outdated Show resolved Hide resolved
data/json/npcs/island_prison/prisoners.json Outdated Show resolved Hide resolved
data/json/npcs/island_prison/prisoners.json Outdated Show resolved Hide resolved
data/json/npcs/island_prison/prisoners.json Outdated Show resolved Hide resolved
data/json/npcs/island_prison/prisoners.json Outdated Show resolved Hide resolved
data/json/npcs/island_prison/prisoners.json Outdated Show resolved Hide resolved
data/json/npcs/island_prison/prisoners.json Outdated Show resolved Hide resolved
data/json/npcs/talk_tags.json Show resolved Hide resolved
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: matskuman5 <selinmatias5@gmail.com>
Anton Burmistrov and others added 4 commits January 16, 2021 08:27
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
@@ -377,8 +377,8 @@
"id": "alcatraz",
"name": "Challenge - Island Prison",
"points": -6,
"description": "You were at a high-security prison right before the Cataclysm. You managed to make it outside the inner walls… Too bad it's located on a remote island, and now you need to find out how to escape it too.",
"allowed_locs": [ "sloc_prison_alcatraz" ],
"description": "You were in a high-security prison right before the Cataclysm. Unfortunately, you're still in it, so you need to figure out how to escape. It's located on a remote island to boot; you'll eventually need to escape that also.",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"description": "You were in a high-security prison right before the Cataclysm. Unfortunately, you're still in it, so you need to figure out how to escape. It's located on a remote island to boot; you'll eventually need to escape that also.",
"description": "You were in a high-security prison right before the Cataclysm. Unfortunately, you're still in it, so you need to figure out how to escape. (It's located on a remote island to boot; you'll eventually need to escape that also.)",

Is this (starting inside) true of the sloc_prison_alcatraz also?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, on alcatraz variant you're starting outside.

Copy link
Contributor

Choose a reason for hiding this comment

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

Urr. In that case, there really need to be two different descriptions (probably meaning two different Island Prison challenges).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately, this is not possible. There could be only one description for the scenario. This is why we need something neutral.
Also it would be very helpful if we could set different scenario descriptions based on scenario professions.

Copy link
Contributor

@actual-nh actual-nh Jan 16, 2021

Choose a reason for hiding this comment

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

Suggested change
"description": "You were in a high-security prison right before the Cataclysm. Unfortunately, you're still in it, so you need to figure out how to escape. It's located on a remote island to boot; you'll eventually need to escape that also.",
"description": "You were in a high-security prison right before the Cataclysm. You're in a better position to escape than you were before, but you're not there yet. For one thing, it's located on a remote island to boot.",

This would be a convict one.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"description": "You were in a high-security prison right before the Cataclysm. Unfortunately, you're still in it, so you need to figure out how to escape. It's located on a remote island to boot; you'll eventually need to escape that also.",
"description": "You were in a high-security prison right before the Cataclysm. This is a problem, particularly since it's located on a remote island.",

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I liked your first variant, and without parentheses.

Copy link
Contributor

Choose a reason for hiding this comment

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

I like how it reads, but I'm not sure how to adapt it for the Alcatraz setup, or non-prisoner profession.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's already neutral enough to fit both alcatraz and this setup, and all available professions.

@kevingranade kevingranade merged commit 7a5f7e7 into CleverRaven:master Feb 6, 2021
@Night-Pryanik Night-Pryanik deleted the new-island-prison-layout branch February 6, 2021 03:54
feinorgh pushed a commit to feinorgh/Cataclysm-DDA that referenced this pull request Feb 8, 2021
* Tweaked some things in mapgen palette
* Added "prisoner" variants for three zombie types
* Added a new "get_lost" talk tag
* Added a new "prisoners" faction
* Added new NPC class, NPC types with this new class, and a whole lot of talking
* Added a new island prison layout and the required stuff for it
* Added a new start location in a new prison
* Added a case when player already has the id card at the time when he meets the leader of prisoners
* Added a small church with a named zombie
Co-authored-by: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: matskuman5 <selinmatias5@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants