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

feat(port, content): freshwater research station #3762

Merged
merged 7 commits into from
Nov 27, 2023

Conversation

Vollch
Copy link
Contributor

@Vollch Vollch commented Nov 26, 2023

Purpose of change

Freshwater Research Station is a neat special to have.
It's mostly JSON thing, but also includes tiny yet vital C++ change, required for all other underwater specials(aircraft carrier).

Describe the solution

Ported PRs:

With minimal changes:

  • Move cost of t_door_metal_bulkhead_o increased from 1 to 2. Such doors are not allowed in BN. (Add check for suspicious move_cost in terrain #2252)
  • Removed city constraints from specials. It had "city_sizes": [ 1, 20 ] which does pretty much nothing, except confusing mapgen.

Describe alternatives you've considered

Also porting vertical swimming, and two way ladders. Both are good, but not directly related - they will be ported separately.

Testing

Spawned via debug; found naturally generated one; started in it from Safe Place scenario. All works.

Additional context

Checklist

@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. labels Nov 26, 2023
@chaosvolt chaosvolt changed the title port(content): Freshwater Research Station port(content): freshwater research station Nov 26, 2023
@chaosvolt
Copy link
Member

heccin' case-sensitive semantic PR thing

@scarf005
Copy link
Member

scarf005 commented Nov 26, 2023

heccin' case-sensitive semantic PR thing

average CapitalCase fan vs average lowercase enjoyer

EDIT: port is not a valid type, changed to feat.

@scarf005 scarf005 changed the title port(content): freshwater research station feat(port, content): freshwater research station Nov 26, 2023
@chaosvolt
Copy link
Member

Whoops, nice. That explains why it was failing, and glad it successfully checked itself off once corrected.

@scarf005 scarf005 self-assigned this Nov 26, 2023
@scarf005
Copy link
Member

hopefully semantic PR bot will be a more helpful after #3672.

Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

image
image
image
image
image
A very nice addition.

image

I also approv of the usage of Co-authored-by here.

@scarf005 scarf005 added this pull request to the merge queue Nov 26, 2023
Merged via the queue into cataclysmbnteam:upload with commit e038b1c Nov 27, 2023
13 of 14 checks passed
@Vollch Vollch deleted the freshwater branch November 27, 2023 00:36
@scarf005 scarf005 linked an issue Apr 18, 2024 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Talking to traders makes trader items vanish
6 participants