feat(content,port): aircraft carrier #3892
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* initial aircraft commit - overmap * adding terrain mechanisms * adding few terrains for carrier * adding few new loot table * adding a carrier palette * adding some nested maps for carrier * adding OMspecial for carrier * 0 level of carrier * -1 level of carrier * first floor of carrier * second floor of the carrier (flight deck) * rename the folder so it has no spaces * adding triple bunkbed * making officers berths, kinda * delete unque flag for test purposes * adding 3 floor (bridge) * Lint * add some zeds to spawn * some turrets on the bridge (bc thats fun) * split OM terrain on two to make different mob spawns * remade z1 vehicle spawn * fix z1 vehicle spawn * fixing z2 transport spawn * burning the random vehicle spawn in fire * added nuclear reactor * disabling the elevators * lint * fixes * 123 * some stairs fix * real some stairs fix * adding loot to driers and washers * some stuff * remade offices, fix clothes * office supplies tweaks, some computer stuff replacing * replacing computers with wooden one, changing the book loot * replacing computers with wooden one, changing the book loot * delete office mess, add loot for entertainment center * TVs FOR EVERYBODY, YEEEEEAH * small bunkbed changes * ( -> ) * fix the metal gates * add some heavy engines to mechanic supplies * lint * spawn only on lake (doesnt work) * fixing the spawn issues * replacing unpickable doors with pickable one * adding water belt around the ship * tweaking the overmap special * ¯\_(ツ)_/¯ * Beds * moved entertainment_center_loot to a better place * fck u inheritance * typo * Update data/json/mapgen_palettes/aircraft_carrier_palette.json Co-authored-by: Maleclypse <[email protected]> Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: waxcatape <[email protected]>
|
The Autofix app has automatically formatted this Pull Request. If you edit your PR on web UI, you can ignore this message.
If you don't do this, your following work will be based on the old commit, and cause MERGE CONFLICT. |
Vollch
changed the title
|
There is reference to the Old Guard operating off an aircraft carrier so a safe version this could also serve as the base (ha) for future quest development depending on the NPCs on it. |
scarf005
reviewed
Dec 13, 2023
scarf005
reviewed
Dec 13, 2023
scarf005
previously approved these changes
Dec 13, 2023
There was a problem hiding this comment.
Additional Notes
- It'd be conveinent to be able to use elevator decks (feat(port): move vehicles in elevator #3151)
- electric grid is missing from aircraft carrier
used floodfill to optain arbitrary size of elevator tiles.
scarf005
approved these changes
Dec 14, 2023
There was a problem hiding this comment.
airplane boat goes nyoom
Additional Changes
Made elevators operational
- because it's cool.
- removed related comments accordingly.
Fixed elevator floor detection algorithm
- turns out carrier elevator was not working due to the original code only checking elevators tiles within
SEEX - 1radius. - made it use
ff::point_flood_fill_4_connectedso it'll work with any size of elevators
Added electric grids
- as electronics (e.g autodoc, elevators) already work, thought it would make sense to add one
- since it's gigantic and installing electric grid manually would take hours
- would make using aircraft carrier as static base much easier
Added alternative starting professions
added Military Rifleman and Combat Engineer profession to scenario, since they were analogous to DDA's original profession.
scarf005
approved these changes
Dec 14, 2023
This was referenced Dec 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of change
Who doesn't like magical flying boats?
Describe the solution
Ported:
New map: Aircraft carrier CleverRaven/Cataclysm-DDA#54711
Aircraft carrier scenario CleverRaven/Cataclysm-DDA#57839
let the "like new" apache on the aircraft carrier take off. CleverRaven/Cataclysm-DDA#62152
terrain-floors_indoor.jsonrenamed toterrain-floors-indoor.json. DDA did it some time ago, and that differences makes JSONs load in different order, which makes porting copy-from needlessly painful. Until now we didn't had anything in repo(and it have no effect on mods) affected by this difference, so it's a safe change.Aircraft carrier is huge, and have a lot of different stuff inside. And not all off that stuff exists in BN. Some mobs were removed, some item groups changed to analogues, etc. All those changes in last commit of PR for easier review.
Describe alternatives you've considered
None.
Testing
Found one in wild, started in another one with scenario. Looks good.
Additional context
Checklist